Skip to content

Commit 5d54efb

Browse files
AdrianPotterAdrianPotter
authored
Merge pull request #635 from ISISComputingGroup/Ticket2707_Add_IOC_SAMSM300_Release_4p2p0
Ticket2707 add ioc samsm300 release 4p2p0
2 parents 326ff5f + a23c9ba commit 5d54efb

File tree

12 files changed

+2292
-16
lines changed

12 files changed

+2292
-16
lines changed

‎base/uk.ac.stfc.isis.ibex.devicescreens/src/uk/ac/stfc/isis/ibex/devicescreens/components/ComponentType.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,11 @@ public enum ComponentType {
121121
/** Helium Level Gauge.*/
122122
HE_LEVEL_GAUGE,
123123
/** LET oscillating collimator. */
124-
OSCILLATING_COLLIMATOR;
124+
OSCILLATING_COLLIMATOR,
125+
/** SM300 sample changer.*/
126+
SM300_SAMPLE_CHANGER,
127+
/** Motion setpoints.*/
128+
MOTION_SET_POINTS;
125129

126130

127131
private Target target;

‎base/uk.ac.stfc.isis.ibex.opis/resources/opi_info.xml‎

Lines changed: 42 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
1+
<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
22
<descriptions>
33
<opis>
44
<entry>
@@ -1196,7 +1196,7 @@
11961196
<entry>
11971197
<key>SKF MB350 Chopper</key>
11981198
<value>
1199-
<categories>
1199+
<categories>
12001200
<category>Choppers</category>
12011201
</categories>
12021202
<type>CHOPPER</type>
@@ -1212,16 +1212,13 @@
12121212
</entry>
12131213
<entry>
12141214
<key>HLG</key>
1215-
<categories>
1216-
<category>Gas handling systems</category>
1217-
</categories>
12181215
<value>
12191216
<categories>
12201217
<category>Cryogenics</category>
12211218
</categories>
12221219
<type>HE_LEVEL_GAUGE</type>
12231220
<path>hlg.opi</path>
1224-
<description>The OPI for the helium level guage.</description>
1221+
<description>The OPI for the helium level gauge.</description>
12251222
<macros>
12261223
<macro>
12271224
<name>HLG</name>
@@ -1232,10 +1229,10 @@
12321229
</entry>
12331230
<entry>
12341231
<key>OscillatingCollimator</key>
1235-
<categories>
1236-
<category>Miscellaneous motion control</category>
1237-
</categories>
12381232
<value>
1233+
<categories>
1234+
<category>Miscellaneous motion control</category>
1235+
</categories>
12391236
<type>OSCILLATING_COLLIMATOR</type>
12401237
<path>OscillatingCollimator/OscillatingCollimator.opi</path>
12411238
<description>The OPI for the LET oscillating collimator.</description>
@@ -1247,5 +1244,41 @@
12471244
</macros>
12481245
</value>
12491246
</entry>
1247+
<entry>
1248+
<key>Motion Set Point</key>
1249+
<value>
1250+
<categories>
1251+
<category>Miscellaneous motion control</category>
1252+
<category>Sample stacks and goniometers</category>
1253+
<category>Sample changers</category>
1254+
</categories>
1255+
<type>MOTION_SET_POINTS</type>
1256+
<path>stage/motion_setpoint.opi</path>
1257+
<description>The OPI for motion setpoints</description>
1258+
<macros>
1259+
<macro>
1260+
<name>MOTION_SET_POINT</name>
1261+
<description>The motion setpoint to display (e.g. LKUP:SAMPLE)</description>
1262+
</macro>
1263+
</macros>
1264+
</value>
1265+
</entry>
1266+
<entry>
1267+
<key>SM300 Sample Changer</key>
1268+
<value>
1269+
<categories>
1270+
<category>Sample changers</category>
1271+
</categories>
1272+
<type>SM300_SAMPLE_CHANGER</type>
1273+
<path>sample_stack/sm300sampos.opi</path>
1274+
<description>The OPI for the SM300 Sample changer</description>
1275+
<macros>
1276+
<macro>
1277+
<name>MOTION_SET_POINT</name>
1278+
<description>The prefix of the Motion set points being used(e.g. LKUP:SAMPLE)</description>
1279+
</macro>
1280+
</macros>
1281+
</value>
1282+
</entry>
12501283
</opis>
12511284
</descriptions>

‎base/uk.ac.stfc.isis.ibex.opis/resources/sample_stack/sm300sampos.opi‎

Lines changed: 204 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,204 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<display typeId="org.csstudio.opibuilder.Display" version="1.0">
3+
<show_close_button>true</show_close_button>
4+
<rules />
5+
<wuid>450885f3:157944e4d4b:-797d</wuid>
6+
<show_grid>true</show_grid>
7+
<auto_zoom_to_fit_all>false</auto_zoom_to_fit_all>
8+
<scripts />
9+
<height>600</height>
10+
<macros>
11+
<include_parent_macros>true</include_parent_macros>
12+
<PV_ROOT>$(P)$(REPLACE_WITH_IOC_NAME_MACRO)</PV_ROOT>
13+
</macros>
14+
<boy_version>3.1.4.201301231545</boy_version>
15+
<show_edit_range>true</show_edit_range>
16+
<widget_type>Display</widget_type>
17+
<auto_scale_widgets>
18+
<auto_scale_widgets>false</auto_scale_widgets>
19+
<min_width>-1</min_width>
20+
<min_height>-1</min_height>
21+
</auto_scale_widgets>
22+
<background_color>
23+
<color name="ISIS_OPI_Background" red="240" green="240" blue="240" />
24+
</background_color>
25+
<width>800</width>
26+
<x>-1</x>
27+
<name>$(NAME)</name>
28+
<grid_space>6</grid_space>
29+
<show_ruler>true</show_ruler>
30+
<y>-1</y>
31+
<snap_to_geometry>true</snap_to_geometry>
32+
<foreground_color>
33+
<color name="ISIS_OPI_Foreground" red="192" green="192" blue="192" />
34+
</foreground_color>
35+
<actions hook="false" hook_all="false" />
36+
<widget typeId="org.csstudio.opibuilder.widgets.linkingContainer" version="1.0">
37+
<opi_file>../stage/motion_setpoint.opi</opi_file>
38+
<border_style>0</border_style>
39+
<tooltip></tooltip>
40+
<rules />
41+
<enabled>true</enabled>
42+
<wuid>-4c24f7a9:157d349e44c:-7f89</wuid>
43+
<auto_size>true</auto_size>
44+
<scripts />
45+
<height>464</height>
46+
<border_width>1</border_width>
47+
<scale_options>
48+
<width_scalable>true</width_scalable>
49+
<height_scalable>true</height_scalable>
50+
<keep_wh_ratio>false</keep_wh_ratio>
51+
</scale_options>
52+
<macros>
53+
<include_parent_macros>true</include_parent_macros>
54+
</macros>
55+
<visible>true</visible>
56+
<group_name></group_name>
57+
<border_color>
58+
<color name="ISIS_GroupBox_Border_NEW" red="0" green="128" blue="255" />
59+
</border_color>
60+
<widget_type>Linking Container</widget_type>
61+
<background_color>
62+
<color red="240" green="240" blue="240" />
63+
</background_color>
64+
<zoom_to_fit>false</zoom_to_fit>
65+
<width>416</width>
66+
<x>6</x>
67+
<name>Moition Setpoints</name>
68+
<y>6</y>
69+
<foreground_color>
70+
<color name="ISIS_OPI_Foreground" red="192" green="192" blue="192" />
71+
</foreground_color>
72+
<actions hook="false" hook_all="false" />
73+
<font>
74+
<opifont.name fontName="Segoe UI" height="9" style="0">ISIS_GroupBox_NEW</opifont.name>
75+
</font>
76+
</widget>
77+
<widget typeId="org.csstudio.opibuilder.widgets.groupingContainer" version="1.0">
78+
<border_style>13</border_style>
79+
<tooltip></tooltip>
80+
<rules />
81+
<enabled>true</enabled>
82+
<wuid>-4805f29c:1579922e8d6:-7f64</wuid>
83+
<transparent>false</transparent>
84+
<lock_children>false</lock_children>
85+
<scripts />
86+
<height>103</height>
87+
<border_width>1</border_width>
88+
<scale_options>
89+
<width_scalable>true</width_scalable>
90+
<height_scalable>true</height_scalable>
91+
<keep_wh_ratio>false</keep_wh_ratio>
92+
</scale_options>
93+
<macros>
94+
<include_parent_macros>true</include_parent_macros>
95+
</macros>
96+
<visible>true</visible>
97+
<border_color>
98+
<color name="ISIS_GroupBox_Border_NEW" red="0" green="128" blue="255" />
99+
</border_color>
100+
<widget_type>Grouping Container</widget_type>
101+
<background_color>
102+
<color name="ISIS_OPI_Background" red="240" green="240" blue="240" />
103+
</background_color>
104+
<width>132</width>
105+
<x>421</x>
106+
<name>Actions</name>
107+
<y>84</y>
108+
<foreground_color>
109+
<color name="ISIS_OPI_Foreground" red="192" green="192" blue="192" />
110+
</foreground_color>
111+
<actions hook="false" hook_all="false" />
112+
<show_scrollbar>true</show_scrollbar>
113+
<font>
114+
<opifont.name fontName="Segoe UI" height="9" style="0">ISIS_GroupBox_NEW</opifont.name>
115+
</font>
116+
<widget typeId="org.csstudio.opibuilder.widgets.NativeButton" version="1.0">
117+
<toggle_button>false</toggle_button>
118+
<border_style>0</border_style>
119+
<forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
120+
<tooltip>$(pv_name)
121+
$(pv_value)</tooltip>
122+
<push_action_index>0</push_action_index>
123+
<rules />
124+
<enabled>true</enabled>
125+
<wuid>-30237fc9:157958fdf6d:-7c14</wuid>
126+
<pv_value />
127+
<text>Initialise</text>
128+
<scripts />
129+
<border_alarm_sensitive>false</border_alarm_sensitive>
130+
<height>28</height>
131+
<border_width>1</border_width>
132+
<scale_options>
133+
<width_scalable>true</width_scalable>
134+
<height_scalable>true</height_scalable>
135+
<keep_wh_ratio>false</keep_wh_ratio>
136+
</scale_options>
137+
<image></image>
138+
<visible>true</visible>
139+
<pv_name>$(P)$(MOTION_SET_POINT):DEV:RESET_AND_HOME</pv_name>
140+
<border_color>
141+
<color name="ISIS_Border" red="0" green="0" blue="0" />
142+
</border_color>
143+
<widget_type>Button</widget_type>
144+
<width>90</width>
145+
<x>6</x>
146+
<name>Button_1</name>
147+
<y>7</y>
148+
<foreground_color>
149+
<color name="ISIS_Standard_Text" red="0" green="0" blue="0" />
150+
</foreground_color>
151+
<actions hook="false" hook_all="false">
152+
<action type="WRITE_PV">
153+
<pv_name>$(pv_name)</pv_name>
154+
<value>1</value>
155+
<timeout>10</timeout>
156+
<description></description>
157+
</action>
158+
</actions>
159+
<font>
160+
<opifont.name fontName="Segoe UI" height="9" style="0">ISIS_Button_NEW</opifont.name>
161+
</font>
162+
</widget>
163+
<widget typeId="org.csstudio.opibuilder.widgets.NativeButton" version="1.0">
164+
<toggle_button>false</toggle_button>
165+
<border_style>0</border_style>
166+
<forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
167+
<tooltip>$(pv_name)
168+
$(pv_value)</tooltip>
169+
<push_action_index>0</push_action_index>
170+
<rules />
171+
<enabled>true</enabled>
172+
<wuid>1ee7c3b8:160e4984431:-7d19</wuid>
173+
<pv_value />
174+
<text>Disconnect</text>
175+
<scripts />
176+
<border_alarm_sensitive>false</border_alarm_sensitive>
177+
<height>28</height>
178+
<border_width>1</border_width>
179+
<scale_options>
180+
<width_scalable>true</width_scalable>
181+
<height_scalable>true</height_scalable>
182+
<keep_wh_ratio>false</keep_wh_ratio>
183+
</scale_options>
184+
<image></image>
185+
<visible>true</visible>
186+
<pv_name>$(P)$(MOTION_SET_POINT):DEV:DISCONNECT</pv_name>
187+
<border_color>
188+
<color name="ISIS_Border" red="0" green="0" blue="0" />
189+
</border_color>
190+
<widget_type>Button</widget_type>
191+
<width>90</width>
192+
<x>6</x>
193+
<name>Button_1</name>
194+
<y>42</y>
195+
<foreground_color>
196+
<color name="ISIS_Standard_Text" red="0" green="0" blue="0" />
197+
</foreground_color>
198+
<actions hook="false" hook_all="false" />
199+
<font>
200+
<opifont.name fontName="Segoe UI" height="9" style="0">ISIS_Button_NEW</opifont.name>
201+
</font>
202+
</widget>
203+
</widget>
204+
</display>

‎base/uk.ac.stfc.isis.ibex.opis/resources/stage/listPosns.py‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,14 @@
55

66
targetPV = display.getWidget('SetPointText').getPV()
77
sourceBtn = display.getWidget('sourceBtn')
8-
sourcePV = sourceBtn.getPV()
98

109
menu = display.getWidget('SetPosnBtn')
11-
12-
values = sourcePV.getValue().getData()
10+
value = pvs[0].getValue()
11+
12+
if value is None:
13+
values = ["No positions", "END"]
14+
else:
15+
values = value.getData()
1316
#ConsoleUtil.writeInfo('count: ' + str(len(values)))
1417

1518
actionList = menu.getPropertyValue('actions').getActionsList()

0 commit comments

Comments
 (0)