mirror
/
horus-gui
kopia lustrzana https://github.com/projecthorus/horus-gui
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Added FFT smoothing as an option

pull/46/head
Andrew Koenig 2025-01-25 20:40:30 -06:00
rodzic f613976e6c
commit 0f2cac724c
2 zmienionych plików z 23 dodań i 10 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

4
horusgui/config.py
Wyświetl plik

@ -38,6 +38,7 @@ default_config = {
"logging_enabled": False,
"log_format": "CSV",
"log_directory": "",
"fft_smoothing": False,
"payload_list": json.dumps(horusdemodlib.payloads.HORUS_PAYLOAD_LIST),
"custom_field_list": json.dumps({})
}
@ -132,6 +133,8 @@ def read_config(widgets):
widgets["loggingFormatSelector"].setCurrentText(default_config["log_format"])
widgets["enableLoggingSelector"].setChecked(ValueToBool(default_config["logging_enabled"]))
widgets["fftSmoothingSelector"].setChecked(ValueToBool(default_config["fft_smoothing"]))
if default_config['baud_rate'] != -1:
widgets["horusModemRateSelector"].setCurrentText(str(default_config['baud_rate']))
@ -179,6 +182,7 @@ def save_config(widgets):
default_config["logging_enabled"] = widgets["enableLoggingSelector"].isChecked()
default_config["log_directory"] = widgets["loggingPathEntry"].text()
default_config["log_format"] = widgets["loggingFormatSelector"].currentText()
default_config["fft_smoothing"] = widgets["fftSmoothingSelector"].isChecked()
default_config["payload_list"] = json.dumps(horusdemodlib.payloads.HORUS_PAYLOAD_LIST)
default_config["custom_field_list"] = json.dumps(horusdemodlib.payloads.HORUS_CUSTOM_FIELDS)

29
horusgui/gui.py
Wyświetl plik

@ -379,6 +379,12 @@ class MainWindow(QMainWindow):
self.widgets["inhibitCRCSelector"].setToolTip(
"Hide CRC Failed error messages."
)
self.widgets["fftSmoothingLabel"] = QLabel("<b>Enable FFT smoothing:</b>")
self.widgets["fftSmoothingSelector"] = QCheckBox()
self.widgets["fftSmoothingSelector"].setChecked(False)
self.widgets["fftSmoothingSelector"].setToolTip(
"Enable IIR filter on FFT with tc=0.25."
)
w1_other.addWidget(self.widgets["horusHeaderLabel"], 0, 0, 1, 2)
w1_other.addWidget(self.widgets["horusUploadLabel"], 1, 0, 1, 1)
@ -400,7 +406,9 @@ class MainWindow(QMainWindow):
w1_other.addWidget(self.widgets["otherHeaderLabel"], 10, 0, 1, 2)
w1_other.addWidget(self.widgets["inhibitCRCLabel"], 11, 0, 1, 1)
w1_other.addWidget(self.widgets["inhibitCRCSelector"], 11, 1, 1, 1)
w1_other.setRowStretch(12, 1)
w1_other.addWidget(self.widgets["fftSmoothingLabel"], 12, 0, 1, 1)
w1_other.addWidget(self.widgets["fftSmoothingSelector"], 12, 1, 1, 1)
w1_other.setRowStretch(13, 1)
w1_other_widget.setLayout(w1_other)
@ -499,25 +507,25 @@ class MainWindow(QMainWindow):
self.widgets["estimatorLines"] = [
pg.InfiniteLine(
pos=-1000,
pen=pg.mkPen(color="w", width=(PEN_WIDTH + 1), style=QtCore.Qt.PenStyle.DashLine),
pen=pg.mkPen(color="grey", width=(PEN_WIDTH + 1), style=QtCore.Qt.PenStyle.DashLine),
label="F1",
labelOpts={'position':0.9}
),
pg.InfiniteLine(
pos=-1000,
pen=pg.mkPen(color="w", width=(PEN_WIDTH + 1), style=QtCore.Qt.PenStyle.DashLine),
pen=pg.mkPen(color="grey", width=(PEN_WIDTH + 1), style=QtCore.Qt.PenStyle.DashLine),
label="F2",
labelOpts={'position':0.9}
),
pg.InfiniteLine(
pos=-1000,
pen=pg.mkPen(color="w", width=(PEN_WIDTH + 1), style=QtCore.Qt.PenStyle.DashLine),
pen=pg.mkPen(color="grey", width=(PEN_WIDTH + 1), style=QtCore.Qt.PenStyle.DashLine),
label="F3",
labelOpts={'position':0.9}
),
pg.InfiniteLine(
pos=-1000,
pen=pg.mkPen(color="w", width=(PEN_WIDTH + 1), style=QtCore.Qt.PenStyle.DashLine),
pen=pg.mkPen(color="grey", width=(PEN_WIDTH + 1), style=QtCore.Qt.PenStyle.DashLine),
label="F4",
labelOpts={'position':0.9}
),
@ -987,11 +995,12 @@ class MainWindow(QMainWindow):
_data = data["fft"]
_dbfs = data["dbfs"]
# _tc = 0.25
# _plot_data = (self.widgets["spectrumPlotData"].getData()[1] * (1 - _tc) + (_data * _tc))
# self.widgets["spectrumPlotData"].setData(_scale, _plot_data)
self.widgets["spectrumPlotData"].setData(_scale, _data)
if self.widgets["fftSmoothingSelector"].isChecked():
_tc = 0.25
_plot_data = (self.widgets["spectrumPlotData"].getData()[1] * (1 - _tc) + (_data * _tc))
self.widgets["spectrumPlotData"].setData(_scale, _plot_data)
else:
self.widgets["spectrumPlotData"].setData(_scale, _data)
# Really basic IIR to smoothly adjust scale
_old_max = self.widgets["spectrumPlotRange"][1]