mirror of https://github.com/f4exb/sdrangel.git
SpectrumVis: removed message queue parameter from configure method
This commit is contained in:
parent
79b670d919
commit
7d6d351891
|
@ -397,7 +397,6 @@ BFMDemodGUI::BFMDemodGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, Baseban
|
|||
ui->glSpectrum->setDisplayMaxHold(false);
|
||||
ui->glSpectrum->setSsbSpectrum(true);
|
||||
m_spectrumVis->configure(
|
||||
m_spectrumVis->getInputMessageQueue(),
|
||||
64, // FFT size
|
||||
0, // Ref level (dB)
|
||||
100, // Power range (dB)
|
||||
|
@ -405,7 +404,8 @@ BFMDemodGUI::BFMDemodGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, Baseban
|
|||
0, // number of averaging samples
|
||||
SpectrumVis::AvgModeNone, // no averaging
|
||||
FFTWindow::BlackmanHarris,
|
||||
false); // logarithmic scale
|
||||
false // logarithmic scale
|
||||
);
|
||||
connect(&MainWindow::getInstance()->getMasterTimer(), SIGNAL(timeout()), this, SLOT(tick()));
|
||||
|
||||
m_channelMarker.blockSignals(true);
|
||||
|
|
|
@ -187,7 +187,7 @@ UDPSinkGUI::UDPSinkGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandS
|
|||
ui->glSpectrum->setSampleRate(ui->sampleRate->text().toInt());
|
||||
ui->glSpectrum->setDisplayWaterfall(true);
|
||||
ui->glSpectrum->setDisplayMaxHold(true);
|
||||
m_spectrumVis->configure(m_spectrumVis->getInputMessageQueue(),
|
||||
m_spectrumVis->configure(
|
||||
64, // FFT size
|
||||
0, // Ref level (dB)
|
||||
100, // Power range (dB)
|
||||
|
@ -195,7 +195,8 @@ UDPSinkGUI::UDPSinkGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandS
|
|||
0, // number of averaging samples
|
||||
SpectrumVis::AvgModeNone, // no averaging
|
||||
FFTWindow::BlackmanHarris,
|
||||
false); // logarithmic scale
|
||||
false // logarithmic scale
|
||||
);
|
||||
|
||||
ui->glSpectrum->connectTimer(MainWindow::getInstance()->getMasterTimer());
|
||||
connect(&MainWindow::getInstance()->getMasterTimer(), SIGNAL(timeout()), this, SLOT(tick()));
|
||||
|
|
|
@ -144,7 +144,7 @@ UDPSourceGUI::UDPSourceGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, Baseb
|
|||
ui->glSpectrum->setSampleRate(ui->sampleRate->text().toInt());
|
||||
ui->glSpectrum->setDisplayWaterfall(true);
|
||||
ui->glSpectrum->setDisplayMaxHold(true);
|
||||
m_spectrumVis->configure(m_spectrumVis->getInputMessageQueue(),
|
||||
m_spectrumVis->configure(
|
||||
64, // FFT size
|
||||
0, // Ref level (dB)
|
||||
100, // Power range (dB)
|
||||
|
@ -152,7 +152,8 @@ UDPSourceGUI::UDPSourceGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, Baseb
|
|||
0, // number of averaging samples
|
||||
SpectrumVis::AvgModeNone, // no averaging
|
||||
FFTWindow::BlackmanHarris,
|
||||
false); // logarithmic scale
|
||||
false // logarithmic scale
|
||||
);
|
||||
|
||||
ui->glSpectrum->connectTimer(MainWindow::getInstance()->getMasterTimer());
|
||||
connect(&MainWindow::getInstance()->getMasterTimer(), SIGNAL(timeout()), this, SLOT(tick()));
|
||||
|
|
|
@ -81,7 +81,7 @@ void SpectrumVis::closeWSSpectrum()
|
|||
getInputMessageQueue()->push(cmd);
|
||||
}
|
||||
|
||||
void SpectrumVis::configure(MessageQueue* msgQueue,
|
||||
void SpectrumVis::configure(
|
||||
int fftSize,
|
||||
float refLevel,
|
||||
float powerRange,
|
||||
|
@ -103,7 +103,7 @@ void SpectrumVis::configure(MessageQueue* msgQueue,
|
|||
|
||||
MsgConfigureSpectrumVis* cmd = MsgConfigureSpectrumVis::create(settings, false);
|
||||
|
||||
msgQueue->push(cmd);
|
||||
getInputMessageQueue()->push(cmd);
|
||||
}
|
||||
|
||||
void SpectrumVis::setScalef(Real scalef)
|
||||
|
|
|
@ -78,7 +78,7 @@ public:
|
|||
void openWSSpectrum();
|
||||
void closeWSSpectrum();
|
||||
|
||||
void configure(MessageQueue* msgQueue,
|
||||
void configure(
|
||||
int fftSize,
|
||||
float refLevel,
|
||||
float powerRange,
|
||||
|
@ -86,7 +86,8 @@ public:
|
|||
unsigned int averagingNb,
|
||||
AvgMode averagingMode,
|
||||
FFTWindow::Function window,
|
||||
bool m_linear);
|
||||
bool m_linear
|
||||
);
|
||||
void setScalef(Real scalef);
|
||||
void configureWSSpectrum(const QString& address, uint16_t port);
|
||||
|
||||
|
|
|
@ -229,7 +229,7 @@ void GLSpectrumGUI::applySettingsVis()
|
|||
|
||||
if (m_spectrumVis)
|
||||
{
|
||||
m_spectrumVis->configure(m_messageQueueToVis,
|
||||
m_spectrumVis->configure(
|
||||
m_fftSize,
|
||||
m_refLevel,
|
||||
m_powerRange,
|
||||
|
|
Loading…
Reference in New Issue