Allow subtracting baseline

qspectrumanalyzer/__main__.py

@@ -14,6 +14,7 @@ from qspectrumanalyzer.ui_qspectrumanalyzer_settings import Ui_QSpectrumAnalyzer
 from qspectrumanalyzer.ui_qspectrumanalyzer_settings_help import Ui_QSpectrumAnalyzerSettingsHelp
 from qspectrumanalyzer.ui_qspectrumanalyzer_smooth import Ui_QSpectrumAnalyzerSmooth
 from qspectrumanalyzer.ui_qspectrumanalyzer_persistence import Ui_QSpectrumAnalyzerPersistence
+from qspectrumanalyzer.ui_qspectrumanalyzer_baseline import Ui_QSpectrumAnalyzerBaseline
 from qspectrumanalyzer.ui_qspectrumanalyzer_colors import Ui_QSpectrumAnalyzerColors
 from qspectrumanalyzer.ui_qspectrumanalyzer import Ui_QSpectrumAnalyzerMainWindow
 
@@ -223,6 +224,7 @@ class QSpectrumAnalyzerColors(QtWidgets.QDialog, Ui_QSpectrumAnalyzerColors):
         self.peakHoldMinColorButton.setColor(str_to_color(settings.value("peak_hold_min_color", "0, 0, 255, 255")))
         self.averageColorButton.setColor(str_to_color(settings.value("average_color", "0, 255, 255, 255")))
         self.persistenceColorButton.setColor(str_to_color(settings.value("persistence_color", "0, 255, 0, 255")))
+        self.baselineColorButton.setColor(str_to_color(settings.value("baseline_color", "255, 0, 255, 255")))
 
     def accept(self):
         """Save settings when dialog is accepted"""
@@ -232,6 +234,32 @@ class QSpectrumAnalyzerColors(QtWidgets.QDialog, Ui_QSpectrumAnalyzerColors):
         settings.setValue("peak_hold_min_color", color_to_str(self.peakHoldMinColorButton.color()))
         settings.setValue("average_color", color_to_str(self.averageColorButton.color()))
         settings.setValue("persistence_color", color_to_str(self.persistenceColorButton.color()))
+        settings.setValue("baseline_color", color_to_str(self.baselineColorButton.color()))
+        QtWidgets.QDialog.accept(self)
+
+
+class QSpectrumAnalyzerBaseline(QtWidgets.QDialog, Ui_QSpectrumAnalyzerBaseline):
+    """QSpectrumAnalyzer baseline dialog"""
+    def __init__(self, parent=None):
+        # Initialize UI
+        super().__init__(parent)
+        self.setupUi(self)
+
+        # Load settings
+        settings = QtCore.QSettings()
+        self.baselineFileEdit.setText(settings.value("baseline_file", ""))
+
+    @QtCore.Slot()
+    def on_baselineFileButton_clicked(self):
+        """Open file dialog when button is clicked"""
+        filename = QtWidgets.QFileDialog.getOpenFileName(self, self.tr("Select baseline file - QSpectrumAnalyzer"))[0]
+        if filename:
+            self.baselineFileEdit.setText(filename)
+
+    def accept(self):
+        """Save settings when dialog is accepted"""
+        settings = QtCore.QSettings()
+        settings.setValue("baseline_file", self.baselineFileEdit.text())
         QtWidgets.QDialog.accept(self)
 
 
