pymodaq 5.0.9__py3-none-any.whl → 5.0.11__py3-none-any.whl

pymodaq/control_modules/daq_move.py

@@ -499,6 +499,7 @@ class DAQ_Move(ParameterControlModule):
                 self._command_tcpip.emit(ThreadCommand(LECOMoveCommands.MOVE_DONE, data_act))
 
         elif status.command == 'outofbounds':
+            logger.warning(f'The Actuator {self.title} has reached its defined bounds')
             self.bounds_signal.emit(True)
 
         elif status.command == 'set_allowed_values':
@@ -638,6 +639,8 @@ class DAQ_Move(ParameterControlModule):
             return '°C'
         elif 'V' in unit or 'volt' in unit.lower():
             return 'V'
+        elif 'Hz' in unit:
+            return 'Hz'
         else:
             return str(Q_(1, unit).to_base_units().units)
 

pymodaq/control_modules/move_utility_classes.py

@@ -609,13 +609,18 @@ class DAQ_Move_base(QObject):
         if self.settings['bounds', 'is_bounds']:
             if self.data_actuator_type == DataActuatorType.DataActuator:
                 for data_array in position:
+                    if np.any(data_array > self.settings['bounds', 'max_bound']) or \
+                            np.any(data_array < self.settings['bounds', 'min_bound']):
+                        self.emit_status(ThreadCommand('outofbounds'))
                     data_array[data_array > self.settings['bounds', 'max_bound']] = self.settings['bounds', 'max_bound']
                     data_array[data_array < self.settings['bounds', 'min_bound']] = self.settings['bounds', 'min_bound']
-                self.emit_status(ThreadCommand('outofbounds', []))
+
             else:
                 if position > self.settings['bounds', 'max_bound']:
+                    self.emit_status(ThreadCommand('outofbounds'))
                     position = self.settings['bounds', 'max_bound']
                 elif position < self.settings['bounds', 'min_bound']:
+                    self.emit_status(ThreadCommand('outofbounds'))
                     position = self.settings['bounds', 'min_bound']
         return position
 

pymodaq/dashboard.py

@@ -890,7 +890,7 @@ class DashBoard(CustomApp):
                 self.splash_sc.showMessage(mssg)
         QtWidgets.QApplication.processEvents()
 
-        mov_mod_tmp.bounds_signal[bool].connect(self.stop_moves)
+        mov_mod_tmp.bounds_signal[bool].connect(self.do_stuff_from_out_bounds)
         move_docks[-1].addWidget(move_forms[-1])
         actuators_modules.append(mov_mod_tmp)
         return mov_mod_tmp
@@ -1139,7 +1139,7 @@ class DashBoard(CustomApp):
                                 QtWidgets.QApplication.processEvents()
 
                         detector_modules[-1].settings.child('main_settings', 'overshoot').show()
-                        detector_modules[-1].overshoot_signal[bool].connect(self.stop_moves)
+                        detector_modules[-1].overshoot_signal[bool].connect(self.stop_moves_from_overshoot)
 
             QtWidgets.QApplication.processEvents()
             # restore dock state if saved
@@ -1519,7 +1519,19 @@ class DashBoard(CustomApp):
                 QtWidgets.QApplication.processEvents()
             self.settings.child('detectors', name).setValue(det.initialized_state)
 
-    def stop_moves(self, overshoot):
+    def do_stuff_from_out_bounds(self, out_of_bounds: bool):
+
+        if out_of_bounds:
+            logger.warning(f'Some actuators reached their bounds')
+            if self.scan_module is not None:
+                logger.warning(f'Stopping the DAQScan for out of bounds')
+                self.scan_module.stop_scan()
+
+    def stop_moves_from_overshoot(self, overshoot):
+        self.overshoot = overshoot
+        self.stop_moves()
+
+    def stop_moves(self, *args, **kwargs):
         """
             Foreach module of the move module object list, stop motion.
 
@@ -1527,7 +1539,6 @@ class DashBoard(CustomApp):
             --------
             stop_scan,  DAQ_Move_main.daq_move.stop_motion
         """
-        self.overshoot = overshoot
         if self.scan_module is not None:
             self.scan_module.stop_scan()
 

