pymodaq 4.2.1__py3-none-any.whl → 4.2.3__py3-none-any.whl

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/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/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/resources/VERSION

@@ -1 +1 @@
-version = '4.2.1'
+version = '4.2.3'

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/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/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.dist-info → pymodaq-4.2.3.dist-info}/METADATA

@@ -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.dist-info → pymodaq-4.2.3.dist-info}/RECORD

@@ -3,13 +3,13 @@ pymodaq/dashboard.py,sha256=4JK_I5M_KbGTyw18ws5cA9NwRersn7yAj_g6u2Ud4LA,64575
 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=ygtVvhZHjfMYUmIASnpMppdESnEVg46PeYpuom1sn8o,34532
+pymodaq/control_modules/daq_move.py,sha256=SOj8zsaN8xlAJzvxLao_f9Op0JhZ4eLJXH1GUAW8DnE,34977
 pymodaq/control_modules/daq_move_ui.py,sha256=sviVOHASH4zjCIfhWzh42v35_n4JaUwUh-t5dFzQBo4,14530
-pymodaq/control_modules/daq_viewer.py,sha256=E9DDC8LaOZsxciEo05CTfBp8zXmc-_N017l00e836lc,57316
+pymodaq/control_modules/daq_viewer.py,sha256=iNN5iEsuTdxB8sxjL4FtrRth_Cj5rDHrTt32SpLg7oM,57723
 pymodaq/control_modules/daq_viewer_ui.py,sha256=FWP3jdIOR9vTgYqNaaodteGZ3dwgQ1GdWKrOpOAuSrs,15693
 pymodaq/control_modules/mocks.py,sha256=hh_xSWp9g1UV3NAQVD9Ft9tNWfTsSvKU0OU0trgzP2w,1956
 pymodaq/control_modules/move_utility_classes.py,sha256=8ePiQUQ7AEBnhn4CjWPjMmo10yLznGHF9-s28OzYWGg,33382
-pymodaq/control_modules/utils.py,sha256=-_qU8HeFzWpO4dBK3jZLijDziU_vT8yGwGyxchycnC8,20272
+pymodaq/control_modules/utils.py,sha256=5YdSwq_lFJm7IalYWe_Hn1U4LUoUmo1gedvV9UguU0Y,20016
 pymodaq/control_modules/viewer_utility_classes.py,sha256=XHL0UOi9rfDezyePaiBhh4KiAH0qeogo3AipA9ei2O8,26509
 pymodaq/examples/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pymodaq/examples/custom_app.py,sha256=2wQR0hlPWjZrWK0abNF6ASv8iQyJqRn2CKnBa_nAgN4,10452
@@ -57,7 +57,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=LZhtkok-oyHA3GTsvtmeXY2B-RoU-3gcS1fD8t7PUQ4,17
+pymodaq/resources/VERSION,sha256=-eqsm_sBWz4JP_b05Cj0u7ghujuS7ZINWWMe8JioixI,18
 pymodaq/resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pymodaq/resources/config_template.toml,sha256=klU5XH_2DBkF8QLIS-ZBQZCKfhwnrxyQHoG2meCEmEA,2889
 pymodaq/resources/preset_default.xml,sha256=Dt8iWLwPPOPtcG00JCVP-mh-G7KC6B0YN8hd8RQdnNI,27256
@@ -309,7 +309,7 @@ pymodaq/utils/data.py,sha256=XCk4oFWXvkIEloHSQruXvs27vHTnNJBZcpK8l6QYm9Y,105709
 pymodaq/utils/enums.py,sha256=wpRipioUJkKcEfoaY2NrDQ2WhGxZTZiZoJty5f2Ljpc,2236
 pymodaq/utils/exceptions.py,sha256=wLO6VlofzfwWkOOWMN2B-3NEWMfpgygyeEdakIx_rAs,668
 pymodaq/utils/factory.py,sha256=QLqAPFnTZ93eUpmAAIr7kESDk2enD57RNSuFUsjxE4E,2311
-pymodaq/utils/logger.py,sha256=JPaLBeu5NAd_5xvkzj4BRviLqXgFlu7b7B8ADfE7-L8,2604
+pymodaq/utils/logger.py,sha256=VxymWeeS38VjNre3wjY_lBv06ynstPyI5JrFNgo4PXc,2754
 pymodaq/utils/math_utils.py,sha256=ydLPe25bQBeR0cI5QcEYgun-lXxycVD9nZLpHA-fFYo,18170
 pymodaq/utils/messenger.py,sha256=N5SPc9NomIGtK0TihQ0oq9evlxyWNYELWfpr2s8PoWw,2072
 pymodaq/utils/qvariant.py,sha256=iIBp-DDk5OVBIEqX5SwqwrJyy5t2cRgFFyfgvxQOHqM,311
