From 685d3de229f5d94cc57c1c5c8e28876b5acbd71b Mon Sep 17 00:00:00 2001 From: jupfi Date: Mon, 10 Jul 2023 08:03:14 +0200 Subject: [PATCH] Implemented automatic loading of settings. --- src/nqrduck_spectrometer_limenqr/model.py | 4 ++-- src/nqrduck_spectrometer_limenqr/view.py | 10 +++------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/nqrduck_spectrometer_limenqr/model.py b/src/nqrduck_spectrometer_limenqr/model.py index 58325ac..a020993 100644 --- a/src/nqrduck_spectrometer_limenqr/model.py +++ b/src/nqrduck_spectrometer_limenqr/model.py @@ -9,8 +9,8 @@ class LimeNQRModel(BaseSpectrometerModel): def __init__(self, module) -> None: super().__init__(module) - self.add_setting("rx_gain", 55, "RX Gain") - self.add_setting("tx_gain", 40, "TX Gain") + self.add_setting("RX Gain", 55, "RX Gain") + self.add_setting("TX Gain", 40, "TX Gain") self.add_pulse_parameter_option("tx_pulse", [self.RectPulse, self.SincPulse, self.GaussianPulse]) self.add_pulse_parameter_option("rx_readout", [self.RXReadout]) self.add_pulse_parameter_option("gate", [self.Gate]) diff --git a/src/nqrduck_spectrometer_limenqr/view.py b/src/nqrduck_spectrometer_limenqr/view.py index e0af74e..77a89c0 100644 --- a/src/nqrduck_spectrometer_limenqr/view.py +++ b/src/nqrduck_spectrometer_limenqr/view.py @@ -1,14 +1,10 @@ from PyQt6.QtWidgets import QWidget -from nqrduck.module.module_view import ModuleView -from .widget import Ui_Form +from nqrduck_spectrometer.base_spectrometer_view import BaseSpectrometerView -class LimeNQRView(ModuleView): +class LimeNQRView(BaseSpectrometerView): def __init__(self, module): super().__init__(module) - widget = QWidget() - self._ui_form = Ui_Form() - self._ui_form.setupUi(self) - self.widget = widget + self.widget = self.load_settings_ui()