@@ -286,7 +314,9 @@ class QSpectrumAnalyzerMainWindow(QtWidgets.QMainWindow, Ui_QSpectrumAnalyzerMai
         self.data_storage.data_recalculated.connect(self.spectrumPlotWidget.recalculate_plot)
         self.data_storage.data_recalculated.connect(self.spectrumPlotWidget.recalculate_persistence)
         self.data_storage.history_updated.connect(self.waterfallPlotWidget.update_plot)
+        self.data_storage.history_recalculated.connect(self.waterfallPlotWidget.recalculate_plot)
         self.data_storage.average_updated.connect(self.spectrumPlotWidget.update_average)
+        self.data_storage.baseline_updated.connect(self.spectrumPlotWidget.update_baseline)
         self.data_storage.peak_hold_max_updated.connect(self.spectrumPlotWidget.update_peak_hold_max)
         self.data_storage.peak_hold_min_updated.connect(self.spectrumPlotWidget.update_peak_hold_min)
 
@@ -386,6 +416,8 @@ class QSpectrumAnalyzerMainWindow(QtWidgets.QMainWindow, Ui_QSpectrumAnalyzerMai
         self.averageCheckBox.setChecked(settings.value("average", 0, int))
         self.smoothCheckBox.setChecked(settings.value("smooth", 0, int))
         self.persistenceCheckBox.setChecked(settings.value("persistence", 0, int))
+        self.baselineCheckBox.setChecked(settings.value("baseline", 0, int))
+        self.subtractBaselineCheckBox.setChecked(settings.value("subtract_baseline", 0, int))
 
         # Restore window state
         if settings.value("window_state"):
@@ -425,6 +457,8 @@ class QSpectrumAnalyzerMainWindow(QtWidgets.QMainWindow, Ui_QSpectrumAnalyzerMai
         settings.setValue("average", int(self.averageCheckBox.isChecked()))
         settings.setValue("smooth", int(self.smoothCheckBox.isChecked()))
         settings.setValue("persistence", int(self.persistenceCheckBox.isChecked()))
+        settings.setValue("baseline", int(self.baselineCheckBox.isChecked()))
+        settings.setValue("subtract_baseline", int(self.subtractBaselineCheckBox.isChecked()))
 
         # Save window state and geometry
         settings.setValue("window_geometry", self.saveGeometry())
@@ -510,14 +544,6 @@ class QSpectrumAnalyzerMainWindow(QtWidgets.QMainWindow, Ui_QSpectrumAnalyzerMai
         self.update_progress(0)
         self.update_status_timer.start(100)
 
-        self.data_storage.reset()
-        self.data_storage.set_smooth(
-            bool(self.smoothCheckBox.isChecked()),
-            settings.value("smooth_length", 11, int),
-            settings.value("smooth_window", "hanning"),
-            recalculate=False
-        )
-
         self.waterfallPlotWidget.history_size = settings.value("waterfall_history_size", 100, int)
         self.waterfallPlotWidget.clear_plot()
 
@@ -529,6 +555,8 @@ class QSpectrumAnalyzerMainWindow(QtWidgets.QMainWindow, Ui_QSpectrumAnalyzerMai
         self.spectrumPlotWidget.peak_hold_min_color = str_to_color(settings.value("peak_hold_min_color", "0, 0, 255, 255"))
         self.spectrumPlotWidget.average = bool(self.averageCheckBox.isChecked())
         self.spectrumPlotWidget.average_color = str_to_color(settings.value("average_color", "0, 255, 255, 255"))
+        self.spectrumPlotWidget.baseline = bool(self.baselineCheckBox.isChecked())
+        self.spectrumPlotWidget.baseline_color = str_to_color(settings.value("baseline_color", "255, 0, 255, 255"))
         self.spectrumPlotWidget.persistence = bool(self.persistenceCheckBox.isChecked())
         self.spectrumPlotWidget.persistence_length = settings.value("persistence_length", 5, int)
         self.spectrumPlotWidget.persistence_decay = settings.value("persistence_decay", "exponential")
@@ -537,21 +565,35 @@ class QSpectrumAnalyzerMainWindow(QtWidgets.QMainWindow, Ui_QSpectrumAnalyzerMai
         self.spectrumPlotWidget.clear_peak_hold_max()
         self.spectrumPlotWidget.clear_peak_hold_min()
         self.spectrumPlotWidget.clear_average()
+        self.spectrumPlotWidget.clear_baseline()
         self.spectrumPlotWidget.clear_persistence()
 
+        self.data_storage.reset()
+        self.data_storage.set_smooth(
+            bool(self.smoothCheckBox.isChecked()),
+            settings.value("smooth_length", 11, int),
+            settings.value("smooth_window", "hanning")
+        )
+        self.data_storage.set_subtract_baseline(
+            bool(self.subtractBaselineCheckBox.isChecked()),
+            settings.value("baseline_file", None)
+        )
+
         if not self.power_thread.alive:
-            self.power_thread.setup(float(self.startFreqSpinBox.value()),
+            self.power_thread.setup(
-                                    float(self.stopFreqSpinBox.value()),
+                float(self.startFreqSpinBox.value()),
-                                    float(self.binSizeSpinBox.value()),
+                float(self.stopFreqSpinBox.value()),
-                                    interval=float(self.intervalSpinBox.value()),
+                float(self.binSizeSpinBox.value()),
-                                    gain=float(self.gainSpinBox.value()),
+                interval=float(self.intervalSpinBox.value()),
-                                    ppm=int(self.ppmSpinBox.value()),
+                gain=float(self.gainSpinBox.value()),
-                                    crop=int(self.cropSpinBox.value()) / 100.0,
+                ppm=int(self.ppmSpinBox.value()),
-                                    single_shot=single_shot,
+                crop=int(self.cropSpinBox.value()) / 100.0,
-                                    device=settings.value("device", ""),
+                single_shot=single_shot,
-                                    sample_rate=settings.value("sample_rate", 2560000, float),
+                device=settings.value("device", ""),
-                                    bandwidth=settings.value("bandwidth", 0, float),
+                sample_rate=settings.value("sample_rate", 2560000, float),
-                                    lnb_lo=settings.value("lnb_lo", 0, float))
+                bandwidth=settings.value("bandwidth", 0, float),
+                lnb_lo=settings.value("lnb_lo", 0, float)
+            )
             self.power_thread.start()
 
     def stop(self):
@@ -613,10 +655,34 @@ class QSpectrumAnalyzerMainWindow(QtWidgets.QMainWindow, Ui_QSpectrumAnalyzerMai
         self.data_storage.set_smooth(
             checked,
             settings.value("smooth_length", 11, int),
-            settings.value("smooth_window", "hanning"),
+            settings.value("smooth_window", "hanning")
-            recalculate=True
         )
 
+    @QtCore.Slot(bool)
+    def on_baselineCheckBox_toggled(self, checked):
+        self.spectrumPlotWidget.baseline = checked
+        if self.spectrumPlotWidget.curve_baseline.xData is None:
+            self.spectrumPlotWidget.update_baseline(self.data_storage)
+        self.spectrumPlotWidget.curve_baseline.setVisible(checked)
+
+    @QtCore.Slot(bool)
+    def on_subtractBaselineCheckBox_toggled(self, checked):
+        settings = QtCore.QSettings()
+        self.data_storage.set_subtract_baseline(
+            checked,
+            settings.value("baseline_file", None)
+        )
+
+    @QtCore.Slot()
+    def on_baselineButton_clicked(self):
+        dialog = QSpectrumAnalyzerBaseline(self)
+        if dialog.exec_():
+            settings = QtCore.QSettings()
+            self.data_storage.set_subtract_baseline(
+                bool(self.subtractBaselineCheckBox.isChecked()),
+                settings.value("baseline_file", None)
+            )
+
     @QtCore.Slot()
     def on_smoothButton_clicked(self):
         dialog = QSpectrumAnalyzerSmooth(self)
@@ -625,8 +691,7 @@ class QSpectrumAnalyzerMainWindow(QtWidgets.QMainWindow, Ui_QSpectrumAnalyzerMai
             self.data_storage.set_smooth(
                 bool(self.smoothCheckBox.isChecked()),
                 settings.value("smooth_length", 11, int),
-                settings.value("smooth_window", "hanning"),
+                settings.value("smooth_window", "hanning")
-                recalculate=True
             )
 
     @QtCore.Slot()
@@ -655,6 +720,7 @@ class QSpectrumAnalyzerMainWindow(QtWidgets.QMainWindow, Ui_QSpectrumAnalyzerMai
             self.spectrumPlotWidget.peak_hold_min_color = str_to_color(settings.value("peak_hold_min_color", "0, 0, 255, 255"))
             self.spectrumPlotWidget.average_color = str_to_color(settings.value("average_color", "0, 255, 255, 255"))
             self.spectrumPlotWidget.persistence_color = str_to_color(settings.value("persistence_color", "0, 255, 0, 255"))
+            self.spectrumPlotWidget.baseline_color = str_to_color(settings.value("baseline_color", "255, 0, 255, 255"))
             self.spectrumPlotWidget.set_colors()
 
     @QtCore.Slot()

qspectrumanalyzer/backends/soapy_power.py

@@ -212,3 +212,43 @@ class PowerThread(BasePowerThread):
         self.process_stop()
         self.alive = False
         self.powerThreadStopped.emit()
+
+
+def read_from_file(f):
+    """Generator for reading data from soapy_power binary files"""
+    if not formatter:
+        return
+
+    min_freq = None
+    databuffer = None
+
+    while True:
+        try:
+            data = formatter.read(f)
+        except ValueError as e:
+            print(e, file=sys.stderr)
+            continue
+
+        if not data:
+            if min_freq is not None:
+                yield databuffer
+            return
+
+        header, y_axis = data
+        x_axis = np.linspace(header.start, header.stop, round((header.stop - header.start) / header.step))
+        if len(x_axis) != len(y_axis):
+            print("ERROR: len(x_axis) != len(y_axis)")
+            continue
+
+        if min_freq is None:
+            min_freq = header.start
+        elif header.start == min_freq:
+            yield databuffer
+
+        if header.start == min_freq:
+            databuffer = {"timestamp": header.time_stop,
+                          "x": list(x_axis),
+                          "y": list(y_axis)}
+        else:
+            databuffer["x"].extend(x_axis)
+            databuffer["y"].extend(y_axis)

qspectrumanalyzer/data.py

@@ -1,9 +1,10 @@
-import time, sys
+import time, sys, os
 
 from Qt import QtCore
 import numpy as np
 
 from qspectrumanalyzer.utils import smooth
+from qspectrumanalyzer.backends import soapy_power
 
 
 class HistoryBuffer:
@@ -59,8 +60,10 @@ class DataStorage(QtCore.QObject):
     """Data storage for spectrum measurements"""
     history_updated = QtCore.Signal(object)
     data_updated = QtCore.Signal(object)
+    history_recalculated = QtCore.Signal(object)
     data_recalculated = QtCore.Signal(object)
     average_updated = QtCore.Signal(object)
+    baseline_updated = QtCore.Signal(object)
     peak_hold_max_updated = QtCore.Signal(object)
     peak_hold_min_updated = QtCore.Signal(object)
 
@@ -70,6 +73,10 @@ class DataStorage(QtCore.QObject):
         self.smooth = False
         self.smooth_length = 11
         self.smooth_window = "hanning"
+        self.subtract_baseline = False
+        self.prev_baseline = None
+        self.baseline = None
+        self.baseline_x = None
 
         # Use only one worker thread because it is not faster
         # with more threads (and memory consumption is much higher)
@@ -114,6 +121,11 @@ class DataStorage(QtCore.QObject):
         if self.x is None:
             self.x = data["x"]
 
+        # Subtract baseline from data
+        data["y"] = np.asarray(data["y"])
+        if self.subtract_baseline and self.baseline is not None and len(data["y"]) == len(self.baseline):
+            data["y"] -= self.baseline
+
         self.start_task(self.update_history, data.copy())
         self.start_task(self.update_data, data)
 
@@ -165,16 +177,63 @@ class DataStorage(QtCore.QObject):
         """Apply smoothing function to data"""
         return smooth(y, window_len=self.smooth_length, window=self.smooth_window)
 
-    def set_smooth(self, toggle, length=11, window="hanning", recalculate=False):
+    def set_smooth(self, toggle, length=11, window="hanning"):
         """Toggle smoothing and set smoothing params"""
         if toggle != self.smooth or length != self.smooth_length or window != self.smooth_window:
             self.smooth = toggle
             self.smooth_length = length
             self.smooth_window = window
-            if recalculate:
+            self.start_task(self.recalculate_data)
-                self.start_task(self.recalculate_data)
+
-            else:
+    def set_subtract_baseline(self, toggle, baseline_file=None):
-                self.reset_data()
+        """Toggle baseline subtraction and set baseline"""
+        baseline = None
+        baseline_x = None
+
+        # Load baseline from file (compute average if there are multiple PSD data in file)
+        if baseline_file and os.path.isfile(baseline_file):
+            average_counter = 0
+            with open(baseline_file, 'rb') as f:
+                for data in soapy_power.read_from_file(f):
+                    average_counter += 1
+                    if baseline is None:
+                        baseline = data['y'].copy()
+                        baseline_x = data['x'].copy()
+                    else:
+                        baseline = np.average((baseline, data['y']), axis=0, weights=(average_counter - 1, 1))
+
+        # Don't subtract baseline if number of bins in baseline differs from number of bins in data
+        if self.y is not None and baseline is not None and len(self.y) != len(baseline):
+            print("Can't subtract baseline (expected {:d} bins, but baseline has {:d} bins)".format(
+                len(self.y), len(baseline)
+            ))
+            #baseline = None
+
+        if self.subtract_baseline:
+            self.prev_baseline = self.baseline
+
+        #if not np.array_equal(baseline, self.baseline):
+        self.baseline = baseline
+        self.baseline_x = baseline_x
+        self.baseline_updated.emit(self)
+
+        self.subtract_baseline = toggle
+        self.start_task(self.recalculate_history)
+        self.start_task(self.recalculate_data)
+
+    def recalculate_history(self):
+        """Recalculate spectrum measurements history"""
+        if self.history is None:
+            return
+
+        history = self.history.get_buffer()
+        if self.prev_baseline is not None and len(history[-1]) == len(self.prev_baseline):
+            history += self.prev_baseline
+            self.prev_baseline = None
+        if self.subtract_baseline and self.baseline is not None and len(history[-1]) == len(self.baseline):
+            history -= self.baseline
+
+        self.history_recalculated.emit(self)
 
     def recalculate_data(self):
         """Recalculate current data from history"""

qspectrumanalyzer/languages/qspectrumanalyzer_cs.ts

@@ -1,223 +1,261 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS><TS version="2.0">
+<context>
+    <name>QSpectrumAnalyzerBaseline</name>
+    <message>
+        <location filename="../__main__.py" line="255"/>
+        <source>Select baseline file - QSpectrumAnalyzer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui_qspectrumanalyzer_baseline.py" line="50"/>
+        <source>Baseline - QSpectrumAnalyzer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui_qspectrumanalyzer_baseline.py" line="51"/>
+        <source>Baseline &amp;file:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui_qspectrumanalyzer_baseline.py" line="52"/>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>QSpectrumAnalyzerColors</name>
     <message>
-        <location filename="../ui_qspectrumanalyzer_colors.py" line="100"/>
+        <location filename="../ui_qspectrumanalyzer_colors.py" line="112"/>
         <source>Colors - QSpectrumAnalyzer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui_qspectrumanalyzer_colors.py" line="101"/>
+        <location filename="../ui_qspectrumanalyzer_colors.py" line="124"/>
-        <source>Main curve color:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui_qspectrumanalyzer_colors.py" line="110"/>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui_qspectrumanalyzer_colors.py" line="107"/>
+        <location filename="../ui_qspectrumanalyzer_colors.py" line="113"/>
-        <source>Average color:</source>
+        <source>&amp;Main curve color:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui_qspectrumanalyzer_colors.py" line="109"/>
+        <location filename="../ui_qspectrumanalyzer_colors.py" line="115"/>
-        <source>Persistence color:</source>
+        <source>Max. peak &amp;hold color:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui_qspectrumanalyzer_colors.py" line="103"/>
+        <location filename="../ui_qspectrumanalyzer_colors.py" line="117"/>
-        <source>Max. peak hold color:</source>
+        <source>M&amp;in. peak hold color:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui_qspectrumanalyzer_colors.py" line="105"/>
+        <location filename="../ui_qspectrumanalyzer_colors.py" line="119"/>
-        <source>Min. peak hold color:</source>
+        <source>Average &amp;color:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui_qspectrumanalyzer_colors.py" line="121"/>
+        <source>Persistence co&amp;lor:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui_qspectrumanalyzer_colors.py" line="123"/>
+        <source>&amp;Baseline color:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QSpectrumAnalyzerMainWindow</name>
     <message>
-        <location filename="../ui_qspectrumanalyzer.py" line="304"/>
+        <location filename="../ui_qspectrumanalyzer.py" line="317"/>
         <source>QSpectrumAnalyzer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui_qspectrumanalyzer.py" line="315"/>
+        <location filename="../__main__.py" line="730"/>
+        <source>About - QSpectrumAnalyzer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../__main__.py" line="730"/>
+        <source>QSpectrumAnalyzer {}</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui_qspectrumanalyzer.py" line="318"/>
+        <source>&amp;File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui_qspectrumanalyzer.py" line="319"/>
+        <source>&amp;Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui_qspectrumanalyzer.py" line="350"/>
+        <source>&amp;Settings...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui_qspectrumanalyzer.py" line="351"/>
+        <source>&amp;Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui_qspectrumanalyzer.py" line="352"/>
+        <source>Ctrl+Q</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui_qspectrumanalyzer.py" line="353"/>
+        <source>&amp;About</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../__main__.py" line="491"/>
+        <source>Frequency hops: {}</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../__main__.py" line="493"/>
+        <source>Total time: {} | Sweep time: {:.2f} s ({:.2f} FPS)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui_qspectrumanalyzer.py" line="321"/>
+        <source>&amp;Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui_qspectrumanalyzer.py" line="322"/>
+        <source>S&amp;top</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui_qspectrumanalyzer.py" line="323"/>
+        <source>Si&amp;ngle shot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui_qspectrumanalyzer.py" line="325"/>
+        <source>Start:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui_qspectrumanalyzer.py" line="328"/>
         <source> MHz</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui_qspectrumanalyzer.py" line="317"/>
+        <location filename="../ui_qspectrumanalyzer.py" line="327"/>
+        <source>Stop:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui_qspectrumanalyzer.py" line="329"/>
+        <source>&amp;Bin size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui_qspectrumanalyzer.py" line="330"/>
         <source> kHz</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../ui_qspectrumanalyzer.py" line="332"/>
-        <source>auto</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../__main__.py" line="601"/>
-        <source>About - QSpectrumAnalyzer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../__main__.py" line="601"/>
-        <source>QSpectrumAnalyzer {}</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui_qspectrumanalyzer.py" line="305"/>
-        <source>&amp;File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui_qspectrumanalyzer.py" line="306"/>
-        <source>&amp;Help</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui_qspectrumanalyzer.py" line="308"/>
-        <source>&amp;Start</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui_qspectrumanalyzer.py" line="309"/>
-        <source>S&amp;top</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui_qspectrumanalyzer.py" line="310"/>
-        <source>Si&amp;ngle shot</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui_qspectrumanalyzer.py" line="312"/>
-        <source>Start:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui_qspectrumanalyzer.py" line="314"/>
-        <source>Stop:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui_qspectrumanalyzer.py" line="321"/>
-        <source>Corr. [ppm]:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui_qspectrumanalyzer.py" line="322"/>
-        <source>Crop [%]:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui_qspectrumanalyzer.py" line="323"/>
-        <source>Main curve</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui_qspectrumanalyzer.py" line="324"/>
-        <source>Colors...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui_qspectrumanalyzer.py" line="325"/>
-        <source>Max. hold</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui_qspectrumanalyzer.py" line="326"/>
-        <source>Min. hold</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui_qspectrumanalyzer.py" line="327"/>
-        <source>Average</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui_qspectrumanalyzer.py" line="328"/>
-        <source>Smoothing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui_qspectrumanalyzer.py" line="331"/>
-        <source>...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui_qspectrumanalyzer.py" line="330"/>
-        <source>Persistence</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui_qspectrumanalyzer.py" line="334"/>
-        <source>&amp;Settings...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui_qspectrumanalyzer.py" line="335"/>
-        <source>&amp;Quit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui_qspectrumanalyzer.py" line="336"/>
-        <source>Ctrl+Q</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui_qspectrumanalyzer.py" line="337"/>
-        <source>&amp;About</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui_qspectrumanalyzer.py" line="316"/>
-        <source>&amp;Bin size:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../ui_qspectrumanalyzer.py" line="319"/>
         <source>&amp;Interval [s]:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui_qspectrumanalyzer.py" line="320"/>
+        <location filename="../ui_qspectrumanalyzer.py" line="333"/>
         <source>&amp;Gain [dB]:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../__main__.py" line="437"/>
+        <location filename="../ui_qspectrumanalyzer.py" line="334"/>
-        <source>Frequency hops: {}</source>
+        <source>Corr. [ppm]:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../__main__.py" line="438"/>
+        <location filename="../ui_qspectrumanalyzer.py" line="335"/>
-        <source>Sweep time: {:.2f} s | FPS: {:.2f}</source>
+        <source>Crop [%]:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui_qspectrumanalyzer.py" line="307"/>
+        <location filename="../ui_qspectrumanalyzer.py" line="336"/>
-        <source>Controls</source>
+        <source>Main curve</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui_qspectrumanalyzer.py" line="311"/>
+        <location filename="../ui_qspectrumanalyzer.py" line="337"/>
-        <source>Frequency</source>
+        <source>Colors...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui_qspectrumanalyzer.py" line="318"/>
+        <location filename="../ui_qspectrumanalyzer.py" line="338"/>
-        <source>Settings</source>
+        <source>Max. hold</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../ui_qspectrumanalyzer.py" line="333"/>
+        <location filename="../ui_qspectrumanalyzer.py" line="339"/>
-        <source>Levels</source>
+        <source>Min. hold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui_qspectrumanalyzer.py" line="340"/>
+        <source>Average</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui_qspectrumanalyzer.py" line="341"/>
+        <source>Smoothing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui_qspectrumanalyzer.py" line="347"/>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui_qspectrumanalyzer.py" line="343"/>
+        <source>Persistence</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui_qspectrumanalyzer.py" line="345"/>
+        <source>auto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui_qspectrumanalyzer.py" line="320"/>
+        <source>&amp;Controls</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui_qspectrumanalyzer.py" line="324"/>
+        <source>Fre&amp;quency</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui_qspectrumanalyzer.py" line="331"/>
+        <source>Se&amp;ttings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui_qspectrumanalyzer.py" line="348"/>
+        <source>Subtract baseline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui_qspectrumanalyzer.py" line="349"/>
+        <source>&amp;Levels</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../ui_qspectrumanalyzer.py" line="346"/>
+        <source>Baseline</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -252,7 +290,7 @@
 <context>
     <name>QSpectrumAnalyzerSettings</name>
     <message>
-        <location filename="../__main__.py" line="73"/>
+        <location filename="../__main__.py" line="76"/>
         <source>Select executable - QSpectrumAnalyzer</source>
         <translation type="unfinished"></translation>
     </message>

qspectrumanalyzer/plot.py

@@ -29,6 +29,8 @@ class SpectrumPlotWidget:
         self.peak_hold_min_color = pg.mkColor("b")
         self.average = False
         self.average_color = pg.mkColor("c")
+        self.baseline = False
+        self.baseline_color = pg.mkColor("m")
 
         self.create_plot()
 
@@ -45,6 +47,7 @@ class SpectrumPlotWidget:
         #self.plot.setDownsampling(mode="peak")
         #self.plot.setClipToView(True)
 
+        self.create_baseline_curve()
         self.create_persistence_curves()
         self.create_average_curve()
         self.create_peak_hold_min_curve()
@@ -81,6 +84,11 @@ class SpectrumPlotWidget:
         self.curve_average = self.plot.plot(pen=self.average_color)
         self.curve_average.setZValue(700)
 
+    def create_baseline_curve(self):
+        """Create baseline curve"""
+        self.curve_baseline = self.plot.plot(pen=self.baseline_color)
+        self.curve_baseline.setZValue(500)
+
     def create_persistence_curves(self):
         """Create spectrum persistence curves"""
         z_index_base = 600
@@ -99,6 +107,7 @@ class SpectrumPlotWidget:
         self.curve_peak_hold_max.setPen(self.peak_hold_max_color)
         self.curve_peak_hold_min.setPen(self.peak_hold_min_color)
         self.curve_average.setPen(self.average_color)
+        self.curve_baseline.setPen(self.baseline_color)
 
         decay = self.get_decay()
         for i, curve in enumerate(self.persistence_curves):
@@ -161,6 +170,17 @@ class SpectrumPlotWidget:
             if force:
                 self.curve_average.setVisible(self.average)
 
+    def update_baseline(self, data_storage, force=False):
+        """Update baseline curve"""
+        if data_storage.baseline_x is None or data_storage.baseline is None:
+            self.curve_baseline.clear()
+            return
+
+        if self.baseline or force:
+            self.curve_baseline.setData(data_storage.baseline_x, data_storage.baseline)
+            if force:
+                self.curve_baseline.setVisible(self.baseline)
+
     def update_persistence(self, data_storage, force=False):
         """Update persistence curves"""
         if data_storage.x is None:
@@ -184,6 +204,7 @@ class SpectrumPlotWidget:
 
         QtCore.QTimer.singleShot(0, lambda: self.update_plot(data_storage, force=True))
         QtCore.QTimer.singleShot(0, lambda: self.update_average(data_storage, force=True))
+        QtCore.QTimer.singleShot(0, lambda: self.update_baseline(data_storage, force=True))
         QtCore.QTimer.singleShot(0, lambda: self.update_peak_hold_max(data_storage, force=True))
         QtCore.QTimer.singleShot(0, lambda: self.update_peak_hold_min(data_storage, force=True))
 
@@ -231,6 +252,10 @@ class SpectrumPlotWidget:
         """Clear average curve"""
         self.curve_average.clear()
 
+    def clear_baseline(self):
+        """Clear baseline curve"""
+        self.curve_baseline.clear()
+
     def clear_persistence(self):
         """Clear spectrum persistence curves"""
         self.persistence_data = None
@@ -308,3 +333,16 @@ class WaterfallPlotWidget:
     def clear_plot(self):
         """Clear waterfall plot"""
         self.counter = 0
+
+    def recalculate_plot(self, data_storage):
+        """Recalculate waterfall plot"""
+        if data_storage.x is None:
+            return
+
+        self.waterfallImg.setImage(data_storage.history.buffer[-self.counter:].T,
+                                   autoLevels=False, autoRange=False)
+        self.waterfallImg.setPos(
+            data_storage.x[0],
+            -self.counter if self.counter < self.history_size else -self.history_size
+        )
+        self.histogram.setImageItem(self.waterfallImg)

qspectrumanalyzer/qspectrumanalyzer.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>1200</width>
-    <height>840</height>
+    <height>892</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -90,7 +90,7 @@
     <set>QDockWidget::DockWidgetFloatable|QDockWidget::DockWidgetMovable</set>
    </property>
    <property name="windowTitle">
-    <string>Controls</string>
+    <string>&amp;Controls</string>
    </property>
    <attribute name="dockWidgetArea">
     <number>2</number>
@@ -143,7 +143,7 @@
    </property>
    <property name="minimumSize">
     <size>
-     <width>197</width>
+     <width>208</width>
      <height>166</height>
     </size>
    </property>
@@ -151,7 +151,7 @@
     <set>QDockWidget::DockWidgetFloatable|QDockWidget::DockWidgetMovable</set>
    </property>
    <property name="windowTitle">
-    <string>Frequency</string>
+    <string>Fre&amp;quency</string>
    </property>
    <attribute name="dockWidgetArea">
     <number>2</number>
@@ -311,7 +311,7 @@
     <set>QDockWidget::DockWidgetFloatable|QDockWidget::DockWidgetMovable</set>
    </property>
    <property name="windowTitle">
-    <string>Settings</string>
+    <string>Se&amp;ttings</string>
    </property>
    <attribute name="dockWidgetArea">
     <number>2</number>
@@ -456,7 +456,7 @@
        </property>
       </widget>
      </item>
-     <item row="9" column="0">
+     <item row="11" column="0">
       <spacer name="verticalSpacer_2">
        <property name="orientation">
         <enum>Qt::Vertical</enum>
@@ -501,6 +501,30 @@
        </property>
       </widget>
      </item>
+     <item row="9" column="0">
+      <widget class="QCheckBox" name="baselineCheckBox">
+       <property name="text">
+        <string>Baseline</string>
+       </property>
+      </widget>
+     </item>
+     <item row="9" column="2">
+      <widget class="QToolButton" name="baselineButton">
+       <property name="text">
+        <string>...</string>
+       </property>
+       <property name="autoRaise">
+        <bool>false</bool>
+       </property>
+      </widget>
+     </item>
+     <item row="10" column="0">
+      <widget class="QCheckBox" name="subtractBaselineCheckBox">
+       <property name="text">
+        <string>Subtract baseline</string>
+       </property>
+      </widget>
+     </item>
     </layout>
    </widget>
   </widget>
@@ -515,7 +539,7 @@
     <set>QDockWidget::DockWidgetFloatable|QDockWidget::DockWidgetMovable</set>
    </property>
    <property name="windowTitle">
-    <string>Levels</string>
+    <string>&amp;Levels</string>
    </property>
    <attribute name="dockWidgetArea">
     <number>2</number>
@@ -581,9 +605,12 @@
   <tabstop>smoothButton</tabstop>
   <tabstop>persistenceCheckBox</tabstop>
   <tabstop>persistenceButton</tabstop>
+  <tabstop>baselineCheckBox</tabstop>
+  <tabstop>baselineButton</tabstop>
+  <tabstop>subtractBaselineCheckBox</tabstop>
   <tabstop>histogramPlotLayout</tabstop>
-  <tabstop>waterfallPlotLayout</tabstop>
   <tabstop>mainPlotLayout</tabstop>
+  <tabstop>waterfallPlotLayout</tabstop>
  </tabstops>
  <resources/>
  <connections/>

qspectrumanalyzer/qspectrumanalyzer_colors.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>232</width>
+    <width>253</width>
-    <height>260</height>
+    <height>266</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -19,7 +19,7 @@
      <item row="0" column="0">
       <widget class="QLabel" name="label_2">
        <property name="text">
-        <string>Main curve color:</string>
+        <string>&amp;Main curve color:</string>
        </property>
        <property name="buddy">
         <cstring>mainColorButton</cstring>
@@ -42,7 +42,7 @@
      <item row="1" column="0">
       <widget class="QLabel" name="label_4">
        <property name="text">
-        <string>Max. peak hold color:</string>
+        <string>Max. peak &amp;hold color:</string>
        </property>
        <property name="buddy">
         <cstring>peakHoldMaxColorButton</cstring>
@@ -65,7 +65,7 @@
      <item row="2" column="0">
       <widget class="QLabel" name="label_6">
        <property name="text">
-        <string>Min. peak hold color:</string>
+        <string>M&amp;in. peak hold color:</string>
        </property>
        <property name="buddy">
         <cstring>peakHoldMinColorButton</cstring>
@@ -88,7 +88,7 @@
      <item row="3" column="0">
       <widget class="QLabel" name="label_5">
        <property name="text">
-        <string>Average color:</string>
+        <string>Average &amp;color:</string>
        </property>
        <property name="buddy">
         <cstring>averageColorButton</cstring>
@@ -111,7 +111,7 @@
      <item row="4" column="0">
       <widget class="QLabel" name="label_3">
        <property name="text">
-        <string>Persistence color:</string>
+        <string>Persistence co&amp;lor:</string>
        </property>
        <property name="buddy">
         <cstring>persistenceColorButton</cstring>
@@ -131,6 +131,29 @@
        </property>
       </widget>
      </item>
+     <item row="5" column="0">
+      <widget class="QLabel" name="label">
+       <property name="text">
+        <string>&amp;Baseline color:</string>
+       </property>
+       <property name="buddy">
+        <cstring>baselineColorButton</cstring>
+       </property>
+      </widget>
+     </item>
+     <item row="5" column="1">
+      <widget class="ColorButton" name="baselineColorButton">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="text">
+        <string>...</string>
+       </property>
+      </widget>
+     </item>
     </layout>
    </item>
    <item>
@@ -171,7 +194,7 @@
   <tabstop>peakHoldMinColorButton</tabstop>
   <tabstop>averageColorButton</tabstop>
   <tabstop>persistenceColorButton</tabstop>
-  <tabstop>buttonBox</tabstop>
+  <tabstop>baselineColorButton</tabstop>
  </tabstops>
  <resources/>
  <connections>
@@ -182,12 +205,12 @@
    <slot>accept()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>248</x>
+     <x>246</x>
-     <y>254</y>
+     <y>259</y>
     </hint>
     <hint type="destinationlabel">
      <x>157</x>
-     <y>274</y>
+     <y>265</y>
     </hint>
    </hints>
   </connection>
@@ -198,12 +221,12 @@
    <slot>reject()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>316</x>
+     <x>246</x>
-     <y>260</y>
+     <y>259</y>
     </hint>
     <hint type="destinationlabel">
-     <x>286</x>
+     <x>252</x>
-     <y>274</y>
+     <y>265</y>
     </hint>
    </hints>
   </connection>

qspectrumanalyzer/ui_qspectrumanalyzer.py

@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'qspectrumanalyzer/qspectrumanalyzer.ui'
 #
-# Created by: PyQt5 UI code generator 5.7.1
+# Created by: PyQt5 UI code generator 5.8
 #
 # WARNING! All changes made in this file will be lost!
 
@@ -11,7 +11,7 @@ from Qt import QtCore, QtGui, QtWidgets
 class Ui_QSpectrumAnalyzerMainWindow(object):
     def setupUi(self, QSpectrumAnalyzerMainWindow):
         QSpectrumAnalyzerMainWindow.setObjectName("QSpectrumAnalyzerMainWindow")
-        QSpectrumAnalyzerMainWindow.resize(1200, 840)
+        QSpectrumAnalyzerMainWindow.resize(1200, 892)
         self.centralwidget = QtWidgets.QWidget(QSpectrumAnalyzerMainWindow)
         self.centralwidget.setObjectName("centralwidget")
         self.horizontalLayout = QtWidgets.QHBoxLayout(self.centralwidget)
@@ -84,7 +84,7 @@ class Ui_QSpectrumAnalyzerMainWindow(object):
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.frequencyDockWidget.sizePolicy().hasHeightForWidth())
         self.frequencyDockWidget.setSizePolicy(sizePolicy)
-        self.frequencyDockWidget.setMinimumSize(QtCore.QSize(197, 166))
+        self.frequencyDockWidget.setMinimumSize(QtCore.QSize(208, 166))
         self.frequencyDockWidget.setFeatures(QtWidgets.QDockWidget.DockWidgetFloatable|QtWidgets.QDockWidget.DockWidgetMovable)
         self.frequencyDockWidget.setObjectName("frequencyDockWidget")
         self.frequencyDockWidgetContents = QtWidgets.QWidget()
@@ -216,7 +216,7 @@ class Ui_QSpectrumAnalyzerMainWindow(object):
         self.persistenceButton.setObjectName("persistenceButton")
         self.gridLayout.addWidget(self.persistenceButton, 8, 2, 1, 1)
         spacerItem2 = QtWidgets.QSpacerItem(20, 1, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
-        self.gridLayout.addItem(spacerItem2, 9, 0, 1, 1)
+        self.gridLayout.addItem(spacerItem2, 11, 0, 1, 1)
         self.cropSpinBox = QtWidgets.QSpinBox(self.settingsDockWidgetContents)
         self.cropSpinBox.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
         self.cropSpinBox.setObjectName("cropSpinBox")
@@ -230,6 +230,16 @@ class Ui_QSpectrumAnalyzerMainWindow(object):
         self.gainSpinBox.setProperty("value", -1.0)
         self.gainSpinBox.setObjectName("gainSpinBox")
         self.gridLayout.addWidget(self.gainSpinBox, 1, 1, 1, 2)
+        self.baselineCheckBox = QtWidgets.QCheckBox(self.settingsDockWidgetContents)
+        self.baselineCheckBox.setObjectName("baselineCheckBox")
+        self.gridLayout.addWidget(self.baselineCheckBox, 9, 0, 1, 1)
+        self.baselineButton = QtWidgets.QToolButton(self.settingsDockWidgetContents)
+        self.baselineButton.setAutoRaise(False)
+        self.baselineButton.setObjectName("baselineButton")
+        self.gridLayout.addWidget(self.baselineButton, 9, 2, 1, 1)
+        self.subtractBaselineCheckBox = QtWidgets.QCheckBox(self.settingsDockWidgetContents)
+        self.subtractBaselineCheckBox.setObjectName("subtractBaselineCheckBox")
+        self.gridLayout.addWidget(self.subtractBaselineCheckBox, 10, 0, 1, 1)
         self.settingsDockWidget.setWidget(self.settingsDockWidgetContents)
         QSpectrumAnalyzerMainWindow.addDockWidget(QtCore.Qt.DockWidgetArea(2), self.settingsDockWidget)
         self.levelsDockWidget = QtWidgets.QDockWidget(QSpectrumAnalyzerMainWindow)
@@ -295,27 +305,30 @@ class Ui_QSpectrumAnalyzerMainWindow(object):
         QSpectrumAnalyzerMainWindow.setTabOrder(self.smoothCheckBox, self.smoothButton)
         QSpectrumAnalyzerMainWindow.setTabOrder(self.smoothButton, self.persistenceCheckBox)
         QSpectrumAnalyzerMainWindow.setTabOrder(self.persistenceCheckBox, self.persistenceButton)
-        QSpectrumAnalyzerMainWindow.setTabOrder(self.persistenceButton, self.histogramPlotLayout)
+        QSpectrumAnalyzerMainWindow.setTabOrder(self.persistenceButton, self.baselineCheckBox)
-        QSpectrumAnalyzerMainWindow.setTabOrder(self.histogramPlotLayout, self.waterfallPlotLayout)
+        QSpectrumAnalyzerMainWindow.setTabOrder(self.baselineCheckBox, self.baselineButton)
-        QSpectrumAnalyzerMainWindow.setTabOrder(self.waterfallPlotLayout, self.mainPlotLayout)
+        QSpectrumAnalyzerMainWindow.setTabOrder(self.baselineButton, self.subtractBaselineCheckBox)
+        QSpectrumAnalyzerMainWindow.setTabOrder(self.subtractBaselineCheckBox, self.histogramPlotLayout)
+        QSpectrumAnalyzerMainWindow.setTabOrder(self.histogramPlotLayout, self.mainPlotLayout)
+        QSpectrumAnalyzerMainWindow.setTabOrder(self.mainPlotLayout, self.waterfallPlotLayout)
 
     def retranslateUi(self, QSpectrumAnalyzerMainWindow):
         _translate = QtCore.QCoreApplication.translate
         QSpectrumAnalyzerMainWindow.setWindowTitle(_translate("QSpectrumAnalyzerMainWindow", "QSpectrumAnalyzer"))
         self.menu_File.setTitle(_translate("QSpectrumAnalyzerMainWindow", "&File"))
         self.menu_Help.setTitle(_translate("QSpectrumAnalyzerMainWindow", "&Help"))
-        self.controlsDockWidget.setWindowTitle(_translate("QSpectrumAnalyzerMainWindow", "Controls"))
+        self.controlsDockWidget.setWindowTitle(_translate("QSpectrumAnalyzerMainWindow", "&Controls"))
         self.startButton.setText(_translate("QSpectrumAnalyzerMainWindow", "&Start"))
         self.stopButton.setText(_translate("QSpectrumAnalyzerMainWindow", "S&top"))
         self.singleShotButton.setText(_translate("QSpectrumAnalyzerMainWindow", "Si&ngle shot"))
-        self.frequencyDockWidget.setWindowTitle(_translate("QSpectrumAnalyzerMainWindow", "Frequency"))
+        self.frequencyDockWidget.setWindowTitle(_translate("QSpectrumAnalyzerMainWindow", "Fre&quency"))
         self.label_2.setText(_translate("QSpectrumAnalyzerMainWindow", "Start:"))
         self.startFreqSpinBox.setSuffix(_translate("QSpectrumAnalyzerMainWindow", " MHz"))
         self.label_3.setText(_translate("QSpectrumAnalyzerMainWindow", "Stop:"))
         self.stopFreqSpinBox.setSuffix(_translate("QSpectrumAnalyzerMainWindow", " MHz"))
         self.label.setText(_translate("QSpectrumAnalyzerMainWindow", "&Bin size:"))
         self.binSizeSpinBox.setSuffix(_translate("QSpectrumAnalyzerMainWindow", " kHz"))
-        self.settingsDockWidget.setWindowTitle(_translate("QSpectrumAnalyzerMainWindow", "Settings"))
+        self.settingsDockWidget.setWindowTitle(_translate("QSpectrumAnalyzerMainWindow", "Se&ttings"))
         self.label_4.setText(_translate("QSpectrumAnalyzerMainWindow", "&Interval [s]:"))
         self.label_6.setText(_translate("QSpectrumAnalyzerMainWindow", "&Gain [dB]:"))
         self.label_5.setText(_translate("QSpectrumAnalyzerMainWindow", "Corr. [ppm]:"))
@@ -330,7 +343,10 @@ class Ui_QSpectrumAnalyzerMainWindow(object):
         self.persistenceCheckBox.setText(_translate("QSpectrumAnalyzerMainWindow", "Persistence"))
         self.persistenceButton.setText(_translate("QSpectrumAnalyzerMainWindow", "..."))
         self.gainSpinBox.setSpecialValueText(_translate("QSpectrumAnalyzerMainWindow", "auto"))
-        self.levelsDockWidget.setWindowTitle(_translate("QSpectrumAnalyzerMainWindow", "Levels"))
+        self.baselineCheckBox.setText(_translate("QSpectrumAnalyzerMainWindow", "Baseline"))
+        self.baselineButton.setText(_translate("QSpectrumAnalyzerMainWindow", "..."))
+        self.subtractBaselineCheckBox.setText(_translate("QSpectrumAnalyzerMainWindow", "Subtract baseline"))
+        self.levelsDockWidget.setWindowTitle(_translate("QSpectrumAnalyzerMainWindow", "&Levels"))
         self.action_Settings.setText(_translate("QSpectrumAnalyzerMainWindow", "&Settings..."))
         self.action_Quit.setText(_translate("QSpectrumAnalyzerMainWindow", "&Quit"))
         self.action_Quit.setShortcut(_translate("QSpectrumAnalyzerMainWindow", "Ctrl+Q"))

qspectrumanalyzer/ui_qspectrumanalyzer_colors.py

@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'qspectrumanalyzer/qspectrumanalyzer_colors.ui'
 #
-# Created by: PyQt5 UI code generator 5.7.1
+# Created by: PyQt5 UI code generator 5.8
 #
 # WARNING! All changes made in this file will be lost!
 
@@ -11,7 +11,7 @@ from Qt import QtCore, QtGui, QtWidgets
 class Ui_QSpectrumAnalyzerColors(object):
     def setupUi(self, QSpectrumAnalyzerColors):
         QSpectrumAnalyzerColors.setObjectName("QSpectrumAnalyzerColors")
-        QSpectrumAnalyzerColors.resize(232, 260)
+        QSpectrumAnalyzerColors.resize(253, 266)
         self.verticalLayout = QtWidgets.QVBoxLayout(QSpectrumAnalyzerColors)
         self.verticalLayout.setObjectName("verticalLayout")
         self.formLayout = QtWidgets.QFormLayout()
@@ -71,6 +71,17 @@ class Ui_QSpectrumAnalyzerColors(object):
         self.persistenceColorButton.setSizePolicy(sizePolicy)
         self.persistenceColorButton.setObjectName("persistenceColorButton")
         self.formLayout.setWidget(4, QtWidgets.QFormLayout.FieldRole, self.persistenceColorButton)
+        self.label = QtWidgets.QLabel(QSpectrumAnalyzerColors)
+        self.label.setObjectName("label")
+        self.formLayout.setWidget(5, QtWidgets.QFormLayout.LabelRole, self.label)
+        self.baselineColorButton = ColorButton(QSpectrumAnalyzerColors)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.baselineColorButton.sizePolicy().hasHeightForWidth())
+        self.baselineColorButton.setSizePolicy(sizePolicy)
+        self.baselineColorButton.setObjectName("baselineColorButton")
+        self.formLayout.setWidget(5, QtWidgets.QFormLayout.FieldRole, self.baselineColorButton)
         self.verticalLayout.addLayout(self.formLayout)
         spacerItem = QtWidgets.QSpacerItem(20, 2, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
         self.verticalLayout.addItem(spacerItem)
@@ -84,6 +95,7 @@ class Ui_QSpectrumAnalyzerColors(object):
         self.label_6.setBuddy(self.peakHoldMinColorButton)
         self.label_5.setBuddy(self.averageColorButton)
         self.label_3.setBuddy(self.persistenceColorButton)
+        self.label.setBuddy(self.baselineColorButton)
 
         self.retranslateUi(QSpectrumAnalyzerColors)
         self.buttonBox.accepted.connect(QSpectrumAnalyzerColors.accept)
@@ -93,20 +105,22 @@ class Ui_QSpectrumAnalyzerColors(object):
         QSpectrumAnalyzerColors.setTabOrder(self.peakHoldMaxColorButton, self.peakHoldMinColorButton)
         QSpectrumAnalyzerColors.setTabOrder(self.peakHoldMinColorButton, self.averageColorButton)
         QSpectrumAnalyzerColors.setTabOrder(self.averageColorButton, self.persistenceColorButton)
-        QSpectrumAnalyzerColors.setTabOrder(self.persistenceColorButton, self.buttonBox)
+        QSpectrumAnalyzerColors.setTabOrder(self.persistenceColorButton, self.baselineColorButton)
 
     def retranslateUi(self, QSpectrumAnalyzerColors):
         _translate = QtCore.QCoreApplication.translate
         QSpectrumAnalyzerColors.setWindowTitle(_translate("QSpectrumAnalyzerColors", "Colors - QSpectrumAnalyzer"))
-        self.label_2.setText(_translate("QSpectrumAnalyzerColors", "Main curve color:"))
+        self.label_2.setText(_translate("QSpectrumAnalyzerColors", "&Main curve color:"))
         self.mainColorButton.setText(_translate("QSpectrumAnalyzerColors", "..."))
-        self.label_4.setText(_translate("QSpectrumAnalyzerColors", "Max. peak hold color:"))
+        self.label_4.setText(_translate("QSpectrumAnalyzerColors", "Max. peak &hold color:"))
         self.peakHoldMaxColorButton.setText(_translate("QSpectrumAnalyzerColors", "..."))
-        self.label_6.setText(_translate("QSpectrumAnalyzerColors", "Min. peak hold color:"))
+        self.label_6.setText(_translate("QSpectrumAnalyzerColors", "M&in. peak hold color:"))
         self.peakHoldMinColorButton.setText(_translate("QSpectrumAnalyzerColors", "..."))
-        self.label_5.setText(_translate("QSpectrumAnalyzerColors", "Average color:"))
+        self.label_5.setText(_translate("QSpectrumAnalyzerColors", "Average &color:"))
         self.averageColorButton.setText(_translate("QSpectrumAnalyzerColors", "..."))
-        self.label_3.setText(_translate("QSpectrumAnalyzerColors", "Persistence color:"))
+        self.label_3.setText(_translate("QSpectrumAnalyzerColors", "Persistence co&lor:"))
         self.persistenceColorButton.setText(_translate("QSpectrumAnalyzerColors", "..."))
+        self.label.setText(_translate("QSpectrumAnalyzerColors", "&Baseline color:"))
+        self.baselineColorButton.setText(_translate("QSpectrumAnalyzerColors", "..."))
 
 from pyqtgraph import ColorButton

qspectrumanalyzer/ui_qspectrumanalyzer_persistence.py

@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'qspectrumanalyzer/qspectrumanalyzer_persistence.ui'
 #
-# Created by: PyQt5 UI code generator 5.7.1
+# Created by: PyQt5 UI code generator 5.8
 #
 # WARNING! All changes made in this file will be lost!
 

qspectrumanalyzer/ui_qspectrumanalyzer_settings.py

@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'qspectrumanalyzer/qspectrumanalyzer_settings.ui'
 #
-# Created by: PyQt5 UI code generator 5.7.1
+# Created by: PyQt5 UI code generator 5.8
 #
 # WARNING! All changes made in this file will be lost!
 

qspectrumanalyzer/ui_qspectrumanalyzer_settings_help.py

@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'qspectrumanalyzer/qspectrumanalyzer_settings_help.ui'
 #
-# Created by: PyQt5 UI code generator 5.7.1
+# Created by: PyQt5 UI code generator 5.8
 #
 # WARNING! All changes made in this file will be lost!
 

qspectrumanalyzer/ui_qspectrumanalyzer_smooth.py

@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'qspectrumanalyzer/qspectrumanalyzer_smooth.ui'
 #
-# Created by: PyQt5 UI code generator 5.7.1
+# Created by: PyQt5 UI code generator 5.8
 #
 # WARNING! All changes made in this file will be lost!