pymodaq 5.0.0__py3-none-any.whl → 5.0.1__py3-none-any.whl

pymodaq/control_modules/daq_move_ui.py

@@ -7,6 +7,7 @@ Created the 28/07/2022
 
 from typing import List
 import sys
+from pint.errors import DimensionalityError
 
 from qtpy import QtWidgets
 from qtpy.QtCore import Signal, Qt
@@ -14,7 +15,10 @@ from qtpy.QtWidgets import QHBoxLayout, QVBoxLayout, QGridLayout, QWidget, QTool
 
 from pymodaq_utils.utils import ThreadCommand
 from pymodaq_utils.config import Config
-from pymodaq_gui.utils.widgets import PushButtonIcon, LabelWithFont, SpinBox, QSpinBox_ro, QLED
+
+from pymodaq_data import Q_
+
+from pymodaq_gui.utils.widgets import PushButtonIcon, LabelWithFont, SpinBox, QSpinBox_ro, QLED, QSpinBoxWithShortcut
 from pymodaq_gui.utils import DockArea
 from pymodaq_gui.plotting.data_viewers.viewer import ViewerDispatcher
 
@@ -65,12 +69,17 @@ class DAQ_Move_UI(ControlModuleUI):
 
         super().__init__(parent)
         self.title = title
+        self._unit = ''
         self.setup_ui()
 
         self.enable_move_buttons(False)
 
     def display_value(self, value: DataActuator):
-        self.current_value_sb.setValue(value.value())
+        try:
+            self.current_value_sb.setValue(value.value(self._unit))
+        except DimensionalityError as e:
+            value.force_units(self._unit)
+            self.current_value_sb.setValue(value.value())
 
     @property
     def actuator_init(self):
@@ -193,9 +202,9 @@ class DAQ_Move_UI(ControlModuleUI):
         self.main_ui.layout().addWidget(self.toolbar, 0, 0, 1, 2)
         self.main_ui.layout().addWidget(self.move_toolbar, 1, 0, 1, 2)
 
-        self.abs_value_sb = SpinBox(step=0.1, dec=True)
+        self.abs_value_sb = QSpinBoxWithShortcut(step=0.1, dec=True, siPrefix=config('actuator', 'siprefix'))
         self.abs_value_sb.setStyleSheet("background-color : lightgreen; color: black")
-        self.abs_value_sb_2 = SpinBox(step=0.1, dec=True)
+        self.abs_value_sb_2 = QSpinBoxWithShortcut(step=0.1, dec=True, siPrefix=config('actuator', 'siprefix'))
         self.abs_value_sb_2.setStyleSheet("background-color : lightcoral; color: black")
         self.move_toolbar.addWidget(self.abs_value_sb)
         self.move_toolbar.addWidget(self.abs_value_sb_2)
@@ -221,7 +230,7 @@ class DAQ_Move_UI(ControlModuleUI):
         self.control_ui.layout().addWidget(LabelWithFont('Abs. Value'), 0, 0)
         self.find_home_pb = PushButtonIcon('home2', 'Find Home')
         self.control_ui.layout().addWidget(self.find_home_pb, 0, 1)
-        self.abs_value_sb_bis = SpinBox(step=0.1, dec=True)
+        self.abs_value_sb_bis = QSpinBoxWithShortcut(step=0.1, dec=True, siPrefix=config('actuator', 'siprefix'))
         self.control_ui.layout().addWidget(self.abs_value_sb_bis, 1, 0)
         self.move_abs_pb = PushButtonIcon('Move', 'Set Abs.',
                                           tip='Set the value of the actuator to the set absolute value')
@@ -230,7 +239,8 @@ class DAQ_Move_UI(ControlModuleUI):
         self.move_rel_plus_pb = PushButtonIcon('MoveUp', 'Set Rel. (+)')
         self.control_ui.layout().addWidget(self.move_rel_plus_pb, 2, 1)
 
-        self.rel_value_sb = SpinBox(step=0.1, dec=True)
+        self.rel_value_sb = QSpinBoxWithShortcut(step=0.1, dec=True, siPrefix=config('actuator', 'siprefix'),
+                                                 key_sequences=("Ctrl+E","Ctrl+Shift+E"),)
         self.control_ui.layout().addWidget(self.rel_value_sb, 3, 0)
         self.move_rel_minus_pb = PushButtonIcon('MoveDown', 'Set Rel. (-)')
         self.control_ui.layout().addWidget(self.move_rel_minus_pb, 3, 1)
