From 8c825c63004a1f713a28dbfdafbbfba77de2342f Mon Sep 17 00:00:00 2001 From: jupfi Date: Sat, 1 Jul 2023 20:49:21 +0200 Subject: [PATCH] Changed names of MVC files. --- .../{spectrometer_controller.py => controller.py} | 0 .../{spectrometer_model.py => model.py} | 1 + src/nqrduck_spectrometer/spectrometer.py | 8 ++++---- .../{spectrometer_view.py => view.py} | 2 +- .../{spectrometer_widget.py => widget.py} | 0 5 files changed, 6 insertions(+), 5 deletions(-) rename src/nqrduck_spectrometer/{spectrometer_controller.py => controller.py} (100%) rename src/nqrduck_spectrometer/{spectrometer_model.py => model.py} (99%) rename src/nqrduck_spectrometer/{spectrometer_view.py => view.py} (88%) rename src/nqrduck_spectrometer/{spectrometer_widget.py => widget.py} (100%) diff --git a/src/nqrduck_spectrometer/spectrometer_controller.py b/src/nqrduck_spectrometer/controller.py similarity index 100% rename from src/nqrduck_spectrometer/spectrometer_controller.py rename to src/nqrduck_spectrometer/controller.py diff --git a/src/nqrduck_spectrometer/spectrometer_model.py b/src/nqrduck_spectrometer/model.py similarity index 99% rename from src/nqrduck_spectrometer/spectrometer_model.py rename to src/nqrduck_spectrometer/model.py index 59a934d..a04b61b 100644 --- a/src/nqrduck_spectrometer/spectrometer_model.py +++ b/src/nqrduck_spectrometer/model.py @@ -8,3 +8,4 @@ class SpectrometerModel(ModuleModel): @property def spectrometer(self): return self._spectrometer + diff --git a/src/nqrduck_spectrometer/spectrometer.py b/src/nqrduck_spectrometer/spectrometer.py index 52e525c..ef5aaaf 100644 --- a/src/nqrduck_spectrometer/spectrometer.py +++ b/src/nqrduck_spectrometer/spectrometer.py @@ -1,8 +1,8 @@ from PyQt5.QtCore import pyqtSignal, QObject from nqrduck.module.module import Module -from nqrduck_spectrometer.spectrometer_model import SpectrometerModel -from nqrduck_spectrometer.spectrometer_view import SpectrometerView -from nqrduck_spectrometer.spectrometer_controller import SpectrometerController -from nqrduck_spectrometer.spectrometer_widget import Ui_Form +from nqrduck_spectrometer.model import SpectrometerModel +from nqrduck_spectrometer.view import SpectrometerView +from nqrduck_spectrometer.controller import SpectrometerController +from nqrduck_spectrometer.widget import Ui_Form Spectrometer = Module(SpectrometerModel, SpectrometerController, SpectrometerView) \ No newline at end of file diff --git a/src/nqrduck_spectrometer/spectrometer_view.py b/src/nqrduck_spectrometer/view.py similarity index 88% rename from src/nqrduck_spectrometer/spectrometer_view.py rename to src/nqrduck_spectrometer/view.py index 4b5ab54..c46e6b5 100644 --- a/src/nqrduck_spectrometer/spectrometer_view.py +++ b/src/nqrduck_spectrometer/view.py @@ -1,6 +1,6 @@ from PyQt5.QtWidgets import QWidget from nqrduck.module.module_view import ModuleView -from .spectrometer_widget import Ui_Form +from .widget import Ui_Form class SpectrometerView(ModuleView): diff --git a/src/nqrduck_spectrometer/spectrometer_widget.py b/src/nqrduck_spectrometer/widget.py similarity index 100% rename from src/nqrduck_spectrometer/spectrometer_widget.py rename to src/nqrduck_spectrometer/widget.py