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

pymodaq/__init__.py

@@ -29,23 +29,42 @@ try:
     # with open(str(Path(__file__).parent.joinpath('resources/VERSION')), 'r') as fvers:
     #     __version__ = fvers.read().strip()
 
-    from pymodaq.utils.logger import set_logger
-    from pymodaq.utils.daq_utils import get_version
+    from pymodaq_utils.logger import set_logger
+    from pymodaq_utils.utils import get_version
     __version__ = get_version()
     try:
         logger = set_logger('pymodaq', add_handler=True, base_logger=True)
     except Exception:
         print("Couldn't create the local folder to store logs , presets...")
+
+    logger.info('')
+    logger.info('')
+    logger.info('************************')
+    logger.info('Starting PyMoDAQ modules')
+    logger.info('************************')
+    logger.info('')
+    logger.info('')
+    logger.info('************************')
+    logger.info('Initializing the pint unit register')
+    logger.info('************************')
+    ureg = UnitRegistry()
+    ureg.default_format = '~'
+    Q_ = ureg.Quantity
+    Unit = ureg.Unit
+    logger.info('')
+    logger.info('')
+
     # in a try statement for compilation on readthedocs server but if this fail, you cannot use the code
-    from pymodaq.utils.plotting import data_viewers  # imported here as to avoid circular imports later on
-    from pymodaq.utils.daq_utils import copy_preset, setLocale, set_qt_backend
-    from pymodaq.utils.daq_utils import get_instrument_plugins
-    from pymodaq.utils.config import Config
+    from pymodaq_gui.plotting import data_viewers  # imported here as to avoid circular imports later on
+    from pymodaq_gui.qt_utils import setLocale, set_qt_backend
+    from pymodaq.utils.daq_utils import copy_preset, get_instrument_plugins
+
+    from pymodaq_utils.config import Config
     from pymodaq.utils.scanner.utils import register_scanners
-    from pymodaq.utils.plotting.plotter.plotter import register_plotter, PlotterFactory
+    from pymodaq_data.plotting.plotter.plotter import register_plotter, PlotterFactory
 
-    # issue on windows when using .NET code within multithreads, this below allows it but requires the
-    # pywin32 (pythoncom) package
+    # issue on windows when using .NET code within multithreads, this below allows it but requires
+    # the pywin32 (pythoncom) package
     if importlib.util.find_spec('clr') is not None:
         try:
             import pythoncom
@@ -58,13 +77,7 @@ try:
 
     config = Config()  # to ckeck for config file existence, otherwise create one
     copy_preset()
-    logger.info('')
-    logger.info('')
-    logger.info('************************')
-    logger.info('Starting PyMoDAQ modules')
-    logger.info('************************')
-    logger.info('')
-    logger.info('')
+
     logger.info('************************')
     logger.info(f"Setting Qt backend to: {config['qtbackend']['backend']} ...")
     set_qt_backend()
@@ -77,13 +90,7 @@ try:
     setLocale()
     logger.info('')
     logger.info('')
-    logger.info('************************')
-    logger.info('Initializing the pint unit register')
-    logger.info('************************')
-    ureg = UnitRegistry()
-    Q_ = ureg.Quantity
-    logger.info('')
-    logger.info('')
+
     logger.info('*************************************************************************')
     logger.info(f"Getting the list of instrument plugins...")
     logger.info('')

pymodaq/control_modules/daq_move.py

@@ -20,23 +20,26 @@ from qtpy import QtWidgets
 
 from easydict import EasyDict as edict
 
-from pymodaq.utils.logger import set_logger, get_module_name
-from pymodaq.control_modules.utils import ParameterControlModule
-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 utils as putils
+from pymodaq_utils.logger import set_logger, get_module_name
+from pymodaq_utils.utils import ThreadCommand
+from pymodaq_utils import utils
 from pymodaq.utils.gui_utils import get_splash_sc
