VE7UWU
/
sdrangel
mirror of https://github.com/f4exb/sdrangel.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

GLSpectrum GUI: removed m_averagingMaxScale from settings

This commit is contained in:
f4exb 2020-05-01 05:33:44 +02:00
parent cf2c04214b
commit 2ccb866c79
3 changed files with 26 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sdrbase/dsp/glspectrumsettings.h
View File

@ -56,7 +56,6 @@ public:
bool m_invert; bool m_invert;
AveragingMode m_averagingMode; AveragingMode m_averagingMode;
int m_averagingIndex; int m_averagingIndex;
int m_averagingMaxScale; //!< Max power of 10 multiplier to 2,5,10 base ex: 2 -> 2,5,10,20,50,100,200,500,1000
unsigned int m_averagingNb; unsigned int m_averagingNb;
bool m_linear; //!< linear else logarithmic scale bool m_linear; //!< linear else logarithmic scale

45
sdrgui/gui/glspectrumgui.cpp
View File

@ -46,9 +46,9 @@ GLSpectrumGUI::GLSpectrumGUI(QWidget* parent) :
ui->levelRange->addItem(QString("%1").arg(range)); ui->levelRange->addItem(QString("%1").arg(range));
} }
setAveragingCombo();
connect(&m_messageQueue, SIGNAL(messageEnqueued()), this, SLOT(handleInputMessages())); connect(&m_messageQueue, SIGNAL(messageEnqueued()), this, SLOT(handleInputMessages()));
displaySettings(); displaySettings();
setAveragingCombo();
applySettings(); applySettings();
} }
@ -169,7 +169,9 @@ void GLSpectrumGUI::applySettings()
m_glSpectrum->setDisplayTraceIntensity(m_settings.m_displayTraceIntensity); m_glSpectrum->setDisplayTraceIntensity(m_settings.m_displayTraceIntensity);
if ((m_settings.m_averagingMode == GLSpectrumSettings::AvgModeFixed) || (m_settings.m_averagingMode == GLSpectrumSettings::AvgModeMax)) { if ((m_settings.m_averagingMode == GLSpectrumSettings::AvgModeFixed) || (m_settings.m_averagingMode == GLSpectrumSettings::AvgModeMax)) {
m_glSpectrum->setTimingRate(getAveragingValue(m_settings.m_averagingIndex) == 0 ? 1 : getAveragingValue(m_settings.m_averagingIndex)); m_glSpectrum->setTimingRate(getAveragingValue(m_settings.m_averagingIndex, m_settings.m_averagingMode) == 0 ?
1 :
getAveragingValue(m_settings.m_averagingIndex, m_settings.m_averagingMode));
} else { } else {
m_glSpectrum->setTimingRate(1); m_glSpectrum->setTimingRate(1);
} }
@ -189,7 +191,7 @@ void GLSpectrumGUI::applySettings()
m_settings.m_refLevel, m_settings.m_refLevel,
m_settings.m_powerRange, m_settings.m_powerRange,
m_settings.m_fftOverlap, m_settings.m_fftOverlap,
getAveragingValue(m_settings.m_averagingIndex), getAveragingValue(m_settings.m_averagingIndex, m_settings.m_averagingMode),
(SpectrumVis::AvgMode) m_settings.m_averagingMode, (SpectrumVis::AvgMode) m_settings.m_averagingMode,
(FFTWindow::Function) m_settings.m_fftWindow, (FFTWindow::Function) m_settings.m_fftWindow,
m_settings.m_linear m_settings.m_linear
@ -221,17 +223,7 @@ void GLSpectrumGUI::on_averagingMode_currentIndexChanged(int index)
GLSpectrumSettings::AvgModeMax : GLSpectrumSettings::AvgModeMax :
(GLSpectrumSettings::AveragingMode) index; (GLSpectrumSettings::AveragingMode) index;
if (m_settings.m_averagingMode == GLSpectrumSettings::AvgModeMoving) setAveragingCombo();
{
m_settings.m_averagingMaxScale = 2;
setAveragingCombo();
}
else
{
m_settings.m_averagingMaxScale = 5;
setAveragingCombo();
}
applySettings(); applySettings();
} }
@ -342,7 +334,16 @@ void GLSpectrumGUI::on_clearSpectrum_clicked(bool checked)
} }
} }
int GLSpectrumGUI::getAveragingIndex(int averagingValue) const int GLSpectrumGUI::getAveragingMaxScale(GLSpectrumSettings::AveragingMode averagingMode)
{
if (averagingMode == GLSpectrumSettings::AvgModeMoving) {
return 2;
} else {
return 5;
}
}
int GLSpectrumGUI::getAveragingIndex(int averagingValue, GLSpectrumSettings::AveragingMode averagingMode)
{ {
if (averagingValue <= 1) { if (averagingValue <= 1) {
return 0; return 0;
@ -351,7 +352,7 @@ int GLSpectrumGUI::getAveragingIndex(int averagingValue) const
int v = averagingValue; int v = averagingValue;
int j = 0; int j = 0;
for (int i = 0; i <= m_settings.m_averagingMaxScale; i++) for (int i = 0; i <= getAveragingMaxScale(averagingMode); i++)
{ {
if (v < 20) if (v < 20)
{ {
@ -371,17 +372,17 @@ int GLSpectrumGUI::getAveragingIndex(int averagingValue) const
v /= 10; v /= 10;
} }
return 3*m_settings.m_averagingMaxScale + 3; return 3 * getAveragingMaxScale(averagingMode) + 3;
} }
int GLSpectrumGUI::getAveragingValue(int averagingIndex) const int GLSpectrumGUI::getAveragingValue(int averagingIndex, GLSpectrumSettings::AveragingMode averagingMode)
{ {
if (averagingIndex <= 0) { if (averagingIndex <= 0) {
return 1; return 1;
} }
int v = averagingIndex - 1; int v = averagingIndex - 1;
int m = pow(10.0, v/3 > m_settings.m_averagingMaxScale ? m_settings.m_averagingMaxScale : v/3); int m = pow(10.0, v/3 > getAveragingMaxScale(averagingMode) ? getAveragingMaxScale(averagingMode) : v/3);
int x = 1; int x = 1;
if (v % 3 == 0) { if (v % 3 == 0) {
@ -402,7 +403,7 @@ void GLSpectrumGUI::setAveragingCombo()
ui->averaging->clear(); ui->averaging->clear();
ui->averaging->addItem(QString("1")); ui->averaging->addItem(QString("1"));
for (int i = 0; i <= m_settings.m_averagingMaxScale; i++) for (int i = 0; i <= getAveragingMaxScale(m_settings.m_averagingMode); i++)
{ {
QString s; QString s;
int m = pow(10.0, i); int m = pow(10.0, i);
@ -460,9 +461,9 @@ void GLSpectrumGUI::setAveragingToolitp()
if (m_glSpectrum) if (m_glSpectrum)
{ {
QString s; QString s;
float averagingTime = (m_settings.m_fftSize * (getAveragingValue(m_settings.m_averagingIndex) == 0 ? float averagingTime = (m_settings.m_fftSize * (getAveragingValue(m_settings.m_averagingIndex, m_settings.m_averagingMode) == 0 ?
1 : 1 :
getAveragingValue(m_settings.m_averagingIndex))) / (float) m_glSpectrum->getSampleRate(); getAveragingValue(m_settings.m_averagingIndex, m_settings.m_averagingMode))) / (float) m_glSpectrum->getSampleRate();
setNumberStr(averagingTime, 2, s); setNumberStr(averagingTime, 2, s);
ui->averaging->setToolTip(QString("Number of averaging samples (avg time: %1s)").arg(s)); ui->averaging->setToolTip(QString("Number of averaging samples (avg time: %1s)").arg(s));
} }

5
sdrgui/gui/glspectrumgui.h
View File

@ -71,8 +71,9 @@ private:
void blockApplySettings(bool block); void blockApplySettings(bool block);
void applySettings(); void applySettings();
void displaySettings(); void displaySettings();
int getAveragingIndex(int averaging) const; static int getAveragingMaxScale(GLSpectrumSettings::AveragingMode averagingMode); //!< Max power of 10 multiplier to 2,5,10 base ex: 2 -> 2,5,10,20,50,100,200,500,1000
int getAveragingValue(int averagingIndex) const; static int getAveragingIndex(int averaging, GLSpectrumSettings::AveragingMode averagingMode);
static int getAveragingValue(int averagingIndex, GLSpectrumSettings::AveragingMode averagingMode);
void setAveragingCombo(); void setAveragingCombo();
void setNumberStr(int n, QString& s); void setNumberStr(int n, QString& s);
void setNumberStr(float v, int decimalPlaces, QString& s); void setNumberStr(float v, int decimalPlaces, QString& s);