pymodaq 5.0.1__py3-none-any.whl → 5.0.3__py3-none-any.whl

pymodaq/control_modules/daq_move.py

@@ -10,7 +10,7 @@ from __future__ import annotations
 import numbers
 from importlib import import_module
 from numbers import Number
-from random import randint
+
 import sys
 from typing import List, Tuple, Union, Optional, Type
 import numpy as np
@@ -472,16 +472,7 @@ class DAQ_Move(ParameterControlModule):
             self.init_signal.emit(self._initialized_state)
 
         elif status.command == "get_actuator_value" or status.command == 'check_position':
-            if isinstance(status.attribute, DataActuator):
-                data_act: DataActuator = status.attribute
-            else:
-                data_act: DataActuator = status.attribute[0]  # backcompatibility
-            data_act.name = self.title  # for the DataActuator name to be the title of the DAQ_Move
-            if (not Unit(self.units).is_compatible_with(Unit(data_act.units)) and
-                    data_act.units == ''):  #this happens if the units have not been specified in
-                # the plugin
-                data_act.force_units(self.units)
-
+            data_act = self._check_data_type(status.attribute)
             if self.ui is not None:
                 self.ui.display_value(data_act)
                 if self.ui.is_action_checked('show_graph'):
@@ -495,11 +486,7 @@ class DAQ_Move(ParameterControlModule):
                 self._command_tcpip.emit(ThreadCommand(LECOMoveCommands.POSITION, data_act))
 
         elif status.command == "move_done":
-            if isinstance(status.attribute, DataActuator):
-                data_act: DataActuator = status.attribute
-            else:
-                data_act: DataActuator = status.attribute[0]  # deprecated
-            data_act.name = self.title  # for the DataActuator name to be the title of the DAQ_Move
+            data_act = self._check_data_type(status.attribute)
             if self.ui is not None:
                 self.ui.display_value(data_act)
                 self.ui.move_done = True
@@ -524,6 +511,22 @@ class DAQ_Move(ParameterControlModule):
         elif status.command == 'units':
             self.units = status.attribute
 
+    def _check_data_type(self, data_act: Union[list[np.ndarray], float, DataActuator]) -> DataActuator:
+        """ Make sure the data is a DataActuator
+
+        Mostly to make sure DAQ_Move is backcompatible with old style plugins
+        """
+        if isinstance(data_act, list):  # backcompatibility
+            data_act = data_act[0]
+        if isinstance(data_act, np.ndarray):  # backcompatibility
+            data_act = DataActuator(data=[data_act], units=self.units)
+        data_act.name = self.title  # for the DataActuator name to be the title of the DAQ_Move
+        if (not Unit(self.units).is_compatible_with(Unit(data_act.units)) and
+                data_act.units == ''):  #this happens if the units have not been specified in
+            # the plugin
+            data_act.force_units(self.units)
+        return  data_act
+
     def get_actuator_value(self):
         """Get the current actuator value via the "get_actuator_value" command send to the hardware
 

pymodaq/control_modules/daq_viewer.py

@@ -6,8 +6,10 @@ Created on Wed Jan 10 16:54:14 2018
 """
 from __future__ import annotations
 from importlib import import_module
+
 from collections import OrderedDict
 import copy
+
 import os
 from pathlib import Path
 from random import randint

pymodaq/control_modules/move_utility_classes.py

@@ -536,8 +536,8 @@ class DAQ_Move_base(QObject):
             return self._current_value
 
     @current_value.setter
-    def current_value(self, value: Union[float, DataActuator]):
-        if isinstance(value, numbers.Number):
+    def current_value(self, value: Union[float, np.ndarray, DataActuator]):
+        if isinstance(value, numbers.Number) or isinstance(value, np.ndarray):
             self._current_value = DataActuator(self._title, data=value,
                                                units=self.axis_unit)
         else:

pymodaq/dashboard.py

@@ -45,7 +45,7 @@ from pymodaq.utils import config as config_mod_pymodaq
 
 from pymodaq.control_modules.daq_move import DAQ_Move
 from pymodaq.control_modules.daq_viewer import DAQ_Viewer
-from pymodaq.utils.gui_utils import get_splash_sc
+from pymodaq_gui.utils.splash import get_splash_sc
 
 from pymodaq import extensions as extmod
 
@@ -395,11 +395,11 @@ class DashBoard(CustomApp):
         self.add_action('modify_preset', 'Modify Preset', '',
                         'Modify an existing experimental setup configuration file: a "preset"',
                         auto_toolbar=False)
-        self.add_action('load_preset', 'LOAD', 'Open',
-                        tip='Load the selected Preset: ')
+
         self.add_widget('preset_list', QtWidgets.QComboBox, toolbar=self.toolbar,
                         signal_str='currentTextChanged', slot=self.update_preset_action)