@@ -364,7 +364,7 @@ pymodaq/utils/managers/batchscan_manager.py,sha256=jcL08YvFafX5kiy03BV1_6obt2Xog
 pymodaq/utils/managers/modules_manager.py,sha256=RKpt1RU0VrELBPmTAlLB_B5k-5KX7deHnequgOFfYKk,20821
 pymodaq/utils/managers/overshoot_manager.py,sha256=fe_CR1Bkw85BER34MoVFlm-xtKl9Hr9bkf2nyaz9hXg,7158
 pymodaq/utils/managers/parameter_manager.py,sha256=s06ja77XrE8C6ksVT4pf1dBpKaA2b1eB4XT2fLvdJeo,11484
-pymodaq/utils/managers/preset_manager.py,sha256=u_gssDcJ-z6oj9Wyrppt1H-FW9pbeihxA8jU00hEFpM,8205
+pymodaq/utils/managers/preset_manager.py,sha256=2cb4m_TqZ8DEvYVxM_4jdNOrhSeite84_3ka3DU2aY4,8302
 pymodaq/utils/managers/preset_manager_utils.py,sha256=d148YBjeNOP9FTkFoTsfdRDxMIXOR8JJHqbOmoL2aVA,8155
 pymodaq/utils/managers/remote_manager.py,sha256=H6k9aiBkuJRJbZ4rpd5jfawQ-pMRFAXOE_miakvciP8,22251
 pymodaq/utils/managers/roi_manager.py,sha256=j6HUd4XwNZ6UhBs4nZ_z2iU74pJiHfMzzDBmQBLi7nY,29064
@@ -396,7 +396,7 @@ pymodaq/utils/plotting/data_viewers/viewer.py,sha256=NjYzOdKE17BDhYJROfLkCU2vwiO
 pymodaq/utils/plotting/data_viewers/viewer0D.py,sha256=jFYdz_JroGpKwDLUv6gpX3-GvRQK5Det8jev_X3ItZc,11608
 pymodaq/utils/plotting/data_viewers/viewer1D.py,sha256=IjU4u5ATZCqsvQMwyOQsuMZkfwpbmCmzBR39YIjZcyU,32083
 pymodaq/utils/plotting/data_viewers/viewer1Dbasic.py,sha256=u91tVhmi_WIlVa8areapb0xWu0NOr5pVRLMylY_in7g,7432
-pymodaq/utils/plotting/data_viewers/viewer2D.py,sha256=ivebdhJ4fR5Yv_rXZLntMojv5D_wRRqRvECBUCzDItg,46166
+pymodaq/utils/plotting/data_viewers/viewer2D.py,sha256=M0Fb3wJ18OSz57edENXZUtpA6auAgO1QczK25-ULlH8,46203
 pymodaq/utils/plotting/data_viewers/viewer2D_basic.py,sha256=aRLu8JVZZI8PH6Lxl8oITpHwUXaUY3PyLW6eHzkf76o,5588
 pymodaq/utils/plotting/data_viewers/viewerND.py,sha256=NrEPrFcE-UxuC95l5W258YqrP58-4WvTg2H80wfucaA,38531
 pymodaq/utils/plotting/items/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -431,8 +431,8 @@ pymodaq/utils/tcp_ip/__init__.py,sha256=1e_EK0AgvdoLAD_CSGGEaITZdy6OWCO7ih9IAIp7
 pymodaq/utils/tcp_ip/mysocket.py,sha256=StAWj8dzHeMnbLj68Sel81uWFy-YkKVNRnVf7gXrESI,3452
 pymodaq/utils/tcp_ip/serializer.py,sha256=HJziYyR_duhGBt8QikmqET8OH1uI5OAFgQu4w4jCQt4,25776
 pymodaq/utils/tcp_ip/tcp_server_client.py,sha256=xIMTNgVW_rKK0yTi4FDNFLf85-Akb27Jz2LdrvOrP68,30660
-pymodaq-4.2.1.dist-info/METADATA,sha256=HPmhknPGuAZduqj1nCdLJhtGR_EcWWP01YMNNYMvFTk,7665
-pymodaq-4.2.1.dist-info/WHEEL,sha256=zEMcRr9Kr03x1ozGwg5v9NQBKn3kndp6LSoSlVg-jhU,87
-pymodaq-4.2.1.dist-info/entry_points.txt,sha256=RAzdYNjvUT28I2eiCKki_g2NzXq0woWxhev6lwzwRv8,348
-pymodaq-4.2.1.dist-info/licenses/LICENSE,sha256=VKOejxexXAe3XwfhAhcFGqeXQ12irxVHdeAojZwFEI8,1108
-pymodaq-4.2.1.dist-info/RECORD,,
+pymodaq-4.2.3.dist-info/METADATA,sha256=Zmf118dAje6aR45mOjzT89lRkCTHCFv4KGGKyIaQcVw,7665
+pymodaq-4.2.3.dist-info/WHEEL,sha256=zEMcRr9Kr03x1ozGwg5v9NQBKn3kndp6LSoSlVg-jhU,87
+pymodaq-4.2.3.dist-info/entry_points.txt,sha256=RAzdYNjvUT28I2eiCKki_g2NzXq0woWxhev6lwzwRv8,348
+pymodaq-4.2.3.dist-info/licenses/LICENSE,sha256=VKOejxexXAe3XwfhAhcFGqeXQ12irxVHdeAojZwFEI8,1108
+pymodaq-4.2.3.dist-info/RECORD,,