-from pymodaq.utils import config as config_mod
+from pymodaq_utils import config as config_mod
 from pymodaq.utils.exceptions import ActuatorError
-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.warnings import deprecation_msg
+from pymodaq.utils.data import DataToExport, DataActuator
+from pymodaq_data.h5modules.backends import Node
+
+from pymodaq_gui.parameter import ioxml, Parameter
+from pymodaq_gui.parameter import utils as putils
 
+from pymodaq.utils.h5modules import module_saving
+from pymodaq.control_modules.utils import ParameterControlModule
+from pymodaq.control_modules.daq_move_ui import DAQ_Move_UI
+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.leco.pymodaq_listener import MoveActorListener, LECOMoveCommands
+from pymodaq.utils.daq_utils import get_plugins
 
 
 local_path = config_mod.get_set_local_dir()
@@ -44,7 +47,7 @@ sys.path.append(str(local_path))
 logger = set_logger(get_module_name(__file__))
 config = config_mod.Config()
 
-DAQ_Move_Actuators = utils.get_plugins('daq_move')
+DAQ_Move_Actuators = get_plugins('daq_move')
 ACTUATOR_TYPES = [mov['name'] for mov in DAQ_Move_Actuators]
 if len(ACTUATOR_TYPES) == 0:
     raise ActuatorError('No installed Actuator')
@@ -479,6 +482,9 @@ class DAQ_Move(ParameterControlModule):
         elif status.command == 'stop':
             self.stop_motion()
 
