Measurements widget

sdrbase/dsp/spectrumsettings.cpp

@@ -69,11 +69,15 @@ void SpectrumSettings::resetToDefaults()
     m_colorMap = "Angel";
     m_spectrumStyle = Line;
     m_measurement = MeasurementNone;
+    m_measurementCenterFrequencyOffset = 0;
     m_measurementBandwidth = 10000;
     m_measurementChSpacing = 10000;
     m_measurementAdjChBandwidth = 10000;
     m_measurementHarmonics = 5;
+    m_measurementPeaks = 5;
     m_measurementHighlight = true;
+    m_measurementsPosition = PositionBelow;
+    m_measurementPrecision = 1;
 }
 
 QByteArray SpectrumSettings::serialize() const
@@ -120,6 +124,10 @@ QByteArray SpectrumSettings::serialize() const
     s.writeS32(39, m_measurementHarmonics);
     // 41, 42 used below
     s.writeBool(42, m_measurementHighlight);
+    s.writeS32(43, m_measurementPeaks);
+    s.writeS32(44, (int)m_measurementsPosition);
+    s.writeS32(45, m_measurementPrecision);
+    s.writeS32(46, m_measurementCenterFrequencyOffset);
     s.writeS32(100, m_histogramMarkers.size());
 
 	for (int i = 0; i < m_histogramMarkers.size(); i++) {
@@ -227,6 +235,10 @@ bool SpectrumSettings::deserialize(const QByteArray& data)
         d.readS32(38, &m_measurementAdjChBandwidth, 10000);
         d.readS32(39, &m_measurementHarmonics, 5);
         d.readBool(42, &m_measurementHighlight, true);
+        d.readS32(43, &m_measurementPeaks, 5);
+        d.readS32(44, (int*)&m_measurementsPosition, (int)PositionBelow);
+        d.readS32(45, &m_measurementPrecision, 1);
+        d.readS32(46, &m_measurementCenterFrequencyOffset, 0);
 
 		int histogramMarkersSize;
 		d.readS32(100, &histogramMarkersSize, 0);

sdrbase/dsp/spectrumsettings.h

@@ -73,15 +73,17 @@ class SDRBASE_API SpectrumSettings : public Serializable
     enum Measurement
     {
         MeasurementNone,
-        MeasurementPeak,
+        MeasurementPeaks,
         MeasurementChannelPower,
         MeasurementAdjacentChannelPower,
-        MeasurementSNR,
-        MeasurementSNFR,
-        MeasurementTHD,
-        MeasurementTHDPN,
-        MeasurementSINAD,
-        MeasurementSFDR
+        MeasurementSNR
+    };
+
+    enum MeasurementsPosition {
+        PositionAbove,
+        PositionBelow,
+        PositionLeft,
+        PositionRight
     };
 
 	int m_fftSize;
@@ -123,11 +125,16 @@ class SDRBASE_API SpectrumSettings : public Serializable
     QString m_colorMap;
     SpectrumStyle m_spectrumStyle;
     Measurement m_measurement;
+    int m_measurementCenterFrequencyOffset;
     int m_measurementBandwidth;
     int m_measurementChSpacing;
     int m_measurementAdjChBandwidth;
     int m_measurementHarmonics;
+    int m_measurementPeaks;
     bool m_measurementHighlight;
+    MeasurementsPosition m_measurementsPosition;
+    int m_measurementPrecision;
+
 	static const int m_log2FFTSizeMin = 6;   // 64
 	static const int m_log2FFTSizeMax = 15;  // 32k
 

sdrgui/CMakeLists.txt

@@ -51,6 +51,7 @@ set(sdrgui_SOURCES
     gui/glshadertvarray.cpp
     gui/glspectrum.cpp
     gui/glspectrumgui.cpp
+    gui/glspectrumview.cpp
     gui/graphicsdialog.cpp
     gui/graphicsviewzoom.cpp
     gui/httpdownloadmanagergui.cpp
@@ -69,6 +70,8 @@ set(sdrgui_SOURCES
     gui/sdrangelsplash.cpp
     gui/spectrumcalibrationpointsdialog.cpp
     gui/spectrummarkersdialog.cpp
+    gui/spectrummeasurementsdialog.cpp
+    gui/spectrummeasurements.cpp
     gui/tickedslider.cpp
     gui/timedelegate.cpp
     gui/transverterbutton.cpp
@@ -154,6 +157,7 @@ set(sdrgui_HEADERS
     gui/glshadertextured.h
     gui/glspectrum.h
     gui/glspectrumgui.h
+    gui/glspectrumview.h
     gui/graphicsdialog.h
     gui/graphicsviewzoom.h
     gui/httpdownloadmanagergui.h
@@ -173,6 +177,8 @@ set(sdrgui_HEADERS
     gui/sdrangelsplash.h
     gui/spectrumcalibrationpointsdialog.h
     gui/spectrummarkersdialog.h
+    gui/spectrummeasurementsdialog.h
+    gui/spectrummeasurements.h
     gui/tickedslider.h
     gui/timedelegate.h
     gui/transverterbutton.h
@@ -239,6 +245,7 @@ set(sdrgui_FORMS
     gui/samplingdevicecontrol.ui
     gui/samplingdevicedialog.ui
     gui/spectrummarkersdialog.ui
+    gui/spectrummeasurementsdialog.ui
     gui/spectrumcalibrationpointsdialog.ui
     gui/myposdialog.ui
     gui/transverterdialog.ui

sdrgui/device/deviceuiset.cpp

@@ -23,6 +23,7 @@
 #include "dsp/dspdevicesourceengine.h"
 #include "dsp/dspdevicesinkengine.h"
 #include "gui/glspectrum.h"
+#include "gui/glspectrumview.h"
 #include "gui/glspectrumgui.h"
 // #include "gui/channelwindow.h"
 #include "gui/workspace.h"
@@ -42,7 +43,7 @@
 
 DeviceUISet::DeviceUISet(int deviceSetIndex, DeviceSet *deviceSet)
 {
-    m_spectrum = new GLSpectrum;
+    m_spectrum = new GLSpectrum();
     m_spectrum->setIsDeviceSpectrum(true);
     m_spectrumVis = deviceSet->m_spectrumVis;
     m_spectrumVis->setGLSpectrum(m_spectrum);