VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-05-30 05:52:24 -04:00
Code Issues Projects Releases Wiki Activity

Websocket spectrum: removed passing of ref level and power range

Browse Source
This commit is contained in:
f4exb 2020-05-04 15:34:16 +02:00
parent 2a2039eb4f
commit 8e291df439
3 changed files with 2 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sdrbase/dsp/spectrumvis.cpp
View File

@ -144,8 +144,6 @@ void SpectrumVis::feed(const Complex *begin, unsigned int length)
m_wsSpectrum.newSpectrum( m_wsSpectrum.newSpectrum(
m_powerSpectrum, m_powerSpectrum,
m_settings.m_fftSize, m_settings.m_fftSize,
m_settings.m_refLevel,
m_settings.m_powerRange,
m_centerFrequency, m_centerFrequency,
m_sampleRate, m_sampleRate,
m_settings.m_linear m_settings.m_linear
@ -179,8 +177,6 @@ void SpectrumVis::feed(const Complex *begin, unsigned int length)
m_wsSpectrum.newSpectrum( m_wsSpectrum.newSpectrum(
m_powerSpectrum, m_powerSpectrum,
m_settings.m_fftSize, m_settings.m_fftSize,
m_settings.m_refLevel,
m_settings.m_powerRange,
m_centerFrequency, m_centerFrequency,
m_sampleRate, m_sampleRate,
m_settings.m_linear m_settings.m_linear
@ -225,8 +221,6 @@ void SpectrumVis::feed(const Complex *begin, unsigned int length)
m_wsSpectrum.newSpectrum( m_wsSpectrum.newSpectrum(
m_powerSpectrum, m_powerSpectrum,
m_settings.m_fftSize, m_settings.m_fftSize,
m_settings.m_refLevel,
m_settings.m_powerRange,
m_centerFrequency, m_centerFrequency,
m_sampleRate, m_sampleRate,
m_settings.m_linear m_settings.m_linear
@ -270,8 +264,6 @@ void SpectrumVis::feed(const Complex *begin, unsigned int length)
m_wsSpectrum.newSpectrum( m_wsSpectrum.newSpectrum(
m_powerSpectrum, m_powerSpectrum,
m_settings.m_fftSize, m_settings.m_fftSize,
m_settings.m_refLevel,
m_settings.m_powerRange,
m_centerFrequency, m_centerFrequency,
m_sampleRate, m_sampleRate,
m_settings.m_linear m_settings.m_linear
@ -372,8 +364,6 @@ void SpectrumVis::feed(const SampleVector::const_iterator& cbegin, const SampleV
m_wsSpectrum.newSpectrum( m_wsSpectrum.newSpectrum(
m_powerSpectrum, m_powerSpectrum,
m_settings.m_fftSize, m_settings.m_fftSize,
m_settings.m_refLevel,
m_settings.m_powerRange,
m_centerFrequency, m_centerFrequency,
m_sampleRate, m_sampleRate,
m_settings.m_linear m_settings.m_linear
@ -428,8 +418,6 @@ void SpectrumVis::feed(const SampleVector::const_iterator& cbegin, const SampleV
m_wsSpectrum.newSpectrum( m_wsSpectrum.newSpectrum(
m_powerSpectrum, m_powerSpectrum,
m_settings.m_fftSize, m_settings.m_fftSize,
m_settings.m_refLevel,
m_settings.m_powerRange,
m_centerFrequency, m_centerFrequency,
m_sampleRate, m_sampleRate,
m_settings.m_linear m_settings.m_linear
@ -504,8 +492,6 @@ void SpectrumVis::feed(const SampleVector::const_iterator& cbegin, const SampleV
m_wsSpectrum.newSpectrum( m_wsSpectrum.newSpectrum(
m_powerSpectrum, m_powerSpectrum,
m_settings.m_fftSize, m_settings.m_fftSize,
m_settings.m_refLevel,
m_settings.m_powerRange,
m_centerFrequency, m_centerFrequency,
m_sampleRate, m_sampleRate,
m_settings.m_linear m_settings.m_linear
@ -579,8 +565,6 @@ void SpectrumVis::feed(const SampleVector::const_iterator& cbegin, const SampleV
m_wsSpectrum.newSpectrum( m_wsSpectrum.newSpectrum(
m_powerSpectrum, m_powerSpectrum,
m_settings.m_fftSize, m_settings.m_fftSize,
m_settings.m_refLevel,
m_settings.m_powerRange,
m_centerFrequency, m_centerFrequency,
m_sampleRate, m_sampleRate,
m_settings.m_linear m_settings.m_linear

8
sdrbase/websockets/wsspectrum.cpp
View File

@ -114,8 +114,6 @@ void WSSpectrum::socketDisconnected()
void WSSpectrum::newSpectrum( void WSSpectrum::newSpectrum(
const std::vector<Real>& spectrum, const std::vector<Real>& spectrum,
int fftSize, int fftSize,
float refLevel,
float powerRange,
uint64_t centerFrequency, uint64_t centerFrequency,
int bandwidth, int bandwidth,
bool linear bool linear
@ -134,8 +132,6 @@ void WSSpectrum::newSpectrum(
spectrum, spectrum,
fftSize, fftSize,
elapsed, elapsed,
refLevel,
powerRange,
centerFrequency, centerFrequency,
bandwidth, bandwidth,
linear linear
@ -157,13 +153,13 @@ void WSSpectrum::buildPayload(
const std::vector<Real>& spectrum, const std::vector<Real>& spectrum,
int fftSize, int fftSize,
int64_t fftTimeMs, int64_t fftTimeMs,
float refLevel,
float powerRange,
uint64_t centerFrequency, uint64_t centerFrequency,
int bandwidth, int bandwidth,
bool linear bool linear
) )
{ {
float refLevel = -30.0;
float powerRange = 70.0;
QBuffer buffer(&bytes); QBuffer buffer(&bytes);
buffer.open(QIODevice::WriteOnly); buffer.open(QIODevice::WriteOnly);
buffer.write((char*) &centerFrequency, sizeof(uint64_t)); // 0 buffer.write((char*) &centerFrequency, sizeof(uint64_t)); // 0

4
sdrbase/websockets/wsspectrum.h
View File

@ -47,8 +47,6 @@ public:
void newSpectrum( void newSpectrum(
const std::vector<Real>& spectrum, const std::vector<Real>& spectrum,
int fftSize, int fftSize,
float refLevel,
float powerRange,
uint64_t centerFrequency, uint64_t centerFrequency,
int bandwidth, int bandwidth,
bool linear bool linear
@ -76,8 +74,6 @@ private:
const std::vector<Real>& spectrum, const std::vector<Real>& spectrum,
int fftSize, int fftSize,
int64_t fftTimeMs, int64_t fftTimeMs,
float refLevel,
float powerRange,
uint64_t centerFrequency, uint64_t centerFrequency,
int bandwidth, int bandwidth,
bool linear bool linear