pymodaq 5.0.15__tar.gz → 5.0.16__tar.gz

{pymodaq-5.0.15 → pymodaq-5.0.16}/PKG-INFO

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

{pymodaq-5.0.15 → pymodaq-5.0.16}/src/pymodaq/control_modules/daq_move.py

@@ -810,7 +810,7 @@ class DAQ_Move_Hardware(QObject):
         position = check_units(position, self.hardware.axis_unit)
         self.hardware.move_is_done = False
         self.hardware.ispolling = polling
-        if self.hardware.data_actuator_type.name == 'float':
+        if self.hardware.data_actuator_type == self.hardware.data_actuator_type.float:
             self.hardware.move_abs(position.units_as(self.hardware.axis_unit).value()) # convert to plugin controller current axis units
         else:
             position.units = self.hardware.axis_unit  # convert to plugin controller current axis units

{pymodaq-5.0.15 → pymodaq-5.0.16}/src/pymodaq/utils/scanner/scanner.py

@@ -119,7 +119,7 @@ class Scanner(QObject, ParameterManager):
         self.settings.child('n_steps').setValue(self._scanner.evaluate_steps())
 
     @property
-    def actuators(self):
+    def actuators(self) -> list[DAQ_Move]:
         """list of str: Returns as a list the name of the selected actuators to describe the actual scan"""
         return self._actuators
 
@@ -206,7 +206,8 @@ class Scanner(QObject, ParameterManager):
         """ Extract the actuators positions at a given index in the scan as a DataToExport of DataActuators"""
         dte = DataToExport('scanner')
         for ind, pos in enumerate(self.positions[index]):
-            dte.append(DataActuator(self.actuators[ind].title, data=float(pos)))
+            dte.append(DataActuator(self.actuators[ind].title, data=float(pos),
+                                    units=self.actuators[ind].units))
         return dte
 
     @property