Browse Source

Add XPPoints and XPolarGrid to settings.

chirpmodem-v8.0.0
Jon Beniston 10 months ago
parent
commit
d10d09c6c9
  1. 11
      sdrbase/dsp/glscopesettings.cpp
  2. 2
      sdrbase/dsp/glscopesettings.h
  3. 4
      sdrgui/gui/glscopegui.cpp

11
sdrbase/dsp/glscopesettings.cpp

@ -47,6 +47,8 @@ GLScopeSettings::GLScopeSettings(const GLScopeSettings& t) @@ -47,6 +47,8 @@ GLScopeSettings::GLScopeSettings(const GLScopeSettings& t)
m_tracesData = t.m_tracesData;
m_triggersData = t.m_triggersData;
m_displayMode = t.m_displayMode;
m_displayXYPoints = t.m_displayXYPoints;
m_displayXYPolarGrid = t.m_displayXYPolarGrid;
m_traceIntensity = t.m_traceIntensity;
m_gridIntensity = t.m_gridIntensity;
m_time = t.m_time;
@ -61,6 +63,8 @@ GLScopeSettings::~GLScopeSettings() @@ -61,6 +63,8 @@ GLScopeSettings::~GLScopeSettings()
void GLScopeSettings::resetToDefaults()
{
m_displayMode = DisplayX;
m_displayXYPoints = false;
m_displayXYPolarGrid = false;
m_traceIntensity = 50;
m_gridIntensity = 10;
m_time = 1;
@ -83,6 +87,9 @@ QByteArray GLScopeSettings::serialize() const @@ -83,6 +87,9 @@ QByteArray GLScopeSettings::serialize() const
s.writeS32(6, m_traceLenMult);
s.writeBool(7, m_freerun);
s.writeBool(8, m_displayXYPoints);
s.writeBool(9, m_displayXYPolarGrid);
std::vector<TraceData>::const_iterator traceDataIt = m_tracesData.begin();
unsigned int i = 0;
@ -152,6 +159,8 @@ bool GLScopeSettings::deserialize(const QByteArray& data) @@ -152,6 +159,8 @@ bool GLScopeSettings::deserialize(const QByteArray& data)
// d.readS32(5, &m_timeOfs, 0);
d.readS32(6, &m_traceLenMult, 1);
d.readBool(7, &m_freerun, true);
d.readBool(8, &m_displayXYPoints, false);
d.readBool(9, &m_displayXYPolarGrid, false);
d.readS32(201, &m_trigPre, 0);
uint32_t nbTracesSaved;
@ -472,6 +481,8 @@ GLScopeSettings& GLScopeSettings::operator=(const GLScopeSettings& t) @@ -472,6 +481,8 @@ GLScopeSettings& GLScopeSettings::operator=(const GLScopeSettings& t)
m_tracesData = t.m_tracesData;
m_triggersData = t.m_triggersData;
m_displayMode = t.m_displayMode;
m_displayXYPoints = t.m_displayXYPoints;
m_displayXYPolarGrid = t.m_displayXYPolarGrid;
m_traceIntensity = t.m_traceIntensity;
m_gridIntensity = t.m_gridIntensity;
m_time = t.m_time;

2
sdrbase/dsp/glscopesettings.h

@ -157,6 +157,8 @@ public: @@ -157,6 +157,8 @@ public:
};
DisplayMode m_displayMode;
bool m_displayXYPoints;
bool m_displayXYPolarGrid;
int m_traceIntensity;
int m_gridIntensity;
int m_time;

4
sdrgui/gui/glscopegui.cpp

@ -444,11 +444,13 @@ void GLScopeGUI::on_polar_toggled(bool checked) @@ -444,11 +444,13 @@ void GLScopeGUI::on_polar_toggled(bool checked)
void GLScopeGUI::on_polarPoints_toggled(bool checked)
{
m_glScope->setDisplayXYPoints(checked);
m_settings.m_displayXYPoints = checked;
}
void GLScopeGUI::on_polarGrid_toggled(bool checked)
{
m_glScope->setDisplayXYPolarGrid(checked);
m_settings.m_displayXYPolarGrid = checked;
}
void GLScopeGUI::on_traceIntensity_valueChanged(int value)
@ -1503,6 +1505,8 @@ void GLScopeGUI::displaySettings() @@ -1503,6 +1505,8 @@ void GLScopeGUI::displaySettings()
const GLScopeSettings::TriggerData& triggerData = m_settings.m_triggersData[m_ctlTriggerIndex];
setTriggerUI(triggerData);
setDisplayMode(m_settings.m_displayMode);
ui->polarPoints->setChecked(m_settings.m_displayXYPoints);
ui->polarGrid->setChecked(m_settings.m_displayXYPolarGrid);
ui->traceIntensity->setToolTip(QString("Trace intensity: %1").arg(m_settings.m_traceIntensity));
ui->traceIntensity->setValue(m_settings.m_traceIntensity);
m_glScope->setDisplayTraceIntensity(m_settings.m_traceIntensity);

Loading…
Cancel
Save