Skip to content

Commit e8d03ff

Browse files
author
Rory Potter
authored
Merge pull request #783 from ISISComputingGroup/Ticket3406_monitor_oscilloscope_trace
Add OPI for muon kicker oscilloscope
2 parents 00e2239 + 4a0c73a commit e8d03ff

File tree

6 files changed

+350
-2
lines changed

6 files changed

+350
-2
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,8 @@ public enum ComponentType {
146146
KEYENCE,
147147
/** Generic Power Supply. */
148148
POWER_SUPPLY,
149+
/** Oscilloscope */
150+
OSCILLOSCOPE;
149151
/** Moxa ioLogik e1210 Remote I/O. */
150152
MOXA_1210;
151153

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

Lines changed: 327 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,327 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<display typeId="org.csstudio.opibuilder.Display" version="1.0.0">
3+
<actions hook="false" hook_all="false" />
4+
<auto_scale_widgets>
5+
<auto_scale_widgets>false</auto_scale_widgets>
6+
<min_width>-1</min_width>
7+
<min_height>-1</min_height>
8+
</auto_scale_widgets>
9+
<auto_zoom_to_fit_all>false</auto_zoom_to_fit_all>
10+
<background_color>
11+
<color name="ISIS_OPI_Background" red="240" green="240" blue="240" />
12+
</background_color>
13+
<boy_version>5.1.0.201707071649</boy_version>
14+
<foreground_color>
15+
<color name="ISIS_OPI_Foreground" red="192" green="192" blue="192" />
16+
</foreground_color>
17+
<grid_space>6</grid_space>
18+
<height>620</height>
19+
<macros>
20+
<include_parent_macros>false</include_parent_macros>
21+
</macros>
22+
<name>$(NAME)</name>
23+
<rules />
24+
<scripts />
25+
<show_close_button>true</show_close_button>
26+
<show_edit_range>true</show_edit_range>
27+
<show_grid>true</show_grid>
28+
<show_ruler>true</show_ruler>
29+
<snap_to_geometry>true</snap_to_geometry>
30+
<widget_type>Display</widget_type>
31+
<width>800</width>
32+
<wuid>-336ad6f:141c65e96ed:-7fff</wuid>
33+
<x>18</x>
34+
<y>30</y>
35+
<widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
36+
<actions hook="false" hook_all="false" />
37+
<auto_size>false</auto_size>
38+
<background_color>
39+
<color name="ISIS_Title_Background_NEW" red="240" green="240" blue="240" />
40+
</background_color>
41+
<border_color>
42+
<color name="ISIS_Border" red="0" green="0" blue="0" />
43+
</border_color>
44+
<border_style>0</border_style>
45+
<border_width>1</border_width>
46+
<enabled>true</enabled>
47+
<font>
48+
<opifont.name fontName="Segoe UI" height="18" style="1" pixels="false">ISIS_Header1_NEW</opifont.name>
49+
</font>
50+
<foreground_color>
51+
<color name="ISIS_Standard_Text" red="0" green="0" blue="0" />
52+
</foreground_color>
53+
<height>37</height>
54+
<horizontal_alignment>0</horizontal_alignment>
55+
<name>Label</name>
56+
<rules />
57+
<scale_options>
58+
<width_scalable>true</width_scalable>
59+
<height_scalable>true</height_scalable>
60+
<keep_wh_ratio>false</keep_wh_ratio>
61+
</scale_options>
62+
<scripts />
63+
<show_scrollbar>false</show_scrollbar>
64+
<text>TDS 3000 Trace ($(NAME))</text>
65+
<tooltip></tooltip>
66+
<transparent>false</transparent>
67+
<vertical_alignment>1</vertical_alignment>
68+
<visible>true</visible>
69+
<widget_type>Label</widget_type>
70+
<width>391</width>
71+
<wrap_words>true</wrap_words>
72+
<wuid>4fdc1aa2:158de06471b:-7a02</wuid>
73+
<x>6</x>
74+
<y>-12</y>
75+
</widget>
76+
<widget typeId="org.csstudio.opibuilder.widgets.tab" version="1.0.0">
77+
<actions hook="false" hook_all="false" />
78+
<active_tab>0</active_tab>
79+
<background_color>
80+
<color name="ISIS_OPI_Background" red="240" green="240" blue="240" />
81+
</background_color>
82+
<border_color>
83+
<color name="ISIS_Border" red="0" green="0" blue="0" />
84+
</border_color>
85+
<border_style>0</border_style>
86+
<border_width>1</border_width>
87+
<enabled>true</enabled>
88+
<foreground_color>
89+
<color name="ISIS_OPI_Background" red="240" green="240" blue="240" />
90+
</foreground_color>
91+
<height>649</height>
92+
<horizontal_tabs>true</horizontal_tabs>
93+
<macros>
94+
<include_parent_macros>true</include_parent_macros>
95+
</macros>
96+
<minimum_tab_height>10</minimum_tab_height>
97+
<name>Tabbed Container</name>
98+
<rules />
99+
<scale_options>
100+
<width_scalable>true</width_scalable>
101+
<height_scalable>true</height_scalable>
102+
<keep_wh_ratio>false</keep_wh_ratio>
103+
</scale_options>
104+
<scripts />
105+
<tab_0_background_color>
106+
<color name="ISIS_OPI_Background" red="240" green="240" blue="240" />
107+
</tab_0_background_color>
108+
<tab_0_enabled>true</tab_0_enabled>
109+
<tab_0_font>
110+
<opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">ISIS_TabTitle_NEW</opifont.name>
111+
</tab_0_font>
112+
<tab_0_foreground_color>
113+
<color name="ISIS_Standard_Text" red="0" green="0" blue="0" />
114+
</tab_0_foreground_color>
115+
<tab_0_icon_path></tab_0_icon_path>
116+
<tab_0_title>View trace</tab_0_title>
117+
<tab_1_background_color>
118+
<color name="ISIS_OPI_Background" red="240" green="240" blue="240" />
119+
</tab_1_background_color>
120+
<tab_1_enabled>true</tab_1_enabled>
121+
<tab_1_font>
122+
<opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">ISIS_TabTitle_NEW</opifont.name>
123+
</tab_1_font>
124+
<tab_1_foreground_color>
125+
<color name="ISIS_Standard_Text" red="0" green="0" blue="0" />
126+
</tab_1_foreground_color>
127+
<tab_1_icon_path></tab_1_icon_path>
128+
<tab_1_title>Configuration</tab_1_title>
129+
<tab_count>2</tab_count>
130+
<tooltip></tooltip>
131+
<visible>true</visible>
132+
<widget_type>Tabbed Container</widget_type>
133+
<width>684</width>
134+
<wuid>1a251549:1653d5a1794:-76d0</wuid>
135+
<x>6</x>
136+
<y>30</y>
137+
<widget typeId="org.csstudio.opibuilder.widgets.groupingContainer" version="1.0.0">
138+
<actions hook="false" hook_all="false" />
139+
<background_color>
140+
<color name="ISIS_OPI_Background" red="240" green="240" blue="240" />
141+
</background_color>
142+
<border_color>
143+
<color name="ISIS_Check_Border" red="0" green="128" blue="255" />
144+
</border_color>
145+
<border_style>0</border_style>
146+
<border_width>1</border_width>
147+
<enabled>true</enabled>
148+
<fc>false</fc>
149+
<font>
150+
<opifont.name fontName="Arial" height="9" style="0" pixels="false">ISIS_Label_Small</opifont.name>
151+
</font>
152+
<foreground_color>
153+
<color name="ISIS_OPI_Foreground" red="192" green="192" blue="192" />
154+
</foreground_color>
155+
<height>620</height>
156+
<lock_children>false</lock_children>
157+
<macros>
158+
<include_parent_macros>true</include_parent_macros>
159+
</macros>
160+
<name>View trace</name>
161+
<rules />
162+
<scale_options>
163+
<width_scalable>true</width_scalable>
164+
<height_scalable>true</height_scalable>
165+
<keep_wh_ratio>false</keep_wh_ratio>
166+
</scale_options>
167+
<scripts />
168+
<show_scrollbar>true</show_scrollbar>
169+
<tooltip></tooltip>
170+
<transparent>true</transparent>
171+
<visible>false</visible>
172+
<widget_type>Grouping Container</widget_type>
173+
<width>682</width>
174+
<wuid>1a251549:1653d5a1794:-76cf</wuid>
175+
<x>1</x>
176+
<y>1</y>
177+
<widget typeId="org.csstudio.opibuilder.widgets.webbrowser" version="1.0.0">
178+
<actions hook="false" hook_all="false" />
179+
<background_color>
180+
<color red="240" green="240" blue="240" />
181+
</background_color>
182+
<border_color>
183+
<color red="192" green="192" blue="192" />
184+
</border_color>
185+
<border_style>1</border_style>
186+
<border_width>1</border_width>
187+
<enabled>true</enabled>
188+
<foreground_color>
189+
<color red="192" green="192" blue="192" />
190+
</foreground_color>
191+
<height>504</height>
192+
<name>Web Browser</name>
193+
<rules />
194+
<scale_options>
195+
<width_scalable>false</width_scalable>
196+
<height_scalable>false</height_scalable>
197+
<keep_wh_ratio>false</keep_wh_ratio>
198+
</scale_options>
199+
<scripts />
200+
<show_toolbar>false</show_toolbar>
201+
<tooltip></tooltip>
202+
<url>$(IP)/Image.png</url>
203+
<visible>true</visible>
204+
<widget_type>Web Browser</widget_type>
205+
<width>679</width>
206+
<wuid>1a251549:1653d5a1794:-7c60</wuid>
207+
<x>0</x>
208+
<y>0</y>
209+
</widget>
210+
<widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
211+
<actions hook="false" hook_all="false" />
212+
<auto_size>false</auto_size>
213+
<background_color>
214+
<color name="ISIS_Label_Background" red="240" green="240" blue="240" />
215+
</background_color>
216+
<border_color>
217+
<color name="ISIS_Border" red="0" green="0" blue="0" />
218+
</border_color>
219+
<border_style>0</border_style>
220+
<border_width>1</border_width>
221+
<enabled>true</enabled>
222+
<font>
223+
<opifont.name fontName="Segoe UI" height="9" style="1" pixels="false">ISIS_Label_NEW</opifont.name>
224+
</font>
225+
<foreground_color>
226+
<color name="ISIS_Standard_Text" red="0" green="0" blue="0" />
227+
</foreground_color>
228+
<height>20</height>
229+
<horizontal_alignment>0</horizontal_alignment>
230+
<name>Ramp_file_label</name>
231+
<rules />
232+
<scale_options>
233+
<width_scalable>true</width_scalable>
234+
<height_scalable>true</height_scalable>
235+
<keep_wh_ratio>false</keep_wh_ratio>
236+
</scale_options>
237+
<scripts />
238+
<show_scrollbar>false</show_scrollbar>
239+
<text>To refresh the data shown on this screen, right click outside the image and select "Refresh OPI".</text>
240+
<tooltip></tooltip>
241+
<transparent>false</transparent>
242+
<vertical_alignment>1</vertical_alignment>
243+
<visible>true</visible>
244+
<widget_type>Label</widget_type>
245+
<width>661</width>
246+
<wrap_words>true</wrap_words>
247+
<wuid>1a251549:1653d5a1794:-78c4</wuid>
248+
<x>6</x>
249+
<y>510</y>
250+
</widget>
251+
</widget>
252+
<widget typeId="org.csstudio.opibuilder.widgets.groupingContainer" version="1.0.0">
253+
<actions hook="false" hook_all="false" />
254+
<background_color>
255+
<color name="ISIS_OPI_Background" red="240" green="240" blue="240" />
256+
</background_color>
257+
<border_color>
258+
<color name="ISIS_Check_Border" red="0" green="128" blue="255" />
259+
</border_color>
260+
<border_style>0</border_style>
261+
<border_width>1</border_width>
262+
<enabled>true</enabled>
263+
<fc>false</fc>
264+
<font>
265+
<opifont.name fontName="Arial" height="9" style="0" pixels="false">ISIS_Label_Small</opifont.name>
266+
</font>
267+
<foreground_color>
268+
<color name="ISIS_OPI_Foreground" red="192" green="192" blue="192" />
269+
</foreground_color>
270+
<height>620</height>
271+
<lock_children>false</lock_children>
272+
<macros>
273+
<include_parent_macros>true</include_parent_macros>
274+
</macros>
275+
<name>Configuration</name>
276+
<rules />
277+
<scale_options>
278+
<width_scalable>true</width_scalable>
279+
<height_scalable>true</height_scalable>
280+
<keep_wh_ratio>false</keep_wh_ratio>
281+
</scale_options>
282+
<scripts />
283+
<show_scrollbar>true</show_scrollbar>
284+
<tooltip></tooltip>
285+
<transparent>true</transparent>
286+
<visible>true</visible>
287+
<widget_type>Grouping Container</widget_type>
288+
<width>682</width>
289+
<wuid>1a251549:1653d5a1794:-76cb</wuid>
290+
<x>1</x>
291+
<y>1</y>
292+
<widget typeId="org.csstudio.opibuilder.widgets.webbrowser" version="1.0.0">
293+
<actions hook="false" hook_all="false" />
294+
<background_color>
295+
<color red="240" green="240" blue="240" />
296+
</background_color>
297+
<border_color>
298+
<color red="192" green="192" blue="192" />
299+
</border_color>
300+
<border_style>1</border_style>
301+
<border_width>1</border_width>
302+
<enabled>true</enabled>
303+
<foreground_color>
304+
<color red="192" green="192" blue="192" />
305+
</foreground_color>
306+
<height>619</height>
307+
<name>Web Browser</name>
308+
<rules />
309+
<scale_options>
310+
<width_scalable>false</width_scalable>
311+
<height_scalable>false</height_scalable>
312+
<keep_wh_ratio>false</keep_wh_ratio>
313+
</scale_options>
314+
<scripts />
315+
<show_toolbar>false</show_toolbar>
316+
<tooltip></tooltip>
317+
<url>$(IP)/Data.html</url>
318+
<visible>true</visible>
319+
<widget_type>Web Browser</widget_type>
320+
<width>679</width>
321+
<wuid>1a251549:1653d5a1794:-761a</wuid>
322+
<x>0</x>
323+
<y>0</y>
324+
</widget>
325+
</widget>
326+
</widget>
327+
</display>

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

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2505,6 +2505,23 @@
25052505
<macros>
25062506
</macros>
25072507
</value>
2508+
</entry>
2509+
<entry>
2510+
<key>TDS 3000 Trace</key>
2511+
<value>
2512+
<categories>
2513+
<category>Oscilloscopes</category>
2514+
</categories>
2515+
<type>OSCILLOSCOPE</type>
2516+
<path>TDS3000_trace.opi</path>
2517+
<description>The trace shown by a TDS 3000 series oscilloscope</description>
2518+
<macros>
2519+
<macro>
2520+
<name>IP</name>
2521+
<description>The IP address of the oscilloscope.</description>
2522+
</macro>
2523+
</macros>
2524+
</value>
25082525
</entry>
25092526
</opis>
25102527
</descriptions>

‎base/uk.ac.stfc.isis.ibex.ui.devicescreens/icons/components/oscilloscope.png‎

3.1 KB
Loading

‎base/uk.ac.stfc.isis.ibex.ui.devicescreens/icons/components/thumbs/oscilloscope_tb.png‎

675 Bytes
Loading

‎base/uk.ac.stfc.isis.ibex.ui.devicescreens/src/uk/ac/stfc/isis/ibex/ui/devicescreens/ComponentIcons.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,8 +161,10 @@ private static String getIconNameForType(ComponentType componentType) {
161161
return "syringe_pump";
162162
case KEYENCE:
163163
return "keyence";
164-
case MOXA_1210:
165-
return "moxa_1210";
164+
case OSCILLOSCOPE:
165+
return "oscilloscope";
166+
case MOXA_1210:
167+
return "moxa_1210";
166168
default:
167169
return "cog";
168170
}

0 commit comments

Comments
 (0)