pymodaq 4.3.5__py3-none-any.whl → 4.3.7__py3-none-any.whl

pymodaq/control_modules/move_utility_classes.py

@@ -236,6 +236,12 @@ class DAQ_Move_base(QObject):
             self._title = parent.title
         else:
             self._title = "myactuator"
+
+        if isinstance(self._controller_units, list):
+            # for backcompatibility
+            # in case an actuator has multiple units properly handled in future version of pymodaq
+            self._controller_units = self._controller_units[self.axis_names.index(self.axis_name)]
+
         self._current_value = DataActuator(self._title,
                                            data=[np.zeros(self.data_shape, dtype=float)],
                                            units=self.controller_units)
@@ -294,7 +300,7 @@ class DAQ_Move_base(QObject):
         """ To be subclassed, in order to init specific attributes needed by the real implementation"""
         self.controller = None
 
-    def ini_stage_init(self, old_controller=None, new_controller=None):
+    def ini_stage_init(self, old_controller=None, new_controller=None, slave_controller=None):
         """Manage the Master/Slave controller issue
 
         First initialize the status dictionary
@@ -312,8 +318,11 @@ class DAQ_Move_base(QObject):
             The particular object that allow the communication with the hardware, in general a python wrapper around the
             hardware library. In case of Master it is the new instance of your plugin controller
         """
+        if old_controller is None and slave_controller is not None:
+            old_controller = slave_controller
+
         self.status.update(edict(info="", controller=None, initialized=False))
-        if self.settings['multiaxes', 'ismultiaxes'] and self.settings['multiaxes', 'multi_status'] == "Slave":
+        if self.settings['multiaxes', 'ismultiaxes'] and not self.is_master:
             if old_controller is None:
                 raise Exception('no controller has been defined externally while this axe is a slave one')
             else:

pymodaq/control_modules/viewer_utility_classes.py

@@ -227,7 +227,7 @@ class DAQ_Viewer_base(QObject):
         """
         pass
 
-    def ini_detector_init(self, old_controller=None, new_controller=None):
+    def ini_detector_init(self, old_controller=None, new_controller=None, slave_controller=None):
         """Manage the Master/Slave controller issue
 
         First initialize the status dictionary
