pymodaq 4.0.5__py3-none-any.whl → 4.0.7__py3-none-any.whl

pymodaq/control_modules/daq_move.py

@@ -7,6 +7,8 @@ Created the 29/07/2022
 
 from __future__ import annotations
 
+from importlib import import_module
+from numbers import Number
 import sys
 from typing import List, Tuple, Union
 import numpy as np
@@ -143,6 +145,7 @@ class DAQ_Move(ParameterManager, ControlModule):
             * show_log
             * actuator_changed
             * rel_value
+            * show_config
         """
         if cmd.command == 'init':
             self.init_hardware(cmd.attribute[0])
@@ -162,6 +165,8 @@ class DAQ_Move(ParameterManager, ControlModule):
             self.move_rel(cmd.attribute)
         elif cmd.command == 'show_log':
             self.show_log()
+        elif cmd.command == 'show_config':
+            self.show_config(config)
         elif cmd.command == 'actuator_changed':
             self.actuator = cmd.attribute
         elif cmd.command == 'rel_value':
@@ -251,7 +256,7 @@ class DAQ_Move(ParameterManager, ControlModule):
         """
         try:
             self._send_to_tcpip = send_to_tcpip
-            if not value == self._current_value:
+            if np.all(value != self._current_value):  # in case value is a ndarray (very specific cases...)
                 if self.ui is not None:
                     self.ui.move_done = False
                 self._move_done_bool = False
