Merge branch 'jgrewe-icons'

pyrelacs/app.py

@@ -3,12 +3,14 @@ import sys
 from PyQt6.QtCore import QSettings
 from PyQt6.QtWidgets import QApplication
 
-from . import info
+from pyrelacs import info
-from .ui.mainwindow import PyRelacs
+from pyrelacs.ui.mainwindow import PyRelacs
-from .util.logging import config_logging
+from pyrelacs.util.logging import config_logging
+import resources
+
 log = config_logging()
 
-from . import resources
+from . import resources  # best created with pyside6-rcc resources.qrc -o resources.py (rcc produces an error...)
 
 def main():
     app = QApplication(sys.argv)

pyrelacs/repros/repros.py

@@ -8,9 +8,9 @@ import nixio as nix
 import importlib.util
 
 from pyrelacs.util.logging import config_logging
+
 log = config_logging()
 
-from IPython import embed
 
 class Repro:
     """
@@ -25,7 +25,6 @@ class Repro:
     def run_repro(
         self, nix_file: nix.File, name: str, file: pathlib.Path, *args, **kwargs
     ) -> None:
-
         spec = importlib.util.spec_from_file_location("rep", file)
         if not spec:
             log.error("Could not load the file")
@@ -35,7 +34,10 @@ class Repro:
                 log.error("Could not load the module of the repro")
             else:
                 sys.modules[name] = module
+                if spec.loader is not None:
                     spec.loader.exec_module(module)
+                else:
+                    log.error(f"{spec.loader} is None")
                 if hasattr(module, name):
                     rep_class = getattr(module, name)
                     rep_class.run(nix_file)

pyrelacs/resources.qrc

@@ -5,5 +5,6 @@
     <file>icons/disconnect.png</file>
     <file>icons/record.png</file>
     <file>icons/stop.png</file>
+    <file>icons/relacstuxheader.png</file>
 </qresource>
 </RCC>

pyrelacs/ui/about.py

@@ -1,5 +1,3 @@
-import pathlib
-
 from PyQt6.QtGui import QPixmap
 from PyQt6.QtWidgets import QDialog, QDialogButtonBox, QLabel, QVBoxLayout, QWidget
 from PyQt6.QtCore import Qt
@@ -40,8 +38,7 @@ class About(QWidget):
         rtd_link.setAlignment(Qt.AlignmentFlag.AlignCenter)
 
         iconlabel = QLabel()
-        _root = pathlib.Path(__file__).parent.parent
+        pixmap = QPixmap(":/icons/relacstuxheader.png")
-        pixmap = QPixmap(str(pathlib.Path.joinpath(_root, "icons/relacstuxheader.png")))
         s = pixmap.size()
         new_height = int(s.height() * 300/s.width())
         pixmap = pixmap.scaled(300, new_height, Qt.AspectRatioMode.KeepAspectRatio, Qt.TransformationMode.FastTransformation)

pyrelacs/ui/mainwindow.py

@@ -8,7 +8,7 @@ from PyQt6.QtWidgets import (
     QMainWindow,
     QPlainTextEdit,
     QMenuBar,
-    QStatusBar
+    QStatusBar,
 )
 import uldaq
 import numpy as np
@@ -18,19 +18,23 @@ import pyqtgraph as pg
 from pathlib import Path as path
 from scipy.signal import welch, find_peaks
 
-from ..worker import Worker
+from pyrelacs.worker import Worker
-from ..repros.repros import Repro
+from pyrelacs.repros.repros import Repro
-from ..util.logging import config_logging
+from pyrelacs.util.logging import config_logging
-from .about import AboutDialog
+from pyrelacs.ui.about import AboutDialog
+
 log = config_logging()
 _root = path(__file__).parent.parent
 
 from IPython import embed
 
+
 class PyRelacs(QMainWindow):
     def __init__(self):
         super().__init__()
-        # self.setToolButtonStyle(Qt.ToolButtonStyle.ToolButtonTextBesideIcon)  # Ensure icons are displayed with text
+        self.setToolButtonStyle(
+            Qt.ToolButtonStyle.ToolButtonTextBesideIcon
+        )  # Ensure icons are displayed with text
         self.setWindowTitle("PyRelacs")
         self.beat_plot = pg.PlotWidget()
         self.power_plot = pg.PlotWidget()
@@ -48,27 +52,19 @@ class PyRelacs(QMainWindow):
         self.create_toolbars()
 
         layout = QGridLayout()
-        layout.addWidget(self.plot_calibration_button, 0, 0)
+        layout.addWidget(self.beat_plot, 0, 0, 1, 2)
-        layout.addWidget(self.daq_disconnect_button, 0, 1)
+        layout.addWidget(self.power_plot, 1, 0, 1, 2)
-        layout.addWidget(self.beat_plot, 2, 0, 1, 2)
+        layout.addWidget(self.text, 2, 0, 1, 2)
-        layout.addWidget(self.power_plot, 3, 0, 1, 2)
-
-        self.toolbar = QToolBar("Repros")
-        self.addToolBar(self.toolbar)
-        self.repros_to_toolbar()
 
-        # self.setFixedSize(QSize(400, 300))
         widget = QWidget()
         widget.setLayout(layout)
         self.setCentralWidget(widget)
 
-        filename = path.joinpath(path.cwd(), "data.nix")
+        filename = path.joinpath(path.cwd(), "data")
-        self.nix_file = nix.File.open(
+        self.nix_file = nix.File.open(str(filename), nix.FileMode.Overwrite)
-            str(filename), nix.FileMode.Overwrite
-        )
 
     def create_actions(self):
-        self._rlx_exitaction = QAction(QIcon(str(path.joinpath(_root, "icons/exit.png"))), "Exit", self)
+        self._rlx_exitaction = QAction(QIcon(":/icons/exit.png"), "Exit", self)
         self._rlx_exitaction.setStatusTip("Close relacs")
         self._rlx_exitaction.setShortcut(QKeySequence("Alt+q"))
         self._rlx_exitaction.triggered.connect(self.on_exit)
@@ -78,17 +74,17 @@ class PyRelacs(QMainWindow):
         self._rlx_aboutaction.setEnabled(True)
         self._rlx_aboutaction.triggered.connect(self.on_about)
 
-        self._daq_connectaction = QAction(QIcon(str(path.joinpath(_root, "icons/connect.png"))), "Connect DAQ", self)
+        self._daq_connectaction = QAction(QIcon(":icons/connect.png"), "Connect DAQ", self)
         self._daq_connectaction.setStatusTip("Connect to daq device")
         # self._daq_connectaction.setShortcut(QKeySequence("Alt+d"))
         self._daq_connectaction.triggered.connect(self.connect_dac)
 
-        self._daq_disconnectaction = QAction(QIcon(str(path.joinpath(_root, "icons/disconnect.png"))), "Disconnect DAQ", self)
+        self._daq_disconnectaction = QAction(QIcon(":/icons/disconnect.png"), "Disconnect DAQ", self)
         self._daq_disconnectaction.setStatusTip("Disconnect the DAQ device")
         # self._daq_connectaction.setShortcut(QKeySequence("Alt+d"))
         self._daq_disconnectaction.triggered.connect(self.disconnect_dac)
 
-        self._daq_calibaction = QAction(QIcon(str(path.joinpath(_root, "icons/calibration.png"))), "Plot calibration", self)
+        self._daq_calibaction = QAction(QIcon(":/icons/calibration.png"), "Plot calibration", self)
         self._daq_calibaction.setStatusTip("Calibrate the attenuator device")
         # self._daq_calibaction.setShortcut(QKeySequence("Alt+d"))
         self._daq_calibaction.triggered.connect(self.plot_calibration)
@@ -96,19 +92,28 @@ class PyRelacs(QMainWindow):
 
     def create_menu(self):
         menu = self.menuBar()
+        if menu is not None:
             file_menu = menu.addMenu("&File")
+            device_menu = menu.addMenu("&DAQ")
+            help_menu = menu.addMenu("&Help")
+
+            if file_menu is not None:
                 file_menu.addAction(self._rlx_exitaction)
                 file_menu.addAction(self._rlx_aboutaction)
 
-        device_menu = menu.addMenu("&DAQ")
+            if device_menu is not None:
                 device_menu.addAction(self._daq_connectaction)
                 device_menu.addAction(self._daq_disconnectaction)
                 device_menu.addSeparator()
                 device_menu.addAction(self._daq_calibaction)
 
-        help_menu = menu.addMenu("&Help")
+            if help_menu is not None:
                 help_menu.addSeparator()
                 # help_menu.addAction(self._help_action)
+        else:
+            log.error("could not create file menu and device menu")
+            self.on_exit()
+
         self.setMenuBar(menu)
 
     def create_toolbars(self):
@@ -215,12 +220,20 @@ class PyRelacs(QMainWindow):
         try:
             self.daq_device = uldaq.DaqDevice(devices[0])
             log.debug(f"Found daq devices {len(devices)}, connecting to the first one")
+        except IndexError:
+            log.error("DAQ is not connected")
+            log.error("Please connect a DAQ device to the system")
+
+        if hasattr(PyRelacs, "daq_device"):
+            try:
                 self.daq_device.connect()
                 log.debug("Connected")
-        except IndexError:
+            except uldaq.ul_exception.ULException as e:
-            log.debug("DAQ is not connected, closing")
+                log.error(f"Could not Connect to DAQ: {e}")
-            self.on_exit()
             self.daq_connect_button.setDisabled(True)
+        else:
+            log.debug("Already handeld the error")
+            pass
 
     def disconnect_dac(self):
         try:
@@ -233,16 +246,6 @@ class PyRelacs(QMainWindow):
         except AttributeError:
             log.debug("DAQ was not connected")
 
-    def repros_to_toolbar(self):
-        repro_names, file_names = self.repros.names_of_repros()
-        for rep, fn in zip(repro_names, file_names):
-            individual_repro_button = QAction(rep, self)
-            individual_repro_button.setStatusTip("Button")
-            individual_repro_button.triggered.connect(
-                lambda checked, n=rep, f=fn: self.run_repro(n, f)
-            )
-            self.toolbar.addAction(individual_repro_button)
-
     def run_repro(self, n, fn):
         self.text.appendPlainText(f"started Repro {n}, {fn}")
         worker = Worker(self.repros.run_repro, self.nix_file, n, fn)