From a4431a087e9e9bec5cb316227048a3a74f445489 Mon Sep 17 00:00:00 2001 From: jupfi Date: Mon, 3 Jul 2023 21:58:36 +0200 Subject: [PATCH] Changed implementation of BaseSpectrometer. --- src/nqrduck_spectrometer/base_spectrometer.py | 16 ++++++++-------- src/nqrduck_spectrometer/controller.py | 5 ++++- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src/nqrduck_spectrometer/base_spectrometer.py b/src/nqrduck_spectrometer/base_spectrometer.py index 68791b5..e0b9a54 100644 --- a/src/nqrduck_spectrometer/base_spectrometer.py +++ b/src/nqrduck_spectrometer/base_spectrometer.py @@ -1,13 +1,13 @@ -class BaseSpectrometer: +from nqrduck.module.module import Module + +class BaseSpectrometer(Module): """Base class for all spectrometers. All spectrometers should inherit from this class.""" - def __init__(self): - pass - - @property - def name(self): - """Name of the spectrometer.""" - raise NotImplementedError + def __init__(self, model, view, controller): + super().__init__(model, None, controller) + # This stops the view from being added to the main window. + self._view = None + self._inner_view = view @property def pulse_program(self): diff --git a/src/nqrduck_spectrometer/controller.py b/src/nqrduck_spectrometer/controller.py index faeb290..ab41020 100644 --- a/src/nqrduck_spectrometer/controller.py +++ b/src/nqrduck_spectrometer/controller.py @@ -3,4 +3,7 @@ from nqrduck.module.module_controller import ModuleController class SpectrometerController(ModuleController): def __init__(self, module): - super().__init__(module) \ No newline at end of file + super().__init__(module) + + def _load_spectrometer_modules(self): + pass \ No newline at end of file