pymodaq 4.2.2__tar.gz → 4.2.4__tar.gz

{pymodaq-4.2.2 → pymodaq-4.2.4}/PKG-INFO

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

{pymodaq-4.2.2 → pymodaq-4.2.4}/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.2 → pymodaq-4.2.4}/src/pymodaq/control_modules/daq_move_ui.py

@@ -187,9 +187,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)
@@ -213,7 +213,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 +222,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)
@@ -311,6 +311,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-4.2.2 → pymodaq-4.2.4}/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.2 → pymodaq-4.2.4}/src/pymodaq/control_modules/utils.py

@@ -481,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.2 → pymodaq-4.2.4}/src/pymodaq/dashboard.py

@@ -229,7 +229,7 @@ class DashBoard(QObject):
         return self.bayesian_module
 
     def load_extension_from_name(self, name: str) -> dict:
-        self.load_extensions_module(find_dict_in_list_from_key_val(extensions, 'name', name))
+        return self.load_extensions_module(find_dict_in_list_from_key_val(extensions, 'name', name))
 
     def load_extensions_module(self, ext: dict):
         """ Init and load an extension from a plugin package
@@ -255,7 +255,7 @@ class DashBoard(QObject):
         self.extension_windows[-1].setWindowTitle(ext['name'])
         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.extensions[ext['class_name']] = klass(area, dashboard=self)
         self.extension_windows[-1].show()
         return self.extensions[ext['class_name']]
 
@@ -1210,7 +1210,6 @@ class DashBoard(QObject):
                 QtWidgets.QApplication.processEvents()
             self.settings.child('detectors', name).setValue(det.initialized_state)
 
-    Slot(bool)
     def stop_moves(self, overshoot):
         """
             Foreach module of the move module object list, stop motion.

{pymodaq-4.2.2 → pymodaq-4.2.4}/src/pymodaq/examples/custom_viewer.py

@@ -96,7 +96,7 @@ if __name__ == '__main__':
     Ny = 200
     x = (np.linspace(0, Nx - 1, Nx) + 100) / 2
     y = (np.linspace(0, Ny - 1, Ny) - 10) * 2
-    from pymodaq.utils.daq_utils import gauss2D
+    from pymodaq.utils.math_utils import gauss2D
 
     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)

pymodaq-4.2.4/src/pymodaq/resources/VERSION

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

{pymodaq-4.2.2 → pymodaq-4.2.4}/src/pymodaq/resources/config_template.toml

@@ -35,14 +35,10 @@ message_status_persistence = 1000  # ms
 [user]
 name = "User name"  # default name used as author in the hdf5 saving files
 
-[viewer]
-daq_type = 'DAQ0D' #either "DAQ0D", "DAQ1D", "DAQ2D", "DAQND"
-viewer_in_thread = true
-timeout = 10000  # default duration in ms to wait for data to be acquirred
-allow_settings_edition = false
 
 [plotting]
 backend = 'matplotlib'  # either 'matplotlib' or 'qt' or any other custom backend
+plot_colors = [[255, 255, 255], [255, 0, 0], [0, 255, 0], [0, 0, 255], [14, 207, 189], [207, 14, 166], [207, 204, 14]]
 
 [network]
     [network.logging]
@@ -69,19 +65,27 @@ default_preset_for_logger = "preset_default"
 default_preset_for_pid = "beam_steering_mock"
 
 [actuator]
-    epsilon_default = 1
-    polling_interval_ms = 100  # ms Careful when using TCP/IP connection as you can saturate the connection with too much polling
-    polling_timeout_s = 20  # s
-    refresh_timeout_ms = 500  # ms
-    timeout = 10000  # default duration in ms to wait for data to be acquirred
+epsilon_default = 1
+polling_interval_ms = 100  # ms Careful when using TCP/IP connection as you can saturate the connection with too much polling
+polling_timeout_s = 20  # s
+refresh_timeout_ms = 500  # ms
+timeout = 10000  # default duration in ms to wait for data to be acquirred
+siprefix = true  # tell if printing of current value use a SI prefix or not (µ, m, k, M...)
+display_units = true # display units in the SpinBoxes
+
+[viewer]
+daq_type = 'DAQ0D' #either "DAQ0D", "DAQ1D", "DAQ2D", "DAQND"
+viewer_in_thread = true
+timeout = 10000  # default duration in ms to wait for data to be acquirred
+allow_settings_edition = false
 
 [scan]