-
+        self.add_action('load_preset', 'LOAD', 'Open',
+                        tip='Load the selected Preset: ')
         self.update_preset_action_list()
 
         self.add_action('new_overshoot', 'New Overshoot', '',

pymodaq/extensions/daq_scan.py

@@ -86,7 +86,12 @@ class DAQScan(QObject, ParameterManager):
             {'title': 'Timeout (ms)', 'name': 'timeout', 'type': 'int', 'value': 10000},
         ]},
         {'title': 'Scan options', 'name': 'scan_options', 'type': 'group', 'children': [
-            {'title': 'Naverage:', 'name': 'scan_average', 'type': 'int', 'value': 1, 'min': 1},
+            {'title': 'Naverage:', 'name': 'scan_average', 'type': 'int',
+             'value': config('scan', 'Naverage'), 'min': 1},
+            {'title': 'Plot on top:', 'name': 'average_on_top', 'type': 'bool',
+             'value': config('scan', 'average_on_top'),
+             'tip': 'At the second iteration will plot the averaged scan on top (True) of the current one'
+                    'or in a second panel (False)'},
         ]},
 
         {'title': 'Plotting options', 'name': 'plot_options', 'type': 'group', 'children': [
@@ -439,7 +444,7 @@ class DAQScan(QObject, ParameterManager):
         if not os.path.isdir(self.h5saver.settings['base_path']):
             os.mkdir(self.h5saver.settings['base_path'])
         filename = gutils.file_io.select_file(self.h5saver.settings['base_path'], save=True, ext='h5')
-        self.h5saver.h5_file.copy_file(str(filename))
+        self.h5saver.h5_file.copy_file(str(filename), overwrite=True)
 
     def save_metadata(self, node, type_info='dataset_info'):
         """
@@ -597,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):
         """
@@ -616,23 +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):
@@ -672,6 +706,7 @@ class DAQScan(QObject, ParameterManager):
             self.ui.set_scan_step_average(status.attribute[1] + 1)
 
         elif status.command == "Scan_done":
+
             self.modules_manager.reset_signals()
             self.live_timer.stop()
             self.ui.set_scan_done()
@@ -736,6 +771,7 @@ class DAQScan(QObject, ParameterManager):
             self.live_plotter.load_plot_data(group_0D=self.settings['plot_options', 'group0D'],
                                              average_axis=average_axis,
                                              average_index=self.ind_average,
+                                             separate_average= not self.settings['scan_options', 'average_on_top'],
                                              target_at=self.scanner.positions[self.ind_scan],
                                              last_step=(self.ind_scan ==
                                                         self.scanner.positions.size - 1 and
@@ -767,11 +803,22 @@ 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")
                 return False
 
+            ## TODO the stuff about adaptive scans have to be moved into a dedicated extension. M
+            ## Most similat to the Bayesian one!
             if self.scanner.scan_sub_type == 'Adaptive':
                 #todo include this in scanners objects for the adaptive scanners
                 if len(self.modules_manager.get_selected_probed_data('0D')) == 0:
@@ -860,9 +907,15 @@ class DAQScan(QObject, ParameterManager):
             self.save_metadata(scan_node, 'scan_info')
 
             self._init_live()
+            Naverage = self.settings['scan_options', 'scan_average']
+            if Naverage > 1:
+                scan_shape = [Naverage]
+                scan_shape.extend(self.scanner.get_scan_shape())
+            else:
+                scan_shape = self.scanner.get_scan_shape()
             for det in self.modules_manager.detectors:
                 det.module_and_data_saver = (
-                    module_saving.DetectorExtendedSaver(det, self.scanner.get_scan_shape()))
+                    module_saving.DetectorExtendedSaver(det, scan_shape))
             self.module_and_data_saver.h5saver = self.h5saver  # force the update as the h5saver ill also be set on each detectors
 
             # mandatory to deal with multithreads
@@ -1029,20 +1082,20 @@ 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))
 
     def start_acquisition(self):
         try:
-            #todo hoaw to apply newlayout to adaptive mode?
+            #todo hoaw to apply newlayout to adaptive mode? => cannot has to be a new extension
 
             self.modules_manager.connect_actuators()
             self.modules_manager.connect_detectors()
@@ -1114,6 +1167,7 @@ class DAQScanAcquisition(QObject):
                     # daq_scan wait time
                     QThread.msleep(self.scan_settings.child('time_flow', 'wait_time').value())
 
+            self.modules_manager.timeout_signal.disconnect()
             self.modules_manager.connect_actuators(False)
             self.modules_manager.connect_detectors(False)
 
@@ -1121,6 +1175,7 @@ class DAQScanAcquisition(QObject):
                                                      attribute="Acquisition has finished"))
             self.status_sig.emit(utils.ThreadCommand("Scan_done"))
 
+
         except Exception as e:
             logger.exception(str(e))
 
@@ -1156,7 +1211,8 @@ class DAQScanAcquisition(QObject):
             full_names: list = self.scan_settings['plot_options', 'plot_0d']['selected'][:]
             full_names.extend(self.scan_settings['plot_options', 'plot_1d']['selected'][:])
             data_temp = det_done_datas.get_data_from_full_names(full_names, deepcopy=False)
