pymodaq 4.1.3__tar.gz → 4.1.5__tar.gz

{pymodaq-4.1.3 → pymodaq-4.1.5}/PKG-INFO

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

{pymodaq-4.1.3 → pymodaq-4.1.5}/src/pymodaq/control_modules/daq_move.py

@@ -39,7 +39,7 @@ from pymodaq.utils.h5modules.backends import Node
 
 
 local_path = config_mod.get_set_local_dir()
-sys.path.append(local_path)
+sys.path.append(str(local_path))
 logger = set_logger(get_module_name(__file__))
 config = config_mod.Config()
 

{pymodaq-4.1.3 → pymodaq-4.1.5}/src/pymodaq/extensions/daq_scan.py

@@ -570,7 +570,12 @@ class DAQScan(QObject, ParameterManager):
             print(f'clicked at: {posx}, {posy}')
         positions = [posx, posy]
         positions = positions[:self.scanner.n_axes]
-        self.modules_manager.move_actuators(positions)
+        actuators = self.modules_manager.actuators
+        dte = DataToExport(name="move_at")
+        for ind, pos in enumerate(positions):
+            dte.append(DataActuator(actuators[ind].title, data=float(pos)))
+
+        self.modules_manager.move_actuators(dte)
 
     def value_changed(self, param):
         """

pymodaq-4.1.5/src/pymodaq/resources/VERSION

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

{pymodaq-4.1.3 → pymodaq-4.1.5}/src/pymodaq/utils/daq_utils.py

@@ -38,12 +38,6 @@ else:
     from functools import lru_cache as cache
 
 
-if version_mod.parse(platform.python_version()) >= version_mod.parse('3.9'):
-    # from version 3.9 the cache decorator is available
-    from functools import cache
-else:
-    from functools import lru_cache as cache
-
 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)]
@@ -611,6 +605,8 @@ def get_instrument_plugins():  # pragma: no cover
                                      'type': 'daq_move'}
                                     for mod in [mod[1] for mod in pkgutil.iter_modules([str(movemodule.path.parent)])]
                                     if 'daq_move' in mod])
+                if len(plugin_list) > 0:
+                    logger.info(f"Found Move Instrument: {plugin_list[-1]['name']}")
             except ModuleNotFoundError:
                 pass
             viewer_modules = {}
@@ -624,6 +620,8 @@ def get_instrument_plugins():  # pragma: no cover
                                      'type': f'daq_{vtype}viewer'}
                                     for mod in [mod[1] for mod in pkgutil.iter_modules([str(viewer_modules[vtype].path.parent)])]
                                     if f'daq_{vtype}viewer' in mod])
+                    if len(plugin_list) > 0:
+                        logger.info(f"Found Viewer Instrument: {plugin_list[-1]['name']}")
                 except ModuleNotFoundError:
                     pass
 

{pymodaq-4.1.3 → pymodaq-4.1.5}/src/pymodaq/utils/gui_utils/file_io.py

@@ -70,8 +70,9 @@ def select_file(start_path=config('data_saving', 'h5file', 'save_path'), save=Tr
         if True, ask you to enter a filename (with or without extension)
     ext: str
         the extension string, e.g. xml, h5, png ...
-    filter: list of string
-        list of possible extensions, mostly valid for loading
+    filter: string
+        list of possible extensions, if you need several you can separate them by ;;
+        for example: "Images (*.png *.xpm *.jpg);;Text files (*.txt);;XML files (*.xml)"
     force_save_extension: bool
         if True force the extension of the saved file to be set to ext
 

{pymodaq-4.1.3 → pymodaq-4.1.5}/src/pymodaq/utils/managers/roi_manager.py

@@ -562,7 +562,7 @@ class ROIManager(QObject):
         try:
             if params is None:
                 if path is None:
-                    path = select_file(start_path=Path.home(), save=False, ext='xml', filter=['xml'])
+                    path = select_file(start_path=Path.home(), save=False, ext='xml', filter='XML files (*.xml)')
                     if path != '':
                         params = Parameter.create(title='Settings', name='settings', type='group',
                                                   children=ioxml.XML_file_to_parameter(path))

pymodaq-4.1.3/src/pymodaq/resources/VERSION

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