pymodaq 5.0.15__py3-none-any.whl → 5.0.17__py3-none-any.whl

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/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/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/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

{pymodaq-5.0.15.dist-info → pymodaq-5.0.17.dist-info}/METADATA

@@ -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.dist-info → pymodaq-5.0.17.dist-info}/RECORD

@@ -3,12 +3,12 @@ pymodaq/dashboard.py,sha256=rUrtOdaK31SKhl1XFagZdvVAEqEwU37WAbplciE6MhE,75119
 pymodaq/icon.ico,sha256=hOHHfNDENKphQvG1WDleSEYcHukneR2eRFJu8isIlD4,74359
 pymodaq/splash.png,sha256=ow8IECF3tPRUMA4tf2tMu1aRiMaxx91_Y2ckVxkrmF0,53114
 pymodaq/control_modules/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pymodaq/control_modules/daq_move.py,sha256=emJLJ5t4w-X8L-yo5Jbwg7g_4hP1zPaoq2yGR9S0N5M,38833
+pymodaq/control_modules/daq_move.py,sha256=yxoVmI_mLu0X4M60ofJeKYxR_0AlkNvF6WQLYXCK11M,38861
 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.py,sha256=XJUkKSmW4ktWSNIRsF_bZ-GG74h4-a82tGijZPrO3FA,58604
 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=xV_sUhNAPvOY9CFVymI4JbS5Vjyfmhqgu4efZWb_f1A,44368
+pymodaq/control_modules/move_utility_classes.py,sha256=zAiOFNEiLVFSmNPMKQRVbWwx7osMgU7ocgBGraEOxF8,44382
 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
@@ -99,7 +99,7 @@ pymodaq/utils/scanner/__init__.py,sha256=LqY1QwGnJEgr8CcW8uLWzbWy55Nvkmjmww4nl7x
 pymodaq/utils/scanner/scan_config.py,sha256=GJeH8oeZ_zMtujwkLM1jpKDQFLFKIN1wlkxXbOv6nWM,325
 pymodaq/utils/scanner/scan_factory.py,sha256=fu4kQrAoYsXeVg1VlHT2cyLZTuCQBJcz6X97CgMb0kw,8577
 pymodaq/utils/scanner/scan_selector.py,sha256=uu55xcijjg1fcvF59VVbtRLzXLoxb_3klEJPLiAuyws,16319
-pymodaq/utils/scanner/scanner.py,sha256=QxQwkkGpJvBfaoUQHGX6EK2EbIQGQFj47qBd8VQ7A0k,10898
+pymodaq/utils/scanner/scanner.py,sha256=007u4TVDTvxRDWnuXCWDNVOiUmflAJB99EjQ33Fh7VM,10985
 pymodaq/utils/scanner/utils.py,sha256=YjjrWWKs9q_OgP5xK277IyEsMqp15qFxU19kQ8f5R-c,3680
 pymodaq/utils/scanner/scanners/_1d_scanners.py,sha256=ArT1H8zl1_TztvxelDhjviEBtyv4AOO9Rt54EMKIuuQ,7812
 pymodaq/utils/scanner/scanners/_2d_scanners.py,sha256=AAHHHgyMtkXQTWnuPh3IY5ytATG5Lqc-AHJRpXIYApw,13851
@@ -114,8 +114,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.15.dist-info/METADATA,sha256=xq6FXBAaDD7tIVkrrkm0toiWjaIeLdoQa2EUS6jpaAA,12902
-pymodaq-5.0.15.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-pymodaq-5.0.15.dist-info/entry_points.txt,sha256=DvPq6fmIPH2JNsCqHDhn1xEj1kX5tfuc7xQ8-l5S2EU,387
-pymodaq-5.0.15.dist-info/licenses/LICENSE,sha256=VKOejxexXAe3XwfhAhcFGqeXQ12irxVHdeAojZwFEI8,1108
-pymodaq-5.0.15.dist-info/RECORD,,
+pymodaq-5.0.17.dist-info/METADATA,sha256=JcDMfoz7bDfgqc2mEwTD0YnMih2i2RZSrgvayLmX1yA,12902
+pymodaq-5.0.17.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+pymodaq-5.0.17.dist-info/entry_points.txt,sha256=DvPq6fmIPH2JNsCqHDhn1xEj1kX5tfuc7xQ8-l5S2EU,387
+pymodaq-5.0.17.dist-info/licenses/LICENSE,sha256=VKOejxexXAe3XwfhAhcFGqeXQ12irxVHdeAojZwFEI8,1108
+pymodaq-5.0.17.dist-info/RECORD,,