pymodaq 4.1.4__py3-none-any.whl → 4.1.5__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Potentially problematic release.
This version of pymodaq might be problematic. Click here for more details.
- pymodaq/control_modules/daq_move.py +1 -1
- pymodaq/resources/VERSION +1 -1
- pymodaq/utils/daq_utils.py +4 -6
- pymodaq/utils/gui_utils/file_io.py +3 -2
- pymodaq/utils/managers/roi_manager.py +1 -1
- {pymodaq-4.1.4.dist-info → pymodaq-4.1.5.dist-info}/METADATA +1 -1
- {pymodaq-4.1.4.dist-info → pymodaq-4.1.5.dist-info}/RECORD +10 -10
- {pymodaq-4.1.4.dist-info → pymodaq-4.1.5.dist-info}/WHEEL +1 -1
- {pymodaq-4.1.4.dist-info → pymodaq-4.1.5.dist-info}/entry_points.txt +0 -0
- {pymodaq-4.1.4.dist-info → pymodaq-4.1.5.dist-info}/licenses/LICENSE +0 -0
pymodaq/resources/VERSION
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
version = '4.1.
|
|
1
|
+
version = '4.1.5'
|
pymodaq/utils/daq_utils.py
CHANGED
|
@@ -38,12 +38,6 @@ else:
|
|
|
38
38
|
from functools import lru_cache as cache
|
|
39
39
|
|
|
40
40
|
|
|
41
|
-
if version_mod.parse(platform.python_version()) >= version_mod.parse('3.9'):
|
|
42
|
-
# from version 3.9 the cache decorator is available
|
|
43
|
-
from functools import cache
|
|
44
|
-
else:
|
|
45
|
-
from functools import lru_cache as cache
|
|
46
|
-
|
|
47
41
|
logger = logger_module.set_logger(logger_module.get_module_name(__file__))
|
|
48
42
|
|
|
49
43
|
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
|
|
|
611
605
|
'type': 'daq_move'}
|
|
612
606
|
for mod in [mod[1] for mod in pkgutil.iter_modules([str(movemodule.path.parent)])]
|
|
613
607
|
if 'daq_move' in mod])
|
|
608
|
+
if len(plugin_list) > 0:
|
|
609
|
+
logger.info(f"Found Move Instrument: {plugin_list[-1]['name']}")
|
|
614
610
|
except ModuleNotFoundError:
|
|
615
611
|
pass
|
|
616
612
|
viewer_modules = {}
|
|
@@ -624,6 +620,8 @@ def get_instrument_plugins(): # pragma: no cover
|
|
|
624
620
|
'type': f'daq_{vtype}viewer'}
|
|
625
621
|
for mod in [mod[1] for mod in pkgutil.iter_modules([str(viewer_modules[vtype].path.parent)])]
|
|
626
622
|
if f'daq_{vtype}viewer' in mod])
|
|
623
|
+
if len(plugin_list) > 0:
|
|
624
|
+
logger.info(f"Found Viewer Instrument: {plugin_list[-1]['name']}")
|
|
627
625
|
except ModuleNotFoundError:
|
|
628
626
|
pass
|
|
629
627
|
|
|
@@ -70,8 +70,9 @@ def select_file(start_path=config('data_saving', 'h5file', 'save_path'), save=Tr
|
|
|
70
70
|
if True, ask you to enter a filename (with or without extension)
|
|
71
71
|
ext: str
|
|
72
72
|
the extension string, e.g. xml, h5, png ...
|
|
73
|
-
filter:
|
|
74
|
-
list of possible extensions,
|
|
73
|
+
filter: string
|
|
74
|
+
list of possible extensions, if you need several you can separate them by ;;
|
|
75
|
+
for example: "Images (*.png *.xpm *.jpg);;Text files (*.txt);;XML files (*.xml)"
|
|
75
76
|
force_save_extension: bool
|
|
76
77
|
if True force the extension of the saved file to be set to ext
|
|
77
78
|
|
|
@@ -562,7 +562,7 @@ class ROIManager(QObject):
|
|
|
562
562
|
try:
|
|
563
563
|
if params is None:
|
|
564
564
|
if path is None:
|
|
565
|
-
path = select_file(start_path=Path.home(), save=False, ext='xml', filter=
|
|
565
|
+
path = select_file(start_path=Path.home(), save=False, ext='xml', filter='XML files (*.xml)')
|
|
566
566
|
if path != '':
|
|
567
567
|
params = Parameter.create(title='Settings', name='settings', type='group',
|
|
568
568
|
children=ioxml.XML_file_to_parameter(path))
|
|
@@ -3,7 +3,7 @@ pymodaq/dashboard.py,sha256=aKG7XhO7e4S_9nv1MdrCFW5xJ2ADJ6evDIgaPy6ih3w,63635
|
|
|
3
3
|
pymodaq/icon.ico,sha256=hOHHfNDENKphQvG1WDleSEYcHukneR2eRFJu8isIlD4,74359
|
|
4
4
|
pymodaq/splash.png,sha256=ow8IECF3tPRUMA4tf2tMu1aRiMaxx91_Y2ckVxkrmF0,53114
|
|
5
5
|
pymodaq/control_modules/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
6
|
-
pymodaq/control_modules/daq_move.py,sha256=
|
|
6
|
+
pymodaq/control_modules/daq_move.py,sha256=j4yL4BCRaDiyWA0Yk3dUh2vPIf2tvlqdwgO8FV_VPFE,36583
|
|
7
7
|
pymodaq/control_modules/daq_move_ui.py,sha256=sviVOHASH4zjCIfhWzh42v35_n4JaUwUh-t5dFzQBo4,14530
|
|
8
8
|
pymodaq/control_modules/daq_viewer.py,sha256=XJ6PHOg_Emz2-Leg9Fw2k91Mlmz00RFk3xm4NGZnJFI,58421
|
|
9
9
|
pymodaq/control_modules/daq_viewer_ui.py,sha256=EfWnXQYcq4x5qOA2GIuYRBcD0L5Gak44lJ7WqwOrFe4,15646
|
|
@@ -53,7 +53,7 @@ pymodaq/post_treatment/daq_measurement/daq_measurement_GUI.py,sha256=1u7hWDaiwsZ
|
|
|
53
53
|
pymodaq/post_treatment/daq_measurement/daq_measurement_GUI.ui,sha256=PyzbCWPMkh5oIYYteZczXyWMeHKW9EJmM1QlzXhnyTk,7037
|
|
54
54
|
pymodaq/post_treatment/daq_measurement/daq_measurement_main.py,sha256=CAKwcWMOD86aXB8mbdxOK7e8nZRos5d59FzDtqK1QoY,17093
|
|
55
55
|
pymodaq/post_treatment/daq_measurement/process_from_QtDesigner_DAQ_Measurement_GUI.bat,sha256=e1tu2A67MS9fk3jhriF6saQgRxWIucIvNW92iWXFP6E,164
|
|
56
|
-
pymodaq/resources/VERSION,sha256=
|
|
56
|
+
pymodaq/resources/VERSION,sha256=sg-e7oU9ys7iAyVQEcek_hr0ETD8p8owGadqrtmQp9I,18
|
|
57
57
|
pymodaq/resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
58
58
|
pymodaq/resources/config_scan_template.toml,sha256=zlbFO6pOdrLOFJTVMXfek8YpvOo29tqv0aTjGnB7_mA,570
|
|
59
59
|
pymodaq/resources/config_template.toml,sha256=b91pWeFlKKN-HPpYkwzBLEsEQnoKEM6GmNKQq7aCfts,3352
|
|
@@ -301,7 +301,7 @@ pymodaq/utils/calibration_camera.py,sha256=d3aAu0izXOdeLs-vyBaFfBuvyDGT3O-SreTuy
|
|
|
301
301
|
pymodaq/utils/chrono_timer.py,sha256=rwX8apS8B-IKhA0Cp2H9tLz0BRN7G3Pg5ptozvd3MKM,7244
|
|
302
302
|
pymodaq/utils/config.py,sha256=iaZpoI-l5KkCKlE49k6IPcRXKB_Ai6bi72Vaf6a2Xbg,12480
|
|
303
303
|
pymodaq/utils/conftests.py,sha256=3Ak8WEpa3EhAp73Yb1LLq8YFONhPqiL7gG9eSDIoTNc,58
|
|
304
|
-
pymodaq/utils/daq_utils.py,sha256=
|
|
304
|
+
pymodaq/utils/daq_utils.py,sha256=CEsvUBd7h-kqefPj6JDGO3ArjV2bu1BkaUpb9-8H1Kc,30357
|
|
305
305
|
pymodaq/utils/data.py,sha256=4O43O1ljHsXhfovxSviSrRfvF45HT9wfd4xeyBZmc3o,86475
|
|
306
306
|
pymodaq/utils/enums.py,sha256=WNU6w3tsNpP7HQnNrQ6eKnDTXulOlZufQRr11__-l0M,1822
|
|
307
307
|
pymodaq/utils/exceptions.py,sha256=wLO6VlofzfwWkOOWMN2B-3NEWMfpgygyeEdakIx_rAs,668
|
|
@@ -321,7 +321,7 @@ pymodaq/utils/db/db_logger/db_logger_models.py,sha256=_QCA1bFneNtw7kme8WMCQj14AN
|
|
|
321
321
|
pymodaq/utils/gui_utils/__init__.py,sha256=tRFUKN4E4o9t-L2W7irkzzaDai32tYsl2XHqZ4Cr6Uo,403
|
|
322
322
|
pymodaq/utils/gui_utils/custom_app.py,sha256=cmBXrM0CTEMOaqpmvRCiylBw5zVWwFDj_eRXur1VUvo,4478
|
|
323
323
|
pymodaq/utils/gui_utils/dock.py,sha256=31gh2mgh4Uld9Zq_B-4uS3AMmpPlz0AVxzCA0KDekHI,2879
|
|
324
|
-
pymodaq/utils/gui_utils/file_io.py,sha256=
|
|
324
|
+
pymodaq/utils/gui_utils/file_io.py,sha256=r8cmvFmw2zIApVlOJqrcIFhto83OWNC5TkmFU-BSzrg,3351
|
|
325
325
|
pymodaq/utils/gui_utils/layout.py,sha256=6oczLLGwwEN4EQ8yUDnz0-4Ue2wlyCRklKsVD1GNcz8,1099
|
|
326
326
|
pymodaq/utils/gui_utils/list_picker.py,sha256=ddYnRTlRlgwdJSy0Q98IzYWHzIf2GS6ABl8XSS9kVXM,1190
|
|
327
327
|
pymodaq/utils/gui_utils/utils.py,sha256=CkXpcJCniAWsDrdC8hve0-wOlbxPaERnAUNhSmqqIy4,5172
|
|
@@ -356,7 +356,7 @@ pymodaq/utils/managers/parameter_manager.py,sha256=BX_wPzx02zYgqZHl0pnGHOq3fwE__
|
|
|
356
356
|
pymodaq/utils/managers/preset_manager.py,sha256=u_gssDcJ-z6oj9Wyrppt1H-FW9pbeihxA8jU00hEFpM,8205
|
|
357
357
|
pymodaq/utils/managers/preset_manager_utils.py,sha256=d148YBjeNOP9FTkFoTsfdRDxMIXOR8JJHqbOmoL2aVA,8155
|
|
358
358
|
pymodaq/utils/managers/remote_manager.py,sha256=H6k9aiBkuJRJbZ4rpd5jfawQ-pMRFAXOE_miakvciP8,22251
|
|
359
|
-
pymodaq/utils/managers/roi_manager.py,sha256=
|
|
359
|
+
pymodaq/utils/managers/roi_manager.py,sha256=GUE4oIFFooaKZ2mK6Vnw2LQxX-Sj6j6olL5ZYfelOjU,28881
|
|
360
360
|
pymodaq/utils/parameter/__init__.py,sha256=fMljZeQ9EVvh2bmss550C5BpxFeKOxT8_AVJdPxQ0kQ,433
|
|
361
361
|
pymodaq/utils/parameter/ioxml.py,sha256=AKOgAyaE8P2yiPIRO4d9Jiq2Bjv00jbJkbzVar-qwrg,16887
|
|
362
362
|
pymodaq/utils/parameter/utils.py,sha256=2tXcfRn_96rpjxdID2vMUctWxdZ41t8G8uZXNUzEMqA,9615
|
|
@@ -415,8 +415,8 @@ pymodaq/utils/tcp_ip/__init__.py,sha256=1e_EK0AgvdoLAD_CSGGEaITZdy6OWCO7ih9IAIp7
|
|
|
415
415
|
pymodaq/utils/tcp_ip/mysocket.py,sha256=StAWj8dzHeMnbLj68Sel81uWFy-YkKVNRnVf7gXrESI,3452
|
|
416
416
|
pymodaq/utils/tcp_ip/serializer.py,sha256=YyVjOyuOLDdRTH7YMUlSXrmuuY0e8km-6KeZrAj7HA8,24932
|
|
417
417
|
pymodaq/utils/tcp_ip/tcp_server_client.py,sha256=eZswNZWKyL6ZFHuSROf3nL53fVgDNXMV1PMK5lJNS1o,30490
|
|
418
|
-
pymodaq-4.1.
|
|
419
|
-
pymodaq-4.1.
|
|
420
|
-
pymodaq-4.1.
|
|
421
|
-
pymodaq-4.1.
|
|
422
|
-
pymodaq-4.1.
|
|
418
|
+
pymodaq-4.1.5.dist-info/METADATA,sha256=nzGDyQCkSB9jucMdNc36yP27EmHLBwEkO5TMqoUDXJI,7583
|
|
419
|
+
pymodaq-4.1.5.dist-info/WHEEL,sha256=zEMcRr9Kr03x1ozGwg5v9NQBKn3kndp6LSoSlVg-jhU,87
|
|
420
|
+
pymodaq-4.1.5.dist-info/entry_points.txt,sha256=RAzdYNjvUT28I2eiCKki_g2NzXq0woWxhev6lwzwRv8,348
|
|
421
|
+
pymodaq-4.1.5.dist-info/licenses/LICENSE,sha256=VKOejxexXAe3XwfhAhcFGqeXQ12irxVHdeAojZwFEI8,1108
|
|
422
|
+
pymodaq-4.1.5.dist-info/RECORD,,
|
|
File without changes
|
|
File without changes
|