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

pymodaq/control_modules/move_utility_classes.py

@@ -607,10 +607,16 @@ class DAQ_Move_base(QObject):
         Return the new position eventually coerced within the bounds
         """
         if self.settings['bounds', 'is_bounds']:
-            for data_array in position:
-                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', []))
+            if self.data_actuator_type == DataActuatorType.DataActuator:
+                for data_array in position:
+                    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']:
+                    position = self.settings['bounds', 'max_bound']
+                elif position < self.settings['bounds', 'min_bound']:
+                    position = self.settings['bounds', 'min_bound']
         return position
 
     def get_actuator_value(self):
@@ -809,14 +815,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.7.dist-info → pymodaq-5.0.9.dist-info}/METADATA

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

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

@@ -9,7 +9,7 @@ pymodaq/control_modules/daq_move_ui.py,sha256=bdkRX0wjkQuFDr4OT1Q6jT_15DEWV1dn2R
 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=2byGqAv7XeDYswRaLnkc8UBZlquqeUrOfsCE_yPEmg0,43216
+pymodaq/control_modules/move_utility_classes.py,sha256=nT-uccyXon8DFsDlVa66Sx2Ph2bXt9GrQsN91Th3Kso,44056
 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.7.dist-info/METADATA,sha256=NNuQWjJziLF9cXab6dlPxky6GusuU_WGpFQ5hPkeL8s,12885
-pymodaq-5.0.7.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-pymodaq-5.0.7.dist-info/entry_points.txt,sha256=DvPq6fmIPH2JNsCqHDhn1xEj1kX5tfuc7xQ8-l5S2EU,387
-pymodaq-5.0.7.dist-info/licenses/LICENSE,sha256=VKOejxexXAe3XwfhAhcFGqeXQ12irxVHdeAojZwFEI8,1108
-pymodaq-5.0.7.dist-info/RECORD,,
+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,,