-            data_temp = data_temp.get_data_with_naxes_lower_than(2-len(indexes))  # maximum Data2D included nav indexes
+            n_nav_axis_selection = 2-len(indexes) + 1 if self.Naverage > 1 else 2-len(indexes)
+            data_temp = data_temp.get_data_with_naxes_lower_than(n_nav_axis_selection)  # maximum Data2D included nav indexes
 
             self.scan_data_tmp.emit(ScanDataTemp(self.ind_scan, indexes, data_temp))
 

pymodaq/extensions/pid/pid_controller.py

@@ -166,7 +166,7 @@ class DAQ_PID(CustomExt):
     def process_output(self, data: DataToExport):
         inputs: DataRaw = data.get_data_from_name('inputs')
         outputs: DataRaw = data.get_data_from_name('outputs')
-        self.curr_points = [float(d) for d in inputs]
+        self.curr_points = [float(array[0]) for array in inputs]
         self.output_viewer.show_data(outputs)
         self.input_viewer.show_data(inputs)
 

pymodaq/extensions/pid/utils.py

@@ -137,38 +137,14 @@ class PIDModelGeneric:
 
 
 def main(xmlfile):
-    from pymodaq.dashboard import DashBoard
-    from pymodaq.utils.config import get_set_preset_path
+    from pymodaq.utils.gui_utils.loader_utils import load_dashboard_with_preset
     from pathlib import Path
     from qtpy import QtWidgets
+    from pymodaq_gui.utils.utils import mkQApp
 
     import sys
-    app = QtWidgets.QApplication(sys.argv)
-    win = QtWidgets.QMainWindow()
-    area = DockArea()
-    win.setCentralWidget(area)
-    win.resize(1000, 500)
-    win.setWindowTitle('PyMoDAQ Dashboard')
-
-    dashboard = DashBoard(area)
-    file = Path(get_set_preset_path()).joinpath(xmlfile)
-    if file.exists():
-        dashboard.set_preset_mode(file)
-        # prog.load_scan_module()
-        pid_area = DockArea()
-        pid_window = QtWidgets.QMainWindow()
-        pid_window.setCentralWidget(pid_area)
-
-        prog = dashboard.load_pid_module(pid_window)
-
-    else:
-        msgBox = QtWidgets.QMessageBox()
-        msgBox.setText(f"The default file specified in the configuration file does not exists!\n"
-                       f"{file}\n"
-                       f"Impossible to load the DAQ_PID Module")
-        msgBox.setStandardButtons(msgBox.Ok)
-        ret = msgBox.exec()
-
+    app = mkQApp('BeamSteering')
+    dashboard, extension, win = load_dashboard_with_preset(xmlfile, 'DAQ_PID')
     sys.exit(app.exec_())
 
 
@@ -180,7 +156,6 @@ def get_models(model_name=None):
     -------
     list: list of disct containting the name and python module of the found models
     """
-    from pymodaq.extensions.pid.utils import PIDModelGeneric
     models_import = []
     discovered_models = list(get_entrypoints(group='pymodaq.pid_models'))
     discovered_models.extend(list(get_entrypoints(group='pymodaq.models')))

pymodaq/post_treatment/load_and_plot.py

@@ -70,7 +70,7 @@ class LoaderPlotter:
     def load_data(self, filter_dims: List[Union[DataDim, str]] = None,
                   filter_full_names: List[str] = None, remove_navigation: bool = True,
                   group_0D=False, average_axis: int=None, average_index: int = 0,
-                  last_step=False):
+                  last_step=False, separate_average=False):
         """Load Data from the h5 node of the dataloader and apply some filtering/manipulation before
         plotting
 
@@ -92,6 +92,8 @@ class LoaderPlotter:
             which step in the averaging process are we in.
         last_step: bool
             tells if this is the very last step of the (averaged) scan
+        separate_average: bool
+            Tells if the averaged data are to be plotted on the same data viewer panel or another one
 
         Returns
         -------
@@ -102,7 +104,8 @@ class LoaderPlotter:
         self.dataloader.load_all('/', self._data)
 
         if average_axis is not None:
-            self.average_axis(average_axis, average_index, last_step=last_step)
+            self.average_axis(average_axis, average_index, last_step=last_step,
+                              separate_average=separate_average)
 
         if filter_dims is not None:
             filter_dims[:] = [enum_checker(DataDim, dim) for dim in filter_dims]
@@ -113,14 +116,15 @@ class LoaderPlotter:
                                   filter_full_names]
 
         if group_0D:  # 0D initial data
-            self.group_0D_data()
+            self.group_0D_data(separate_average=separate_average)
 
         if remove_navigation:
             self.remove_navigation_axes()
 
         return self._data
 
-    def average_axis(self, average_axis, average_index, last_step=False) -> None:
+    def average_axis(self, average_axis, average_index, last_step=False,
+                     separate_average=False) -> None:
         """ Average the data along their average axis
 
         Parameters
@@ -132,7 +136,12 @@ class LoaderPlotter:
             which step in the averaging process are we in.
         last_step: bool
             tells if this is the very last step of the (averaged) scan
+        separate_average: bool
+            Tells if the averaged data are to be plotted on the same data viewer panel or another one
+
         """
