pyrelacs/app.py

@@ -3,13 +3,12 @@ import sys
 from PyQt6.QtCore import QSettings
 from PyQt6.QtWidgets import QApplication
 
-from pyrelacs import info
+from . import info
-from pyrelacs.ui.mainwindow import PyRelacs
+from .ui.mainwindow import PyRelacs
-from pyrelacs.util.logging import config_logging
+from .util.logging import config_logging
-import resources
-
 log = config_logging()
 
+from . import resources
 
 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,6 +25,7 @@ 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")
@@ -34,10 +35,7 @@ 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)
-                    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/ui/mainwindow.py

@@ -8,7 +8,7 @@ from PyQt6.QtWidgets import (
     QMainWindow,
     QPlainTextEdit,
     QMenuBar,
-    QStatusBar,
+    QStatusBar
 )
 import uldaq
 import numpy as np
@@ -18,23 +18,19 @@ import pyqtgraph as pg
 from pathlib import Path as path
 from scipy.signal import welch, find_peaks
 
-from pyrelacs.worker import Worker
+from ..worker import Worker
-from pyrelacs.repros.repros import Repro
+from ..repros.repros import Repro
-from pyrelacs.util.logging import config_logging
+from ..util.logging import config_logging
-from pyrelacs.ui.about import AboutDialog
+from .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(
+        # self.setToolButtonStyle(Qt.ToolButtonStyle.ToolButtonTextBesideIcon)  # Ensure icons are displayed with text
-            Qt.ToolButtonStyle.ToolButtonTextBesideIcon
-        )  # Ensure icons are displayed with text
         self.setWindowTitle("PyRelacs")
         self.beat_plot = pg.PlotWidget()
         self.power_plot = pg.PlotWidget()
@@ -52,51 +48,47 @@ class PyRelacs(QMainWindow):
         self.create_toolbars()
 
         layout = QGridLayout()
-        layout.addWidget(self.beat_plot, 0, 0, 1, 2)
+        layout.addWidget(self.plot_calibration_button, 0, 0)
-        layout.addWidget(self.power_plot, 1, 0, 1, 2)
+        layout.addWidget(self.daq_disconnect_button, 0, 1)
-        layout.addWidget(self.text, 2, 0, 1, 2)
+        layout.addWidget(self.beat_plot, 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")
+        filename = path.joinpath(path.cwd(), "data.nix")
-        self.nix_file = nix.File.open(str(filename), nix.FileMode.Overwrite)
+        self.nix_file = nix.File.open(
+            str(filename), nix.FileMode.Overwrite
+        )
 
     def create_actions(self):
-        self._rlx_exitaction = QAction(
+        self._rlx_exitaction = QAction(QIcon(str(path.joinpath(_root, "icons/exit.png"))), "Exit", self)
-            QIcon(str(path.joinpath(_root, "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)
-
+        
         self._rlx_aboutaction = QAction("about")
         self._rlx_aboutaction.setStatusTip("Show about dialog")
         self._rlx_aboutaction.setEnabled(True)
         self._rlx_aboutaction.triggered.connect(self.on_about)
 
-        self._daq_connectaction = QAction(
+        self._daq_connectaction = QAction(QIcon(str(path.joinpath(_root, "icons/connect.png"))), "Connect DAQ", self)
-            QIcon(str(path.joinpath(_root, "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(
+        self._daq_disconnectaction = QAction(QIcon(str(path.joinpath(_root, "icons/disconnect.png"))), "Disconnect DAQ", self)
-            QIcon(str(path.joinpath(_root, "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(
+        self._daq_calibaction = QAction(QIcon(str(path.joinpath(_root, "icons/calibration.png"))), "Plot calibration", self)
-            QIcon(str(path.joinpath(_root, "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)
@@ -104,28 +96,19 @@ class PyRelacs(QMainWindow):
 
     def create_menu(self):
         menu = self.menuBar()
-        if menu is not None:
+        file_menu = menu.addMenu("&File")
-            file_menu = menu.addMenu("&File")
+        file_menu.addAction(self._rlx_exitaction)
-            device_menu = menu.addMenu("&DAQ")
+        file_menu.addAction(self._rlx_aboutaction)
-            help_menu = menu.addMenu("&Help")
+
-
+        device_menu = menu.addMenu("&DAQ")
-            if file_menu is not None:
+        device_menu.addAction(self._daq_connectaction)
-                file_menu.addAction(self._rlx_exitaction)
+        device_menu.addAction(self._daq_disconnectaction)
-                file_menu.addAction(self._rlx_aboutaction)
+        device_menu.addSeparator()
-
+        device_menu.addAction(self._daq_calibaction)
-            if device_menu is not None:
+
-                device_menu.addAction(self._daq_connectaction)
+        help_menu = menu.addMenu("&Help")
-                device_menu.addAction(self._daq_disconnectaction)
+        help_menu.addSeparator()
-                device_menu.addSeparator()
+        # help_menu.addAction(self._help_action)
-                device_menu.addAction(self._daq_calibaction)
-
-            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):
@@ -232,20 +215,12 @@ class PyRelacs(QMainWindow):
         try:
             self.daq_device = uldaq.DaqDevice(devices[0])
             log.debug(f"Found daq devices {len(devices)}, connecting to the first one")
+            self.daq_device.connect()
+            log.debug("Connected")
         except IndexError:
-            log.error("DAQ is not connected")
+            log.debug("DAQ is not connected, closing")
-            log.error("Please connect a DAQ device to the system")
+            self.on_exit()
-
+        self.daq_connect_button.setDisabled(True)
-        if hasattr(PyRelacs, "daq_device"):
-            try:
-                self.daq_device.connect()
-                log.debug("Connected")
-            except uldaq.ul_exception.ULException as e:
-                log.error(f"Could not Connect to DAQ: {e}")
-            self.daq_connect_button.setDisabled(True)
-        else:
-            log.debug("Already handeld the error")
-            pass
 
     def disconnect_dac(self):
         try:
@@ -258,6 +233,16 @@ 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)
@@ -270,7 +255,7 @@ class PyRelacs(QMainWindow):
     def on_exit(self):
         print("exit button!")
         self.close()
-
+    
     def on_about(self, e):
         about = AboutDialog(self)
         about.show()
@@ -282,4 +267,4 @@ class PyRelacs(QMainWindow):
         print("THREAD COMPLETE!")
 
     def progress_fn(self, n):
-        print("%d%% done" % n)
+        print("%d%% done" % n)