VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-09-27 15:26:33 -04:00
Code Issues Projects Releases Wiki Activity

Update spectrum settings to match what's used in sink.

Browse Source 
Fix deserialisation of UI related settings.
This commit is contained in:
Jon Beniston 2023-05-22 13:29:25 +01:00
parent 11bc050b67
commit 4f997afa37
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/channelrx/demodils/ilsdemodgui.cpp
View File

@ -1019,16 +1019,16 @@ ILSDemodGUI::ILSDemodGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, Baseban
setAttribute(Qt::WA_DeleteOnClose, true); setAttribute(Qt::WA_DeleteOnClose, true);
m_helpURL = "plugins/channelrx/demodils/readme.md"; m_helpURL = "plugins/channelrx/demodils/readme.md";
RollupContents *rollupContents = getRollupContents(); RollupContents *rollupContents = getRollupContents();
ui->setupUi(rollupContents); ui->setupUi(rollupContents);
setSizePolicy(rollupContents->sizePolicy()); setSizePolicy(rollupContents->sizePolicy());
rollupContents->arrangeRollups(); rollupContents->arrangeRollups();
connect(rollupContents, SIGNAL(widgetRolled(QWidget*,bool)), this, SLOT(onWidgetRolled(QWidget*,bool))); connect(rollupContents, SIGNAL(widgetRolled(QWidget*,bool)), this, SLOT(onWidgetRolled(QWidget*,bool)));
connect(this, SIGNAL(customContextMenuRequested(const QPoint &)), this, SLOT(onMenuDialogCalled(const QPoint &))); connect(this, SIGNAL(customContextMenuRequested(const QPoint &)), this, SLOT(onMenuDialogCalled(const QPoint &)));
m_ilsDemod = reinterpret_cast<ILSDemod*>(rxChannel); m_ilsDemod = reinterpret_cast<ILSDemod*>(rxChannel);
m_ilsDemod->setMessageQueueToGUI(getInputMessageQueue()); m_ilsDemod->setMessageQueueToGUI(getInputMessageQueue());
m_spectrumVis = m_ilsDemod->getSpectrumVis(); m_spectrumVis = m_ilsDemod->getSpectrumVis();
m_spectrumVis->setGLSpectrum(ui->glSpectrum); m_spectrumVis->setGLSpectrum(ui->glSpectrum);
connect(&MainCore::instance()->getMasterTimer(), SIGNAL(timeout()), this, SLOT(tick())); // 50 ms connect(&MainCore::instance()->getMasterTimer(), SIGNAL(timeout()), this, SLOT(tick())); // 50 ms
@ -1124,7 +1124,8 @@ ILSDemodGUI::ILSDemodGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, Baseban
ui->p150Units->setVisible(devMode); ui->p150Units->setVisible(devMode);
SpectrumSettings spectrumSettings = m_spectrumVis->getSettings(); SpectrumSettings spectrumSettings = m_spectrumVis->getSettings();
spectrumSettings.m_fftSize = 2048; spectrumSettings.m_fftSize = 256;
spectrumSettings.m_fftWindow = FFTWindow::Flattop; // To match what's used in sink
spectrumSettings.m_averagingMode = SpectrumSettings::AvgModeMoving; spectrumSettings.m_averagingMode = SpectrumSettings::AvgModeMoving;
spectrumSettings.m_averagingValue = 1; spectrumSettings.m_averagingValue = 1;
spectrumSettings.m_displayWaterfall = true; spectrumSettings.m_displayWaterfall = true;
@ -1133,7 +1134,6 @@ ILSDemodGUI::ILSDemodGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, Baseban
spectrumSettings.m_displayHistogram = false; spectrumSettings.m_displayHistogram = false;
spectrumSettings.m_displayCurrent = true; spectrumSettings.m_displayCurrent = true;
spectrumSettings.m_spectrumStyle = SpectrumSettings::Gradient; spectrumSettings.m_spectrumStyle = SpectrumSettings::Gradient;
// FLAT TOP?
SpectrumVis::MsgConfigureSpectrumVis *msg = SpectrumVis::MsgConfigureSpectrumVis::create(spectrumSettings, false); SpectrumVis::MsgConfigureSpectrumVis *msg = SpectrumVis::MsgConfigureSpectrumVis::create(spectrumSettings, false);
m_spectrumVis->getInputMessageQueue()->push(msg); m_spectrumVis->getInputMessageQueue()->push(msg);

6
plugins/channelrx/demodils/ilsdemodsettings.cpp
View File

@ -221,9 +221,9 @@ bool ILSDemodSettings::deserialize(const QByteArray& data)
d.readBlob(52, &bytetmp); d.readBlob(52, &bytetmp);
m_rollupState->deserialize(bytetmp); m_rollupState->deserialize(bytetmp);
} }
d.readS32(28, &m_workspaceIndex, 0); d.readS32(53, &m_workspaceIndex, 0);
d.readBlob(29, &m_geometryBytes); d.readBlob(54, &m_geometryBytes);
d.readBool(30, &m_hidden, false); d.readBool(55, &m_hidden, false);
return true; return true;
} }