@@ -245,6 +245,8 @@ class DAQ_Viewer_base(QObject):
             The particular object that allow the communication with the hardware, in general a python wrapper around the
             hardware library. In case of Master it is the new instance of your plugin controller
         """
+        if old_controller is None and slave_controller is not None:
+            old_controller = slave_controller
         self.status.update(edict(info="", controller=None, initialized=False))
         if self.settings['controller_status'] == "Slave":
             if old_controller is None:

pymodaq/resources/VERSION

@@ -1,2 +1,2 @@
-version = '4.3.5'
+version = '4.3.7'
 

{pymodaq-4.3.5.dist-info → pymodaq-4.3.7.dist-info}/METADATA

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

{pymodaq-4.3.5.dist-info → pymodaq-4.3.7.dist-info}/RECORD

@@ -8,9 +8,9 @@ pymodaq/control_modules/daq_move_ui.py,sha256=euA8_utFfiscd9ahZxRTqqTiCSrNB4CKCL
 pymodaq/control_modules/daq_viewer.py,sha256=5CYmdWHGE7sQApeMfdWNV3zbPyoxxYtzFlQ1PaEw4fI,57883
 pymodaq/control_modules/daq_viewer_ui.py,sha256=FWP3jdIOR9vTgYqNaaodteGZ3dwgQ1GdWKrOpOAuSrs,15693
 pymodaq/control_modules/mocks.py,sha256=hh_xSWp9g1UV3NAQVD9Ft9tNWfTsSvKU0OU0trgzP2w,1956
-pymodaq/control_modules/move_utility_classes.py,sha256=84xsY5LJz-KEVaXpVK0rBUs6TAV1qQwm2UWxaNIfNAM,35339
+pymodaq/control_modules/move_utility_classes.py,sha256=g_Q8eOPetwFuVbQfWTk4gX5XMsJoTvf_a7vdOrR5DoU,35731
 pymodaq/control_modules/utils.py,sha256=5YdSwq_lFJm7IalYWe_Hn1U4LUoUmo1gedvV9UguU0Y,20016
-pymodaq/control_modules/viewer_utility_classes.py,sha256=mhUNZCx0SzaZJtxuKBMDcW5BfCY7hGPowJyQtQquwNE,26704
+pymodaq/control_modules/viewer_utility_classes.py,sha256=OHxwue1t3z2AXyeqNjnwPT2pMc8yXhnqyiWc9IdCI2c,26841
 pymodaq/examples/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pymodaq/examples/custom_app.py,sha256=2wQR0hlPWjZrWK0abNF6ASv8iQyJqRn2CKnBa_nAgN4,10452
 pymodaq/examples/custom_viewer.py,sha256=nUj5n6l7DSyh-qaXboNBfXKa9mAiXrHSiOcuFL1ayRE,4814
@@ -58,7 +58,7 @@ pymodaq/post_treatment/daq_measurement/daq_measurement_GUI.py,sha256=1u7hWDaiwsZ
 pymodaq/post_treatment/daq_measurement/daq_measurement_GUI.ui,sha256=PyzbCWPMkh5oIYYteZczXyWMeHKW9EJmM1QlzXhnyTk,7037
 pymodaq/post_treatment/daq_measurement/daq_measurement_main.py,sha256=CAKwcWMOD86aXB8mbdxOK7e8nZRos5d59FzDtqK1QoY,17093
 pymodaq/post_treatment/daq_measurement/process_from_QtDesigner_DAQ_Measurement_GUI.bat,sha256=e1tu2A67MS9fk3jhriF6saQgRxWIucIvNW92iWXFP6E,164
-pymodaq/resources/VERSION,sha256=0IjdCbIfZfg9UZFoqckqiyGBwq0UheKTOg6QR2i3-Xw,19
+pymodaq/resources/VERSION,sha256=fP37ke9RfdHBjYyyxWc1kXW6-Gg-gr80uqzn0qTdrE8,19
 pymodaq/resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pymodaq/resources/config_template.toml,sha256=d3pofgIK5FxaRMELAI1qEsRcMD3GlYd87zZjDj9G9m0,3210
 pymodaq/resources/preset_default.xml,sha256=Dt8iWLwPPOPtcG00JCVP-mh-G7KC6B0YN8hd8RQdnNI,27256
@@ -438,8 +438,8 @@ pymodaq/utils/tcp_ip/__init__.py,sha256=1e_EK0AgvdoLAD_CSGGEaITZdy6OWCO7ih9IAIp7
 pymodaq/utils/tcp_ip/mysocket.py,sha256=StAWj8dzHeMnbLj68Sel81uWFy-YkKVNRnVf7gXrESI,3452
 pymodaq/utils/tcp_ip/serializer.py,sha256=oTQ24JNln_vRX4YADitTYiJplwFIdsta1ZDp6TOGMCA,27562
 pymodaq/utils/tcp_ip/tcp_server_client.py,sha256=xIMTNgVW_rKK0yTi4FDNFLf85-Akb27Jz2LdrvOrP68,30660
-pymodaq-4.3.5.dist-info/METADATA,sha256=RXJPRnt6t5mgH-ipkC__L_ESRPaV2rT-SrtENNTWv7w,7657
-pymodaq-4.3.5.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-pymodaq-4.3.5.dist-info/entry_points.txt,sha256=RAzdYNjvUT28I2eiCKki_g2NzXq0woWxhev6lwzwRv8,348
-pymodaq-4.3.5.dist-info/licenses/LICENSE,sha256=VKOejxexXAe3XwfhAhcFGqeXQ12irxVHdeAojZwFEI8,1108
-pymodaq-4.3.5.dist-info/RECORD,,
+pymodaq-4.3.7.dist-info/METADATA,sha256=jrLMgm6DJyOZdZaK-32Cxe4h_-ikdS4vDVKW6e8ozRc,7657
+pymodaq-4.3.7.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+pymodaq-4.3.7.dist-info/entry_points.txt,sha256=RAzdYNjvUT28I2eiCKki_g2NzXq0woWxhev6lwzwRv8,348
+pymodaq-4.3.7.dist-info/licenses/LICENSE,sha256=VKOejxexXAe3XwfhAhcFGqeXQ12irxVHdeAojZwFEI8,1108
+pymodaq-4.3.7.dist-info/RECORD,,