+        if separate_average and average_index > 0:
+            averaged_data = DataToExport('Averaged')
         for ind, data in enumerate(self._data):
             current_data = data.inav[average_index, ...]
             if average_index > 0:
@@ -143,10 +152,16 @@ class LoaderPlotter:
                         data_to_append = data.inav[0, ...]
                     else:
                         data_to_append = data.inav[0:average_index, ...].mean(axis=average_axis)
-
+                data_to_append.name = f'{data_to_append.name}_averaged'
                 data_to_append.labels = [f'{label}_averaged' for label in data_to_append.labels]
-                current_data.append(data_to_append)
+                if not (separate_average and average_index > 0):
+                    current_data.append(data_to_append)
+                else:
+                    averaged_data.append(data_to_append)
             self._data[ind] = current_data
+        if separate_average and average_index > 0:
+            self._data.append(averaged_data.data)
+
 
     def remove_navigation_axes(self):
         """Make the navigation axes as signal axes
@@ -159,18 +174,27 @@ class LoaderPlotter:
             data.transpose()  # because usual ND data should be plotted here as 2D with the nav axes as the minor
             # (horizontal)
 
-    def group_0D_data(self):
+    def group_0D_data(self, separate_average=False):
         """Group in a single DataFromPlugins all data that are initialy Data0D
 
         """
         data = self._data.get_data_from_sig_axes(0)
         if len(data) > 0:
             data0D_arrays = []
+            data0D_arrays_averaged = []
             labels = []
+            labels_averaged = []
             for dwa in data:
-                data0D_arrays.extend(dwa.data)
-                labels.extend([f'{dwa.get_full_name()}/{label}' for label in dwa.labels])
-                self._data.remove(dwa)
+                if 'averaged' in dwa.name and separate_average:
+                    data0D_arrays_averaged.extend(dwa.data)
+                    labels_averaged.extend([f'{dwa.get_full_name()}/{label}' for label in dwa.labels])
+                    self._data.remove(dwa)
+
+
+                else:
+                    data0D_arrays.extend(dwa.data)
+                    labels.extend([f'{dwa.get_full_name()}/{label}' for label in dwa.labels])
+                    self._data.remove(dwa)
 
             data0D = DataFromPlugins(self.grouped_data0D_fullname.split('/')[1],
                                      data=data0D_arrays, labels=labels,
@@ -179,6 +203,15 @@ class LoaderPlotter:
                                      axes=dwa.axes, nav_indexes=dwa.nav_indexes,
                                      )
             self._data.append(data0D)
+            if 'averaged' in dwa.name and separate_average:
+                data0D_averaged = DataFromPlugins(
+                    f"{self.grouped_data0D_fullname.split('/')[1]}_averaged",
+                    data=data0D_arrays_averaged, labels=labels_averaged,
+                    dim='DataND',
+                    origin=self.grouped_data0D_fullname.split('/')[0],
+                    axes=dwa.axes, nav_indexes=dwa.nav_indexes,
+                )
+                self._data.append(data0D_averaged)
 
     def load_plot_data(self, **kwargs):
         """Load and plot all data from the current H5Saver

pymodaq/utils/data.py

@@ -9,9 +9,16 @@ from pymodaq_utils.warnings import deprecation_msg, user_warning
 
 from pymodaq_data.data import (DataRaw, DataWithAxes, DataToExport, DataCalculated, DataDim,
                                DataSource, DataBase, Axis, NavAxis, DataDistribution, Q_, Unit,
-                               )  # imported here for backcompatibility
+                               )  # imported here for backcompatibility. Will allow also the object serialization
+                                  # registration
 
 
+from pymodaq_utils.serialize.factory import SerializableFactory, SerializableBase
+
+ser_factory = SerializableFactory()
+
+
+@ser_factory.register_decorator()
 class DataActuator(DataRaw):
     """Specialized DataWithAxes set with source as 'raw'.
     To be used for raw data generated by actuator plugins"""
@@ -40,6 +47,7 @@ class DataActuator(DataRaw):
             return super().__add__(other)
 
 
+@ser_factory.register_decorator()
 class DataFromPlugins(DataRaw):
     """Specialized DataWithAxes set with source as 'raw'. To be used for raw data generated by Detector plugins
 
@@ -83,12 +91,14 @@ class DataFromPlugins(DataRaw):
         super().__init__(*args, **kwargs)
 
 
+@ser_factory.register_decorator()
 class DataScan(DataToExport):
     """Specialized DataToExport.To be used for data to be saved """
     def __init__(self, name: str, data: List[DataWithAxes] = [], **kwargs):
         super().__init__(name, data, **kwargs)
 
 
+@ser_factory.register_decorator()
 class DataToActuators(DataToExport):
     """ Particular case of a DataToExport adding one named parameter to indicate what kind of change
     should be applied to the actuators, absolute or relative
@@ -115,4 +125,3 @@ class DataToActuators(DataToExport):
 
     def __repr__(self):
         return f'{super().__repr__()}: {self.mode}'
-

pymodaq/utils/gui_utils/loader_utils.py

