ham-ref/wfview
1
0
Fork 0
mirror of https://github.com/wf-group/wfview synced 2026-08-13 17:32:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Skip replot() if taking too long

Browse source
This commit is contained in:
Phil Taylor 2024-11-14 00:21:18 +00:00
parent b567002f03
commit bc00a46200
3 changed files with 20 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

29
spectrumscope.cpp
View file

@ -432,6 +432,7 @@ spectrumScope::spectrumScope(bool scope, uchar receiver, uchar vfo, QWidget *par
connect(spectrum, SIGNAL(mouseWheel(QWheelEvent*)), this, SLOT(scroll(QWheelEvent*)));
showHideControls(spectrumMode_t::spectModeCenter);
lastData.start();
}
@ -672,11 +673,7 @@ bool spectrumScope::updateScope(scopeData data)
showBandIndicators(true);
}
qint64 spectime = 0;
QElapsedTimer elapsed;
QElapsedTimer totalUpdateTime;
totalUpdateTime.start();
//qint64 spectime = 0;
bool updateRange = false;
@ -857,9 +854,6 @@ bool spectrumScope::updateScope(scopeData data)
spectrum->yAxis->setRange(plotFloor, plotCeiling);
spectrum->xAxis->setRange(data.startFreq, data.endFreq);
elapsed.start();
spectrum->replot();
spectime = elapsed.elapsed();
if(specLen == spectWidth)
{
@ -882,9 +876,20 @@ bool spectrumScope::updateScope(scopeData data)
waterfall->yAxis->setRange(0,wfLength - 1);
waterfall->xAxis->setRange(0, spectWidth-1);
elapsed.start();
waterfall->replot();
redrawSpeed->setText(QString("%0ms/%1ms").arg(spectime).arg(totalUpdateTime.elapsed()));
int spectrumTime = static_cast<int>(spectrum->replotTime(false));
int waterfallTime = static_cast<int>(waterfall->replotTime(false));
QString missed = "";
if (lastData.elapsed() > spectrumTime && lastData.elapsed() > waterfallTime)
{
spectrum->replot();
waterfall->replot();
lastData.restart();
} else {
missed = "*";
}
redrawSpeed->setText(QString("%0%1ms/%2ms").arg(missed).arg(spectrumTime).arg(waterfallTime));
/*
#if defined (USB_CONTROLLER)
@ -918,7 +923,7 @@ bool spectrumScope::updateScope(scopeData data)
oorIndicator->setVisible(false);
}
emit elapsedTime(receiver, elapsed.elapsed());
//emit elapsedTime(receiver, elapsed.elapsed());
return true;
}

1
spectrumscope.h
View file

@ -306,6 +306,7 @@ private:
bool bandIndicatorsVisible=false;
rigCapabilities* rigCaps=Q_NULLPTR;
bandType currentBand;
QElapsedTimer lastData;
};
#endif // SPECTRUMSCOPE_H

4
wfmain.cpp
View file

@ -3578,9 +3578,9 @@ void wfmain:: getInitialRigState()
// Only show settingsgroup if rig has sub
ui->scopeSettingsGroup->setVisible(rigCaps->commands.contains(funcScopeWaveData));
ui->scopeSettingsGroup->setVisible(rigCaps->commands.contains(funcScopeMainSub));
ui->scopeDualBtn->setVisible(rigCaps->commands.contains(funcScopeSingleDual));
ui->scopeDualBtn->setVisible(rigCaps->commands.contains(funcVFODualWatch));
ui->antennaGroup->setVisible(rigCaps->commands.contains(funcAntenna));
ui->preampAttGroup->setVisible(rigCaps->commands.contains(funcPreamp));