pymodaq 5.0.16__py3-none-any.whl → 5.0.18__py3-none-any.whl

pymodaq/control_modules/daq_move.py

@@ -512,14 +512,21 @@ class DAQ_Move(ParameterControlModule):
         elif status.command == 'units':
             self.units = status.attribute
 
-    def _check_data_type(self, data_act: Union[list[np.ndarray], float, DataActuator]) -> DataActuator:
+    def _check_data_type(self, data_act: Union[list, np.ndarray, Number, DataActuator]) -> DataActuator:
         """ Make sure the data is a DataActuator
 
         Mostly to make sure DAQ_Move is backcompatible with old style plugins
         """
         if isinstance(data_act, list):  # backcompatibility
-            data_act = data_act[0]
-        if isinstance(data_act, np.ndarray):  # backcompatibility
+            if isinstance(data_act[0], Number):
+                data_act = DataActuator(data=[np.atleast_1d(val) for val in data_act], units=self.units)
+            elif isinstance(data_act[0], np.ndarray):
+                data_act = DataActuator(data=data_act, units=self.units)
+            elif isinstance(data_act[0], DataActuator):
+                data_act = data_act[0]
+            else:
+                raise TypeError('Unknown data type')
+        elif isinstance(data_act, np.ndarray):  # backcompatibility
             data_act = DataActuator(data=[data_act], units=self.units)
         data_act.name = self.title  # for the DataActuator name to be the title of the DAQ_Move
         if (not Unit(self.units).is_compatible_with(Unit(data_act.units)) and
@@ -783,7 +790,7 @@ class DAQ_Move_Hardware(QObject):
             try:
                 infos = self.hardware.ini_stage(controller)  # return edict(info="", controller=, stage=)
             except Exception as e:
-                logger.exception('Hardware couldn\'t be initialized' + str(e))
+                logger.exception("Hardware couldn't be initialized", exc_info=e)
                 infos = str(e), False
 
             if isinstance(infos, edict):  # following old plugin templating

pymodaq/control_modules/daq_viewer.py

@@ -1309,7 +1309,7 @@ class DAQ_Detector(QObject):
                 status.controller = self.detector.controller
 
             except Exception as e:
-                logger.exception('Hardware couldn\'t be initialized' + str(e))
+                logger.exception("Hardware couldn't be initialized", exc_info=e)
                 infos = str(e), False
                 status.controller = None
 

pymodaq/control_modules/move_utility_classes.py

@@ -697,7 +697,7 @@ class DAQ_Move_base(QObject):
                 position = self.get_actuator_value()
         if position.name != self._title:  # make sure the emitted DataActuator has the name of the real implementation
             #of the plugin
-            position = DataActuator(self._title, data=position.value(),
+            position = DataActuator(self._title, data=position.value(self.axis_unit),
                                     units=self.axis_unit)
         self.move_done_signal.emit(position)
         self.move_is_done = True

pymodaq/extensions/bayesian/bayesian_optimisation.py

@@ -12,7 +12,7 @@ from pymodaq_utils import utils
 from pymodaq_utils import config as config_mod
 from pymodaq_utils.enums import BaseEnum
 
-from pymodaq_gui.config import ConfigSaverLoader
+
 from pymodaq_utils.logger import set_logger, get_module_name
 
 from pymodaq_gui.plotting.data_viewers.viewer0D import Viewer0D
@@ -23,6 +23,11 @@ from pymodaq_gui import utils as gutils
 from pymodaq_gui.parameter import utils as putils
 from pymodaq_gui.h5modules.saving import H5Saver
 
+try:
+    from pymodaq_gui.config_saver_loader import ConfigSaverLoader
+except ModuleNotFoundError:
+    from pymodaq_gui.config import ConfigSaverLoader #backcompatibility
+
 from pymodaq_data.h5modules.data_saving import DataEnlargeableSaver
 
 

pymodaq/utils/config.py

@@ -1,6 +1,9 @@
 from pymodaq_utils.config import (BaseConfig, Config, ConfigError, get_set_config_dir,
                                   USER, CONFIG_BASE_PATH, get_set_local_dir)
-from pymodaq_gui.config import get_set_roi_path
+try:
+    from pymodaq_gui.config_saver_loader import get_set_roi_path
+except ModuleNotFoundError:
+    from pymodaq_gui.config import get_set_roi_path
 
 
 def get_set_preset_path():

pymodaq/utils/scanner/scan_factory.py

@@ -24,7 +24,12 @@ from pymodaq_gui.managers.parameter_manager import ParameterManager, Parameter
 from pymodaq_data.data import Axis, DataDistribution
 
 from pymodaq.utils.scanner.scan_config import ScanConfig
-from pymodaq_gui.config import ConfigSaverLoader
+try:
+    from pymodaq_gui.config_saver_loader import ConfigSaverLoader
+except ModuleNotFoundError:
+    from pymodaq_gui.config import ConfigSaverLoader
+
+from pymodaq.utils.config import Config as ControlModulesConfig
 
 
 if TYPE_CHECKING:

{pymodaq-5.0.16.dist-info → pymodaq-5.0.18.dist-info}/METADATA

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

{pymodaq-5.0.16.dist-info → pymodaq-5.0.18.dist-info}/RECORD

@@ -3,12 +3,12 @@ pymodaq/dashboard.py,sha256=rUrtOdaK31SKhl1XFagZdvVAEqEwU37WAbplciE6MhE,75119
 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=wWzQpFxi1gPx4c03mUos1W3SVrGneVqVTq9k0RyZdnM,38859
+pymodaq/control_modules/daq_move.py,sha256=tCEr_IivQkx9Q1TBdAIvxZb3jiClrsYuwbyT9DFH-7k,39275
 pymodaq/control_modules/daq_move_ui.py,sha256=bdkRX0wjkQuFDr4OT1Q6jT_15DEWV1dn2R6WF50H23s,16811
-pymodaq/control_modules/daq_viewer.py,sha256=f9WYEWIlVjnEakesObhsoLBIWfv1tv4Q8TopqfP8lsg,58602
+pymodaq/control_modules/daq_viewer.py,sha256=XJUkKSmW4ktWSNIRsF_bZ-GG74h4-a82tGijZPrO3FA,58604
 pymodaq/control_modules/daq_viewer_ui.py,sha256=7XTidYrYlzj--DbbE1Wx4UBjvp1upGpziGhSTPoMKCc,15677
 pymodaq/control_modules/mocks.py,sha256=CdczKJDAuM2oL7VvIpSBWiYtTCqK_6x9unxavezp3_s,1954
-pymodaq/control_modules/move_utility_classes.py,sha256=xV_sUhNAPvOY9CFVymI4JbS5Vjyfmhqgu4efZWb_f1A,44368
+pymodaq/control_modules/move_utility_classes.py,sha256=zAiOFNEiLVFSmNPMKQRVbWwx7osMgU7ocgBGraEOxF8,44382
 pymodaq/control_modules/utils.py,sha256=E94gyLrh7fkeppwihHXcwNyKD3CqBZvkMkk8X4fl_UE,20897
 pymodaq/control_modules/viewer_utility_classes.py,sha256=1TcyAC7AiJNKvJ6OGNOYoyFvRCT-u6RBbFv-X8IkZYA,28076
 pymodaq/daq_utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -40,7 +40,7 @@ pymodaq/extensions/daq_scan_ui.py,sha256=kKcXu2tNo-VJR7GQPNEXxMKiKitA4F3a_tOSama
 pymodaq/extensions/h5browser.py,sha256=7WbF2hj7sdU0kCqTxB4nXvfKGqUnoIsa2_AhCtCBNQo,1131
 pymodaq/extensions/utils.py,sha256=18FvgD9vtwAvGdD01LiV0-jcGv0WNjYyDLSP-NFUjno,3042
 pymodaq/extensions/bayesian/__init__.py,sha256=QMV9tq8Axi6YjoGj4UguBO8Zvuh26r5s91bm6YU7Itk,55
-pymodaq/extensions/bayesian/bayesian_optimisation.py,sha256=25nAtpQxN2LnBUyUFDkbPRojBqqGxcLe7hruAVQZj_o,30297
+pymodaq/extensions/bayesian/bayesian_optimisation.py,sha256=Wa1nBCLhQjFQmTK53Nx-6Uh4Q0NbcalqFM8zjM20648,30421
 pymodaq/extensions/bayesian/utils.py,sha256=PNBIHETkZNieExyd9gr8pqWAYXg3_1QW570pwbHbcQw,15473
 pymodaq/extensions/daq_logger/__init__.py,sha256=u-W6S5KmVKjOuRLbpnM0bqn9vCiJjW97RpW7iaKssKM,28
 pymodaq/extensions/daq_logger/abstract.py,sha256=I-t-2nSIVHHUfHJ-3IoqsuULZiIsXRe4saotaEL3-Fk,1095
@@ -63,7 +63,7 @@ pymodaq/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pymodaq/utils/array_manipulation.py,sha256=lU-MwuAIv0ZFc0_E11w0TSX5AfGarJOG58yIZZk36GY,272
 pymodaq/utils/calibration_camera.py,sha256=WTRXFbacR5tL01rFH1JZ5ejEXGcxOVUM8kRA5GPyCc8,8869
 pymodaq/utils/chrono_timer.py,sha256=uBVtV3AW-m-fnHlMYgm1qYiuBpREdL1A93yJG78VAiM,7086
-pymodaq/utils/config.py,sha256=w0EkWEvUbLCq7nTNZQccaMWVILuFaGW1JsIgX3VIKKc,1155
+pymodaq/utils/config.py,sha256=T4UjUsMN3CAw3nND_tU1L69VOL9_U7loYEJshINroZU,1257
 pymodaq/utils/conftests.py,sha256=3Ak8WEpa3EhAp73Yb1LLq8YFONhPqiL7gG9eSDIoTNc,58
 pymodaq/utils/daq_utils.py,sha256=AJIA6PTDKe2nzoL0hgSJRWA5PYhKwZsBKfpPh0QkoTc,6131
 pymodaq/utils/data.py,sha256=8iAchr5nkwDo_usgChX85MOQiHnrubPrvAg3MrYnumw,4415
@@ -97,7 +97,7 @@ pymodaq/utils/parameter/__init__.py,sha256=I5oOJu5nJbcn5sa7TdUP0QVNNZKBrKReeMHJG
 pymodaq/utils/parameter/utils.py,sha256=atxN31PFrLDPjpX0ITEL_ugBvreOVI-RfjbOU_YCMhw,247
 pymodaq/utils/scanner/__init__.py,sha256=LqY1QwGnJEgr8CcW8uLWzbWy55Nvkmjmww4nl7xMpYU,171
 pymodaq/utils/scanner/scan_config.py,sha256=GJeH8oeZ_zMtujwkLM1jpKDQFLFKIN1wlkxXbOv6nWM,325
-pymodaq/utils/scanner/scan_factory.py,sha256=fu4kQrAoYsXeVg1VlHT2cyLZTuCQBJcz6X97CgMb0kw,8577
+pymodaq/utils/scanner/scan_factory.py,sha256=Y0jaeTTp6LhW_CdDeCP_nnIREfssahjdnBmry-3pJ5Y,8745
 pymodaq/utils/scanner/scan_selector.py,sha256=uu55xcijjg1fcvF59VVbtRLzXLoxb_3klEJPLiAuyws,16319
 pymodaq/utils/scanner/scanner.py,sha256=007u4TVDTvxRDWnuXCWDNVOiUmflAJB99EjQ33Fh7VM,10985
 pymodaq/utils/scanner/utils.py,sha256=YjjrWWKs9q_OgP5xK277IyEsMqp15qFxU19kQ8f5R-c,3680
@@ -114,8 +114,8 @@ pymodaq/utils/tcp_ip/__init__.py,sha256=1e_EK0AgvdoLAD_CSGGEaITZdy6OWCO7ih9IAIp7
 pymodaq/utils/tcp_ip/mysocket.py,sha256=03FaQskso8nLLAsN-ijX-RazXbeMezRnAPvsRxTQa4k,326
 pymodaq/utils/tcp_ip/serializer.py,sha256=Bp6ZpGqMdZlX4CnT371d7ZYqIp7UygsRsE9XFkWZrto,400
 pymodaq/utils/tcp_ip/tcp_server_client.py,sha256=eL-Q1HnnaAG8wfTUb9unEIiNFApMXzfzfveUWoC0_mg,30657
-pymodaq-5.0.16.dist-info/METADATA,sha256=AyhKhjh8_dbJYOmlVZIf6tzE4yBv0iMQPhG6MnFcBbo,12902
-pymodaq-5.0.16.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-pymodaq-5.0.16.dist-info/entry_points.txt,sha256=DvPq6fmIPH2JNsCqHDhn1xEj1kX5tfuc7xQ8-l5S2EU,387
-pymodaq-5.0.16.dist-info/licenses/LICENSE,sha256=VKOejxexXAe3XwfhAhcFGqeXQ12irxVHdeAojZwFEI8,1108
-pymodaq-5.0.16.dist-info/RECORD,,
+pymodaq-5.0.18.dist-info/METADATA,sha256=ZiEswU-Xq_Xw7qO1_s39JnB8CfgLx3zpgcNa_4llvLs,12902
+pymodaq-5.0.18.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+pymodaq-5.0.18.dist-info/entry_points.txt,sha256=DvPq6fmIPH2JNsCqHDhn1xEj1kX5tfuc7xQ8-l5S2EU,387
+pymodaq-5.0.18.dist-info/licenses/LICENSE,sha256=VKOejxexXAe3XwfhAhcFGqeXQ12irxVHdeAojZwFEI8,1108
+pymodaq-5.0.18.dist-info/RECORD,,