+        elif status.command == 'units':
+            self.units = status.attribute
+
     def get_actuator_value(self):
         """Get the current actuator value via the "get_actuator_value" command send to the hardware
 
@@ -551,8 +557,15 @@ class DAQ_Move(ParameterControlModule):
 
     @property
     def units(self):
+        """Get/Set the units for the controller"""
         return self.settings['move_settings', 'units']
 
+    @units.setter
+    def units(self, unit: str):
+        self.settings.child('move_settings', 'units').setValue(unit)
+        if self.ui is not None and config('actuator', 'display_units'):
+            self.ui.set_unit_as_suffix(unit)
+
     def update_settings(self):
 
         self.settings.child('main_settings', 'move_type').setValue(self._actuator_type)

pymodaq/control_modules/daq_move_ui.py

@@ -9,16 +9,20 @@ from typing import List
 import sys
 
 from qtpy import QtWidgets
-from qtpy.QtCore import Signal
+from qtpy.QtCore import Signal, Qt
 from qtpy.QtWidgets import QHBoxLayout, QVBoxLayout, QGridLayout, QWidget, QToolBar, QComboBox
 
-from pymodaq.utils.daq_utils import ThreadCommand
-from pymodaq.utils.gui_utils.custom_app import CustomApp
-from pymodaq.utils.gui_utils.widgets import PushButtonIcon, LabelWithFont, SpinBox, QSpinBox_ro, QLED
+from pymodaq_utils.utils import ThreadCommand
+from pymodaq_utils.config import Config
+from pymodaq_gui.utils.widgets import PushButtonIcon, LabelWithFont, SpinBox, QSpinBox_ro, QLED
+from pymodaq_gui.utils import DockArea
+from pymodaq_gui.plotting.data_viewers.viewer import ViewerDispatcher
+
 from pymodaq.control_modules.utils import ControlModuleUI
-from pymodaq.utils.gui_utils import DockArea
-from pymodaq.utils.plotting.data_viewers.viewer import ViewerDispatcher
-from pymodaq.utils.data import DataWithAxes, DataToExport, DataActuator
+from pymodaq.utils.data import DataToExport, DataActuator
+
+
+config = Config()
 
 
 class DAQ_Move_UI(ControlModuleUI):
@@ -151,11 +155,13 @@ class DAQ_Move_UI(ControlModuleUI):
 
     def setup_docks(self):
         self.parent.setLayout(QVBoxLayout())
-        self.parent.layout().setSizeConstraint(QHBoxLayout.SetFixedSize)
+        #self.parent.layout().setSizeConstraint(QHBoxLayout.SetFixedSize)
         self.parent.layout().setContentsMargins(2, 2, 2, 2)
 
         widget = QWidget()
         widget.setLayout(QHBoxLayout())
+        splitter_hor = QtWidgets.QSplitter(Qt.Orientation.Horizontal)
+        widget.layout().addWidget(splitter_hor)
         self.parent.layout().addWidget(widget)
 
         self.main_ui = QWidget()
@@ -174,9 +180,9 @@ class DAQ_Move_UI(ControlModuleUI):
         left_widget.layout().addWidget(self.control_ui)
         left_widget.layout().setContentsMargins(0, 0, 0, 0)
         left_widget.layout().addStretch()
-        widget.layout().addWidget(left_widget)
-        widget.layout().addWidget(self.settings_ui)
-        widget.layout().addStretch()
+        splitter_hor.addWidget(left_widget)
+        splitter_hor.addWidget(self.settings_ui)
+        #widget.layout().addStretch()
 
         # populate the main ui
         self.move_toolbar = QToolBar()
@@ -187,9 +193,9 @@ class DAQ_Move_UI(ControlModuleUI):
         self.main_ui.layout().addWidget(self.toolbar, 0, 0, 1, 2)
         self.main_ui.layout().addWidget(self.move_toolbar, 1, 0, 1, 2)
 
-        self.abs_value_sb = SpinBox()
+        self.abs_value_sb = SpinBox(step=0.1, dec=True)
         self.abs_value_sb.setStyleSheet("background-color : lightgreen; color: black")
-        self.abs_value_sb_2 = SpinBox()
+        self.abs_value_sb_2 = SpinBox(step=0.1, dec=True)
         self.abs_value_sb_2.setStyleSheet("background-color : lightcoral; color: black")
         self.move_toolbar.addWidget(self.abs_value_sb)
         self.move_toolbar.addWidget(self.abs_value_sb_2)
@@ -205,7 +211,9 @@ class DAQ_Move_UI(ControlModuleUI):
         self.main_ui.layout().addWidget(LabelWithFont('Current value:'), 4, 0)
         self.move_done_led = QLED(readonly=True)
         self.main_ui.layout().addWidget(self.move_done_led, 4, 1)
-        self.current_value_sb = QSpinBox_ro(font_size=30, min_height=35)
+        self.current_value_sb = QSpinBox_ro(font_size=20, min_height=27,
+                                            siPrefix=config('actuator', 'siprefix'),
+                                            )
         self.main_ui.layout().addWidget(self.current_value_sb, 5, 0, 1, 2)
 
         # populate the control ui
@@ -213,7 +221,7 @@ class DAQ_Move_UI(ControlModuleUI):
         self.control_ui.layout().addWidget(LabelWithFont('Abs. Value'), 0, 0)
         self.find_home_pb = PushButtonIcon('home2', 'Find Home')
         self.control_ui.layout().addWidget(self.find_home_pb, 0, 1)
-        self.abs_value_sb_bis = SpinBox()
+        self.abs_value_sb_bis = SpinBox(step=0.1, dec=True)
         self.control_ui.layout().addWidget(self.abs_value_sb_bis, 1, 0)
         self.move_abs_pb = PushButtonIcon('Move', 'Set Abs.',
                                           tip='Set the value of the actuator to the set absolute value')
@@ -222,7 +230,7 @@ class DAQ_Move_UI(ControlModuleUI):
         self.move_rel_plus_pb = PushButtonIcon('MoveUp', 'Set Rel. (+)')
         self.control_ui.layout().addWidget(self.move_rel_plus_pb, 2, 1)
 
-        self.rel_value_sb = SpinBox()
+        self.rel_value_sb = SpinBox(step=0.1, dec=True)
         self.control_ui.layout().addWidget(self.rel_value_sb, 3, 0)
         self.move_rel_minus_pb = PushButtonIcon('MoveDown', 'Set Rel. (-)')
         self.control_ui.layout().addWidget(self.move_rel_minus_pb, 3, 1)
@@ -242,6 +250,14 @@ class DAQ_Move_UI(ControlModuleUI):
         self.statusbar.setMaximumHeight(30)
         self.parent.layout().addWidget(self.statusbar)
 
+    def set_unit_as_suffix(self, unit: str):
+        """Will append the actuator units in the value display"""
+        self.current_value_sb.setOpts(suffix=unit)
+        self.abs_value_sb_bis.setOpts(suffix=unit)
+        self.abs_value_sb.setOpts(suffix=unit)
+        self.abs_value_sb_2.setOpts(suffix=unit)
+        self.rel_value_sb.setOpts(suffix=unit)
+
     def setup_actions(self):
         self.add_action('move_abs', 'Move Abs', 'go_to_1', "Move to the set absolute value",
                         toolbar=self.move_toolbar)
@@ -311,6 +327,7 @@ class DAQ_Move_UI(ControlModuleUI):
                                                      self.actuators_combo.currentText()]))
 
     def emit_move_abs(self, spinbox):
+        spinbox.editingFinished.emit()
         self.command_sig.emit(ThreadCommand('move_abs', DataActuator(data=spinbox.value())))
 
     def emit_move_rel(self, sign):

pymodaq/control_modules/daq_viewer.py

@@ -20,28 +20,36 @@ import numpy as np
 from qtpy import QtWidgets
 from qtpy.QtCore import Qt, QObject, Slot, QThread, Signal
 
-from pymodaq.utils.data import DataFromPlugins, DataToExport, Axis, DataDistribution
-from pymodaq.utils.logger import set_logger, get_module_name
+
+from pymodaq_data.data import DataToExport, Axis, DataDistribution
+from pymodaq.utils.data import DataFromPlugins
+
+from pymodaq_utils.logger import set_logger, get_module_name
 from pymodaq.control_modules.utils import ParameterControlModule
-from pymodaq.utils.gui_utils.file_io import select_file
-from pymodaq.utils.gui_utils.widgets.lcd import LCD
-from pymodaq.utils.config import Config, get_set_local_dir
-from pymodaq.utils.h5modules.browsing import browse_data
-from pymodaq.utils.h5modules.saving import H5Saver
+
+from pymodaq_gui.utils.file_io import select_file
+from pymodaq_gui.utils.widgets.lcd import LCD
+
+from pymodaq_utils.config import Config, get_set_local_dir
+from pymodaq_gui.h5modules.browsing import browse_data
+from pymodaq_gui.h5modules.saving import H5Saver
 from pymodaq.utils.h5modules import module_saving
-from pymodaq.utils.h5modules.backends import Node
-from pymodaq.utils.daq_utils import ThreadCommand
-from pymodaq.utils.parameter import ioxml, Parameter
-from pymodaq.utils.parameter import utils as putils
+from pymodaq_data.h5modules.backends import Node
+from pymodaq_utils.utils import ThreadCommand
+
+from pymodaq_gui.parameter import ioxml, Parameter
+from pymodaq_gui.parameter import utils as putils
 from pymodaq.control_modules.viewer_utility_classes import params as daq_viewer_params
-from pymodaq.utils import daq_utils as utils
-from pymodaq.utils.messenger import deprecation_msg
-from pymodaq.utils.gui_utils import DockArea, get_splash_sc, Dock
+from pymodaq_utils import utils
+from pymodaq_utils.warnings import deprecation_msg
+from pymodaq_gui.utils import DockArea, Dock
+
+from pymodaq.utils.gui_utils import get_splash_sc
 from pymodaq.control_modules.daq_viewer_ui import DAQ_Viewer_UI
 from pymodaq.control_modules.utils import DET_TYPES, get_viewer_plugins, DAQTypesEnum, DetectorError
-from pymodaq.utils.plotting.data_viewers.viewer import ViewerBase
-from pymodaq.utils.plotting.data_viewers import ViewersEnum
-from pymodaq.utils.enums import enum_checker
+from pymodaq_gui.plotting.data_viewers.viewer import ViewerBase
+from pymodaq_gui.plotting.data_viewers import ViewersEnum
+from pymodaq_utils.enums import enum_checker
 from pymodaq.control_modules.viewer_utility_classes import DAQ_Viewer_base
 
 from pymodaq.utils.leco.pymodaq_listener import ViewerActorListener, LECOClientCommands
@@ -94,7 +102,7 @@ class DAQ_Viewer(ParameterControlModule):
 
     listener_class = ViewerActorListener
 
-    def __init__(self, parent=None, title="Testing",
+    def __init__(self, parent: DockArea=None, title="Testing",
                  daq_type=config('viewer', 'daq_type'),
                  dock_settings=None, dock_viewer=None,
                  **kwargs):
@@ -666,19 +674,20 @@ class DAQ_Viewer(ParameterControlModule):
         DetectorSaver, DetectorEnlargeableSaver, DetectorExtendedSaver
 
         """