@@ -362,7 +367,7 @@ class DAQ_Move(ParameterManager, ControlModule):
                 self._hardware_thread.hardware = hardware
                 self._hardware_thread.start()
                 self.command_hardware.emit(
-                    ThreadCommand(command="ini_stage", attribute=[self.settings.child(('move_settings')).saveState(),
+                    ThreadCommand(command="ini_stage", attribute=[self.settings.child('move_settings').saveState(),
                                                                   self.controller]))
             except Exception as e:
                 self.logger.exception(str(e))
@@ -394,6 +399,9 @@ class DAQ_Move(ParameterManager, ControlModule):
         elif param.name() == 'refresh_timeout':
             self._refresh_timer.setInterval(param.value())
 
+        elif param.name() == 'plugin_config':
+            self.show_config(self.plugin_config)
+
         path = self.settings.childPath(param)
         if path is not None:
             if 'main_settings' not in path:
@@ -543,12 +551,19 @@ class DAQ_Move(ParameterManager, ControlModule):
     def actuator(self, act_type):
         if act_type in ACTUATOR_TYPES:
             self._actuator_type = act_type
+            self.update_plugin_config()
             if self.ui is not None:
                 self.ui.actuator = act_type
                 self.update_settings()
         else:
             raise ActuatorError(f'{act_type} is an invalid actuator, should be within {ACTUATOR_TYPES}')
 
+    def update_plugin_config(self):
+        parent_module = utils.find_dict_in_list_from_key_val(DAQ_Move_Actuators, 'name', self.actuator)
+        mod = import_module(parent_module['module'].__package__.split('.')[0])
+        if hasattr(mod, 'config'):
+            self.plugin_config = mod.config
+
     @property
     def units(self):
         return self.settings['move_settings', 'units']
@@ -734,8 +749,9 @@ class DAQ_Move_Hardware(QObject):
             --------
             move_Abs
         """
-        position = float(position)  # because it may be a numpy float and could cause issues
-        # see https://github.com/pythonnet/pythonnet/issues/1833
+        if isinstance(position, Number):
+            position = float(position)  # because it may be a numpy float and could cause issues
+            # see https://github.com/pythonnet/pythonnet/issues/1833
         self._target_value = position
         self.hardware.move_is_done = False
         self.hardware.ispolling = polling

pymodaq/control_modules/daq_move_ui.py

@@ -39,6 +39,8 @@ class DAQ_Move_UI(ControlModuleUI):
             * show_log
             * actuator_changed
             * rel_value
+            * show_config
+            * show_plugin_config
 
     Methods
     -------
@@ -237,6 +239,8 @@ class DAQ_Move_UI(ControlModuleUI):
                         toolbar=self.toolbar)
         self.add_action('show_settings', 'Show Settings', 'Settings', "Show Settings", checkable=True,
                         toolbar=self.toolbar)
+        self.add_action('show_config', 'Show Config', 'tree', "Show Plugin Config", checkable=False,
+                        toolbar=self.toolbar)
         self.add_action('refresh_value', 'Refresh', 'Refresh2', "Refresh Value", checkable=True,
                         toolbar=self.toolbar)
         self.add_action('stop', 'Stop', 'stop', "Stop Motion", checkable=False,
@@ -256,6 +260,7 @@ class DAQ_Move_UI(ControlModuleUI):
         self.connect_action('move_abs_2', lambda: self.emit_move_abs(self.abs_value_sb_2))
         self.connect_action('log', lambda: self.command_sig.emit(ThreadCommand('show_log', )))
         self.connect_action('stop', lambda: self.command_sig.emit(ThreadCommand('stop', )))
+        self.connect_action('show_config', lambda : self.command_sig.emit(ThreadCommand('show_config', )))
 
         self.move_abs_pb.clicked.connect(lambda: self.emit_move_abs(self.abs_value_sb_bis))
 

pymodaq/control_modules/daq_viewer.py

@@ -5,7 +5,7 @@ Created on Wed Jan 10 16:54:14 2018
 @author: Weber Sébastien
 """
 from __future__ import annotations
-
+from importlib import import_module
 from collections import OrderedDict
 import copy
 import os
@@ -250,6 +250,12 @@ class DAQ_Viewer(ParameterManager, ControlModule):
         if self.ui is not None:
             return self.ui.viewer_docks
 
+    @property
+    def viewers_docks(self) -> List[Dock]:
+        """list of Viewer Docks from the UI, for back compatibility"""
+        deprecation_msg('viewers_docks is a deprecated property use viewer_docks instead')
+        return self.viewer_docks
+
     def daq_type_changed_from_ui(self, daq_type: DAQTypesEnum):
         """ Apply changes from the selection of a different DAQTypesEnum in the UI
 
@@ -289,6 +295,7 @@ class DAQ_Viewer(ParameterManager, ControlModule):
 
     def detector_changed_from_ui(self, detector: str):
         self._detector = detector
+        self.update_plugin_config()
         self._set_setting_tree()
 
     @property
@@ -301,10 +308,17 @@ class DAQ_Viewer(ParameterManager, ControlModule):
         if det not in self.detectors:
             raise ValueError(f'{det} is not a valid Detector: {self.detectors}')
         self._detector = det
+        self.update_plugin_config()
         if self.ui is not None:
             self.ui.detector = det
         self._set_setting_tree()
 
+    def update_plugin_config(self):
+        parent_module = utils.find_dict_in_list_from_key_val(DET_TYPES[self.daq_type.name], 'name', self.detector)
+        mod = import_module(parent_module['module'].__package__.split('.')[0])
+        if hasattr(mod, 'config'):
+            self.plugin_config = mod.config
+
     def detectors_changed_from_ui(self, detectors: List[str]):
         self._detectors = detectors
 
@@ -906,10 +920,13 @@ class DAQ_Viewer(ParameterManager, ControlModule):
 
         elif param.name() == 'ip_address' or param.name == 'port':
             self._command_tcpip.emit(
-                ThreadCommand('update_connection', dict(ipaddress=self.settings.child('main_settings', 'tcpip',
-                                                                                      'ip_address').value(),
-                                                        port=self.settings.child('main_settings', 'tcpip',
-                                                                                 'port').value())))
+                ThreadCommand('update_connection', dict(ipaddress=self.settings['main_settings', 'tcpip',
+                                                                                      'ip_address'],
+                                                        port=self.settings['main_settings', 'tcpip',
+                                                                                 'port'])))
+
+        elif param.name() == 'plugin_config':
+            self.show_config(self.plugin_config)
 
         if path is not None:
             if 'main_settings' not in path:
@@ -1319,7 +1336,7 @@ class DAQ_Detector(QObject):
         if not self.grab_state:
             self.detector.stop()
 
-    def single(self, Naverage=1, **kwargs):
+    def single(self, Naverage=1, *args, **kwargs):
         """ Convenience function to grab a single set of data
 
         Parameters

pymodaq/control_modules/daq_viewer_ui.py

@@ -206,7 +206,7 @@ class DAQ_Viewer_UI(ControlModuleUI, ViewerDispatcher):
 
         self.add_action('show_controls', 'Show Controls', 'Settings', "Show Controls to set DAQ and Detector type",
                         checkable=True)
-        self.add_action('show_settings', 'Show Settings', 'Settings', "Show Settings", checkable=True)
+        self.add_action('show_settings', 'Show Settings', 'tree', "Show Settings", checkable=True)
 
         self.add_action('quit', 'Quit the module', 'close2')
         self.add_action('log', 'Show Log file', 'information2')

pymodaq/control_modules/move_utility_classes.py

@@ -1,22 +1,25 @@
+from time import perf_counter
+from typing import Union, List, Dict
+
+from easydict import EasyDict as edict
+import numpy as np
 from qtpy import QtWidgets
 from qtpy.QtCore import QObject, Slot, Signal, QTimer
 
-
-from easydict import EasyDict as edict
 import pymodaq.utils.daq_utils as utils
 import pymodaq.utils.parameter.utils as putils
-from pymodaq.utils.logger import set_logger, get_module_name, get_module_name
+from pymodaq.utils.parameter import Parameter
+from pymodaq.utils.logger import set_logger, get_module_name
 from pymodaq.utils.parameter import ioxml
-from pyqtgraph.parametertree import Parameter
-from pymodaq.utils.daq_utils import ThreadCommand, getLineInfo
-from pymodaq.utils.config import Config
+
+from pymodaq.utils.daq_utils import ThreadCommand, getLineInfo, find_keys_from_val
+from pymodaq.utils import config as configmod
 from pymodaq.utils.tcp_server_client import TCPServer, tcp_parameters
 from pymodaq.utils.messenger import deprecation_msg
-import numpy as np
-from time import perf_counter
+
 
 logger = set_logger(get_module_name(__file__))
-config = Config()
+config = configmod.Config()
 
 
 def comon_parameters(epsilon=config('actuator', 'epsilon_default')):
@@ -94,6 +97,7 @@ params = [
     {'title': 'Main Settings:', 'name': 'main_settings', 'type': 'group', 'children': [
         {'title': 'Actuator type:', 'name': 'move_type', 'type': 'str', 'value': '', 'readonly': True},
         {'title': 'Actuator name:', 'name': 'module_name', 'type': 'str', 'value': '', 'readonly': True},
+        {'title': 'Plugin Config:', 'name': 'plugin_config', 'type': 'bool_push', 'label': 'Show Config', },
         {'title': 'Controller ID:', 'name': 'controller_ID', 'type': 'int', 'value': 0, 'default': 0},
         {'title': 'Refresh value (ms):', 'name': 'refresh_timeout', 'type': 'int',
             'value': config('actuator', 'refresh_timeout_ms')},
@@ -138,45 +142,43 @@ def main(plugin_file, init=True, title='test'):
 
 
 class DAQ_Move_base(QObject):
-    """ The base class to be herited by all actuator modules
+    """ The base class to be inherited by all actuator modules
 
     This base class implements all necessary parameters and methods for the plugin to communicate with its parent (the
     DAQ_Move module)
 
     Parameters
     ----------
-    parent : DAQ_Move_stage instance (see daq_viewer_main module)
-    params_state : Parameter instance (pyqtgraph) from which the module will get the initial settings (as defined in the managers)
-
-
-    :ivar move_done_signal: Signal signal represented by a float. Is emitted each time the hardware reached the target
-                            position within the epsilon precision (see comon_parameters variable)
-
-    :ivar controller: the object representing the hardware in the plugin. Used to access hardware functionality
-
-    :ivar status: easydict instance to set information (str), controller object, stage object (if required) and initialized
-                  state (bool) to return to parent after initialization
-
-    :ivar settings: Parameter instance representing the hardware settings defined from the params attribute. Modifications
-                    on the GUI settings will be transferred to this attribute. It stores at all times the current state of the hardware/plugin
-
-    :ivar params: class level attribute. List of dict used to create a Parameter object. Its definition on the class level enable
-                  the automatic update of the GUI settings when changing plugins (even in managers mode creation). To be populated
-                  on the plugin level as the base class does't represents a real hardware
-
-    :ivar is_multiaxes: class level attribute (bool). Defines if the plugin controller controls multiple axes. If True, one has to define
-                        a Master instance of this plugin and slave instances of this plugin (all sharing the same controller_ID Parameter)
-
-    :ivar current_value: (float) stores the current position after each call to the get_actuator_value in the child module
-
-    :ivar target_value: (float) stores the target position the controller should reach within epsilon
-
+    parent : DAQ_Move_Hardware
+    params_state : Parameter
+            pyqtgraph Parameter instance from which the module will get the initial settings (as defined in the preset)
+    Attributes
+    ----------
+    move_done_signal: Signal
+        signal represented by a float. Is emitted each time the hardware reached the target position within the epsilon
+        precision (see comon_parameters variable)
+    controller: object
+        the object representing the hardware in the plugin. Used to access hardware functionality
+    settings: Parameter
+        instance representing the hardware settings defined from the params attribute. Modifications on the GUI settings
+         will be transferred to this attribute. It stores at all times the current state of the hardware/plugin settings
+    params: List of dict used to create a Parameter object.
+        Its definition on the class level enable the automatic update of the GUI settings when changing plugins
+        (even in managers mode creation). To be populated on the plugin level as the base class does't represents a
+        real hardware
+    is_multiaxes: bool
+        class level attribute. Defines if the plugin controller controls multiple axes. If True, one has to define
+        a Master instance of this plugin and slave instances of this plugin (all sharing the same controller_ID
+        parameter)
+    current_value: float
+        stores the current position after each call to the get_actuator_value in the plugin
+    target_value: float
+        stores the target position the controller should reach within epsilon
     """
 
     move_done_signal = Signal(float)
     is_multiaxes = False
     stage_names = []
-    axes_name = []
     params = []
     _controller_units = ''
     _epsilon = 1
@@ -210,7 +212,40 @@ class DAQ_Move_base(QObject):
 
         self.ini_attributes()
 
+    @property
+    def axis_name(self) -> str:
+        """Get/Set the current axis using its string identifier"""
+        limits = self.settings.child('multiaxes', 'axis').opts['limits']
+        if isinstance(limits, list):
+            return self.settings.child('multiaxes', 'axis').value()
+        elif isinstance(limits, dict):
+            return find_keys_from_val(limits, val=self.settings.child('multiaxes', 'axis').value())[0]
+
+    @axis_name.setter
+    def axis_name(self, name: str):
+        limits = self.settings.child('multiaxes', 'axis').opts['limits']
+        if name in limits:
+            if isinstance(limits, list):
+                self.settings.child('multiaxes', 'axis').setValue(name)
+            elif isinstance(limits, dict):
+                self.settings.child('multiaxes', 'axis').setValue(limits[name])
+
+    @property
+    def axis_names(self) -> Union[List, Dict]:
+        """ Get/Set the names of all axes controlled by this instrument plugin
+
+        Returns
+        -------
+        List of string or dictionary mapping names to integers
+        """
+        return self.settings.child('multiaxes', 'axis').opts['limits']
+
+    @axis_names.setter
+    def axis_names(self, names: Union[List, Dict]):
+        self.settings.child('multiaxes', 'axis').opts['limits'] = names
+
     def ini_attributes(self):
+        """ 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):
@@ -262,6 +297,7 @@ class DAQ_Move_base(QObject):
 
     @property
     def controller_units(self):
+        """ Get/Set the units of this plugin"""
         return self._controller_units
 
     @controller_units.setter
@@ -274,22 +310,17 @@ class DAQ_Move_base(QObject):
 
     @property
     def ispolling(self):
+        """ Get/Set the polling status"""
         return self._ispolling
 
     @ispolling.setter
     def ispolling(self, polling=True):
         self._ispolling = polling
 
-    def check_bound(self, position):
-        """
-
-        Parameters
-        ----------
-        position
-
-        Returns
-        -------
+    def check_bound(self, position: float) -> float:
+        """ Check if the current position is within the software bounds
 
+        Return the new position eventually coerced within the bounds
         """
         if self.settings.child('bounds', 'is_bounds').value():
             if position > self.settings.child('bounds', 'max_bound').value():
@@ -329,19 +360,7 @@ class DAQ_Move_base(QObject):
             raise NotImplementedError
 
     def emit_status(self, status: ThreadCommand):
-        """
-            | Emit the statut signal from the given status parameter.
-            |
-            | The signal is sended to the gui to update the user interface.
-
-            =============== ===================== ========================================================================================================================================
-            **Parameters**   **Type**              **Description**
-             *status*        ordered dictionnary    dictionnary containing keys:
-                                                        * *info* : string displaying various info
-                                                        * *controller*: instance of the controller object in order to control other axes without the need to init the same controller twice
-                                                        * *stage*: instance of the stage (axis or whatever) object
-                                                        * *initialized*: boolean indicating if initialization has been done corretly
-            =============== ===================== ========================================================================================================================================
+        """ Emit the status_sig signal with the given status ThreadCommand back to the main GUI.
         """
         if self.parent is not None:
             self.parent.status_sig.emit(status)
@@ -349,37 +368,19 @@ class DAQ_Move_base(QObject):
         else:
             print(status)
 
-    def emit_value(self, pos):
+    def emit_value(self, pos: float):
+        """Convenience method to emit the current actuator value back to the UI"""
+
         self.emit_status(ThreadCommand('get_actuator_value', [pos]))
 
-    def commit_settings(self, param):
+    def commit_settings(self, param: Parameter):
         """
           to subclass to transfer parameters to hardware
         """
-        pass
 
     def commit_common_settings(self, param):
         pass
 
-    def get_position_with_scaling(self, pos):
-        """
-            Get the current position from the hardware with scaling conversion.
-
-            =============== ========= =====================
-            **Parameters**  **Type**  **Description**
-             *pos*           float    the current position
-            =============== ========= =====================
-
-            Returns
-            =======
-            float
-                the computed position.
-        """
-        if self.settings.child('scaling', 'use_scaling').value():
-            pos = (pos - self.settings.child('scaling', 'offset').value()) * self.settings.child('scaling',
-                                                                                                 'scaling').value()
-        return pos
-
     def move_done(self, position=None):  # the position argument is just there to match some signature of child classes
         """
             | Emit a move done signal transmitting the float position to hardware.
@@ -397,12 +398,11 @@ class DAQ_Move_base(QObject):
         self.move_is_done = True
 
     def poll_moving(self):
-        """
-            Poll the current moving. In case of timeout emit the raise timeout Thread command.
+        """ Poll the current moving. In case of timeout emit the raise timeout Thread command.
 
-            See Also
-            --------
-            DAQ_utils.ThreadCommand, move_done
+        See Also
+        --------
+        DAQ_utils.ThreadCommand, move_done
         """
         if 'TCPServer' not in self.__class__.__name__:
             self.start_time = perf_counter()
@@ -437,19 +437,9 @@ class DAQ_Move_base(QObject):
             self.move_done(self.current_value)
 
     def send_param_status(self, param, changes):
-        """
-            | Send changes value updates to the gui to update consequently the User Interface.
-            | The message passing is made via the Thread Command "update_settings".
+        """ Send changes value updates to the gui to update consequently the User Interface
 
-            =============== =================================== ==================================================
-            **Parameters**  **Type**                             **Description**
-            *param*         instance of pyqtgraph parameter      The parameter to be checked
-            *changes*       (parameter,change,infos)tuple list   The (parameter,change,infos) list to be treated
-            =============== =================================== ==================================================
-
-            See Also
-            ========
-            DAQ_utils.ThreadCommand
+        The message passing is made via the ThreadCommand "update_settings".
         """
 
         for param, change, data in changes:
@@ -464,28 +454,24 @@ class DAQ_Move_base(QObject):
             elif change == 'parent':
                 pass
 
-    def set_position_with_scaling(self, pos):
+    def get_position_with_scaling(self, pos: float):
+        """ Get the current position from the hardware with scaling conversion.
         """
-            Set the current position from the parameter and hardware with scaling conversion.
-
-            =============== ========= ==========================
-            **Parameters**  **Type**  **Description**
-             *pos*           float    the position to be setted
-            =============== ========= ==========================
+        if self.settings.child('scaling', 'use_scaling').value():
+            pos = (pos - self.settings.child('scaling', 'offset').value()) * self.settings.child('scaling',
+                                                                                                 'scaling').value()
+        return pos
 
-            Returns
-            =======
-            float
-                the computed position.
+    def set_position_with_scaling(self, pos: float):
+        """ Set the current position from the parameter and hardware with scaling conversion.
         """
         if self.settings.child('scaling', 'use_scaling').value():
             pos = pos / self.settings.child('scaling', 'scaling').value() + self.settings.child('scaling',
                                                                                                 'offset').value()
         return pos
 
-    def set_position_relative_with_scaling(self, pos):
-        """
-            Set the scaled positions in case of relative moves
+    def set_position_relative_with_scaling(self, pos: float):
+        """ Set the scaled positions in case of relative moves
         """
         if self.settings.child('scaling', 'use_scaling').value():
             pos = pos / self.settings.child('scaling', 'scaling').value()
@@ -493,17 +479,8 @@ class DAQ_Move_base(QObject):
 
     @Slot(edict)
     def update_settings(self, settings_parameter_dict):  # settings_parameter_dict=edict(path=path,param=param)
-        """
-            Receive the settings_parameter signal from the param_tree_changed method and make hardware updates of mmodified values.
-
-            ==========================  =========== ==========================================================================================================
-            **Arguments**               **Type**     **Description**
-            *settings_parameter_dict*   dictionnary Dictionnary with the path of the parameter in hardware structure as key and the parameter name as element
-            ==========================  =========== ==========================================================================================================
-
-            See Also
-            --------
-            send_param_status, commit_settings
+        """ Receive the settings_parameter signal from the param_tree_changed method and make hardware updates of
+        modified values.
         """
         path = settings_parameter_dict['path']
         param = settings_parameter_dict['param']
@@ -564,9 +541,9 @@ class DAQ_Move_TCP_server(DAQ_Move_base, TCPServer):
         """
         self.client_type = "ACTUATOR"
         DAQ_Move_base.__init__(self, parent, params_state)  # initialize base class with commom attribute and methods
-        self.settings.child(('bounds')).hide()
-        self.settings.child(('scaling')).hide()
-        self.settings.child(('epsilon')).setValue(1)
+        self.settings.child('bounds').hide()
+        self.settings.child('scaling').hide()
+        self.settings.child('epsilon').setValue(1)
 
         TCPServer.__init__(self, self.client_type)
 

pymodaq/control_modules/utils.py

@@ -15,6 +15,7 @@ from pymodaq.utils.parameter import Parameter
 from pymodaq.utils.enums import BaseEnum, enum_checker
 from pymodaq.utils.plotting.data_viewers.viewer import ViewersEnum
 from pymodaq.utils.exceptions import DetectorError
+from pymodaq.utils import config as configmod
 
 
 class DAQTypesEnum(BaseEnum):
@@ -114,6 +115,7 @@ class ControlModule(QObject):
         self._tcpclient_thread = None
         self._hardware_thread = None
         self.module_and_data_saver = None
+        self.plugin_config: configmod.Config = None
 
     def __repr__(self):
         return f'{self.__class__.__name__}: {self.title}'
@@ -135,6 +137,7 @@ class ControlModule(QObject):
                 * raise_timeout:
                 * show_splash: Display the splash screen with attribute as message
                 * close_splash
+                * show_config: display the plugin configuration
         """
 
         if status.command == "Update_Status":
@@ -284,6 +287,12 @@ class ControlModule(QObject):
         import webbrowser
         webbrowser.open(self.logger.parent.handlers[0].baseFilename)
 
+    def show_config(self, config: Config):
+        """ Display in a tree the current configuration"""
+        if config is not None:
+            config_tree = configmod.TreeFromToml(config)
+            config_tree.show_dialog()
+
     def update_status(self, txt, log=True):
         """Display a message in the ui status bar and eventually log the message
 

pymodaq/control_modules/viewer_utility_classes.py

@@ -36,6 +36,7 @@ params = [
          'readonly': True},
         {'title': 'Detector type:', 'name': 'detector_type', 'type': 'str', 'value': '', 'readonly': True},
         {'title': 'Detector Name:', 'name': 'module_name', 'type': 'str', 'value': '', 'readonly': True},
+        {'title': 'Plugin Config:', 'name': 'plugin_config', 'type': 'bool_push', 'label': 'Show Config', },
         {'title': 'Controller ID:', 'name': 'controller_ID', 'type': 'int', 'value': 0, 'default': 0, 'readonly': False},
         {'title': 'Show data and process:', 'name': 'show_data', 'type': 'bool', 'value': True, },
         {'title': 'Refresh time (ms):', 'name': 'refresh_time', 'type': 'float', 'value': 50., 'min': 0.},

pymodaq/dashboard.py

@@ -213,18 +213,33 @@ class DashBoard(QObject):
 
         return qtconsole
 
-    def load_extensions_module(self, ext):
+    def load_extensions_module(self, ext: dict):
+        """ Init and load an extension from a plugin package
+
+        ext: dict
+            dictionary containing info on the extension plugin package and class to be loaded, it contains four
+            keys:
+
+            * pkg: the name of the plugin package
+            * module: the module name where your extension class is defined
+            * class_name: the name of the class defining the extension
+            * name: a nice name for your extension to be displayed in the menu
+
+        See Also
+        --------
+        pymodaq.extensions.utils.get_extensions
+        """
+
         self.extension_windows.append(QtWidgets.QMainWindow())
         area = DockArea()
         self.extension_windows[-1].setCentralWidget(area)
         self.extension_windows[-1].resize(1000, 500)
         self.extension_windows[-1].setWindowTitle(ext['name'])
-        pkg = ext['module']
-        module = import_module(f'{pkg.__name__}.{pkg.module_name}', pkg)
-        klass = getattr(module, pkg.klass_name)
-        self.extensions[pkg.klass_name] = klass(dockarea=area, dashboard=self)
+        module = import_module(f"{ext['pkg']}.extensions.{ext['module']}")
+        klass = getattr(module, ext['class_name'])
+        self.extensions[ext['class_name']] = klass(dockarea=area, dashboard=self)
         self.extension_windows[-1].show()
-        return self.extensions[pkg.klass_name]
+        return self.extensions[ext['class_name']]
 
     def create_menu(self, menubar):
         """
@@ -604,7 +619,7 @@ class DashBoard(QObject):
             self.logger_dock.area.addDock(det_docks_settings[-1], 'bottom')  # dockarea of the logger dock
         else:
             self.dockarea.addDock(det_docks_settings[-1], 'right',
-                                  detector_modules[-1].viewers_docks[-1])
+                                  detector_modules[-1].viewer_docks[-1])
         self.dockarea.addDock(det_docks_viewer[-1], 'right', det_docks_settings[-1])
         det_mod_tmp = DAQ_Viewer(self.dockarea, title=plug_name, daq_type=plug_type,
                                  dock_settings=det_docks_settings[-1],
@@ -1269,9 +1284,9 @@ class DashBoard(QObject):
     def check_version(self, show=True):
         try:
             current_version = version_mod.parse(get_version())
-            available_version = [version_mod.parse(ver) for ver in get_pypi_pymodaq('pymodaq')['versions']]
+            available_version = version_mod.parse(get_pypi_pymodaq('pymodaq')['version'])
             msgBox = QtWidgets.QMessageBox()
-            if max(available_version) > current_version:
+            if available_version > current_version:
                 msgBox.setText(f"A new version of PyMoDAQ is available, {str(max(available_version))}!")
                 msgBox.setInformativeText("Do you want to install it?")
                 msgBox.setStandardButtons(msgBox.Ok | msgBox.Cancel)

pymodaq/examples/custom_app.py

@@ -16,7 +16,11 @@ from pymodaq.utils.parameter import ioxml
 from pymodaq.control_modules.daq_viewer import DAQ_Viewer
 from pymodaq.utils.plotting.data_viewers.viewer0D import Viewer0D
 
-from pymodaq.utils.h5modules import H5Browser, H5Saver
+from pymodaq.utils.h5modules.browsing import H5Browser
+from pymodaq.utils.h5modules.saving import H5Saver
+from pymodaq.utils.h5modules.data_saving import DataToExportSaver
+from pymodaq.utils.data import DataToExport
+
 
 config = Config()
 logger = set_logger(get_module_name(__file__))
@@ -51,7 +55,7 @@ class CustomAppExample(CustomApp):
         super().__init__(dockarea)
 
         # init the object parameters
-        self.raw_data = []
+        self.raw_data: DataToExport = None
         self.setup_ui()
 
     def setup_actions(self):
@@ -98,11 +102,12 @@ class CustomAppExample(CustomApp):
         # init one daq_viewer object named detector
 
         self.detector = DAQ_Viewer(self.dockarea, dock_settings=self.dock_detector_settings,
-                               dock_viewer=self.dock_detector, title="A detector", DAQ_type='DAQ0D')
+                               dock_viewer=self.dock_detector, title="A detector")
         # set its type to 'Mock'
-        self.detector.daq_type = 'Mock'
+        self.detector.daq_type = 'DAQ0D'
+        self.detector.detector = 'Mock'
         # init the detector and wait 1000ms for the completion
-        self.detector.init_det()
+        self.detector.init_hardware()
         self.detector.settings.child('main_settings', 'wait_time').setValue(100)
         QtWidgets.QApplication.processEvents()
         QThread.msleep(1000)
@@ -159,30 +164,21 @@ class CustomAppExample(CustomApp):
 
         logger.debug(f'Value change applied')
 
-    @Slot(OrderedDict)
     def data_done(self, data):
         # print(data)
         pass
 
-    @Slot(OrderedDict)
-    def show_data(self, data):
+    def show_data(self, data: DataToExport):
         """
         do stuff with data from the detector if its grab_done_signal has been connected
         Parameters
         ----------
-        data: (OrderedDict) #OrderedDict(name=self.title,x_axis=None,y_axis=None,z_axis=None,data0D=None,data1D=None,data2D=None)
+        data: DataToExport
         """
-        data0D = [[data['data0D'][key]['data']] for key in data['data0D']]
-        if self.raw_data == []:
-            self.raw_data = data0D
-        else:
-            if len(self.raw_data) != len(data0D):
-                self.raw_data = data0D
-            else:
-                for ind in range(len(data0D)):
-                    self.raw_data[ind].append(data0D[ind][0])
+        self.raw_data = data
+        data0D = data.get_data_from_dim('Data0D')
 
-        self.target_viewer.show_data(data0D)
+        self.target_viewer.show_data(data0D.data[0])
 
     def load_file(self):
         # init the data browser module
@@ -207,6 +203,8 @@ class CustomAppExample(CustomApp):
                 # init the file object with an addhoc name given by the user
                 h5saver = H5Saver(save_type='custom')
                 h5saver.init_file(update_h5=True, addhoc_file_path=path)
+                datasaver = DataToExportSaver(h5saver)
+
 
                 # save all metadata
                 settings_str = ioxml.parameter_to_xml_string(self.settings)
@@ -214,22 +212,14 @@ class CustomAppExample(CustomApp):
                 settings_str += ioxml.parameter_to_xml_string(self.detector.settings) + ioxml.parameter_to_xml_string(
                     h5saver.settings) + b'</All_settings>'
 
-                data_group = h5saver.add_data_group(h5saver.raw_group, group_data_type='data0D',
-                                                    title='data from custom app',
-                                                    settings_as_xml=settings_str)
+                datasaver.add_data(h5saver.root(), self.raw_data, settings_as_xml=settings_str)
 
-                for dat in self.raw_data:
-                    channel = h5saver.add_CH_group(data_group)
-                    data_dict = dict(data=np.array(dat),
-                                     x_axis=dict(data=np.linspace(0, len(dat) - 1, len(dat)), units='pxl'))
-                    h5saver.add_data(channel, data_dict=data_dict, scan_type='')
+                h5saver.close_file()
 
                 st = 'file {:s} has been saved'.format(str(path))
                 self.add_log(st)
                 self.settings.child('main_settings', 'info').setValue(st)
 
-                h5saver.close_file()
-
         except Exception as e:
             logger.exception(str(e))
 

pymodaq/examples/custom_viewer.py

@@ -5,7 +5,7 @@ from pymodaq.utils import gui_utils as gutils
 from pyqtgraph.dockarea import Dock
 from pyqtgraph.parametertree import ParameterTree, Parameter
 from pymodaq.utils.parameter.pymodaq_ptypes.tableview import TableViewCustom
-from pymodaq.utils.scanner import TableModelTabular
+from pymodaq.utils.scanner.scanners.tabular import TableModelTabular
 from qtpy.QtCore import QObject, Qt, Slot
 from qtpy import QtWidgets
 
@@ -14,7 +14,7 @@ class ViewerPointList(QObject):
     def __init__(self, area):
         super().__init__()
         self.area = area
-        self.viewer = None
+        self.viewer: Viewer2D = None
 
         self.set_viewer()
         self.set_point_list()
@@ -22,13 +22,13 @@ class ViewerPointList(QObject):
 
     @Slot(float, float)
     def double_click_action(self, posx, posy):
-        xs, ys = self.viewer.scale_axis(posx, posy)
-        data_at = self.viewer.get_data_at('red', (posx, posy))
+        xs, ys = self.viewer.view.unscale_axis(posx, posy)
+        data_at = self.viewer.view.get_data_at('red', (xs, ys))
         if data_at is not None:
-            self.table_model.add_data(self.table_view.currentIndex().row() + 1, [xs, ys, data_at])
+            self.table_model.add_data(self.table_view.currentIndex().row() + 1, [posx, posy, data_at])
 
-    def setData(self, data):
-        self.viewer.setImage(data_red=data)
+    def show_data(self, data):
+        self.viewer.show_data(data)
 
     def setXaxis(self, xaxis):
         self.viewer.x_axis = xaxis
@@ -58,7 +58,7 @@ class ViewerPointList(QObject):
         self.table_view = get_widget_from_tree(self.settings_tree, TableViewCustom)[0]
         self.settings.child(('tabular_table')).setValue(self.table_model)
 
-        self.table_view.horizontalHeader().setResizeMode(QtWidgets.QHeaderView.ResizeToContents)
+        self.table_view.horizontalHeader().ResizeMode(QtWidgets.QHeaderView.ResizeToContents)
         self.table_view.horizontalHeader().setStretchLastSection(True)
         self.table_view.setSelectionBehavior(QtWidgets.QTableView.SelectRows)
         self.table_view.setSelectionMode(QtWidgets.QTableView.SingleSelection)
@@ -82,7 +82,7 @@ class ViewerPointList(QObject):
 
 if __name__ == '__main__':
     from pymodaq.utils.gui_utils import DockArea
-    from pymodaq.utils.data import Axis
+    from pymodaq.utils.data import Axis, DataFromPlugins
     import sys
     import numpy as np
 
@@ -100,8 +100,11 @@ if __name__ == '__main__':
 
     data_red = 3 * gauss2D(x, np.mean(x), (np.max(x)-np.min(x)) / 5, y, np.mean(y), (np.max(y)-np.min(y)) / 5, 1)
     data_red += np.random.random(data_red.shape)
+    data_to_plot = DataFromPlugins(name='mydata', distribution='uniform', data=[data_red],
+                                   axes=[Axis('xaxis', units='xpxl', data=x, index=1),
+                                         Axis('yaxis', units='ypxl', data=y, index=0), ])
 
-    viewer.setData(data_red)
+    viewer.show_data(data_to_plot)
     viewer.setXaxis(Axis(data=x, label='This is x axis', units='au'))
     viewer.setYaxis(Axis(data=y, label='This is y axis', units='au'))
     win.show()

pymodaq/extensions/utils.py

@@ -5,18 +5,35 @@ Created the 27/10/2022
 @author: Sebastien Weber
 """
 import importlib
+from pathlib import Path
+import pkgutil
+
 from pymodaq.utils import logger as logger_module
 from pymodaq.utils.daq_utils import get_entrypoints
 logger = logger_module.set_logger(logger_module.get_module_name(__file__))
 
 
+def get_ext_modules(path: Path):
+    modules = []
+    for mod in pkgutil.iter_modules([path]):
+        modules.append(mod.name)
+    return modules
+
+
 def get_extensions():
     """
     Get pymodaq extensions as a list
 
     Returns
     -------
-    list: list of dict containting the name and module of the found extension
+    list: list of dict containing the name and module of the found extension
+
+        Each dict is defined with four keys:
+            * pkg: the name of the plugin package
+            * module: the module name where your extension class is defined
+            * class_name: the name of the class defining the extension
+            * name: a nice name for your extension to be displayed in the menu
+
     """
     extension_import = []
     discovered_extension = get_entrypoints(group='pymodaq.extensions')
@@ -24,14 +41,13 @@ def get_extensions():
         for pkg in discovered_extension:
             try:
                 module = importlib.import_module(pkg.value)
-                if hasattr(module, 'NICE_NAME'):
-                    name = module.NICE_NAME
-                else:
-                    name = pkg.value
-                extension = {'name': name, 'module': module}
-                extension_import.append(extension)
+                modules = get_ext_modules(Path(module.__path__[0]).joinpath('extensions'))
+                for mod in modules:
+                    mod_in = importlib.import_module(f'{pkg.value}.extensions.{mod}')
+                    extension_import.append({'pkg': pkg.value, 'module': mod, 'name': mod_in.EXTENSION_NAME,
+                                             'class_name': mod_in.CLASS_NAME})
 
             except Exception as e:  # pragma: no cover
-                logger.warning(f'Impossible to import the {pkg.value} extension: {str(e)}')
+                logger.warning(f'Impossible to import the {pkg.value}.extensions.{mod} extension: {str(e)}')
 
     return extension_import

pymodaq/resources/VERSION

@@ -1 +1 @@
-version = '4.0.5'
+version = '4.0.7'

pymodaq/utils/config.py

@@ -4,13 +4,14 @@ from os import environ
 import sys
 import datetime
 from pathlib import Path
-from typing import Union
+from typing import Union, Dict, TypeVar, Any
 
 import toml
 from qtpy.QtCore import QObject
 from pyqtgraph.parametertree import Parameter, ParameterTree
 from qtpy import QtWidgets, QtCore
 
+
 try:
     USER = environ['USERNAME'] if sys.platform == 'win32' else environ['USER']
 except:
@@ -20,6 +21,23 @@ CONFIG_BASE_PATH = Path(environ['PROGRAMDATA']) if sys.platform == 'win32' else
     Path('Library/Application Support') if sys.platform == 'darwin' else Path('/etc')
 
 
+KeyType = TypeVar('KeyType')
+
+
+def deep_update(mapping: Dict[KeyType, Any], *updating_mappings: Dict[KeyType, Any]) -> Dict[KeyType, Any]:
+    """ Make sure a dictionary is updated using another dict in any nested level
+    Taken from Pydantic v1
+    """
+    updated_mapping = mapping.copy()
+    for updating_mapping in updating_mappings:
+        for k, v in updating_mapping.items():
+            if k in updated_mapping and isinstance(updated_mapping[k], dict) and isinstance(v, dict):
+                updated_mapping[k] = deep_update(updated_mapping[k], v)
+            else:
+                updated_mapping[k] = v
+    return updated_mapping
+
+
 def replace_file_extension(filename: str, ext: str):
     """Replace the extension of a file by the specified one, without the dot"""
     file_name = Path(filename).stem  # remove eventual extensions
@@ -245,7 +263,7 @@ def load_system_config_and_update_from_user(config_file_name: str):
         config_dict = toml.load(toml_base_path)
     toml_user_path = get_config_file(config_file_name, user=True)
     if toml_user_path.is_file():
-        config_dict.update(toml.load(toml_user_path))
+        config_dict = deep_update(config_dict, toml.load(toml_user_path))
     return config_dict
 
 
@@ -324,7 +342,7 @@ class BaseConfig:
 
     def dict_to_add_to_user(self):
         """To subclass"""
-        return None
+        return dict([])
 
     @property
     def config_path(self):

pymodaq/utils/daq_utils.py

@@ -8,7 +8,6 @@ import functools
 import re
 import time
 import warnings
-
 from packaging import version as version_mod
 from pathlib import Path
 import pkgutil
@@ -450,6 +449,11 @@ def elt_as_first_element_dicts(elt_list, match_word='Mock', key='name'):
     return plugins
 
 
+def find_keys_from_val(dict_tmp: dict, val: object):
+    """Returns the keys from a dict if its value is matching val"""
+    return [k for k, v in dict_tmp.items() if v == val]
+
+
 def find_object_if_matched_attr_name_val(obj, attr_name, attr_value):
     """check if an attribute  key/value pair match in a given object
 
@@ -534,8 +538,6 @@ def find_dict_if_matched_key_val(dict_tmp, key, value):
     return False
 
 
-
-
 def find_dict_in_list_from_key_val(dicts, key, value, return_index=False):
     """ lookup within a list of dicts. Look for the dict within the list which has the correct key, value pair
 
@@ -596,7 +598,7 @@ def get_plugins(plugin_type='daq_0Dviewer'):  # pragma: no cover
     """
     plugins_import = []
     discovered_plugins = get_entrypoints(group='pymodaq.plugins')
-    logger.info(f'Found {len(discovered_plugins)} installed plugins, trying to import them')
+    logger.debug(f'Found {len(discovered_plugins)} installed plugins, trying to import them')
     for module in discovered_plugins:
         try:
             if plugin_type == 'daq_move':
@@ -619,20 +621,20 @@ def get_plugins(plugin_type='daq_0Dviewer'):  # pragma: no cover
                     plugins_import.append(mod)
                 except Exception as e:  # pragma: no cover
                     """If an error is generated at the import, then exclude this plugin"""
-                    logger.warning(f'Impossible to import {mod["name"]}')
-                    print(f'Impossible to import Instrument plugin {mod["name"]} from module: {submodule.__package__}')
+                    logger.debug(f'Impossible to import Instrument plugin {mod["name"]}'
+                                 f' from module: {submodule.__package__}')
         except Exception as e:  # pragma: no cover
-            logger.warning(str(e))
+            logger.debug(str(e))
 
-    #add utility plugin for PID
+    #  add utility plugin for PID
     if plugin_type == 'daq_move':
         try:
-            submodule = importlib.import_module('pymodaq.pid')
-
+            submodule = importlib.import_module('pymodaq.extensions.pid')
             plugins_import.append({'name': 'PID', 'module': submodule})
 
-        except Exception:  # pragma: no cover
-            pass
+        except Exception as e:
+            logger.debug(f'Impossible to import the Fake PID Instrument plugin\n'
+                         f'{str(e)}')
 
     plugins_import = elt_as_first_element_dicts(plugins_import, match_word='Mock', key='name')
     return plugins_import

pymodaq/utils/parameter/ioxml.py

@@ -163,14 +163,14 @@ def dict_from_param(param):
             readonly = '0'
     opts.update(dict(readonly=readonly))
 
-    if 'limits' in param.opts:
-        values = str(param.opts['limits'])
-        opts.update(dict(values=values))
+    # if 'limits' in param.opts:
+    #     values = str(param.opts['limits'])
+    #     opts.update(dict(values=values))
 
     if 'limits' in param.opts:
         limits = str(param.opts['limits'])
         opts.update(dict(limits=limits))
-        opts.update(dict(values=limits))
+        # opts.update(dict(values=limits))
 
     if 'addList' in param.opts:
         addList = str(param.opts['addList'])
@@ -273,13 +273,13 @@ def elt_to_dict(el):
         addText = str(el.get('addText'))
         param.update(dict(addText=addText))
 
-    if 'limits' in el.attrib.keys():
-        try:
-            values = list(eval(el.get('limits')))  # make sure the evaluated values are returned as list (in case another
-        # iterator type has been used
-            param.update(dict(values=values))
-        except:
-            pass
+    # if 'limits' in el.attrib.keys():
+    #     try:
+    #         values = list(eval(el.get('limits')))  # make sure the evaluated values are returned as list (in case another
+    #     # iterator type has been used
+    #         param.update(dict(values=values))
+    #     except:
+    #         pass
 
     if 'limits' in el.attrib.keys():
         try:
@@ -531,4 +531,4 @@ def XML_string_to_pobject(xml_string):
     --------
     parameter_to_xml_string
     """
-    return Parameter.create(name='settings', type='group', children=XML_file_to_parameter(xml_string))
+    return Parameter.create(name='settings', type='group', children=XML_string_to_parameter(xml_string))

pymodaq/utils/parameter/pymodaq_ptypes/list.py

@@ -2,6 +2,7 @@ from qtpy import QtWidgets, QtGui, QtCore
 from pyqtgraph.parametertree.parameterTypes.list import ListParameter, ListParameterItem
 from pyqtgraph.parametertree.Parameter import ParameterItem
 
+
 class Combo_pb(QtWidgets.QWidget):
 
     def __init__(self, items=[]):

pymodaq/utils/parameter/utils.py

@@ -121,7 +121,6 @@ def get_param_dict_from_name(parent_list, name, pop=False):
                 return ch
 
 
-
 if __name__ == '__main__':              # pragma: no cover
     parent = [
         {'title': 'Spectro Settings:', 'name': 'spectro_settings', 'type': 'group', 'expanded': True,
@@ -156,9 +155,15 @@ def set_param_from_param(param_old, param_new):
 
         if 'group' not in param_type:  # covers 'group', custom 'groupmove'...
             # try:
-            if 'list' in param_type:  # check if the value is in the limits of the old params (limits are usually set at initialization)
-                if child_new.value() not in child_old.opts['limits']:
-                    child_old.opts['limits'].append(child_new.value())
+            if 'list' in param_type:  # check if the value is in the limits of the old params
+                # (limits are usually set at initialization) but carefull as such paramater limits can be a list or a
+                # dict object
+                if isinstance(child_old.opts['limits'], list):
+                    if child_new.value() not in child_old.opts['limits']:
+                        child_old.opts['limits'].append(child_new.value())
+                elif isinstance(child_old.opts['limits'], dict):
+                    if child_new.value() not in child_old.opts['limits'].values():
+                        child_old.opts['limits'].update(dict(str(child_new.value()), child_new.value()))
 
                 child_old.setValue(child_new.value())
             elif 'str' in param_type or 'browsepath' in param_type or 'text' in param_type:

pymodaq/utils/plotting/data_viewers/viewerND.py

@@ -3,8 +3,14 @@ import sys
 from typing import List, Tuple, Union
 
 import numpy as np
-from scipy.spatial import QhullError
-from scipy.spatial import Delaunay as Triangulation
+
+try:
+    from scipy.spatial import QhullError  # works for newer version of scipy
+    from scipy.spatial import Delaunay as Triangulation
+except ImportError:
+    from scipy.spatial.qhull import QhullError  # works for old version of scipy
+    from scipy.spatial.qhull import Delaunay as Triangulation
+
 from qtpy import QtWidgets
 from qtpy.QtCore import QObject, Slot, Signal, QRectF, QPointF
 

{pymodaq-4.0.5.dist-info → pymodaq-4.0.7.dist-info}/METADATA

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

{pymodaq-4.0.5.dist-info → pymodaq-4.0.7.dist-info}/RECORD

@@ -1,20 +1,20 @@
 pymodaq/__init__.py,sha256=HzsUe4yEzUskSKMBL4AP1NVHcoBetXoKUP4VKEt9Kmc,3290
 pymodaq/daq_utils.py,sha256=Wgaoj9V7cUHiy6lgFebopw47IoJbLocU5T_fg0dDx7k,8738
-pymodaq/dashboard.py,sha256=C3AXm3YRSK4t_XAyEyBlEEVGoCXgVeGYb__qcPUH_YQ,61748
+pymodaq/dashboard.py,sha256=TEQ9aZ3HIBfisDVFIvJONjrmRphj_AzPM9d7Sd4MRZo,62296
 pymodaq/icon.ico,sha256=hOHHfNDENKphQvG1WDleSEYcHukneR2eRFJu8isIlD4,74359
 pymodaq/splash.png,sha256=ow8IECF3tPRUMA4tf2tMu1aRiMaxx91_Y2ckVxkrmF0,53114
 pymodaq/control_modules/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pymodaq/control_modules/daq_move.py,sha256=TVt3HDssIUAjHBJssnvIl5G9IcsSRsOkqShaZYRhZoA,35925
-pymodaq/control_modules/daq_move_ui.py,sha256=J7IWSQTIdgYEWIBh7rdexgLAiqaskb5vhRHLCIDi4ZU,13301
-pymodaq/control_modules/daq_viewer.py,sha256=G8VUZQwL84K0pLcvLFvviQ44rjhu1ojhzQZwbbrfjjc,56658
-pymodaq/control_modules/daq_viewer_ui.py,sha256=eu5QqTGcHfivypxC1a3QIcJK6fn9Ecz5L95sTp1Rl4Q,15462
+pymodaq/control_modules/daq_move.py,sha256=VpNdzSwG7TNdFeO5EbMT_ukIZiezLXI2TjPRhFxXTak,36635
+pymodaq/control_modules/daq_move_ui.py,sha256=YE_gQFkP2W1xlUGcN2wSoPsjSzllNolq5UoRsp6cL9c,13614
+pymodaq/control_modules/daq_viewer.py,sha256=AXjCDAJywbVSkhL4qvtB_uHYGXvb9nJZgGokWgd-1ow,57403
+pymodaq/control_modules/daq_viewer_ui.py,sha256=vPvRKeZT1847KR6Bjxc4nptGFAGXiXv2VjisB5KeaP8,15458
 pymodaq/control_modules/mocks.py,sha256=hh_xSWp9g1UV3NAQVD9Ft9tNWfTsSvKU0OU0trgzP2w,1956
-pymodaq/control_modules/move_utility_classes.py,sha256=bgZt57ZmHtBcsS0cpSSlIzDMHyu9g0kFLCQb4PrxT5k,30998
-pymodaq/control_modules/utils.py,sha256=bcy19SsHNkbpBF_V53gyXXMuQsmu36ec_aXbLZq0B9Y,13245
-pymodaq/control_modules/viewer_utility_classes.py,sha256=M8RgBo7HIc9eWA3AC4Z1-frw_9seK9PYaAMQND1_HOo,26816
+pymodaq/control_modules/move_utility_classes.py,sha256=UumAnTidek8vK8Dz379EZtMyKmTXVA_WV4efQZNCleo,29412
+pymodaq/control_modules/utils.py,sha256=jsidfQFs5jz8rNPXHND2g2iUrVHsgACSHOUI9JZzEoU,13636
+pymodaq/control_modules/viewer_utility_classes.py,sha256=A58qegvBErr-prayw2vh_NZgL0xE-1PoC4PsxVvZkbA,26925
 pymodaq/examples/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pymodaq/examples/custom_app.py,sha256=C9-XjjnxxQ_tj4N6BXNW4K7DSLbCW0GkGxHoT0oQwuc,11127
-pymodaq/examples/custom_viewer.py,sha256=Fefiox1hmLzIwXnBvVNfgmeKNTeX4cdMHVU_p9Qxq-E,4492
+pymodaq/examples/custom_app.py,sha256=2wQR0hlPWjZrWK0abNF6ASv8iQyJqRn2CKnBa_nAgN4,10452
+pymodaq/examples/custom_viewer.py,sha256=Y2tbqpWya3ZqsYRQjSCksJ4VjgjUDDnD77T6wOuB5Pg,4813
 pymodaq/examples/function_plotter.py,sha256=T-VT0Rd3jHP9GcR2h6Nao6lwZE06P8zWUbOlz8b8Rxk,6104
 pymodaq/examples/nonlinearscanner.py,sha256=x0R2_FP0YnuOCCAmYRiAiZ1jfUdRxu5RqIYLyGQMZ0U,3790
 pymodaq/examples/parameter_ex.py,sha256=cnGXD-g5yNLlklNTondw-6A0u8w_TW5ZDaijIP27aQI,7187
@@ -40,7 +40,7 @@ pymodaq/extensions/daq_logger.py,sha256=xsd0rmU8FfJmjuKwpYzSgSQ2Jadm_yA8FN_esO_B
 pymodaq/extensions/daq_scan.py,sha256=WhO5ud8-ahekb5AqNQmajNk4o8BYHL2Ue6NNfFRnhIY,56505
 pymodaq/extensions/daq_scan_ui.py,sha256=zp9dCOnsWdPRe0LuU8hxhTf8L3t2eo-MjBd8xiHX_mk,10134
 pymodaq/extensions/h5browser.py,sha256=3hX53yA67WD-m5S5ifilCNuHnreSdXyOtBNfD8UXYFU,513
-pymodaq/extensions/utils.py,sha256=fOEDFADtxZprXGF4iu89r25B0zhlf9y1EAnHbqfusMk,1149
+pymodaq/extensions/utils.py,sha256=CMa3t2S165PCZC3jsSHmIrImyou6gh5FuA11tXd1Xk8,1815
 pymodaq/extensions/pid/__init__.py,sha256=YP5CemFZ54mFlFIhktct2SeOmkAuvxQm2y1Fiq5HiMQ,534
 pymodaq/extensions/pid/daq_move_PID.py,sha256=UVtxY0PJT2HMhVKzPPCMwI__pkjmzDWAKXvaPmtHLCw,3139
 pymodaq/extensions/pid/pid_controller.py,sha256=hxY6mMZ7-Odbb06aEepCd8Y36DABlkCyJmIIR5ifW3o,29797
@@ -55,7 +55,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=qUmqUR1kq75_Xl_ooRs22WzQEuI54TmWM-rI3TNtPoU,18
+pymodaq/resources/VERSION,sha256=D_XUFwf7uSH7qBRyE1Pv0kAqfkza3SalQAlYEN0aRMg,18
 pymodaq/resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pymodaq/resources/config_template.toml,sha256=SvUTT3mkizOcergQ6uz8uZYn0ZpB_qPtIHzpJuoASIc,3280
 pymodaq/resources/preset_default.xml,sha256=uAnnhgbQmng8dSK3c4bfICHv8nZV8V3C7hbe-lBAw2A,31882
@@ -295,9 +295,9 @@ pymodaq/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pymodaq/utils/array_manipulation.py,sha256=uMdiVVR2mU7j6Z4DKL5VGhUPqiWvFX2YK7RLMGdLyC8,10415
 pymodaq/utils/calibration_camera.py,sha256=Hs-kZbGj9d8oNOqey6ONly60Ghf3JMBz4-Ls2yXeoKM,8921
 pymodaq/utils/chrono_timer.py,sha256=rwX8apS8B-IKhA0Cp2H9tLz0BRN7G3Pg5ptozvd3MKM,7244
-pymodaq/utils/config.py,sha256=6iDR0rknFA5rs9d58c_3nMpL4hnT-jWjlOz1W_nFNdw,15404
+pymodaq/utils/config.py,sha256=ghaTFrV0Z9rgJJ23xUMk8lY99lxEWXB_oLFKE5s0iRs,16094
 pymodaq/utils/conftests.py,sha256=3Ak8WEpa3EhAp73Yb1LLq8YFONhPqiL7gG9eSDIoTNc,58
-pymodaq/utils/daq_utils.py,sha256=gMykzoioA3TdWrVsm7zG_867t74ydui3m8H2lr5o0Pc,27972
+pymodaq/utils/daq_utils.py,sha256=kKYlDgOXuGKbE_i80qdJO3kdFFrjSCORgIqGiCq10ys,28217
 pymodaq/utils/data.py,sha256=xUj2El6d8aApZPn89q-ckt6NzknZEICTu-JdOerNO74,71226
 pymodaq/utils/enums.py,sha256=WNU6w3tsNpP7HQnNrQ6eKnDTXulOlZufQRr11__-l0M,1822
 pymodaq/utils/exceptions.py,sha256=_pm9vcJI7M-4aO_Hb0jBfXzefrs8J5w1kbrxdwUU5BQ,584
@@ -354,15 +354,15 @@ pymodaq/utils/managers/preset_manager_utils.py,sha256=8A4z0pW2lyzjg3K1AYxX-pIhMN
 pymodaq/utils/managers/remote_manager.py,sha256=-BtQvHy32ltZehej8jyK0GzfIdu9OnO8ukLAGrsWvMw,22216
 pymodaq/utils/managers/roi_manager.py,sha256=MDW-emef7uoIC3m3Ps71xjfWXwfVj1otBJf9eDcNzxM,28454
 pymodaq/utils/parameter/__init__.py,sha256=rfXpqq0yxkKwCCxuiTHTB8Z54o9MtO_vn8zVgUn-k-g,106
-pymodaq/utils/parameter/ioxml.py,sha256=IMWLrWfTrZneVtA70Gzzq5I_u997hQZsXgRqAuYghi4,16536
-pymodaq/utils/parameter/utils.py,sha256=6P9I_zGz6NU0PbVYBmZ_dykDOFIsDhlyToET9d1w2Wo,6408
+pymodaq/utils/parameter/ioxml.py,sha256=-GLKr_csnvc7IcGRZifFZHwK4F_vKST_Gl6cH9EF0TA,16560
+pymodaq/utils/parameter/utils.py,sha256=IYcHQ0iDSxJgAOEH5oOiO0NGfyy7HOeBxbF8L3zfIWE,6836
 pymodaq/utils/parameter/pymodaq_ptypes/__init__.py,sha256=NNPGOTfpft27W4mxHbqcgfq6bFdaFW0NlfFHx-kwjP4,1988
 pymodaq/utils/parameter/pymodaq_ptypes/bool.py,sha256=yz9-zn6T5NN7SDEWwf8tfw8Ezbllbt1rOd8vHGqw3mI,761
 pymodaq/utils/parameter/pymodaq_ptypes/date.py,sha256=7mOGlw0ViJWD8au0HNsh-C9Fr4woZzkXhFs5Lno7yik,3706
 pymodaq/utils/parameter/pymodaq_ptypes/filedir.py,sha256=IVFbN08Dr3NdRNMufBef1vWr2igiULq3CBu10-yLqSQ,4571
 pymodaq/utils/parameter/pymodaq_ptypes/itemselect.py,sha256=dnj1qBzxwmdPpQ2Sk5lfmOolb1rgWqhGikhItoARuoo,5553
 pymodaq/utils/parameter/pymodaq_ptypes/led.py,sha256=oDKM3k4aPy_CArgQIEqjLx3KG5CR7NrywacJKalmKQ4,1129
-pymodaq/utils/parameter/pymodaq_ptypes/list.py,sha256=RKrLL_j7Fpsszn8isHb__e6sy-4QwxzKTavYuL1TOBM,4980
+pymodaq/utils/parameter/pymodaq_ptypes/list.py,sha256=v5XVMWCkUle2-cgbdNAO9JHNTQIfVufFv6j14tX18C4,4981
 pymodaq/utils/parameter/pymodaq_ptypes/numeric.py,sha256=lzklQWAnzh9LDC20hdlGbAj2NdVzNDDeJke1KnPi7GU,560
 pymodaq/utils/parameter/pymodaq_ptypes/pixmap.py,sha256=PnSEU8uT29UhbiL4uNsoc_dnKDCeGTBuEz_28K3unsE,5228
 pymodaq/utils/parameter/pymodaq_ptypes/slide.py,sha256=x3n6CNezOboFsK-vjjciGT_4CDrUGdgsW7LwLDGHRPk,4716
@@ -382,7 +382,7 @@ pymodaq/utils/plotting/data_viewers/viewer1D.py,sha256=kdfntqTVr_7Bay-gCD6AOy5nL
 pymodaq/utils/plotting/data_viewers/viewer1Dbasic.py,sha256=sfqiuNPlsF2SbhFwVfLD7CzfKD7UUlHITb5LC1clXE0,7407
 pymodaq/utils/plotting/data_viewers/viewer2D.py,sha256=9I8ge0zHRBGzr6MO78feCFyqImZL0F2g6JTDsePwzfk,41922
 pymodaq/utils/plotting/data_viewers/viewer2D_basic.py,sha256=MgxQBiPrMOTYB3KReylS7XGeoVoFP059HW0D33Z5zsc,5567
-pymodaq/utils/plotting/data_viewers/viewerND.py,sha256=0fQAPEbRaQqakzonwBATdHdVwDeAgKW9T7xGTSq_REo,34930
+pymodaq/utils/plotting/data_viewers/viewerND.py,sha256=C_ynk1agkvvz8Lo2qmDkyPy9owomj3p6jbTnHu0Fjd8,35144
 pymodaq/utils/plotting/items/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pymodaq/utils/plotting/items/axis_scaled.py,sha256=YVSqpSs2gfALdsH_wKheYf6fgEQ0-7tU2zWu709K3h4,3245
 pymodaq/utils/plotting/items/crosshair.py,sha256=hVoM3dDtRmYGfzZJsP-Yhyfnx2HV1g-nLSQMVl6ZZXY,3064
@@ -406,8 +406,8 @@ pymodaq/utils/svg/__init__.py,sha256=QWpeotkNhAQkoVTdWBH8t6MRr9-lrPJx4bXn7J6fCNA
 pymodaq/utils/svg/svg_renderer.py,sha256=USEcrOWmQAq8UM620e_XIGPI6z9IQmhyJuqbPo3jLzE,406
 pymodaq/utils/svg/svg_view.py,sha256=bmXpDqnw9S-Bp3F8Hi_oeYB5Y9gebiCNsQWVJzCq-PA,901
 pymodaq/utils/svg/svg_viewer2D.py,sha256=LTJ3Ulb5zWXdRPr7vqcWumbpq7ZctzrYUMtD5QV3x60,1523
-pymodaq-4.0.5.dist-info/METADATA,sha256=EBOdKEBt-xBsSZfk-CCdTdAPpm3CtH4qg8LnlY6fiyo,7571
-pymodaq-4.0.5.dist-info/WHEEL,sha256=9QBuHhg6FNW7lppboF2vKVbCGTVzsFykgRQjjlajrhA,87
-pymodaq-4.0.5.dist-info/entry_points.txt,sha256=RAzdYNjvUT28I2eiCKki_g2NzXq0woWxhev6lwzwRv8,348
-pymodaq-4.0.5.dist-info/licenses/LICENSE,sha256=VKOejxexXAe3XwfhAhcFGqeXQ12irxVHdeAojZwFEI8,1108
-pymodaq-4.0.5.dist-info/RECORD,,
+pymodaq-4.0.7.dist-info/METADATA,sha256=RGbvyltfaKJaGuJa2W2EteKxvsojHDvLefmSFQxpHII,7571
+pymodaq-4.0.7.dist-info/WHEEL,sha256=9QBuHhg6FNW7lppboF2vKVbCGTVzsFykgRQjjlajrhA,87
+pymodaq-4.0.7.dist-info/entry_points.txt,sha256=RAzdYNjvUT28I2eiCKki_g2NzXq0woWxhev6lwzwRv8,348
+pymodaq-4.0.7.dist-info/licenses/LICENSE,sha256=VKOejxexXAe3XwfhAhcFGqeXQ12irxVHdeAojZwFEI8,1108
+pymodaq-4.0.7.dist-info/RECORD,,