From 3d7bf03c6b68b4874bd595613ee2f962fdce4186 Mon Sep 17 00:00:00 2001 From: jupfi Date: Mon, 3 Jul 2023 21:58:03 +0200 Subject: [PATCH] Added submodule implementation --- src/nqrduck_spectrometer_limenqr/limenqr.py | 4 +- src/nqrduck_spectrometer_limenqr/model.py | 3 -- .../resources/limenqr.ini | 7 ++- .../resources/limenqr_widget.ui | 51 +++++++++++++++++++ src/nqrduck_spectrometer_limenqr/view.py | 14 +++++ src/nqrduck_spectrometer_limenqr/widget.py | 43 ++++++++++++++++ 6 files changed, 116 insertions(+), 6 deletions(-) create mode 100644 src/nqrduck_spectrometer_limenqr/resources/limenqr_widget.ui create mode 100644 src/nqrduck_spectrometer_limenqr/widget.py diff --git a/src/nqrduck_spectrometer_limenqr/limenqr.py b/src/nqrduck_spectrometer_limenqr/limenqr.py index d79090a..890f4a0 100644 --- a/src/nqrduck_spectrometer_limenqr/limenqr.py +++ b/src/nqrduck_spectrometer_limenqr/limenqr.py @@ -1,6 +1,6 @@ -from nqrduck.module.module import Module +from nqrduck_spectrometer.base_spectrometer import BaseSpectrometer from nqrduck_spectrometer_limenqr.model import LimeNQRModel from nqrduck_spectrometer_limenqr.view import LimeNQRView from nqrduck_spectrometer_limenqr.controller import LimeNQRController -Spectrometer = Module(LimeNQRModel, LimeNQRView, LimeNQRController) \ No newline at end of file +LimeNQR = BaseSpectrometer(LimeNQRModel, LimeNQRView, LimeNQRController) \ No newline at end of file diff --git a/src/nqrduck_spectrometer_limenqr/model.py b/src/nqrduck_spectrometer_limenqr/model.py index f800981..dd54887 100644 --- a/src/nqrduck_spectrometer_limenqr/model.py +++ b/src/nqrduck_spectrometer_limenqr/model.py @@ -7,6 +7,3 @@ class LimeNQRModel(ModuleModel): def __init__(self, module) -> None: super().__init__(module) - - def is_spectrometer(self): - return True \ No newline at end of file diff --git a/src/nqrduck_spectrometer_limenqr/resources/limenqr.ini b/src/nqrduck_spectrometer_limenqr/resources/limenqr.ini index 46d6e29..60448e3 100644 --- a/src/nqrduck_spectrometer_limenqr/resources/limenqr.ini +++ b/src/nqrduck_spectrometer_limenqr/resources/limenqr.ini @@ -1,3 +1,8 @@ [META] -name = limenqr +name = nqrduck-spectrometer-limenqr toolbar_name = LimeNQR +category = Spectrometer +tooltip = Application used to control the LimeSDR + +[FILES] +config = resources/limenqr.ini diff --git a/src/nqrduck_spectrometer_limenqr/resources/limenqr_widget.ui b/src/nqrduck_spectrometer_limenqr/resources/limenqr_widget.ui new file mode 100644 index 0000000..1f2e68f --- /dev/null +++ b/src/nqrduck_spectrometer_limenqr/resources/limenqr_widget.ui @@ -0,0 +1,51 @@ + + + Form + + + + 0 + 0 + 800 + 600 + + + + Form + + + + + -1 + -1 + 811 + 611 + + + + + + + + + + 10 + 10 + 88 + 34 + + + + LimeNQR + + + + + + + + + + + + diff --git a/src/nqrduck_spectrometer_limenqr/view.py b/src/nqrduck_spectrometer_limenqr/view.py index e69de29..bb7237e 100644 --- a/src/nqrduck_spectrometer_limenqr/view.py +++ b/src/nqrduck_spectrometer_limenqr/view.py @@ -0,0 +1,14 @@ +from PyQt5.QtWidgets import QWidget +from nqrduck.module.module_view import ModuleView +from .widget import Ui_Form + + +class LimeNQRView(ModuleView): + def __init__(self, module): + super().__init__(module) + + widget = QWidget() + self._ui_form = Ui_Form() + self._ui_form.setupUi(self) + self.widget = widget + diff --git a/src/nqrduck_spectrometer_limenqr/widget.py b/src/nqrduck_spectrometer_limenqr/widget.py new file mode 100644 index 0000000..e6fc791 --- /dev/null +++ b/src/nqrduck_spectrometer_limenqr/widget.py @@ -0,0 +1,43 @@ +# -*- coding: utf-8 -*- + +# Form implementation generated from reading ui file '../Modules/nqrduck-spectrometer-limenqr/src/nqrduck_spectrometer_limenqr/resources/limenqr_widget.ui' +# +# Created by: PyQt5 UI code generator 5.15.9 +# +# WARNING: Any manual changes made to this file will be lost when pyuic5 is +# run again. Do not edit this file unless you know what you are doing. + + +from PyQt5 import QtCore, QtGui, QtWidgets + + +class Ui_Form(object): + def setupUi(self, Form): + Form.setObjectName("Form") + Form.resize(800, 600) + self.gridLayoutWidget = QtWidgets.QWidget(Form) + self.gridLayoutWidget.setGeometry(QtCore.QRect(-1, -1, 811, 611)) + self.gridLayoutWidget.setObjectName("gridLayoutWidget") + self.gridLayout = QtWidgets.QGridLayout(self.gridLayoutWidget) + self.gridLayout.setContentsMargins(0, 0, 0, 0) + self.gridLayout.setObjectName("gridLayout") + self.stackedWidget = QtWidgets.QStackedWidget(self.gridLayoutWidget) + self.stackedWidget.setObjectName("stackedWidget") + self.page = QtWidgets.QWidget() + self.page.setObjectName("page") + self.pushButton = QtWidgets.QPushButton(self.page) + self.pushButton.setGeometry(QtCore.QRect(10, 10, 88, 34)) + self.pushButton.setObjectName("pushButton") + self.stackedWidget.addWidget(self.page) + self.page_2 = QtWidgets.QWidget() + self.page_2.setObjectName("page_2") + self.stackedWidget.addWidget(self.page_2) + self.gridLayout.addWidget(self.stackedWidget, 0, 0, 1, 1) + + self.retranslateUi(Form) + QtCore.QMetaObject.connectSlotsByName(Form) + + def retranslateUi(self, Form): + _translate = QtCore.QCoreApplication.translate + Form.setWindowTitle(_translate("Form", "Form")) + self.pushButton.setText(_translate("Form", "LimeNQR"))