VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-11-22 16:08:39 -05:00
Code Issues Projects Releases Wiki Activity

Spectrum: restore holdoff to what it should actually do (trim transient contribution). Reviewed decay, holdoff and stoke limits

Browse Source
This commit is contained in:
f4exb 2018-10-17 14:21:25 +02:00
parent 9eb08541ee
commit 71e9556b6f
5 changed files with 19 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
sdrgui/gui/glspectrum.cpp
View File

@ -104,9 +104,9 @@ GLSpectrum::GLSpectrum(QWidget* parent) :
((quint8*)&m_histogramPalette[i])[3] = c.alpha(); ((quint8*)&m_histogramPalette[i])[3] = c.alpha();
} }
m_histogramHoldoffBase = 2; // was 4 m_histogramHoldoffBase = 4; // was 2
m_histogramHoldoffCount = m_histogramHoldoffBase; m_histogramHoldoffCount = m_histogramHoldoffBase;
m_histogramLateHoldoff = 1; // was 20 m_histogramLateHoldoff = 20; // was 1
m_histogramStroke = 40; // was 4 m_histogramStroke = 40; // was 4
m_timeScale.setFont(font()); m_timeScale.setFont(font());
@ -170,29 +170,17 @@ void GLSpectrum::setPowerRange(Real powerRange)
void GLSpectrum::setDecay(int decay) void GLSpectrum::setDecay(int decay)
{ {
m_decay = decay; m_decay = decay < 0 ? 0 : decay > 20 ? 20 : decay;
if(m_decay < 0)
m_decay = 0;
else if(m_decay > 10)
m_decay = 10;
} }
void GLSpectrum::setHistoLateHoldoff(int lateHoldoff) void GLSpectrum::setHistoHoldoffBase(int holdoffBase)
{ {
m_histogramLateHoldoff = lateHoldoff; m_histogramHoldoffBase = holdoffBase < 0 ? 0 : holdoffBase > 20 ? 20 : holdoffBase;
if(m_histogramLateHoldoff < 0)
m_histogramLateHoldoff = 0;
else if(m_histogramLateHoldoff > 20)
m_histogramLateHoldoff = 20;
} }
void GLSpectrum::setHistoStroke(int stroke) void GLSpectrum::setHistoStroke(int stroke)
{ {
m_histogramStroke = stroke; m_histogramStroke = stroke < 4 ? 4 : stroke > 240 ? 240 : stroke;
if(m_histogramStroke < 4)
m_histogramStroke = 4;
else if(m_histogramStroke > 240)
m_histogramStroke = 240;
} }
void GLSpectrum::setSampleRate(qint32 sampleRate) void GLSpectrum::setSampleRate(qint32 sampleRate)

2
sdrgui/gui/glspectrum.h
View File

@ -69,7 +69,7 @@ public:
void setReferenceLevel(Real referenceLevel); void setReferenceLevel(Real referenceLevel);
void setPowerRange(Real powerRange); void setPowerRange(Real powerRange);
void setDecay(int decay); void setDecay(int decay);
void setHistoLateHoldoff(int lateHoldoff); void setHistoHoldoffBase(int holdoffBase);
void setHistoStroke(int stroke); void setHistoStroke(int stroke);
void setDisplayWaterfall(bool display); void setDisplayWaterfall(bool display);
void setSsbSpectrum(bool ssbSpectrum); void setSsbSpectrum(bool ssbSpectrum);

18
sdrgui/gui/glspectrumgui.cpp
View File