-    scan_in_thread = true
-    show_popups = true
-    default = "Scan2D"
-    Naverage = 1  # minimum is 1
-    steps_limit = 1000  # the limit of the number of steps you can set in a given scan
-    sort1D = true
+scan_in_thread = true
+show_popups = true
+default = "Scan2D"
+Naverage = 1  # minimum is 1
+steps_limit = 1000  # the limit of the number of steps you can set in a given scan
+sort1D = true
 
     [scan.timeflow]
     wait_time = 0

{pymodaq-4.2.2 → pymodaq-4.2.4}/src/pymodaq/utils/daq_utils.py

@@ -42,10 +42,54 @@ else:
 
 logger = logger_module.set_logger(logger_module.get_module_name(__file__))
 
-plot_colors = [(255, 255, 255), (255, 0, 0), (0, 255, 0), (0, 0, 255), (14, 207, 189), (207, 14, 166), (207, 204, 14)]
 config = Config()
 
 
+class PlotColors:
+
+    def __init__(self, colors=config('plotting', 'plot_colors')[:]):
+
+        self._internal_counter = -1
+
+        self.check_colors(colors)
+        self._plot_colors = list(colors)
+
+    def __getitem__(self, item: int):
+        if not isinstance(item, int):
+            raise TypeError('getter should be an integer')
+        return tuple(self._plot_colors[item % len(self._plot_colors)])
+
+    def __len__(self):
+        return len(self._plot_colors)
+
+    def __iter__(self):
+        self._internal_counter = -1
+        return self
+
+    def __next__(self):
+        if self._internal_counter >= len(self) - 1:
+            raise StopIteration
+        self._internal_counter += 1
+        return self[self._internal_counter]
+
+    def check_colors(self, colors: IterableType):
+        if not isinstance(colors, Iterable):
+            raise TypeError('Colors should be a list of 3-tuple 8 bits integer (0-255)')
+        for color in colors:
+            self.check_color(color)
+
+    @staticmethod
+    def check_color(color: IterableType):
+        if not isinstance(color, Iterable) and len(color) != 3:
+            raise TypeError('Colors should be a list of 3-tuple 8 bits integer (0-255)')
+        for col_val in color:
+            if not (isinstance(col_val, int) and 0 <= col_val <= 255):
+                raise TypeError('Colors should be a list of 3-tuple 8 bits integer (0-255)')
+
+
+plot_colors = PlotColors()
+
+
 def is_64bits():
     return sys.maxsize > 2**32
 

{pymodaq-4.2.2 → pymodaq-4.2.4}/src/pymodaq/utils/h5modules/data_saving.py

@@ -427,16 +427,19 @@ class DataSaverLoader(DataManagement):
             if not isinstance(data_node, CARRAY):
                 return
             data_nodes = [data_node]
+            error_node = None
             try:
                 error_node_index = self.get_index_from_node_name(data_node)
-                error_node = self._error_saver.get_node_from_index(parent_node, error_node_index)
+                if error_node_index is not None:
+                    error_node = self._error_saver.get_node_from_index(parent_node, error_node_index)
             except NodeError as e:
-                error_node = None
+                pass
 
         if 'axis' in self.data_type.name:
             ndarrays = [squeeze(data_node.read()) for data_node in data_nodes]
             axes = [Axis(label=data_node.attrs['label'], units=data_node.attrs['units'],
                          data=np.linspace(0, ndarrays[0].size-1, ndarrays[0].size-1))]
+            error_arrays = None
         else:
             ndarrays = self.get_data_arrays(data_node, with_bkg=with_bkg, load_all=load_all)
             axes = self.get_axes(parent_node)
@@ -467,7 +470,8 @@ class DataSaverLoader(DataManagement):
                             errors=error_arrays,
                             path=data_node.path,
                             **extra_attributes)
-        data.timestamp = data_node.attrs['timestamp']
+        if 'axis' not in self.data_type.name:
+            data.timestamp = data_node.attrs['timestamp']
         return data
 
 

