kopia lustrzana https://github.com/f4exb/sdrangel
SpectrumVis: remove now useless configure method
rodzic
13ace213a7
commit
a09b66c38b
|
@ -375,16 +375,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(&MainCore::instance()->getMasterTimer(), SIGNAL(timeout()), this, SLOT(tick()));
|
||||
|
||||
m_channelMarker.blockSignals(true);
|
||||
|
|
|
@ -166,16 +166,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(MainCore::instance()->getMasterTimer());
|
||||
connect(&MainCore::instance()->getMasterTimer(), SIGNAL(timeout()), this, SLOT(tick()));
|
||||
|
|
|
@ -124,16 +124,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(MainCore::instance()->getMasterTimer());
|
||||
connect(&MainCore::instance()->getMasterTimer(), SIGNAL(timeout()), this, SLOT(tick()));
|
||||
|
|
|
@ -72,31 +72,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);
|
||||
|
@ -818,4 +793,4 @@ void SpectrumVis::handleConfigureWSSpectrum(const QString& address, uint16_t por
|
|||
m_wsSpectrum.setPort(port);
|
||||
m_wsSpectrum.openSocket();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -114,16 +114,6 @@ public:
|
|||
|
||||
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);
|
||||
const GLSpectrumSettings& getSettings() const { return m_settings; }
|
||||
|
|
Ładowanie…
Reference in New Issue