@@ -39,6 +39,8 @@ def load_dashboard_with_preset(preset_name: str, extension_name: str) -> \
     # win.setVisible(False)
     dashboard = DashBoard(area)
 
+    preset_name = Path(preset_name).stem
+
     file = Path(get_set_preset_path()).joinpath(f"{preset_name}.xml")
 
     if file is not None and file.exists():

pymodaq/utils/h5modules/module_saving.py

@@ -11,7 +11,7 @@ import xml.etree.ElementTree as ET
 
 
 import numpy as np
-
+from pymodaq_utils.logger import set_logger, get_module_name
 from pymodaq_utils.abstract import ABCMeta, abstract_attribute, abstractmethod
 from pymodaq_utils.utils import capitalize
 from pymodaq_data.data import Axis, DataDim, DataWithAxes, DataToExport, DataDistribution
@@ -28,6 +28,9 @@ if TYPE_CHECKING:
     from pymodaq.extensions.daq_logger.h5logging import H5Logger
 
 
+logger = set_logger(get_module_name(__file__))
+
+
 class ModuleSaver(metaclass=ABCMeta):
     """Abstract base class to save info and data from main modules (DAQScan, DAQViewer, DAQMove, ...)"""
     group_type: GroupType = abstract_attribute()
@@ -374,7 +377,7 @@ class ScanSaver(ModuleSaver):
             try:
                 detector.insert_data(indexes, where=self._module_group, distribution=distribution)
             except Exception as e:
-                pass
+                logger.exception(f'Cannot insert data: {str(e)}')
 
 
 class LoggerSaver(ScanSaver):

pymodaq/utils/leco/daq_move_LECODirector.py

@@ -17,8 +17,7 @@ from pymodaq_gui.parameter import Parameter
 
 from pymodaq.utils.leco.leco_director import LECODirector, leco_parameters
 from pymodaq.utils.leco.director_utils import ActuatorDirector
