pymodaq 4.2.1__tar.gz → 4.2.3__tar.gz

{pymodaq-4.2.1 → pymodaq-4.2.3}/PKG-INFO

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

{pymodaq-4.2.1 → pymodaq-4.2.3}/src/pymodaq/control_modules/daq_move.py

@@ -26,7 +26,7 @@ from pymodaq.control_modules.daq_move_ui import DAQ_Move_UI, ThreadCommand
 from pymodaq.control_modules.move_utility_classes import MoveCommand, DAQ_Move_base
 from pymodaq.control_modules.move_utility_classes import params as daq_move_params
 from pymodaq.utils import daq_utils as utils
-from pymodaq.utils.parameter import Parameter, utils as putils
+from pymodaq.utils.parameter import utils as putils
 from pymodaq.utils.gui_utils import get_splash_sc
 from pymodaq.utils import config as config_mod
 from pymodaq.utils.exceptions import ActuatorError
@@ -34,6 +34,7 @@ from pymodaq.utils.messenger import deprecation_msg
 from pymodaq.utils.h5modules import module_saving
 from pymodaq.utils.data import DataRaw, DataToExport, DataFromPlugins, DataActuator
 from pymodaq.utils.h5modules.backends import Node
+from pymodaq.utils.parameter import ioxml, Parameter
 
 from pymodaq.utils.leco.pymodaq_listener import MoveActorListener, LECOMoveCommands
 
@@ -596,6 +597,14 @@ class DAQ_Move(ParameterControlModule):
             self._send_to_tcpip = True
             self.command_hardware.emit(ThreadCommand('get_actuator_value', ))
 
+        elif status.command == 'set_info':
+            path_in_settings = status.attribute[0]
+            param_as_xml = status.attribute[1]
+            param_dict = ioxml.XML_string_to_parameter(param_as_xml)[0]
+            param_tmp = Parameter.create(**param_dict)
+            param = self.settings.child('move_settings', *path_in_settings[1:])
+            param.restoreState(param_tmp.saveState())
+
 
 class DAQ_Move_Hardware(QObject):
     """

{pymodaq-4.2.1 → pymodaq-4.2.3}/src/pymodaq/control_modules/daq_viewer.py

@@ -1106,6 +1106,14 @@ class DAQ_Viewer(ParameterControlModule):
         elif status.command == LECOClientCommands.LECO_DISCONNECTED:
             self.settings.child('main_settings', 'leco', 'leco_connected').setValue(False)
 
+        elif status.command == 'set_info':
+            path_in_settings = status.attribute[0]
+            param_as_xml = status.attribute[1]
+            param_dict = ioxml.XML_string_to_parameter(param_as_xml)[0]
+            param_tmp = Parameter.create(**param_dict)
+            param = self.settings.child('detector_settings', *path_in_settings[1:])
+            param.restoreState(param_tmp.saveState())
+
         elif status.command == 'get_axis':
             raise DeprecationWarning('Do not use this, the axis are in the data objects')
             self.command_hardware.emit(

{pymodaq-4.2.1 → pymodaq-4.2.3}/src/pymodaq/control_modules/utils.py

@@ -22,6 +22,7 @@ from pymodaq.utils.plotting.data_viewers import ViewersEnum
 from pymodaq.utils.exceptions import DetectorError
 from pymodaq.utils import config as configmod
 from pymodaq.utils.leco.pymodaq_listener import ActorListener, LECOClientCommands, LECOCommands
+from pymodaq.utils.logger import get_base_logger
 
 
 class DAQTypesEnum(BaseEnum):
@@ -294,7 +295,7 @@ class ControlModule(QObject):
     def show_log(self):
         """Open the log file in the default text editor"""
         import webbrowser
-        webbrowser.open(self.logger.parent.handlers[0].baseFilename)
+        webbrowser.open(get_base_logger(self.logger).handlers[0].baseFilename)
 
     def show_config(self, config: Config) -> Config:
         """ Display in a tree the current configuration"""
@@ -480,12 +481,6 @@ class ParameterControlModule(ParameterManager, ControlModule):
         elif status.command == 'Update_Status':
             self.thread_status(status)
 
-        elif status.command == 'set_info':
-            param_dict = ioxml.XML_string_to_parameter(status.attribute[1])[0]
-            param_tmp = Parameter.create(**param_dict)
-            param = self.settings.child('move_settings', *status.attribute[0][1:])
-
-            param.restoreState(param_tmp.saveState())
         else:
             # not handled
             return status

pymodaq-4.2.3/src/pymodaq/resources/VERSION

@@ -0,0 +1 @@
+version = '4.2.3'

{pymodaq-4.2.1 → pymodaq-4.2.3}/src/pymodaq/utils/logger.py

@@ -66,6 +66,12 @@ def set_logger(logger_name, add_handler=False, base_logger=False, add_to_console
     return logger
 
 
+def get_base_logger(logger: logging.Logger) -> logging.Logger:
+    while logger.name != 'pymodaq':
+        logger = logger.parent
+    return logger
+
+
 def get_module_name(module__file__path):
     """from the full path of a module extract its name"""
     path = Path(module__file__path)

{pymodaq-4.2.1 → pymodaq-4.2.3}/src/pymodaq/utils/managers/preset_manager.py

@@ -119,7 +119,9 @@ class PresetManager:
         for param, change, data in changes:
             path = self.preset_params.childPath(param)
             if change == 'childAdded':
-                data[0].child('params', 'main_settings', 'module_name').setValue(data[0].child('name').value())
+                if len(data) > 1:
+                    if 'params' in data[0].children():
+                        data[0].child('params', 'main_settings', 'module_name').setValue(data[0].child('name').value())
 
             elif change == 'value':
 

{pymodaq-4.2.1 → pymodaq-4.2.3}/src/pymodaq/utils/plotting/data_viewers/viewer2D.py

@@ -650,11 +650,12 @@ class View2D(ActionManager, QtCore.QObject):
         self.ROIselect.setSize(rect.size() * 2 / 3)
 
     def set_image_labels(self, labels: List[str]):
-        action_names =['red', 'green', 'blue']
-        for action_name, label in zip(action_names[:len(labels)], labels):
-            self.get_action(action_name).setToolTip(f'{self.get_action(action_name).toolTip()}'
-                                                    f' - '
-                                                    f'{label}')
+        if self.data_displayer.labels != labels:
+            action_names =['red', 'green', 'blue']
+            for action_name, label in zip(action_names[:len(labels)], labels):
+                self.get_action(action_name).setToolTip('Show/Hide'
+                                                        f' - '
+                                                        f'{label}')
 
     def set_axis_label(self, position, label='', units=''):
         """

pymodaq-4.2.1/src/pymodaq/resources/VERSION

@@ -1 +0,0 @@
-version = '4.2.1'