-        detector_node = self.module_and_data_saver.get_set_node(where)
-        dte = dte if not self.module_and_data_saver.h5saver.settings['save_raw_only'] else \
-            dte.get_data_from_source('raw')  # filters depending on the source: raw or calculated
+        if dte is not None:
+            detector_node = self.module_and_data_saver.get_set_node(where)
+            dte = dte if not self.module_and_data_saver.h5saver.settings['save_raw_only'] else \
+                dte.get_data_from_source('raw')  # filters depending on the source: raw or calculated
 
-        dte = DataToExport(name=dte.name, data=  # filters depending on the extra argument 'save'
-                           [dwa for dwa in dte if ('do_save' not in dwa.extra_attributes) or
-                            ('do_save' in dwa.extra_attributes and dwa.do_save)])
+            dte = DataToExport(name=dte.name, data=  # filters depending on the extra argument 'save'
+                               [dwa for dwa in dte if ('do_save' not in dwa.extra_attributes) or
+                                ('do_save' in dwa.extra_attributes and dwa.do_save)])
 
-        self.module_and_data_saver.add_data(detector_node, dte, **kwargs)
+            self.module_and_data_saver.add_data(detector_node, dte, **kwargs)
 
-        if init_step:
-            if self._do_bkg and self._bkg is not None:
-                self.module_and_data_saver.add_bkg(detector_node, self._bkg)
+            if init_step:
+                if self._do_bkg and self._bkg is not None:
+                    self.module_and_data_saver.add_bkg(detector_node, self._bkg)
 
     def _save_data(self, path=None, dte: DataToExport = None):
         """Private. Practical implementation to save data into a h5file altogether with metadata, axes, background...
@@ -1067,6 +1076,7 @@ class DAQ_Viewer(ParameterControlModule):
             QtWidgets.QApplication.processEvents()
 
         elif status.command == 'lcd':
+            """status.attribute should be a list of numpy arrays of shape (1,)"""
             self._lcd.setvalues(status.attribute)
 
         elif status.command == 'stop':

pymodaq/control_modules/daq_viewer_ui.py

@@ -15,13 +15,13 @@ from qtpy.QtWidgets import QVBoxLayout,  QWidget, QComboBox
 from pymodaq.utils.daq_utils import ThreadCommand
 from pymodaq.control_modules.utils import ControlModuleUI
 
-from pymodaq.utils.gui_utils.widgets import PushButtonIcon, LabelWithFont, QLED
-from pymodaq.utils.gui_utils import Dock
-from pymodaq.utils.config import Config
+from pymodaq_gui.utils.widgets import PushButtonIcon, LabelWithFont, QLED
+from pymodaq_gui.utils import Dock
+from pymodaq_utils.config import Config
 from pymodaq.control_modules.utils import DET_TYPES, DAQTypesEnum
-from pymodaq.utils.plotting.data_viewers.viewer import ViewerFactory, ViewerDispatcher
-from pymodaq.utils.plotting.data_viewers import ViewersEnum
-from pymodaq.utils.enums import enum_checker
+from pymodaq_gui.plotting.data_viewers.viewer import ViewerFactory, ViewerDispatcher
+from pymodaq_gui.plotting.data_viewers import ViewersEnum
+from pymodaq_utils.enums import enum_checker
 
 
 viewer_factory = ViewerFactory()

pymodaq/control_modules/mocks.py

@@ -5,7 +5,7 @@ Created the 16/03/2023
 @author: Sebastien Weber
 """
 from pymodaq.utils.parameter import Parameter
