pymodaq 4.4.2__tar.gz → 4.4.4__tar.gz

{pymodaq-4.4.2 → pymodaq-4.4.4}/PKG-INFO

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

{pymodaq-4.4.2 → pymodaq-4.4.4}/src/pymodaq/control_modules/daq_move.py

@@ -595,14 +595,14 @@ class DAQ_Move(ParameterControlModule):
     def units(self, unit: str):
         self.settings.child('move_settings', 'units').setValue(unit)
         if self.ui is not None and config('actuator', 'display_units'):
-            if unit == '°':
+            if unit == '°' or unit == 'degree':
                 # special cas as pint base unit for angles are radians
-                self.ui.set_unit_as_suffix(unit)
+                self.ui.set_unit_as_suffix('°')
             else:
                 # if the controller units are in mm the displayed unit will be m
                 # because m is the base unit
                 # then the user could ask for mm, km, µm...
-                self.ui.set_unit_as_suffix(str(Q_(1, unit).to_base_units().units))
+                self.ui.set_unit_as_suffix(str(Q_(1, unit).to_reduced_units().units))
 
     def update_settings(self):
 

{pymodaq-4.4.2 → pymodaq-4.4.4}/src/pymodaq/control_modules/move_utility_classes.py

@@ -141,7 +141,11 @@ def comon_parameters_fun(is_multiaxes=False, axes_names=None,
 
     is_multiaxes = len(axis_names) > 1
     if isinstance(axis_names, list):
-        axis_name = axis_names[0]
+        if len(axis_names) > 0:
+            axis_name = axis_names[0]
+        else:
+            axis_names = ['']
+            axis_name = ''
     elif isinstance(axis_names, dict):
         axis_name = axis_names[list(axis_names.keys())[0]]
     params = [
@@ -867,7 +871,7 @@ class DAQ_Move_TCP_server(DAQ_Move_base, TCPServer):
     message_list = ["Quit", "Status", "Done", "Server Closed", "Info", "Infos", "Info_xml", "move_abs",
                     'move_home', 'move_rel', 'get_actuator_value', 'stop_motion', 'position_is', 'move_done']
     socket_types = ["ACTUATOR"]
-    params = comon_parameters() + tcp_parameters
+    params = comon_parameters_fun() + tcp_parameters
 
     def __init__(self, parent=None, params_state=None):
         """
@@ -939,6 +943,12 @@ class DAQ_Move_TCP_server(DAQ_Move_base, TCPServer):
         initialized = True
         return info, initialized
 
+    def read_infos(self, sock: Socket = None, infos=''):
+        """Reimplemented to get the units"""
+        super().read_infos(sock, infos)
+
+        self.axis_unit = self.settings['settings_client', 'units']
+
     def close(self):
         """
             Should be used to uninitialize hardware.

pymodaq-4.4.4/src/pymodaq/resources/VERSION

@@ -0,0 +1,2 @@
+version = '4.4.4'
+

pymodaq-4.4.2/src/pymodaq/resources/VERSION

@@ -1,2 +0,0 @@
-version = '4.4.2'
-