pymodaq 5.0.2__py3-none-any.whl → 5.0.4__py3-none-any.whl

pymodaq/control_modules/move_utility_classes.py

@@ -78,7 +78,7 @@ def comon_parameters(epsilon=config('actuator', 'epsilon_default'),
     if isinstance(epsilon, list):
         epsilon = epsilon[0]
     elif isinstance(epsilon, dict):
-        epsilon = epsilon[list[epsilon.keys()][0]]
+        epsilon = epsilon[list(epsilon.keys())[0]]
 
     return [{'title': 'Units:', 'name': 'units', 'type': 'str', 'value': '', 'readonly': True},
             {'title': 'Epsilon:', 'name': 'epsilon', 'type': 'float',

pymodaq/extensions/daq_scan.py

@@ -602,7 +602,7 @@ class DAQScan(QObject, ParameterManager):
         for ind, pos in enumerate(positions):
             dte.append(DataActuator(actuators[ind].title, data=float(pos)))
 
-        self.modules_manager.move_actuators(dte)
+        self.modules_manager.move_actuators(dte, polling=False)
 
     def value_changed(self, param):
         """
@@ -621,27 +621,52 @@ class DAQScan(QObject, ParameterManager):
         self.settings.child('plot_options', 'plot_0d').setValue(dict(all_items=[], selected=[]))
         self.settings.child('plot_options', 'plot_1d').setValue(dict(all_items=[], selected=[]))
 
-    def prepare_viewers(self):
+    def check_number_type_viewers(self) -> Tuple[
+        List[ViewersEnum],
+        List[str],
+        bool]:
+        """ Assert from selected options the number and type of needed viewers for live plotting
 
-        viewers_enum = [ViewersEnum('Data0D').increase_dim(self.scanner.n_axes)
+        Return
+        ------
+        List[ViewersEnum]: the list of needed viewers
+         List[str]: the list of data names to be plotted in the corresponding viewer
+        """
+        viewer2D_overload = False
+        viewers_enum = [ViewersEnum.Viewer0D.increase_dim(self.scanner.n_axes)
                         for _ in range(len(self.settings['plot_options', 'plot_0d']['selected']))]
         data_names = self.settings['plot_options', 'plot_0d']['selected'][:]
 
-        if self.settings['plot_options', 'group0D'] and len(viewers_enum) > 0 and ViewersEnum('Data1D') in viewers_enum:
-            viewers_enum = [ViewersEnum('Data1D')]
+        if self.settings['plot_options', 'group0D'] and len(viewers_enum) > 0 and ViewersEnum.Viewer1D in viewers_enum:
+            viewers_enum = [ViewersEnum.Viewer1D]
             data_names = [self.live_plotter.grouped_data0D_fullname]
-        elif self.settings['plot_options', 'group0D'] and len(viewers_enum) > 0 and ViewersEnum('Data2D') in viewers_enum:
-            viewers_enum = [ViewersEnum('Data2D')]
+        elif (self.settings['plot_options', 'group0D'] and len(viewers_enum) > 0 and
+              ViewersEnum.Viewer2D in viewers_enum):
+            viewers_enum = [ViewersEnum.Viewer2D]
+            n2Dplots = len(data_names)
+            if (self.settings['scan_options', 'scan_average'] > 1 and
+                self.settings['scan_options', 'average_on_top']):
+                n2Dplots *= 2
+            if n2Dplots > 3:
+                viewer2D_overload = True
             data_names = [self.live_plotter.grouped_data0D_fullname]
 
         if self.scanner.n_axes <= 1:
-            viewers_enum.extend([ViewersEnum('Data1D').increase_dim(self.scanner.n_axes)
+            viewers_enum.extend([ViewersEnum.Viewer1D.increase_dim(self.scanner.n_axes)
                                  for _ in range(len(self.settings['plot_options', 'plot_1d']['selected']))])
             data_names.extend(self.settings['plot_options', 'plot_1d']['selected'][:])
         if not self.settings['scan_options', 'average_on_top']:
 
             viewers_enum = viewers_enum + viewers_enum
             data_names = data_names + [f'{data_name}_averaged' for data_name in data_names]
+
+        return viewers_enum, data_names, viewer2D_overload
+
+    def prepare_viewers(self):
+        """ Assert from selected options the number and type of needed viewers for live plotting
+        and prepare them on the live plot panel
+        """
+        viewers_enum, data_names, _ = self.check_number_type_viewers()
         self.live_plotter.prepare_viewers(viewers_enum, viewers_name=data_names)
 
     def update_status(self, txt: str, wait_time=0):
@@ -778,6 +803,15 @@ class DAQScan(QObject, ParameterManager):
                          f"limit in the config file ({config['scan']['steps_limit']}) or modify"
                          f" your scan settings.")
 
+            _, _, viewer2D_overload = self.check_number_type_viewers()
+            if viewer2D_overload:
+                messagebox(text=
+                           'The number of live data chosen and the selected options '
+                           'will not be able to render fully on the 2D live viewers. Consider changing '
+                           'the options, such as "plot on top" for the averaging or "Group 0D data" '
+                           'or the number of selected data')
+                return False
+
             if self.modules_manager.Nactuators != self.scanner.n_axes:
                 messagebox(
                     text="There are not enough or too much selected move modules for this scan")
@@ -1048,13 +1082,13 @@ class DAQScanAcquisition(QObject):
             self.set_ini_positions()
 
         elif command.command == "move_stages":
-            self.modules_manager.move_actuators(command.attribute)
+            self.modules_manager.move_actuators(command.attribute, polling=False)
 
     def set_ini_positions(self):
         """ Set the actuators's positions totheir initial value as defined in the scanner  """
         try:
             if self.scanner.scan_sub_type != 'Adaptive':
-                self.modules_manager.move_actuators(self.scanner.positions_at(0))
+                self.modules_manager.move_actuators(self.scanner.positions_at(0), polling=False)
 
         except Exception as e:
             logger.exception(str(e))

pymodaq/utils/leco/utils.py

@@ -39,7 +39,7 @@ def binary_serialization(
     """Serialize (binary) a pymodaq object, if it is not JSON compatible."""
     if isinstance(pymodaq_object, get_args(JSON_TYPES)):
         return pymodaq_object, None
-    elif isinstance(pymodaq_object, get_args(Union[*ser_factory.get_serializables()])):
+    elif isinstance(pymodaq_object, get_args(SERIALIZABLE)):
         return None, [Serializer(pymodaq_object).to_bytes()]
     else:
         raise ValueError(

{pymodaq-5.0.2.dist-info → pymodaq-5.0.4.dist-info}/METADATA

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

{pymodaq-5.0.2.dist-info → pymodaq-5.0.4.dist-info}/RECORD

@@ -9,7 +9,7 @@ pymodaq/control_modules/daq_move_ui.py,sha256=bdkRX0wjkQuFDr4OT1Q6jT_15DEWV1dn2R
 pymodaq/control_modules/daq_viewer.py,sha256=f9WYEWIlVjnEakesObhsoLBIWfv1tv4Q8TopqfP8lsg,58602
 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=5RAhxHEyThS8um42d_nixf0a9ZOQTo6VePhOmmId4QQ,43216
+pymodaq/control_modules/move_utility_classes.py,sha256=2byGqAv7XeDYswRaLnkc8UBZlquqeUrOfsCE_yPEmg0,43216
 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
@@ -36,7 +36,7 @@ pymodaq/examples/Labview_TCP_Client/client_state.ctl,sha256=IxYi5Og0QXFB1e0VeBL2
 pymodaq/examples/Labview_TCP_Client/cmd_types.ctl,sha256=gwuDyGcte11Zqx0C-U8ljRyYCQleUPh18MYqg9GtxPg,4618
 pymodaq/extensions/__init__.py,sha256=PXelEHNgMwhjWlvxwObYU1joSLJnaIsFBZs9ZTR8w5c,470
 pymodaq/extensions/console.py,sha256=kkuHHog_a2Y_5cYrAFTD7IGRQ4BA4NBQz4hrwFYanQY,2277
-pymodaq/extensions/daq_scan.py,sha256=7GVI4hBtFAcwvz8-hMNlhB_4REcCwwxGk6rUfWoeUZU,50568
+pymodaq/extensions/daq_scan.py,sha256=bM-lat9ldaNg62seN8DaepA321NTZ0ViAMOUWTm46Iw,52132
 pymodaq/extensions/daq_scan_ui.py,sha256=kKcXu2tNo-VJR7GQPNEXxMKiKitA4F3a_tOSamalWh0,10052
 pymodaq/extensions/h5browser.py,sha256=7WbF2hj7sdU0kCqTxB4nXvfKGqUnoIsa2_AhCtCBNQo,1131
 pymodaq/extensions/utils.py,sha256=18FvgD9vtwAvGdD01LiV0-jcGv0WNjYyDLSP-NFUjno,3042
@@ -86,7 +86,7 @@ pymodaq/utils/leco/desktop.ini,sha256=2zopClaSQqdFfIsC8CGo2Oc-14x9h1gV0-fUrDtLFm
 pymodaq/utils/leco/director_utils.py,sha256=0inrKh5aI-1pQs3fTXYvmjvwZ6TiyEEAupr2Hw_pMj0,2105
 pymodaq/utils/leco/leco_director.py,sha256=4QZVwU2tRM2OBNC4MV-a-JHDLgH_clJYKE8QVqymLgY,3145
 pymodaq/utils/leco/pymodaq_listener.py,sha256=kK3IasfKAC8bYq7h95yqVyXkNROKdhzHeAZm_zOdNt8,10736
-pymodaq/utils/leco/utils.py,sha256=ETQmVNHriB1TxVjspAVctRAqGcpc5rwzFDVlaHud394,2632
+pymodaq/utils/leco/utils.py,sha256=RX24FFidWqyDOwqv-E9uO06vBeTdu5ZBZWXQQa995tI,2605
 pymodaq/utils/managers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pymodaq/utils/managers/batchscan_manager.py,sha256=rhz2qeVfePX0h8sjIY1tHQckIHIxKhH-zOIzvM0_1Ag,13666
 pymodaq/utils/managers/modules_manager.py,sha256=LjYXl6TiFHUnoWpvX_Ht3uPg165C_klNgUVHI8suDbo,21076
@@ -115,8 +115,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.2.dist-info/METADATA,sha256=wqtlmvm87MlofZCdNqxepykwmVgzwIutaWEyCqu8Tcg,12878
-pymodaq-5.0.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-pymodaq-5.0.2.dist-info/entry_points.txt,sha256=DvPq6fmIPH2JNsCqHDhn1xEj1kX5tfuc7xQ8-l5S2EU,387
-pymodaq-5.0.2.dist-info/licenses/LICENSE,sha256=VKOejxexXAe3XwfhAhcFGqeXQ12irxVHdeAojZwFEI8,1108
-pymodaq-5.0.2.dist-info/RECORD,,
+pymodaq-5.0.4.dist-info/METADATA,sha256=fvaIk1_JrkBvEKSttUJ00XW1aHyE8ZOyToLbyQXt-8I,12878
+pymodaq-5.0.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+pymodaq-5.0.4.dist-info/entry_points.txt,sha256=DvPq6fmIPH2JNsCqHDhn1xEj1kX5tfuc7xQ8-l5S2EU,387
+pymodaq-5.0.4.dist-info/licenses/LICENSE,sha256=VKOejxexXAe3XwfhAhcFGqeXQ12irxVHdeAojZwFEI8,1108
+pymodaq-5.0.4.dist-info/RECORD,,