-from pymodaq.utils.h5modules import saving
+from pymodaq_gui.h5modules import saving
 from pymodaq.utils.h5modules.module_saving import DetectorSaver, ActuatorSaver, ScanSaver
 
 

pymodaq/control_modules/move_utility_classes.py

@@ -7,18 +7,18 @@ import numpy as np
 from qtpy import QtWidgets
 from qtpy.QtCore import QObject, Slot, Signal, QTimer
 
-import pymodaq.utils.daq_utils as utils
-import pymodaq.utils.parameter.utils as putils
-from pymodaq.utils.parameter import Parameter
-from pymodaq.utils.logger import set_logger, get_module_name
-from pymodaq.utils.parameter import ioxml
-
-from pymodaq.utils.daq_utils import ThreadCommand, getLineInfo, find_keys_from_val
-from pymodaq.utils import config as configmod
+from pymodaq_utils.utils import ThreadCommand, find_keys_from_val
+from pymodaq_utils import config as configmod
+from pymodaq_utils.warnings import deprecation_msg
+from pymodaq_utils.enums import BaseEnum, enum_checker
+from pymodaq_utils.logger import set_logger, get_module_name
+
+import pymodaq_gui.parameter.utils as putils
+from pymodaq_gui.parameter import Parameter
+from pymodaq_gui.parameter import ioxml
+
 from pymodaq.utils.tcp_ip.tcp_server_client import TCPServer, tcp_parameters