-from pymodaq.utils.tcp_ip.serializer import DeSerializer
-
+from pymodaq_utils.serialize.serializer_legacy import DeSerializer
 
 class DAQ_Move_LECODirector(LECODirector, DAQ_Move_base):
     """A control module, which in the dashboard, allows to control a remote Move module.

pymodaq/utils/leco/daq_xDviewer_LECODirector.py

@@ -6,8 +6,9 @@ from easydict import EasyDict as edict
 from pymodaq.control_modules.viewer_utility_classes import DAQ_Viewer_base, comon_parameters, main
 
 from pymodaq_utils.utils import ThreadCommand, getLineInfo
+
 from pymodaq_gui.parameter import Parameter
-from pymodaq.utils.tcp_ip.serializer import DeSerializer
+from pymodaq_utils.serialize.serializer_legacy import DeSerializer
 
 from pymodaq.utils.leco.leco_director import LECODirector, leco_parameters
 from pymodaq.utils.leco.director_utils import DetectorDirector

pymodaq/utils/leco/leco_director.py

@@ -1,8 +1,9 @@
-
 import random
-
 from typing import Callable, Sequence, List
 
+from pymodaq_utils.enums import StrEnum
+from typing import Callable, Sequence, List, Optional, Union
+
 import pymodaq_gui.parameter.utils as putils
 # object used to send info back to the main thread:
 from pymodaq_utils.utils import ThreadCommand
@@ -14,7 +15,7 @@ from pymodaq.utils.leco.pymodaq_listener import PymodaqListener
 
 leco_parameters = [
     {'title': 'Actor name:', 'name': 'actor_name', 'type': 'str', 'value': "actor_name",
-     'text': 'Name of the actor plugin to communicate with.'},
+     'tip': 'Name of the actor plugin to communicate with.'},
 ]
 
 

pymodaq/utils/leco/pymodaq_listener.py

@@ -1,11 +1,6 @@
 
-try:
-    from enum import StrEnum  # type: ignore
-except ImportError:
-    from enum import Enum
+from pymodaq_utils.enums import StrEnum
 
-    class StrEnum(str, Enum):
-        pass
 import logging
 from threading import Event
 from typing import Optional, Union, List, Type

pymodaq/utils/leco/utils.py

@@ -2,10 +2,11 @@ from __future__ import annotations
 import subprocess
 import sys
 from typing import Any, Optional, Union, get_args, TypeVar
-from pymodaq_data import data
+
 from pymodaq.utils import data
 # import also the DeSerializer for easier imports in dependents
 from pymodaq_utils.serialize.serializer_legacy import Serializer, DeSerializer, SerializableFactory
+
 # type: ignore  # noqa
 from pymodaq_utils.logger import set_logger
 
@@ -14,7 +15,6 @@ logger = set_logger('leco_utils')
 ser_factory = SerializableFactory()
 JSON_TYPES = Union[str, int, float]
 
-SERIALIZABLE = ser_factory.get_serializables()
 
 
 def serialize_object(pymodaq_object: Union[SERIALIZABLE, Any]) -> Union[str, Any]:
@@ -26,6 +26,13 @@ def serialize_object(pymodaq_object: Union[SERIALIZABLE, Any]) -> Union[str, Any
     #is not serializable
 
 
+## this form below is to be compatible with python <= 3.10
+## for py>= 3.11 this could be written SERIALIZABLE = Union[ser_factory.get_serializables()]
+SERIALIZABLE = Union[ser_factory.get_serializables()[0]]
+for klass in ser_factory.get_serializables()[1:]:
+    SERIALIZABLE = Union[SERIALIZABLE, klass]
+
+
 def binary_serialization(
     pymodaq_object: Union[SERIALIZABLE, Any],
 ) -> tuple[Optional[Any], Optional[list[bytes]]]:

pymodaq/utils/managers/modules_manager.py

@@ -374,12 +374,12 @@ class ModulesManager(QObject, ParameterManager):
                 sig.connect(slot)
         else:
 
-            for sig in [mod.grab_done_signal for mod in self.detectors_all]:
+            for sig in [mod.grab_done_signal for mod in self.detectors]:
                 try:
                     sig.disconnect(slot)
                 except TypeError as e:
                     # means the slot was not previously connected
-                    logger.info(str(e))
+                    logger.info(f'Could not disconnect grab signal from the {slot} slot', stacklevel=2)
 
         self.detectors_connected = connect
 

pymodaq/utils/tcp_ip/serializer.py

@@ -7,7 +7,7 @@ Created the 20/10/2023
 
 from pymodaq_utils.utils import deprecation_msg
 
-from pymodaq_data.serialize.serializer_legacy import Serializer, DeSerializer, SocketString, Socket
+from pymodaq_utils.serialize.serializer_legacy import Serializer, DeSerializer, SocketString, Socket
 
 deprecation_msg('Importing Serializer, DeSerializer from pymodaq is deprecated in PyMoDAQ >= 5,'
                 'import them from pymodaq_data.serialize.serializer')

{pymodaq-5.0.1.dist-info → pymodaq-5.0.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pymodaq
-Version: 5.0.1
+Version: 5.0.3
 Summary: Modular Data Acquisition with Python
 Project-URL: Homepage, http://pymodaq.cnrs.fr
 Project-URL: Source, https://github.com/PyMoDAQ/PyMoDAQ
@@ -50,11 +50,11 @@ Requires-Dist: numpy<2.0.0
 Requires-Dist: packaging
 Requires-Dist: pint
 Requires-Dist: pyleco>0.3; python_version >= '3.8'
-Requires-Dist: pymodaq-data>=5.0.15
-Requires-Dist: pymodaq-gui>=5.0.16
+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
+Requires-Dist: pymodaq-utils>=0.0.14
 Requires-Dist: pyqtgraph>=0.12
 Requires-Dist: python-dateutil
 Requires-Dist: qtconsole

{pymodaq-5.0.1.dist-info → pymodaq-5.0.3.dist-info}/RECORD

@@ -1,15 +1,15 @@
 pymodaq/__init__.py,sha256=VtSBaXkrFtgRchmQN2dIet1X88h9r9M6C8OCD9WZPy0,3250
-pymodaq/dashboard.py,sha256=htNN_zwK8v8wuSMA735wBiKYLu_Kx_KzAdqHpkt0FYQ,76519
+pymodaq/dashboard.py,sha256=LTI3JhUpFRRw8fiuxlVwkRGpkZtLDxMimgI35bOWYkU,76520
 pymodaq/icon.ico,sha256=hOHHfNDENKphQvG1WDleSEYcHukneR2eRFJu8isIlD4,74359
 pymodaq/splash.png,sha256=ow8IECF3tPRUMA4tf2tMu1aRiMaxx91_Y2ckVxkrmF0,53114
 pymodaq/updater.py,sha256=JMCVRgAXwmlrKxZv3837E-LRhF0F8V-td_wODwCoXaY,3821
 pymodaq/control_modules/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pymodaq/control_modules/daq_move.py,sha256=YMkcaMiveStJ7EvNQAWb-PA-V2AxSj8jTv8NIAmx6-c,38467
+pymodaq/control_modules/daq_move.py,sha256=qK9ehMu40tcRrD3Az9oX3POXCQtlwTHZQlfvuGTJhcg,38521
 pymodaq/control_modules/daq_move_ui.py,sha256=bdkRX0wjkQuFDr4OT1Q6jT_15DEWV1dn2R6WF50H23s,16811
-pymodaq/control_modules/daq_viewer.py,sha256=wMXIT62zr3W_8behOz61OjpMKP35bEwhbWICkt4_yIg,58600
+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=Y4AttqefEmlg_Mi-KUCNXyj27JleUu7QLclwrYvInW8,43171
+pymodaq/control_modules/move_utility_classes.py,sha256=5RAhxHEyThS8um42d_nixf0a9ZOQTo6VePhOmmId4QQ,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=-qEl576RLvr2eF5tBHQk2UyMcFWIDCB07OxMzNvWdyE,49282
+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
@@ -53,10 +53,10 @@ pymodaq/extensions/daq_logger/db/db_logger_models.py,sha256=r9672aG8vUPqtHq6gFSu
 pymodaq/extensions/pid/__init__.py,sha256=tHegjXR1MZ3XHdFTpzYasFIzMxjkNUL-986DKLagAXs,517
 pymodaq/extensions/pid/actuator_controller.py,sha256=SOE2GjevbqxqxXewW0DMgoqNL_0CaPdNLjyKNc6ULKI,377
 pymodaq/extensions/pid/daq_move_PID.py,sha256=9q-lMVkS_yBNy0xyAhCWfreKGCOqIBt-LjReKpvNKrA,2146
-pymodaq/extensions/pid/pid_controller.py,sha256=fXgLbS_u32mUkDxkTli6QjHuAALnANkKwWLM8c08Olk,29046
-pymodaq/extensions/pid/utils.py,sha256=kvrioyi_ZwgzXODPby9FsnWpgFmS3Gcfqj1yUyX1uP8,7990
+pymodaq/extensions/pid/pid_controller.py,sha256=Sqti9GyQAIXiwzmZJCz6lWHmLzYemFp3B5Fsu2zJ50c,29057
+pymodaq/extensions/pid/utils.py,sha256=C1QrfDiyTzq_tkSp3LHzxlTInuGj2KtxLE97-TEiwK0,7182
 pymodaq/post_treatment/__init__.py,sha256=xaaLFZJ7OLqI_7yPurFk89A7m2ywSbYDXAsdE-QQ8Zg,81
-pymodaq/post_treatment/load_and_plot.py,sha256=dqDhZv_g3YY_Ah8bJ6OoOfPxR5xb-CuggbzlfSkPMvU,12158
+pymodaq/post_treatment/load_and_plot.py,sha256=fmaBfdlM6WiFSAPuJxuN5W03JLr9MTn0DJMUsPfmkyg,13920
 pymodaq/resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pymodaq/resources/preset_default.xml,sha256=3OMyj4d0SeArDNcgT41JHUWSEuITM56QsP3CHgLhhqQ,26382
 pymodaq/resources/setup_plugin.py,sha256=jvMuSp4UxGaPUe9uPUvHg9DrdwyFakG6_sFy_zXb1f8,3182
@@ -67,29 +67,29 @@ pymodaq/utils/chrono_timer.py,sha256=uBVtV3AW-m-fnHlMYgm1qYiuBpREdL1A93yJG78VAiM
 pymodaq/utils/config.py,sha256=w0EkWEvUbLCq7nTNZQccaMWVILuFaGW1JsIgX3VIKKc,1155
 pymodaq/utils/conftests.py,sha256=3Ak8WEpa3EhAp73Yb1LLq8YFONhPqiL7gG9eSDIoTNc,58
 pymodaq/utils/daq_utils.py,sha256=AJIA6PTDKe2nzoL0hgSJRWA5PYhKwZsBKfpPh0QkoTc,6131
-pymodaq/utils/data.py,sha256=_Xx8vVzJd6xpGgCFpa0Px48YnWBAr-uDaYzWhXYoxLQ,4068
+pymodaq/utils/data.py,sha256=8iAchr5nkwDo_usgChX85MOQiHnrubPrvAg3MrYnumw,4415
 pymodaq/utils/enums.py,sha256=9PzGPsPN_6Wl9Pm0uV66-KByPsfpV2Coi5193kNVmII,233
 pymodaq/utils/exceptions.py,sha256=xWORkqBplDEKI3t5N4LEYPlowlxIs9E007AtYe4E8Y4,627
 pymodaq/utils/logger.py,sha256=6x5BPpWXw1zW2M7F4lRGIOP2TtnqJHz2m7XSqI8g0u0,293
 pymodaq/utils/math_utils.py,sha256=uBnk15-O2ucoF0dH-f41HqQYWIFsqNdkCb7AngwN8BI,248
 pymodaq/utils/messenger.py,sha256=T-RjQtx6Hz4F96TvOL61jomKjfqmNa_FdnGvvpQFfe0,246
 pymodaq/utils/gui_utils/__init__.py,sha256=MUGjejjsXUzTtDTqDzaQTL9W8Sc850ZZxYBlJn6xlxg,539
-pymodaq/utils/gui_utils/loader_utils.py,sha256=nuCNpzS2garrNqsEdZ8UuvOMtQwas3Tnto5UhtCXn2M,2052
+pymodaq/utils/gui_utils/loader_utils.py,sha256=l7-xMbvYlTkO3uUV3UtV_-JeZ-4uVtCVOOb-2YV-sGE,2094
 pymodaq/utils/gui_utils/utils.py,sha256=0FbuHR-3glsZZO_Lye-h470y9TNuFMcVMJkMF_euzoQ,494
 pymodaq/utils/gui_utils/widgets/lcd.py,sha256=x7uUPO_JSJX6ZkIa3xvdVFC898G2e3wvPUsATOs3iik,306
 pymodaq/utils/h5modules/__init__.py,sha256=daEdpEyAJIa8b2VkCqSKcw8PaExcB6Qro80XNes_sHA,2
-pymodaq/utils/h5modules/module_saving.py,sha256=wGI4eHKvcHOyfJ4MTclKIpqIM8MOlBYNBvqqs6nV3qA,14112
+pymodaq/utils/h5modules/module_saving.py,sha256=wUTAF0laqB8CoJWhE-1vBOHtFKlt4kRZbrUIYudCgBA,14266
 pymodaq/utils/leco/__init__.py,sha256=PVxGVZx5uHCsZmFWrVTkVX1lE5C2V95bKBj0vK9KZQU,878
-pymodaq/utils/leco/daq_move_LECODirector.py,sha256=7s5XD9REJr5496uRT3vaZxH8hzKM6nzB74jqAleycqA,6806
-pymodaq/utils/leco/daq_xDviewer_LECODirector.py,sha256=GrcVFgTNzexG3hTPF9ejWdAPWMoTbgfwkdxLxGJu6go,6311
+pymodaq/utils/leco/daq_move_LECODirector.py,sha256=nw9zfWcGPaf7Zbk-jX35Nel4dHpBVjOugC6NvWWWStQ,6815
+pymodaq/utils/leco/daq_xDviewer_LECODirector.py,sha256=ZC9mrGq5Pa7wv-9w44hMvFxnsUr9w4Zp6w2Aa3z-i24,6322
 pymodaq/utils/leco/desktop.ini,sha256=2zopClaSQqdFfIsC8CGo2Oc-14x9h1gV0-fUrDtLFmA,82
 pymodaq/utils/leco/director_utils.py,sha256=0inrKh5aI-1pQs3fTXYvmjvwZ6TiyEEAupr2Hw_pMj0,2105
-pymodaq/utils/leco/leco_director.py,sha256=TVd8DNKGoq7Uh9P5JNHFBDt1Q0VxIYPweciDbpTpa8M,3046
-pymodaq/utils/leco/pymodaq_listener.py,sha256=BCZlEQw5Z06tdHu6dqi2w9VMh4-UsSZC95hJXCDkW80,10835
-pymodaq/utils/leco/utils.py,sha256=TQQwHrVgkhqpfjg2VZq2H5cv3Vwod5E5NTrsczkahRE,2373
+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=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=YSpVQHA3ts9ccAgr77C_EjiMJof8R8uhZ3-aGkMQ5pQ,21016
+pymodaq/utils/managers/modules_manager.py,sha256=LjYXl6TiFHUnoWpvX_Ht3uPg165C_klNgUVHI8suDbo,21076
 pymodaq/utils/managers/overshoot_manager.py,sha256=df_0cpvU5BxUvVqrWXuBFWyHSs9i_2NwLFjFsIOcBOA,9055
 pymodaq/utils/managers/preset_manager.py,sha256=JlndG8eWbqhU4ijiLsvBqAVIkSkCY5wpG8kPjlHXV5I,8014
 pymodaq/utils/managers/preset_manager_utils.py,sha256=3tmhxMKJnYA-SRPumPtdrx-3t7tyTnNr0Z7GFVN_z28,8269
@@ -113,10 +113,10 @@ pymodaq/utils/svg/svg_view.py,sha256=bmXpDqnw9S-Bp3F8Hi_oeYB5Y9gebiCNsQWVJzCq-PA
 pymodaq/utils/svg/svg_viewer2D.py,sha256=HbJKT90bu1fTY1m018NBtXCZGBXnGNAFemBDrMxc0PY,1427
 pymodaq/utils/tcp_ip/__init__.py,sha256=1e_EK0AgvdoLAD_CSGGEaITZdy6OWCO7ih9IAIp7HT4,81
 pymodaq/utils/tcp_ip/mysocket.py,sha256=03FaQskso8nLLAsN-ijX-RazXbeMezRnAPvsRxTQa4k,326
-pymodaq/utils/tcp_ip/serializer.py,sha256=CTgPSaG05CKCHdYMfwaTNMt6_6FbINF7uiELLgylsUE,399
+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.1.dist-info/METADATA,sha256=UDcSy9nS66ee6lFG96hrrGXAB1CSZ0oNwkNZymr-myo,12870
-pymodaq-5.0.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-pymodaq-5.0.1.dist-info/entry_points.txt,sha256=DvPq6fmIPH2JNsCqHDhn1xEj1kX5tfuc7xQ8-l5S2EU,387
-pymodaq-5.0.1.dist-info/licenses/LICENSE,sha256=VKOejxexXAe3XwfhAhcFGqeXQ12irxVHdeAojZwFEI8,1108
-pymodaq-5.0.1.dist-info/RECORD,,
+pymodaq-5.0.3.dist-info/METADATA,sha256=SdC4975JmDa4Hb5BcOtdFpOGnamJ3RWM-LfHgbh-454,12878
+pymodaq-5.0.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+pymodaq-5.0.3.dist-info/entry_points.txt,sha256=DvPq6fmIPH2JNsCqHDhn1xEj1kX5tfuc7xQ8-l5S2EU,387
+pymodaq-5.0.3.dist-info/licenses/LICENSE,sha256=VKOejxexXAe3XwfhAhcFGqeXQ12irxVHdeAojZwFEI8,1108
+pymodaq-5.0.3.dist-info/RECORD,,