Skip to content

Commit

Permalink
replacing *values* in list parameter declaration by *limits*
Browse files Browse the repository at this point in the history
  • Loading branch information
@seb5g
seb5g committed Nov 12, 2021
1 parent 3308c94 commit abcfc89
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 14 deletions.
6 changes: 3 additions & 3 deletions src/pymodaq_plugins_newport/daq_move_plugins/daq_move_Conex.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,12 @@ class DAQ_Move_Conex(DAQ_Move_base):
params= [{'title': 'controller library:', 'name': 'conex_lib', 'type': 'browsepath', 'value': conex_path},
{'title': 'Controller Name:', 'name': 'controller_name', 'type': 'str', 'value': '', 'readonly': True},
{'title': 'Motor ID:', 'name': 'motor_id', 'type': 'str', 'value': '', 'readonly': True},
{'title': 'COM Port:', 'name': 'com_port', 'type': 'list', 'values': ports},
{'title': 'COM Port:', 'name': 'com_port', 'type': 'list', 'limits': ports},
{'title': 'Controller address:', 'name': 'controller_address', 'type': 'int', 'value': 1, 'default': 1, 'min': 1},
{'title': 'MultiAxes:', 'name': 'multiaxes', 'type': 'group','visible':is_multiaxes, 'children':[
{'title': 'is Multiaxes:', 'name': 'ismultiaxes', 'type': 'bool', 'value': is_multiaxes, 'default': False},
{'title': 'Status:', 'name': 'multi_status', 'type': 'list', 'value': 'Master', 'values': ['Master','Slave']},
{'title': 'Axis:', 'name': 'axis', 'type': 'list', 'values':stage_names},
{'title': 'Status:', 'name': 'multi_status', 'type': 'list', 'value': 'Master', 'limits': ['Master','Slave']},
{'title': 'Axis:', 'name': 'axis', 'type': 'list', 'limits':stage_names},

]}]+comon_parameters

Expand Down
8 changes: 4 additions & 4 deletions src/pymodaq_plugins_newport/daq_move_plugins/daq_move_Newport_AGUC8.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,14 +48,14 @@ class DAQ_Move_Newport_AGUC8(DAQ_Move_base):
port = 'COM6' if 'COM6' in ports else ports[0] if len(ports) > 0 else ''

params = [
{'title': 'COM Port:', 'name': 'com_port', 'type': 'list', 'values': ports, 'value': port},
{'title': 'COM Port:', 'name': 'com_port', 'type': 'list', 'limits': ports, 'value': port},
{'title': 'Firmware:', 'name': 'firmware', 'type': 'str', 'value': ''},
{'title': 'Channel:', 'name': 'channel', 'type': 'list', 'values': channel_names},
{'title': 'Axis:', 'name': 'axis', 'type': 'list', 'values': axis_names},
{'title': 'Channel:', 'name': 'channel', 'type': 'list', 'limits': channel_names},
{'title': 'Axis:', 'name': 'axis', 'type': 'list', 'limits': axis_names},
{'title': 'Sleep time (s):', 'name': 'sleep_time', 'type': 'float', 'value': 0.25},
{'title': 'MultiAxes:', 'name': 'multiaxes', 'type': 'group', 'visible': is_multiaxes, 'children': [
{'title': 'is Multiaxes:', 'name': 'ismultiaxes','type': 'bool', 'value': is_multiaxes},
{'title': 'Status:', 'name': 'multi_status', 'type': 'list', 'values': ['Master', 'Slave']},
{'title': 'Status:', 'name': 'multi_status', 'type': 'list', 'limits': ['Master', 'Slave']},
]}
] + comon_parameters

Expand Down
8 changes: 4 additions & 4 deletions src/pymodaq_plugins_newport/daq_move_plugins/daq_move_Newport_AGUC8low.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,14 +48,14 @@ class DAQ_Move_Newport_AGUC8low(DAQ_Move_base):
port = 'COM9' if 'COM9' in ports else ports[0] if len(ports) > 0 else ''

params = [
{'title': 'COM Port:', 'name': 'com_port', 'type': 'list', 'values': ports, 'value': port},
{'title': 'COM Port:', 'name': 'com_port', 'type': 'list', 'limits': ports, 'value': port},
{'title': 'Firmware:', 'name': 'firmware', 'type': 'str', 'value': ''},
{'title': 'Channel:', 'name': 'channel', 'type': 'list', 'values': channel_names},
{'title': 'Axis:', 'name': 'axis', 'type': 'list', 'values': axis_names},
{'title': 'Channel:', 'name': 'channel', 'type': 'list', 'limits': channel_names},
{'title': 'Axis:', 'name': 'axis', 'type': 'list', 'limits': axis_names},
{'title': 'Sleep time (s):', 'name': 'sleep_time', 'type': 'float', 'value': 0.25},
{'title': 'MultiAxes:', 'name': 'multiaxes', 'type': 'group', 'visible': is_multiaxes, 'children': [
{'title': 'is Multiaxes:', 'name': 'ismultiaxes','type': 'bool', 'value': is_multiaxes},
{'title': 'Status:', 'name': 'multi_status', 'type': 'list', 'values': ['Master', 'Slave']},
{'title': 'Status:', 'name': 'multi_status', 'type': 'list', 'limits': ['Master', 'Slave']},
]}
] + comon_parameters

Expand Down
6 changes: 3 additions & 3 deletions src/pymodaq_plugins_newport/daq_move_plugins/daq_move_Newport_ESP100.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@ class DAQ_Move_Newport_ESP100(DAQ_Move_base):

params= [{'title': 'Time interval (ms):', 'name': 'time_interval', 'type': 'int', 'value': 200},
{'title': 'Controller Info:', 'name': 'controller_id', 'type': 'text', 'value': '', 'readonly': True},
{'title': 'COM Port:', 'name': 'com_port', 'type': 'list', 'values': ports, 'value': port},
{'title': 'COM Port:', 'name': 'com_port', 'type': 'list', 'limits': ports, 'value': port},
{'title': 'Velocity:', 'name': 'velocity', 'type': 'float', 'value': 1.0},

{'title': 'MultiAxes:', 'name': 'multiaxes', 'type': 'group','visible':is_multiaxes, 'children':[
{'title': 'is Multiaxes:', 'name': 'ismultiaxes', 'type': 'bool', 'value': is_multiaxes, 'default': False},
{'title': 'Status:', 'name': 'multi_status', 'type': 'list', 'value': 'Master', 'values': ['Master', 'Slave']},
{'title': 'Axis:', 'name': 'axis', 'type': 'list', 'values': stage_names},
{'title': 'Status:', 'name': 'multi_status', 'type': 'list', 'value': 'Master', 'limits': ['Master', 'Slave']},
{'title': 'Axis:', 'name': 'axis', 'type': 'list', 'limits': stage_names},

]}]+comon_parameters

Expand Down

0 comments on commit abcfc89

Please sign in to comment.