-from pymodaq.utils.messenger import deprecation_msg
 from pymodaq.utils.data import DataActuator
-from pymodaq.utils.enums import BaseEnum, enum_checker
 from pymodaq.utils.tcp_ip.mysocket import Socket
 from pymodaq.utils.tcp_ip.serializer import DeSerializer, Serializer
 
@@ -362,6 +362,14 @@ class DAQ_Move_base(QObject):
     def target_position(self, value):
         self.target_value = value
 
+    @property
+    def is_master(self) -> bool:
+        """ Get the controller master/slave status
+
+        new in version 4.3.0
+        """
+        return self.settings['multiaxes', 'multi_status'] == 'Master'
+
     @property
     def controller_units(self):
         """ Get/Set the units of this plugin"""
@@ -372,6 +380,7 @@ class DAQ_Move_base(QObject):
         self._controller_units = units
         try:
             self.settings.child('units').setValue(units)
+            self.emit_status(ThreadCommand('units', units))
         except Exception:
             pass
 

pymodaq/control_modules/utils.py

@@ -11,18 +11,22 @@ from easydict import EasyDict as edict
 
 from qtpy import QtCore
 from qtpy.QtCore import Signal, QObject, Qt, Slot, QThread
-from pymodaq.utils.gui_utils import CustomApp
-from pymodaq.utils.daq_utils import ThreadCommand, get_plugins, find_dict_in_list_from_key_val
-from pymodaq.utils.config import Config
+
+from pymodaq_utils.utils import ThreadCommand, find_dict_in_list_from_key_val
+from pymodaq_utils.config import Config
+from pymodaq_utils.enums import BaseEnum, enum_checker
+from pymodaq_utils.logger import get_base_logger
+
+from pymodaq_gui.utils.custom_app import CustomApp
+from pymodaq_gui.parameter import Parameter, ioxml
+from pymodaq_gui.managers.parameter_manager import ParameterManager
+from pymodaq_gui.plotting.data_viewers import ViewersEnum
+
 from pymodaq.utils.tcp_ip.tcp_server_client import TCPClient