@@ -250,8 +260,21 @@ class DAQ_Move_UI(ControlModuleUI):
         self.statusbar.setMaximumHeight(30)
         self.parent.layout().addWidget(self.statusbar)
 
+    def set_abs_value_red(self, value: Q_):
+        self.abs_value_sb_2.setValue(value.m_as(self._unit))
+
+    def set_abs_value_green(self, value: Q_):
+        self.abs_value_sb.setValue(value.m_as(self._unit))
+
+    def set_abs_value(self, value: Q_):
+        self.abs_value_sb_bis.setValue(value.m_as(self._unit))
+
+    def set_rel_value(self, value: Q_):
+        self.rel_value_sb.setValue(value.m_as(self._unit))
+
     def set_unit_as_suffix(self, unit: str):
         """Will append the actuator units in the value display"""
+        self._unit = unit
         self.current_value_sb.setOpts(suffix=unit)
         self.abs_value_sb_bis.setOpts(suffix=unit)
         self.abs_value_sb.setOpts(suffix=unit)
@@ -295,11 +318,17 @@ class DAQ_Move_UI(ControlModuleUI):
         self.connect_action('show_config', lambda: self.command_sig.emit(ThreadCommand('show_config', )))
 
         self.move_abs_pb.clicked.connect(lambda: self.emit_move_abs(self.abs_value_sb_bis))
+        self.abs_value_sb.shortcut["Ctrl+E"].activated.connect(lambda: self.emit_move_abs(self.abs_value_sb))
+        self.abs_value_sb_2.shortcut["Ctrl+E"].activated.connect(lambda: self.emit_move_abs(self.abs_value_sb_2))
+        self.abs_value_sb_bis.shortcut["Ctrl+E"].activated.connect(lambda: self.emit_move_abs(self.abs_value_sb_bis))
+
 
         self.rel_value_sb.valueChanged.connect(lambda: self.command_sig.emit(
             ThreadCommand('rel_value', self.rel_value_sb.value())))
         self.move_rel_plus_pb.clicked.connect(lambda: self.emit_move_rel('+'))
         self.move_rel_minus_pb.clicked.connect(lambda: self.emit_move_rel('-'))
+        self.rel_value_sb.shortcut["Ctrl+E"].activated.connect(lambda: self.emit_move_rel('+'))
+        self.rel_value_sb.shortcut["Ctrl+Shift+E"].activated.connect(lambda: self.emit_move_rel('-'))
 
         self.find_home_pb.clicked.connect(lambda: self.command_sig.emit(ThreadCommand('find_home', )))
         self.stop_pb.clicked.connect(lambda: self.command_sig.emit(ThreadCommand('stop', )))
@@ -328,12 +357,14 @@ class DAQ_Move_UI(ControlModuleUI):
 
     def emit_move_abs(self, spinbox):
         spinbox.editingFinished.emit()
-        self.command_sig.emit(ThreadCommand('move_abs', DataActuator(data=spinbox.value())))
+        self.command_sig.emit(ThreadCommand('move_abs', DataActuator(data=spinbox.value(),
+                                                                     units=self._unit)))
 
     def emit_move_rel(self, sign):
-        self.command_sig.emit(ThreadCommand('move_rel',
-                                            DataActuator(data=self.rel_value_sb.value() * (1 if sign == '+'
-                                                                                           else -1))))
+        self.command_sig.emit(ThreadCommand(
+            'move_rel',
+            DataActuator(data=self.rel_value_sb.value() * (1 if sign == '+' else -1),
+                         units=self._unit)))
 
     def close(self):
         self.graph_ui.close()
@@ -341,7 +372,7 @@ class DAQ_Move_UI(ControlModuleUI):
 
 
 def main(init_qt=True):
-    from pymodaq.utils.gui_utils.dock import DockArea
+    from pymodaq_gui.utils.dock import DockArea
     if init_qt:  # used for the test suite
         app = QtWidgets.QApplication(sys.argv)
 

pymodaq/control_modules/daq_viewer.py

@@ -43,6 +43,7 @@ from pymodaq.control_modules.viewer_utility_classes import params as daq_viewer_
 from pymodaq_utils import utils
 from pymodaq_utils.warnings import deprecation_msg
 from pymodaq_gui.utils import DockArea, Dock
+from pymodaq_gui.utils.utils import mkQApp
 
 from pymodaq.utils.gui_utils import get_splash_sc
 from pymodaq.control_modules.daq_viewer_ui import DAQ_Viewer_UI
