pymodaq 5.0.15__tar.gz → 5.0.17__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pymodaq
-Version: 5.0.15
+Version: 5.0.17
 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.17}/src/pymodaq/control_modules/daq_move.py

@@ -783,7 +783,7 @@ class DAQ_Move_Hardware(QObject):
             try:
                 infos = self.hardware.ini_stage(controller)  # return edict(info="", controller=, stage=)
             except Exception as e:
-                logger.exception('Hardware couldn\'t be initialized' + str(e))
+                logger.exception("Hardware couldn't be initialized", exc_info=e)
                 infos = str(e), False
 
             if isinstance(infos, edict):  # following old plugin templating
@@ -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.17}/src/pymodaq/control_modules/daq_viewer.py

@@ -1309,7 +1309,7 @@ class DAQ_Detector(QObject):
                 status.controller = self.detector.controller
 
             except Exception as e:
-                logger.exception('Hardware couldn\'t be initialized' + str(e))
+                logger.exception("Hardware couldn't be initialized", exc_info=e)
                 infos = str(e), False
                 status.controller = None
 

{pymodaq-5.0.15 → pymodaq-5.0.17}/src/pymodaq/control_modules/move_utility_classes.py

@@ -697,7 +697,7 @@ class DAQ_Move_base(QObject):
                 position = self.get_actuator_value()
         if position.name != self._title:  # make sure the emitted DataActuator has the name of the real implementation
             #of the plugin
-            position = DataActuator(self._title, data=position.value(),
+            position = DataActuator(self._title, data=position.value(self.axis_unit),
                                     units=self.axis_unit)
         self.move_done_signal.emit(position)
         self.move_is_done = True

{pymodaq-5.0.15 → pymodaq-5.0.17}/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