-from pymodaq.utils.parameter import Parameter, ioxml
-from pymodaq.utils.managers.parameter_manager import ParameterManager
-from pymodaq.utils.enums import BaseEnum, enum_checker
-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
+
+from pymodaq.utils.daq_utils import get_plugins
 
 
 class DAQTypesEnum(BaseEnum):
@@ -60,12 +64,14 @@ class DAQTypesEnum(BaseEnum):
     def get_dim(self):
         return self.value.split('Viewer')[1].split('D')[0]
 
+
 DAQ_TYPES = DAQTypesEnum
 
 DET_TYPES = {'DAQ0D': get_plugins('daq_0Dviewer'),
              'DAQ1D': get_plugins('daq_1Dviewer'),
              'DAQ2D': get_plugins('daq_2Dviewer'),
-             'DAQND': get_plugins('daq_NDviewer'),}
+             'DAQND': get_plugins('daq_NDviewer'),
+             }
 
 if len(DET_TYPES['DAQ0D']) == 0:
     raise DetectorError('No installed Detector')
@@ -123,7 +129,7 @@ class ControlModule(QObject):
         self._tcpclient_thread = None
         self._hardware_thread = None
         self.module_and_data_saver = None
-        self.plugin_config: Optional[configmod.Config] = None
+        self.plugin_config: Optional[Config] = None
 
     def __repr__(self):
         return f'{self.__class__.__name__}: {self.title}'
@@ -300,7 +306,7 @@ class ControlModule(QObject):
     def show_config(self, config: Config) -> Config:
         """ Display in a tree the current configuration"""
         if config is not None:
-            from pymodaq.utils.gui_utils.widgets.tree_toml import TreeFromToml
+            from pymodaq_gui.utils.widgets.tree_toml import TreeFromToml
             config_tree = TreeFromToml(config)
             config_tree.show_dialog()
 

pymodaq/control_modules/viewer_utility_classes.py

@@ -9,11 +9,12 @@ from easydict import EasyDict as edict
 
 import numpy as np
 from pymodaq.utils.math_utils import gauss1D, gauss2D
-from pymodaq.utils.daq_utils import ThreadCommand, getLineInfo
-from pymodaq.utils.config import Config, get_set_local_dir
+from pymodaq_utils.utils import ThreadCommand, getLineInfo
+
+from pymodaq_utils.config import Config, get_set_local_dir
 from pymodaq.utils.tcp_ip.tcp_server_client import TCPServer, tcp_parameters
-from pymodaq.utils.data import DataToExport, DataRaw
-from pymodaq.utils.messenger import deprecation_msg
+from pymodaq_data.data import DataToExport, DataRaw
+from pymodaq_utils.warnings import deprecation_msg
 from pymodaq.utils.tcp_ip.mysocket import Socket
 from pymodaq.utils.tcp_ip.serializer import DeSerializer, Serializer
 
@@ -197,6 +198,14 @@ class DAQ_Viewer_base(QObject):
         except Exception as exc:
             print(f"Error with old message signal stuff: {exc}")
 
+    @property
+    def is_master(self):
+        """ Get the controller master/slave status
+
+        new in version 4.3.0
+        """
+        return self.settings['controller_status'] == 'Master'
+
     def _emit_dte(self, dte: Union[DataToExport, list]):
         if isinstance(dte, list):
             deprecation_msg('Data emitted from the instrument plugins should be a DataToExport instance'