@ -17,7 +17,7 @@ GLSpectrumGUI::GLSpectrumGUI(QWidget* parent) :
m_refLevel(0), m_refLevel(0),
m_powerRange(100), m_powerRange(100),
m_decay(0), m_decay(0),
m_histogramLateHoldoff(1), m_histogramHoldoffBase(0),
m_histogramStroke(40), m_histogramStroke(40),
m_displayGridIntensity(5), m_displayGridIntensity(5),
m_displayTraceIntensity(50), m_displayTraceIntensity(50),
@ -67,7 +67,7 @@ void GLSpectrumGUI::resetToDefaults()
m_refLevel = 0; m_refLevel = 0;
m_powerRange = 100; m_powerRange = 100;
m_decay = 0; m_decay = 0;
m_histogramLateHoldoff = 1; m_histogramHoldoffBase = 0;
m_histogramStroke = 40; m_histogramStroke = 40;
m_displayGridIntensity = 5, m_displayGridIntensity = 5,
m_displayWaterfall = true; m_displayWaterfall = true;
@ -98,7 +98,7 @@ QByteArray GLSpectrumGUI::serialize() const
s.writeBool(11, m_displayGrid); s.writeBool(11, m_displayGrid);
s.writeBool(12, m_invert); s.writeBool(12, m_invert);
s.writeS32(13, m_displayGridIntensity); s.writeS32(13, m_displayGridIntensity);
s.writeS32(14, m_histogramLateHoldoff); s.writeS32(14, m_histogramHoldoffBase);
s.writeS32(15, m_histogramStroke); s.writeS32(15, m_histogramStroke);
s.writeBool(16, m_displayCurrent); s.writeBool(16, m_displayCurrent);
s.writeS32(17, m_displayTraceIntensity); s.writeS32(17, m_displayTraceIntensity);
@ -134,7 +134,7 @@ bool GLSpectrumGUI::deserialize(const QByteArray& data)
d.readBool(11, &m_displayGrid, false); d.readBool(11, &m_displayGrid, false);
d.readBool(12, &m_invert, true); d.readBool(12, &m_invert, true);
d.readS32(13, &m_displayGridIntensity, 5); d.readS32(13, &m_displayGridIntensity, 5);
d.readS32(14, &m_histogramLateHoldoff, 1); d.readS32(14, &m_histogramHoldoffBase, 0);
d.readS32(15, &m_histogramStroke, 40); d.readS32(15, &m_histogramStroke, 40);
d.readBool(16, &m_displayCurrent, false); d.readBool(16, &m_displayCurrent, false);
d.readS32(17, &m_displayTraceIntensity, 50); d.readS32(17, &m_displayTraceIntensity, 50);
@ -171,7 +171,7 @@ void GLSpectrumGUI::applySettings()
ui->averagingMode->setCurrentIndex((int) m_averagingMode); ui->averagingMode->setCurrentIndex((int) m_averagingMode);
ui->linscale->setChecked(m_linear); ui->linscale->setChecked(m_linear);
ui->decay->setSliderPosition(m_decay); ui->decay->setSliderPosition(m_decay);
ui->holdoff->setSliderPosition(m_histogramLateHoldoff); ui->holdoff->setSliderPosition(m_histogramHoldoffBase);
ui->stroke->setSliderPosition(m_histogramStroke); ui->stroke->setSliderPosition(m_histogramStroke);
ui->waterfall->setChecked(m_displayWaterfall); ui->waterfall->setChecked(m_displayWaterfall);
ui->maxHold->setChecked(m_displayMaxHold); ui->maxHold->setChecked(m_displayMaxHold);
@ -182,7 +182,7 @@ void GLSpectrumGUI::applySettings()
ui->gridIntensity->setSliderPosition(m_displayGridIntensity); ui->gridIntensity->setSliderPosition(m_displayGridIntensity);
ui->decay->setToolTip(QString("Decay: %1").arg(m_decay)); ui->decay->setToolTip(QString("Decay: %1").arg(m_decay));
ui->holdoff->setToolTip(QString("Holdoff: %1").arg(m_histogramLateHoldoff)); ui->holdoff->setToolTip(QString("Holdoff: %1").arg(m_histogramHoldoffBase));
ui->stroke->setToolTip(QString("Stroke: %1").arg(m_histogramStroke)); ui->stroke->setToolTip(QString("Stroke: %1").arg(m_histogramStroke));
ui->gridIntensity->setToolTip(QString("Grid intensity: %1").arg(m_displayGridIntensity)); ui->gridIntensity->setToolTip(QString("Grid intensity: %1").arg(m_displayGridIntensity));
ui->traceIntensity->setToolTip(QString("Trace intensity: %1").arg(m_displayTraceIntensity)); ui->traceIntensity->setToolTip(QString("Trace intensity: %1").arg(m_displayTraceIntensity));
@ -193,7 +193,7 @@ void GLSpectrumGUI::applySettings()
m_glSpectrum->setDisplayCurrent(m_displayCurrent); m_glSpectrum->setDisplayCurrent(m_displayCurrent);
m_glSpectrum->setDisplayHistogram(m_displayHistogram); m_glSpectrum->setDisplayHistogram(m_displayHistogram);
m_glSpectrum->setDecay(m_decay); m_glSpectrum->setDecay(m_decay);
m_glSpectrum->setHistoLateHoldoff(m_histogramLateHoldoff); m_glSpectrum->setHistoHoldoffBase(m_histogramHoldoffBase);
m_glSpectrum->setHistoStroke(m_histogramStroke); m_glSpectrum->setHistoStroke(m_histogramStroke);
m_glSpectrum->setInvertedWaterfall(m_invert); m_glSpectrum->setInvertedWaterfall(m_invert);
m_glSpectrum->setDisplayGrid(m_displayGrid); m_glSpectrum->setDisplayGrid(m_displayGrid);
@ -372,8 +372,8 @@ void GLSpectrumGUI::on_holdoff_valueChanged(int index)
if (index < 0) { if (index < 0) {
return; return;
} }
m_histogramLateHoldoff = index; m_histogramHoldoffBase = index;
//ui->holdoff->setToolTip(QString("Holdoff: %1").arg(m_histogramLateHoldoff)); //ui->holdoff->setToolTip(QString("Holdoff: %1").arg(m_histogramHoldoffBase));
if(m_glSpectrum != 0) { if(m_glSpectrum != 0) {
applySettings(); applySettings();
} }

2
sdrgui/gui/glspectrumgui.h
View File

@ -49,7 +49,7 @@ private:
Real m_refLevel; Real m_refLevel;
Real m_powerRange; Real m_powerRange;
int m_decay; int m_decay;
int m_histogramLateHoldoff; int m_histogramHoldoffBase;
int m_histogramStroke; int m_histogramStroke;
int m_displayGridIntensity; int m_displayGridIntensity;
int m_displayTraceIntensity; int m_displayTraceIntensity;

4
sdrgui/gui/glspectrumgui.ui
View File

@ -17,7 +17,7 @@
</font> </font>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Oscilloscope</string> <string>Spectrum</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout" columnstretch="1,0,0"> <layout class="QGridLayout" name="gridLayout" columnstretch="1,0,0">
<property name="leftMargin"> <property name="leftMargin">
@ -52,7 +52,7 @@
<string>Decay:</string> <string>Decay:</string>
</property> </property>
<property name="maximum"> <property name="maximum">
<number>240</number> <number>20</number>
</property> </property>
<property name="pageStep"> <property name="pageStep">
<number>1</number> <number>1</number>