{pymodaq-5.0.9.dist-info → pymodaq-5.0.11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pymodaq
-Version: 5.0.9
+Version: 5.0.11
 Summary: Modular Data Acquisition with Python
 Project-URL: Homepage, http://pymodaq.cnrs.fr
 Project-URL: Source, https://github.com/PyMoDAQ/PyMoDAQ

{pymodaq-5.0.9.dist-info → pymodaq-5.0.11.dist-info}/RECORD

@@ -1,15 +1,15 @@
 pymodaq/__init__.py,sha256=VtSBaXkrFtgRchmQN2dIet1X88h9r9M6C8OCD9WZPy0,3250
-pymodaq/dashboard.py,sha256=gbDGP34Wa0_7pO5I_nGlXqV4ahlDIsB8CaxhNVUdT_s,76688
+pymodaq/dashboard.py,sha256=FHccIAKb9qjoDYIoKdJqk0_8HZFu3BDoTFT6EkGogzI,77122
 pymodaq/icon.ico,sha256=hOHHfNDENKphQvG1WDleSEYcHukneR2eRFJu8isIlD4,74359
 pymodaq/splash.png,sha256=ow8IECF3tPRUMA4tf2tMu1aRiMaxx91_Y2ckVxkrmF0,53114
 pymodaq/updater.py,sha256=JMCVRgAXwmlrKxZv3837E-LRhF0F8V-td_wODwCoXaY,3821
 pymodaq/control_modules/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pymodaq/control_modules/daq_move.py,sha256=WXmtKz6-F68LTqpnTAer4SwropUgd7ZdfB_BYGdFkQY,38605
+pymodaq/control_modules/daq_move.py,sha256=V1oLP1ANQU-O4puSNpo_tLvtRCHqzWw1Iaf8IMniHxU,38744
 pymodaq/control_modules/daq_move_ui.py,sha256=bdkRX0wjkQuFDr4OT1Q6jT_15DEWV1dn2R6WF50H23s,16811
 pymodaq/control_modules/daq_viewer.py,sha256=f9WYEWIlVjnEakesObhsoLBIWfv1tv4Q8TopqfP8lsg,58602
 pymodaq/control_modules/daq_viewer_ui.py,sha256=7XTidYrYlzj--DbbE1Wx4UBjvp1upGpziGhSTPoMKCc,15677
 pymodaq/control_modules/mocks.py,sha256=CdczKJDAuM2oL7VvIpSBWiYtTCqK_6x9unxavezp3_s,1954
-pymodaq/control_modules/move_utility_classes.py,sha256=nT-uccyXon8DFsDlVa66Sx2Ph2bXt9GrQsN91Th3Kso,44056
+pymodaq/control_modules/move_utility_classes.py,sha256=xV_sUhNAPvOY9CFVymI4JbS5Vjyfmhqgu4efZWb_f1A,44368
 pymodaq/control_modules/utils.py,sha256=E94gyLrh7fkeppwihHXcwNyKD3CqBZvkMkk8X4fl_UE,20897
 pymodaq/control_modules/viewer_utility_classes.py,sha256=1TcyAC7AiJNKvJ6OGNOYoyFvRCT-u6RBbFv-X8IkZYA,28076
 pymodaq/daq_utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -115,8 +115,8 @@ pymodaq/utils/tcp_ip/__init__.py,sha256=1e_EK0AgvdoLAD_CSGGEaITZdy6OWCO7ih9IAIp7
 pymodaq/utils/tcp_ip/mysocket.py,sha256=03FaQskso8nLLAsN-ijX-RazXbeMezRnAPvsRxTQa4k,326
 pymodaq/utils/tcp_ip/serializer.py,sha256=Bp6ZpGqMdZlX4CnT371d7ZYqIp7UygsRsE9XFkWZrto,400
 pymodaq/utils/tcp_ip/tcp_server_client.py,sha256=eL-Q1HnnaAG8wfTUb9unEIiNFApMXzfzfveUWoC0_mg,30657
-pymodaq-5.0.9.dist-info/METADATA,sha256=NpHHxGUyK4W_14veaqXPUs-qEQVXJFHw1NbPVpeOckU,12885
-pymodaq-5.0.9.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-pymodaq-5.0.9.dist-info/entry_points.txt,sha256=DvPq6fmIPH2JNsCqHDhn1xEj1kX5tfuc7xQ8-l5S2EU,387
-pymodaq-5.0.9.dist-info/licenses/LICENSE,sha256=VKOejxexXAe3XwfhAhcFGqeXQ12irxVHdeAojZwFEI8,1108
-pymodaq-5.0.9.dist-info/RECORD,,
+pymodaq-5.0.11.dist-info/METADATA,sha256=ou9ZCnpP7pHGqyENHpnLCZooJoeteIaWYIQyHKgaQ80,12886
+pymodaq-5.0.11.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+pymodaq-5.0.11.dist-info/entry_points.txt,sha256=DvPq6fmIPH2JNsCqHDhn1xEj1kX5tfuc7xQ8-l5S2EU,387
+pymodaq-5.0.11.dist-info/licenses/LICENSE,sha256=VKOejxexXAe3XwfhAhcFGqeXQ12irxVHdeAojZwFEI8,1108
+pymodaq-5.0.11.dist-info/RECORD,,