diff --git a/plugins/channelrx/demodbfm/bfmdemodgui.cpp b/plugins/channelrx/demodbfm/bfmdemodgui.cpp index 348145809..3c9e6c1ec 100644 --- a/plugins/channelrx/demodbfm/bfmdemodgui.cpp +++ b/plugins/channelrx/demodbfm/bfmdemodgui.cpp @@ -396,16 +396,6 @@ BFMDemodGUI::BFMDemodGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, Baseban ui->glSpectrum->setDisplayWaterfall(false); ui->glSpectrum->setDisplayMaxHold(false); ui->glSpectrum->setSsbSpectrum(true); - m_spectrumVis->configure( - 64, // FFT size - 0, // Ref level (dB) - 100, // Power range (dB) - 10, // overlapping % - 0, // number of averaging samples - SpectrumVis::AvgModeNone, // no averaging - FFTWindow::BlackmanHarris, - false // logarithmic scale - ); connect(&MainWindow::getInstance()->getMasterTimer(), SIGNAL(timeout()), this, SLOT(tick())); m_channelMarker.blockSignals(true); diff --git a/plugins/channelrx/udpsink/udpsinkgui.cpp b/plugins/channelrx/udpsink/udpsinkgui.cpp index 9068537de..6fae4a234 100644 --- a/plugins/channelrx/udpsink/udpsinkgui.cpp +++ b/plugins/channelrx/udpsink/udpsinkgui.cpp @@ -187,16 +187,6 @@ 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( - 64, // FFT size - 0, // Ref level (dB) - 100, // Power range (dB) - 10, // overlapping % - 0, // number of averaging samples - SpectrumVis::AvgModeNone, // no averaging - FFTWindow::BlackmanHarris, - false // logarithmic scale - ); ui->glSpectrum->connectTimer(MainWindow::getInstance()->getMasterTimer()); connect(&MainWindow::getInstance()->getMasterTimer(), SIGNAL(timeout()), this, SLOT(tick())); diff --git a/plugins/channeltx/udpsource/udpsourcegui.cpp b/plugins/channeltx/udpsource/udpsourcegui.cpp index 472652029..90dff3749 100644 --- a/plugins/channeltx/udpsource/udpsourcegui.cpp +++ b/plugins/channeltx/udpsource/udpsourcegui.cpp @@ -144,16 +144,6 @@ 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( - 64, // FFT size - 0, // Ref level (dB) - 100, // Power range (dB) - 10, // overlapping % - 0, // number of averaging samples - SpectrumVis::AvgModeNone, // no averaging - FFTWindow::BlackmanHarris, - false // logarithmic scale - ); ui->glSpectrum->connectTimer(MainWindow::getInstance()->getMasterTimer()); connect(&MainWindow::getInstance()->getMasterTimer(), SIGNAL(timeout()), this, SLOT(tick())); diff --git a/sdrbase/dsp/spectrumvis.cpp b/sdrbase/dsp/spectrumvis.cpp index 209f731d4..d33b7d08e 100644 --- a/sdrbase/dsp/spectrumvis.cpp +++ b/sdrbase/dsp/spectrumvis.cpp @@ -60,7 +60,6 @@ SpectrumVis::SpectrumVis(Real scalef) : { setObjectName("SpectrumVis"); applySettings(m_settings, true); - //m_wsSpectrum.openSocket(); // FIXME: conditional } SpectrumVis::~SpectrumVis() @@ -69,31 +68,6 @@ SpectrumVis::~SpectrumVis() fftFactory->releaseEngine(m_settings.m_fftSize, false, m_fftEngineSequence); } -void SpectrumVis::configure( - int fftSize, - float refLevel, - float powerRange, - int overlapPercent, - unsigned int averagingNb, - AvgMode averagingMode, - FFTWindow::Function window, - bool linear) -{ - GLSpectrumSettings settings = m_settings; - settings.m_fftSize = fftSize; - settings.m_refLevel = refLevel; - settings.m_powerRange = powerRange; - settings.m_fftOverlap = overlapPercent; - settings.m_averagingMode = (GLSpectrumSettings::AveragingMode) averagingMode; - settings.m_averagingIndex = GLSpectrumSettings::getAveragingIndex(averagingNb, settings.m_averagingMode); - settings.m_fftWindow = window; - settings.m_linear = linear; - - MsgConfigureSpectrumVis* cmd = MsgConfigureSpectrumVis::create(settings, false); - - getInputMessageQueue()->push(cmd); -} - void SpectrumVis::setScalef(Real scalef) { MsgConfigureScalingFactor* cmd = new MsgConfigureScalingFactor(scalef); diff --git a/sdrbase/dsp/spectrumvis.h b/sdrbase/dsp/spectrumvis.h index 7bffa82fb..e72099b3f 100644 --- a/sdrbase/dsp/spectrumvis.h +++ b/sdrbase/dsp/spectrumvis.h @@ -94,17 +94,6 @@ public: virtual ~SpectrumVis(); void setGLSpectrum(GLSpectrumInterface* glSpectrum) { m_glSpectrum = glSpectrum; } - - void configure( - int fftSize, - float refLevel, - float powerRange, - int overlapPercent, - unsigned int averagingNb, - AvgMode averagingMode, - FFTWindow::Function window, - bool m_linear - ); void setScalef(Real scalef); void configureWSSpectrum(const QString& address, uint16_t port);