pymodaq 5.0.4__tar.gz → 5.0.6__tar.gz

{pymodaq-5.0.4 → pymodaq-5.0.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pymodaq
-Version: 5.0.4
+Version: 5.0.6
 Summary: Modular Data Acquisition with Python
 Project-URL: Homepage, http://pymodaq.cnrs.fr
 Project-URL: Source, https://github.com/PyMoDAQ/PyMoDAQ
@@ -54,7 +54,7 @@ Requires-Dist: pymodaq-data>=5.0.18
 Requires-Dist: pymodaq-gui>=5.0.17
 Requires-Dist: pymodaq-plugin-manager>=0.0.17
 Requires-Dist: pymodaq-plugins-mock>=5.0.5
-Requires-Dist: pymodaq-utils>=0.0.14
+Requires-Dist: pymodaq-utils<1.0.0,>=0.0.14
 Requires-Dist: pyqtgraph>=0.12
 Requires-Dist: python-dateutil
 Requires-Dist: qtconsole

{pymodaq-5.0.4 → pymodaq-5.0.6}/pyproject.toml

@@ -31,7 +31,7 @@ classifiers = [
     "Topic :: Software Development :: User Interfaces",
 ]
 dependencies = [
-    "pymodaq_utils>=0.0.14",
+    "pymodaq_utils>=0.0.14, <1.0.0",
     "pymodaq_gui>=5.0.17",
     "pymodaq_data>=5.0.18",
     "easydict",

{pymodaq-5.0.4 → pymodaq-5.0.6}/src/pymodaq/control_modules/daq_move.py

@@ -806,7 +806,7 @@ class DAQ_Move_Hardware(QObject):
         self.hardware.move_is_done = False
         self.hardware.ispolling = polling
         if self.hardware.data_actuator_type.name == 'float':
-            self.hardware.move_abs(position.value())
+            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
             self.hardware.move_abs(position)

{pymodaq-5.0.4 → pymodaq-5.0.6}/src/pymodaq/dashboard.py

@@ -775,9 +775,15 @@ class DashBoard(CustomApp):
                 if hasattr(self.extensions[ext], 'quit_fun'):
                     self.extensions[ext].quit_fun()
             for mov in self.actuators_modules:
-                mov.init_signal.disconnect(self.update_init_tree)
+                try:
+                    mov.init_signal.disconnect(self.update_init_tree)
+                except TypeError:
+                    pass
             for det in self.detector_modules:
-                det.init_signal.disconnect(self.update_init_tree)
+                try:
+                    det.init_signal.disconnect(self.update_init_tree)
+                except TypeError:
+                    pass
 
             for module in self.actuators_modules:
                 try: