VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-01-06 16:28:40 -05:00
Code Issues Projects Releases Wiki Activity

SpectrumVis: remove now useless configure method

Browse Source
This commit is contained in:
f4exb 2020-05-02 01:30:28 +02:00
parent d399e2fdc8
commit 67ceeeb171
5 changed files with 0 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/channelrx/demodbfm/bfmdemodgui.cpp
View File

@ -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);

10
plugins/channelrx/udpsink/udpsinkgui.cpp
View File

@ -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()));

10
plugins/channeltx/udpsource/udpsourcegui.cpp
View File

@ -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()));

26
sdrbase/dsp/spectrumvis.cpp
View File

@ -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);

11
sdrbase/dsp/spectrumvis.h
View File

@ -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);