From 8e291df4398163062abffff2efe9c1129bd57c39 Mon Sep 17 00:00:00 2001
From: f4exb <f4exb06@gmail.com>
Date: Mon, 4 May 2020 15:34:16 +0200
Subject: [PATCH] Websocket spectrum: removed passing of ref level and power
 range

---
 sdrbase/dsp/spectrumvis.cpp       | 16 ----------------
 sdrbase/websockets/wsspectrum.cpp |  8 ++------
 sdrbase/websockets/wsspectrum.h   |  4 ----
 3 files changed, 2 insertions(+), 26 deletions(-)

diff --git a/sdrbase/dsp/spectrumvis.cpp b/sdrbase/dsp/spectrumvis.cpp
index ad7e26b8b..330bd2fb7 100644
--- a/sdrbase/dsp/spectrumvis.cpp
+++ b/sdrbase/dsp/spectrumvis.cpp
@@ -144,8 +144,6 @@ void SpectrumVis::feed(const Complex *begin, unsigned int length)
             m_wsSpectrum.newSpectrum(
                 m_powerSpectrum,
                 m_settings.m_fftSize,
-                m_settings.m_refLevel,
-                m_settings.m_powerRange,
                 m_centerFrequency,
                 m_sampleRate,
                 m_settings.m_linear
@@ -179,8 +177,6 @@ void SpectrumVis::feed(const Complex *begin, unsigned int length)
             m_wsSpectrum.newSpectrum(
                 m_powerSpectrum,
                 m_settings.m_fftSize,
-                m_settings.m_refLevel,
-                m_settings.m_powerRange,
                 m_centerFrequency,
                 m_sampleRate,
                 m_settings.m_linear
@@ -225,8 +221,6 @@ void SpectrumVis::feed(const Complex *begin, unsigned int length)
                 m_wsSpectrum.newSpectrum(
                     m_powerSpectrum,
                     m_settings.m_fftSize,
-                    m_settings.m_refLevel,
-                    m_settings.m_powerRange,
                     m_centerFrequency,
                     m_sampleRate,
                     m_settings.m_linear
@@ -270,8 +264,6 @@ void SpectrumVis::feed(const Complex *begin, unsigned int length)
                 m_wsSpectrum.newSpectrum(
                     m_powerSpectrum,
                     m_settings.m_fftSize,
-                    m_settings.m_refLevel,
-                    m_settings.m_powerRange,
                     m_centerFrequency,
                     m_sampleRate,
                     m_settings.m_linear
@@ -372,8 +364,6 @@ void SpectrumVis::feed(const SampleVector::const_iterator& cbegin, const SampleV
                     m_wsSpectrum.newSpectrum(
                         m_powerSpectrum,
                         m_settings.m_fftSize,
-                        m_settings.m_refLevel,
-                        m_settings.m_powerRange,
                         m_centerFrequency,
                         m_sampleRate,
                         m_settings.m_linear
@@ -428,8 +418,6 @@ void SpectrumVis::feed(const SampleVector::const_iterator& cbegin, const SampleV
                     m_wsSpectrum.newSpectrum(
                         m_powerSpectrum,
                         m_settings.m_fftSize,
-                        m_settings.m_refLevel,
-                        m_settings.m_powerRange,
                         m_centerFrequency,
                         m_sampleRate,
                         m_settings.m_linear
@@ -504,8 +492,6 @@ void SpectrumVis::feed(const SampleVector::const_iterator& cbegin, const SampleV
                         m_wsSpectrum.newSpectrum(
                             m_powerSpectrum,
                             m_settings.m_fftSize,
-                            m_settings.m_refLevel,
-                            m_settings.m_powerRange,
                             m_centerFrequency,
                             m_sampleRate,
                             m_settings.m_linear
@@ -579,8 +565,6 @@ void SpectrumVis::feed(const SampleVector::const_iterator& cbegin, const SampleV
                         m_wsSpectrum.newSpectrum(
                             m_powerSpectrum,
                             m_settings.m_fftSize,
-                            m_settings.m_refLevel,
-                            m_settings.m_powerRange,
                             m_centerFrequency,
                             m_sampleRate,
                             m_settings.m_linear
diff --git a/sdrbase/websockets/wsspectrum.cpp b/sdrbase/websockets/wsspectrum.cpp
index 41d49f2db..26296f5d1 100644
--- a/sdrbase/websockets/wsspectrum.cpp
+++ b/sdrbase/websockets/wsspectrum.cpp
@@ -114,8 +114,6 @@ void WSSpectrum::socketDisconnected()
 void WSSpectrum::newSpectrum(
     const std::vector<Real>& spectrum,
     int fftSize,
-    float refLevel,
-    float powerRange,
     uint64_t centerFrequency,
     int bandwidth,
     bool linear
@@ -134,8 +132,6 @@ void WSSpectrum::newSpectrum(
         spectrum,
         fftSize,
         elapsed,
-        refLevel,
-        powerRange,
         centerFrequency,
         bandwidth,
         linear
@@ -157,13 +153,13 @@ void WSSpectrum::buildPayload(
     const std::vector<Real>& spectrum,
     int fftSize,
     int64_t fftTimeMs,
-    float refLevel,
-    float powerRange,
     uint64_t centerFrequency,
     int bandwidth,
     bool linear
 )
 {
+    float refLevel = -30.0;
+    float powerRange = 70.0;
     QBuffer buffer(&bytes);
     buffer.open(QIODevice::WriteOnly);
     buffer.write((char*) &centerFrequency, sizeof(uint64_t));    // 0
diff --git a/sdrbase/websockets/wsspectrum.h b/sdrbase/websockets/wsspectrum.h
index 6269af83f..76f709f98 100644
--- a/sdrbase/websockets/wsspectrum.h
+++ b/sdrbase/websockets/wsspectrum.h
@@ -47,8 +47,6 @@ public:
     void newSpectrum(
         const std::vector<Real>& spectrum,
         int fftSize,
-        float refLevel,
-        float powerRange,
         uint64_t centerFrequency,
         int bandwidth,
         bool linear
@@ -76,8 +74,6 @@ private:
         const std::vector<Real>& spectrum,
         int fftSize,
         int64_t fftTimeMs,
-        float refLevel,
-        float powerRange,
         uint64_t centerFrequency,
         int bandwidth,
         bool linear