pymodaq 5.0.8__tar.gz → 5.0.10__tar.gz

{pymodaq-5.0.8 → pymodaq-5.0.10}/PKG-INFO

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

{pymodaq-5.0.8 → pymodaq-5.0.10}/src/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':

{pymodaq-5.0.8 → pymodaq-5.0.10}/src/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
 
@@ -815,14 +820,21 @@ class DAQ_Move_base(QObject):
         """ Get the current position from the hardware with scaling conversion.
         """
         if self.settings['scaling', 'use_scaling']:
-            pos = (pos - self.settings['scaling', 'offset']) * self.settings['scaling', 'scaling']
+            if self.data_actuator_type == DataActuatorType.float:
+                pos = (pos - self.settings['scaling', 'offset']) * self.settings['scaling', 'scaling']
+            else:
+                pos = (pos - Q_(self.settings['scaling', 'offset'],
+                                self.axis_unit)) * self.settings['scaling', 'scaling']
         return pos
 
     def set_position_with_scaling(self, pos: DataActuator) -> DataActuator:
         """ Set the current position from the parameter and hardware with scaling conversion.
         """
         if self.settings['scaling', 'use_scaling']:
-            pos = pos / self.settings['scaling', 'scaling'] + self.settings['scaling', 'offset']
+            if self.data_actuator_type == DataActuatorType.DataActuator:
+                pos = pos / self.settings['scaling', 'scaling'] + Q_(self.settings['scaling', 'offset'], self.axis_unit)
+            else:
+                pos = pos / self.settings['scaling', 'scaling'] + self.settings['scaling', 'offset']
         return pos
 
     def set_position_relative_with_scaling(self, pos: DataActuator) -> DataActuator:

{pymodaq-5.0.8 → pymodaq-5.0.10}/src/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()