@@ -269,6 +270,20 @@ class DAQ_Viewer(ParameterControlModule):
         deprecation_msg('viewers_docks is a deprecated property use viewer_docks instead')
         return self.viewer_docks
 
+    @property
+    def master(self) -> bool:
+        """ Get/Set programmatically the Master/Slave status of a detector"""
+        if self.initialized_state:
+            return self.settings['detector_settings', 'controller_status'] == 'Master'
+        else:
+            return True
+
+    @master.setter
+    def master(self, is_master: bool):
+        if self.initialized_state:
+            self.settings.child('detector_settings', 'controller_status').setValue(
+                'Master' if is_master else 'Slave')
+
     def daq_type_changed_from_ui(self, daq_type: DAQTypesEnum):
         """ Apply changes from the selection of a different DAQTypesEnum in the UI
 
@@ -376,7 +391,7 @@ class DAQ_Viewer(ParameterControlModule):
             return self._viewers
 
     @viewers.setter
-    def viewers(self, viewers):
+    def viewers(self, viewers: List[ViewerBase]):
         for viewer in self._viewers:
             try:
                 viewer.data_to_export_signal.disconnect()
@@ -392,6 +407,11 @@ class DAQ_Viewer(ParameterControlModule):
                 lambda roi_info: self.command_hardware.emit(
                     ThreadCommand('roi_select',
                                   dict(roi_info=roi_info, ind_viewer=ind_viewer))))
+            viewer.crosshair_dragged.connect(
+                lambda crosshair_info: self.command_hardware.emit(
+                    ThreadCommand('crosshair',
+                                  dict(crosshair_info=crosshair_info, ind_viewer=ind_viewer))))
+
 
         self._viewers = viewers
 
@@ -1004,7 +1024,8 @@ class DAQ_Viewer(ParameterControlModule):
         if self.settings.child('main_settings', 'overshoot', 'stop_overshoot').value():
             for dwa in dte:
                 for data_array in dwa.data:
-                    if any(data_array >= self.settings.child('main_settings', 'overshoot', 'overshoot_value').value()):
+                    if np.any(data_array >= self.settings['main_settings', 'overshoot',
+                                                          'overshoot_value']):
                         self.overshoot_signal.emit(True)
 
     def get_scaling_options(self):
@@ -1046,11 +1067,11 @@ class DAQ_Viewer(ParameterControlModule):
         super().thread_status(status, 'detector')
 
         if status.command == "ini_detector":
-            self.update_status("detector initialized: " + str(status.attribute[0]['initialized']))
+            self.update_status("detector initialized: " + str(status.attribute['initialized']))
             if self.ui is not None:
-                self.ui.detector_init = status.attribute[0]['initialized']
-            if status.attribute[0]['initialized']:
-                self.controller = status.attribute[0]['controller']
+                self.ui.detector_init = status.attribute['initialized']
+            if status.attribute['initialized']:
+                self.controller = status.attribute['controller']
                 self._initialized_state = True
             else:
                 self._initialized_state = False
@@ -1214,7 +1235,7 @@ class DAQ_Detector(QObject):
         """
         if command.command == "ini_detector":
             status = self.ini_detector(*command.attribute)
-            self.status_sig.emit(ThreadCommand(command.command, [status, 'log']))
+            self.status_sig.emit(ThreadCommand(command.command, status))
 
         elif command.command == "close":
             status = self.close()
@@ -1416,7 +1437,7 @@ class DAQ_Detector(QObject):
     def close(self):
         """ Call the close method of the instrument plugin class
         """
-        if self.detector is not None:
+        if self.detector is not None and self.detector.controller is not None:
             status = self.detector.close()
             return status
 
@@ -1444,16 +1465,12 @@ def main(init_qt=True, init_det=False):
     """ Method called to start the DAQ_Viewer in standalone mode"""
 
     if init_qt:  # used for the test suite
-        app = QtWidgets.QApplication(sys.argv)
-        if config('style', 'darkstyle'):
-            import qdarkstyle
-            app.setStyleSheet(qdarkstyle.load_stylesheet(qdarkstyle.DarkPalette))
+        app = mkQApp("PyMoDAQ Viewer")
 
     win = QtWidgets.QMainWindow()
     area = DockArea()
     win.setCentralWidget(area)
     win.resize(1000, 500)
-    win.setWindowTitle('PyMoDAQ Viewer')
     win.show()
 
     title = "Testing"