VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-11-12 09:10:34 -05:00
Code Issues Projects Releases Wiki Activity

GLSpectrum: synchronize spectrum running with the GUI spectrum freeze button. Fixes issue #561

Browse Source
This commit is contained in:
f4exb 2020-07-10 00:08:42 +02:00
parent 784708b71d
commit ac5c4dc070
3 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
sdrbase/dsp/spectrumvis.cpp
View File

@ -592,12 +592,24 @@ void SpectrumVis::feed(const SampleVector::const_iterator& cbegin, const SampleV
void SpectrumVis::start() void SpectrumVis::start()
{ {
m_running = true; setRunning(true);
if (getMessageQueueToGUI()) // propagate to GUI if any
{
MsgStartStop *msg = MsgStartStop::create(true);
getMessageQueueToGUI()->push(msg);
}
} }
void SpectrumVis::stop() void SpectrumVis::stop()
{ {
m_running = false; setRunning(false);
if (getMessageQueueToGUI()) // propagate to GUI if any
{
MsgStartStop *msg = MsgStartStop::create(false);
getMessageQueueToGUI()->push(msg);
}
} }
bool SpectrumVis::handleMessage(const Message& message) bool SpectrumVis::handleMessage(const Message& message)
@ -636,14 +648,10 @@ bool SpectrumVis::handleMessage(const Message& message)
handleConfigureWSSpectrum(conf.getAddress(), conf.getPort()); handleConfigureWSSpectrum(conf.getAddress(), conf.getPort());
return true; return true;
} }
else if (MsgStartStop::match(message)) { else if (MsgStartStop::match(message))
{
MsgStartStop& cmd = (MsgStartStop&) message; MsgStartStop& cmd = (MsgStartStop&) message;
setRunning(cmd.getStartStop());
if (cmd.getStartStop()) {
start();
} else {
stop();
}
return true; return true;
} }

1
sdrbase/dsp/spectrumvis.h
View File

@ -206,6 +206,7 @@ private:
QMutex m_mutex; QMutex m_mutex;
void setRunning(bool running) { m_running = running; }
void applySettings(const GLSpectrumSettings& settings, bool force = false); void applySettings(const GLSpectrumSettings& settings, bool force = false);
void handleConfigureDSP(uint64_t centerFrequency, int sampleRate); void handleConfigureDSP(uint64_t centerFrequency, int sampleRate);
void handleScalef(Real scalef); void handleScalef(Real scalef);

8
sdrgui/gui/glspectrumgui.cpp
View File

@ -527,6 +527,14 @@ bool GLSpectrumGUI::handleMessage(const Message& message)
ui->wsSpectrum->blockSignals(false); ui->wsSpectrum->blockSignals(false);
return true; return true;
} }
else if (SpectrumVis::MsgStartStop::match(message))
{
const SpectrumVis::MsgStartStop& msg = (SpectrumVis::MsgStartStop&) message;
ui->freeze->blockSignals(true);
ui->freeze->doToggle(!msg.getStartStop()); // this is a freeze so stop is true
ui->freeze->blockSignals(false);
return true;
}
return false; return false;
} }