{pymodaq-4.2.2 → pymodaq-4.2.4}/src/pymodaq/utils/plotting/data_viewers/viewer0D.py

@@ -278,7 +278,7 @@ def main():
     app = QtWidgets.QApplication(sys.argv)
     widget = QtWidgets.QWidget()
     prog = Viewer0D(widget, show_toolbar=False)
-    from pymodaq.utils.daq_utils import gauss1D
+    from pymodaq.utils.math_utils import gauss1D
 
     x = np.linspace(0, 200, 201)
     y1 = gauss1D(x, 75, 25) + 0.1*np.random.rand(len(x))

{pymodaq-4.2.2 → pymodaq-4.2.4}/src/pymodaq/utils/plotting/data_viewers/viewer1D.py

@@ -672,7 +672,9 @@ def main():
 
     # x = np.sin(np.linspace(0,6*np.pi,201))
     # y = np.sin(np.linspace(0, 6*np.pi, 201)+np.pi/2)
-    data = DataRaw('mydata', data=[y1, ydata_expodec, -ydata_expodec, -y1],
+    data = DataRaw('mydata', data=[y1, ydata_expodec, -ydata_expodec, -y1,
+                                   y1, ydata_expodec, -ydata_expodec, -y1,
+                                   y1, ydata_expodec, -ydata_expodec, -y1,],
                    axes=[Axis('myaxis', 'units', data=x)])
 
     Form.show()
@@ -700,7 +702,7 @@ def main_unsorted():
     widget = QtWidgets.QWidget()
     prog = Viewer1D(widget)
 
-    from pymodaq.utils.daq_utils import gauss1D
+    from pymodaq.utils.math_utils import gauss1D
 
     x = np.linspace(0, 200, 201)
     xaxis = np.concatenate((x, x[::-1]))
@@ -713,6 +715,7 @@ def main_unsorted():
 
     sys.exit(app.exec_())
 
+
 def main_random():
     app = QtWidgets.QApplication(sys.argv)
     widget = QtWidgets.QWidget()
@@ -733,6 +736,7 @@ def main_random():
     QtWidgets.QApplication.processEvents()
     sys.exit(app.exec_())
 
+
 def main_extra_scatter():
     app = QtWidgets.QApplication(sys.argv)
     widget = QtWidgets.QWidget()
@@ -761,6 +765,7 @@ def main_extra_scatter():
     QtWidgets.QApplication.processEvents()
     sys.exit(app.exec_())
 
+
 def main_errors():
     app = QtWidgets.QApplication(sys.argv)
     widget = QtWidgets.QWidget()
@@ -783,6 +788,7 @@ def main_errors():
     QtWidgets.QApplication.processEvents()
     sys.exit(app.exec_())
 
+
 def main_view1D():
     app = QtWidgets.QApplication(sys.argv)
     widget = QtWidgets.QWidget()
@@ -796,7 +802,7 @@ def main_nans():
     widget = QtWidgets.QWidget()
     prog = Viewer1D(widget)
 
-    from pymodaq.utils.daq_utils import gauss1D
+    from pymodaq.utils.math_utils import gauss1D
 
     x = np.linspace(0, 200, 201)
     y = gauss1D(x, 75, 25)
@@ -812,9 +818,9 @@ def main_nans():
 
 
 if __name__ == '__main__':  # pragma: no cover
-    # main()
+    main()
     # main_random()
     #main_errors()
-    main_extra_scatter()
+    #main_extra_scatter()
     #main_view1D()
     #main_nans()

{pymodaq-4.2.2 → pymodaq-4.2.4}/src/pymodaq/utils/plotting/utils/lineout.py

@@ -17,7 +17,7 @@ from pymodaq.utils.data import DataCalculated
 
 logger = set_logger(get_module_name(__file__))
 IMAGE_TYPES = ['red', 'green', 'blue']
-COLOR_LIST = utils.plot_colors
+COLOR_LIST = list(utils.plot_colors)
 COLORS_DICT = dict(red=(255, 0, 0), green=(0, 255, 0), blue=(0, 0, 255), spread=(128, 128, 128))
 
 

pymodaq-4.2.2/src/pymodaq/resources/VERSION

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