pymodaq 4.2.2__py3-none-any.whl → 4.2.3__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 +10 -1
- pymodaq/control_modules/daq_viewer.py +8 -0
- pymodaq/control_modules/utils.py +0 -6
- pymodaq/resources/VERSION +1 -1
- {pymodaq-4.2.2.dist-info → pymodaq-4.2.3.dist-info}/METADATA +1 -1
- {pymodaq-4.2.2.dist-info → pymodaq-4.2.3.dist-info}/RECORD +9 -9
- {pymodaq-4.2.2.dist-info → pymodaq-4.2.3.dist-info}/WHEEL +0 -0
- {pymodaq-4.2.2.dist-info → pymodaq-4.2.3.dist-info}/entry_points.txt +0 -0
- {pymodaq-4.2.2.dist-info → pymodaq-4.2.3.dist-info}/licenses/LICENSE +0 -0
|
@@ -26,7 +26,7 @@ from pymodaq.control_modules.daq_move_ui import DAQ_Move_UI, ThreadCommand
|
|
|
26
26
|
from pymodaq.control_modules.move_utility_classes import MoveCommand, DAQ_Move_base
|
|
27
27
|
from pymodaq.control_modules.move_utility_classes import params as daq_move_params
|
|
28
28
|
from pymodaq.utils import daq_utils as utils
|
|
29
|
-
from pymodaq.utils.parameter import
|
|
29
|
+
from pymodaq.utils.parameter import utils as putils
|
|
30
30
|
from pymodaq.utils.gui_utils import get_splash_sc
|
|
31
31
|
from pymodaq.utils import config as config_mod
|
|
32
32
|
from pymodaq.utils.exceptions import ActuatorError
|
|
@@ -34,6 +34,7 @@ from pymodaq.utils.messenger import deprecation_msg
|
|
|
34
34
|
from pymodaq.utils.h5modules import module_saving
|
|
35
35
|
from pymodaq.utils.data import DataRaw, DataToExport, DataFromPlugins, DataActuator
|
|
36
36
|
from pymodaq.utils.h5modules.backends import Node
|
|
37
|
+
from pymodaq.utils.parameter import ioxml, Parameter
|
|
37
38
|
|
|
38
39
|
from pymodaq.utils.leco.pymodaq_listener import MoveActorListener, LECOMoveCommands
|
|
39
40
|
|
|
@@ -596,6 +597,14 @@ class DAQ_Move(ParameterControlModule):
|
|
|
596
597
|
self._send_to_tcpip = True
|
|
597
598
|
self.command_hardware.emit(ThreadCommand('get_actuator_value', ))
|
|
598
599
|
|
|
600
|
+
elif status.command == 'set_info':
|
|
601
|
+
path_in_settings = status.attribute[0]
|
|
602
|
+
param_as_xml = status.attribute[1]
|
|
603
|
+
param_dict = ioxml.XML_string_to_parameter(param_as_xml)[0]
|
|
604
|
+
param_tmp = Parameter.create(**param_dict)
|
|
605
|
+
param = self.settings.child('move_settings', *path_in_settings[1:])
|
|
606
|
+
param.restoreState(param_tmp.saveState())
|
|
607
|
+
|
|
599
608
|
|
|
600
609
|
class DAQ_Move_Hardware(QObject):
|
|
601
610
|
"""
|
|
@@ -1106,6 +1106,14 @@ class DAQ_Viewer(ParameterControlModule):
|
|
|
1106
1106
|
elif status.command == LECOClientCommands.LECO_DISCONNECTED:
|
|
1107
1107
|
self.settings.child('main_settings', 'leco', 'leco_connected').setValue(False)
|
|
1108
1108
|
|
|
1109
|
+
elif status.command == 'set_info':
|
|
1110
|
+
path_in_settings = status.attribute[0]
|
|
1111
|
+
param_as_xml = status.attribute[1]
|
|
1112
|
+
param_dict = ioxml.XML_string_to_parameter(param_as_xml)[0]
|
|
1113
|
+
param_tmp = Parameter.create(**param_dict)
|
|
1114
|
+
param = self.settings.child('detector_settings', *path_in_settings[1:])
|
|
1115
|
+
param.restoreState(param_tmp.saveState())
|
|
1116
|
+
|
|
1109
1117
|
elif status.command == 'get_axis':
|
|
1110
1118
|
raise DeprecationWarning('Do not use this, the axis are in the data objects')
|
|
1111
1119
|
self.command_hardware.emit(
|
pymodaq/control_modules/utils.py
CHANGED
|
@@ -481,12 +481,6 @@ class ParameterControlModule(ParameterManager, ControlModule):
|
|
|
481
481
|
elif status.command == 'Update_Status':
|
|
482
482
|
self.thread_status(status)
|
|
483
483
|
|
|
484
|
-
elif status.command == 'set_info':
|
|
485
|
-
param_dict = ioxml.XML_string_to_parameter(status.attribute[1])[0]
|
|
486
|
-
param_tmp = Parameter.create(**param_dict)
|
|
487
|
-
param = self.settings.child('move_settings', *status.attribute[0][1:])
|
|
488
|
-
|
|
489
|
-
param.restoreState(param_tmp.saveState())
|
|
490
484
|
else:
|
|
491
485
|
# not handled
|
|
492
486
|
return status
|
pymodaq/resources/VERSION
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
version = '4.2.
|
|
1
|
+
version = '4.2.3'
|
|
@@ -3,13 +3,13 @@ pymodaq/dashboard.py,sha256=4JK_I5M_KbGTyw18ws5cA9NwRersn7yAj_g6u2Ud4LA,64575
|
|
|
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=SOj8zsaN8xlAJzvxLao_f9Op0JhZ4eLJXH1GUAW8DnE,34977
|
|
7
7
|
pymodaq/control_modules/daq_move_ui.py,sha256=sviVOHASH4zjCIfhWzh42v35_n4JaUwUh-t5dFzQBo4,14530
|
|
8
|
-
pymodaq/control_modules/daq_viewer.py,sha256=
|
|
8
|
+
pymodaq/control_modules/daq_viewer.py,sha256=iNN5iEsuTdxB8sxjL4FtrRth_Cj5rDHrTt32SpLg7oM,57723
|
|
9
9
|
pymodaq/control_modules/daq_viewer_ui.py,sha256=FWP3jdIOR9vTgYqNaaodteGZ3dwgQ1GdWKrOpOAuSrs,15693
|
|
10
10
|
pymodaq/control_modules/mocks.py,sha256=hh_xSWp9g1UV3NAQVD9Ft9tNWfTsSvKU0OU0trgzP2w,1956
|
|
11
11
|
pymodaq/control_modules/move_utility_classes.py,sha256=8ePiQUQ7AEBnhn4CjWPjMmo10yLznGHF9-s28OzYWGg,33382
|
|
12
|
-
pymodaq/control_modules/utils.py,sha256=
|
|
12
|
+
pymodaq/control_modules/utils.py,sha256=5YdSwq_lFJm7IalYWe_Hn1U4LUoUmo1gedvV9UguU0Y,20016
|
|
13
13
|
pymodaq/control_modules/viewer_utility_classes.py,sha256=XHL0UOi9rfDezyePaiBhh4KiAH0qeogo3AipA9ei2O8,26509
|
|
14
14
|
pymodaq/examples/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
15
15
|
pymodaq/examples/custom_app.py,sha256=2wQR0hlPWjZrWK0abNF6ASv8iQyJqRn2CKnBa_nAgN4,10452
|
|
@@ -57,7 +57,7 @@ pymodaq/post_treatment/daq_measurement/daq_measurement_GUI.py,sha256=1u7hWDaiwsZ
|
|
|
57
57
|
pymodaq/post_treatment/daq_measurement/daq_measurement_GUI.ui,sha256=PyzbCWPMkh5oIYYteZczXyWMeHKW9EJmM1QlzXhnyTk,7037
|
|
58
58
|
pymodaq/post_treatment/daq_measurement/daq_measurement_main.py,sha256=CAKwcWMOD86aXB8mbdxOK7e8nZRos5d59FzDtqK1QoY,17093
|
|
59
59
|
pymodaq/post_treatment/daq_measurement/process_from_QtDesigner_DAQ_Measurement_GUI.bat,sha256=e1tu2A67MS9fk3jhriF6saQgRxWIucIvNW92iWXFP6E,164
|
|
60
|
-
pymodaq/resources/VERSION,sha256
|
|
60
|
+
pymodaq/resources/VERSION,sha256=-eqsm_sBWz4JP_b05Cj0u7ghujuS7ZINWWMe8JioixI,18
|
|
61
61
|
pymodaq/resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
62
62
|
pymodaq/resources/config_template.toml,sha256=klU5XH_2DBkF8QLIS-ZBQZCKfhwnrxyQHoG2meCEmEA,2889
|
|
63
63
|
pymodaq/resources/preset_default.xml,sha256=Dt8iWLwPPOPtcG00JCVP-mh-G7KC6B0YN8hd8RQdnNI,27256
|
|
@@ -431,8 +431,8 @@ pymodaq/utils/tcp_ip/__init__.py,sha256=1e_EK0AgvdoLAD_CSGGEaITZdy6OWCO7ih9IAIp7
|
|
|
431
431
|
pymodaq/utils/tcp_ip/mysocket.py,sha256=StAWj8dzHeMnbLj68Sel81uWFy-YkKVNRnVf7gXrESI,3452
|
|
432
432
|
pymodaq/utils/tcp_ip/serializer.py,sha256=HJziYyR_duhGBt8QikmqET8OH1uI5OAFgQu4w4jCQt4,25776
|
|
433
433
|
pymodaq/utils/tcp_ip/tcp_server_client.py,sha256=xIMTNgVW_rKK0yTi4FDNFLf85-Akb27Jz2LdrvOrP68,30660
|
|
434
|
-
pymodaq-4.2.
|
|
435
|
-
pymodaq-4.2.
|
|
436
|
-
pymodaq-4.2.
|
|
437
|
-
pymodaq-4.2.
|
|
438
|
-
pymodaq-4.2.
|
|
434
|
+
pymodaq-4.2.3.dist-info/METADATA,sha256=Zmf118dAje6aR45mOjzT89lRkCTHCFv4KGGKyIaQcVw,7665
|
|
435
|
+
pymodaq-4.2.3.dist-info/WHEEL,sha256=zEMcRr9Kr03x1ozGwg5v9NQBKn3kndp6LSoSlVg-jhU,87
|
|
436
|
+
pymodaq-4.2.3.dist-info/entry_points.txt,sha256=RAzdYNjvUT28I2eiCKki_g2NzXq0woWxhev6lwzwRv8,348
|
|
437
|
+
pymodaq-4.2.3.dist-info/licenses/LICENSE,sha256=VKOejxexXAe3XwfhAhcFGqeXQ12irxVHdeAojZwFEI8,1108
|
|
438
|
+
pymodaq-4.2.3.dist-info/RECORD,,
|
|
File without changes
|
|
File without changes
|
|
File without changes
|