Skip to content

Commit 5778b3f

Browse files
author
AdrianPotter
committed
Tweak output based on default settings
1 parent 8bdb3f2 commit 5778b3f

File tree

4 files changed

+322
-141
lines changed

4 files changed

+322
-141
lines changed

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

Lines changed: 139 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<show_grid>true</show_grid>
77
<auto_zoom_to_fit_all>true</auto_zoom_to_fit_all>
88
<scripts />
9-
<height>110</height>
9+
<height>170</height>
1010
<macros>
1111
<include_parent_macros>true</include_parent_macros>
1212
<PV_ROOT>$(P)$(KEIT2400)</PV_ROOT>
@@ -71,7 +71,7 @@ from org.csstudio.opibuilder.scriptUtil import ConsoleUtil
7171
</background_color>
7272
<width>765</width>
7373
<x>10</x>
74-
<name>Command</name>
74+
<name>Read</name>
7575
<y>10</y>
7676
<foreground_color>
7777
<color name="ISIS_OPI_Foreground" red="192" green="192" blue="192" />
@@ -271,4 +271,141 @@ $(pv_value)</tooltip>
271271
</font>
272272
</widget>
273273
</widget>
274+
<widget typeId="org.csstudio.opibuilder.widgets.groupingContainer" version="1.0">
275+
<border_style>13</border_style>
276+
<tooltip></tooltip>
277+
<rules />
278+
<enabled>true</enabled>
279+
<wuid>-56b28ff1:159bc8b3e86:-7f5c</wuid>
280+
<transparent>false</transparent>
281+
<lock_children>false</lock_children>
282+
<scripts />
283+
<height>63</height>
284+
<border_width>1</border_width>
285+
<scale_options>
286+
<width_scalable>true</width_scalable>
287+
<height_scalable>true</height_scalable>
288+
<keep_wh_ratio>false</keep_wh_ratio>
289+
</scale_options>
290+
<macros>
291+
<include_parent_macros>true</include_parent_macros>
292+
</macros>
293+
<visible>true</visible>
294+
<border_color>
295+
<color name="ISIS_GroupBox_Border_NEW" red="0" green="128" blue="255" />
296+
</border_color>
297+
<widget_type>Grouping Container</widget_type>
298+
<background_color>
299+
<color name="ISIS_OPI_Background" red="240" green="240" blue="240" />
300+
</background_color>
301+
<width>765</width>
302+
<x>10</x>
303+
<name>Write</name>
304+
<y>100</y>
305+
<foreground_color>
306+
<color name="ISIS_OPI_Foreground" red="192" green="192" blue="192" />
307+
</foreground_color>
308+
<actions hook="false" hook_all="false" />
309+
<show_scrollbar>true</show_scrollbar>
310+
<font>
311+
<opifont.name fontName="Segoe UI" height="9" style="0">ISIS_GroupBox_NEW</opifont.name>
312+
</font>
313+
<widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0">
314+
<border_style>0</border_style>
315+
<tooltip></tooltip>
316+
<horizontal_alignment>2</horizontal_alignment>
317+
<rules />
318+
<enabled>true</enabled>
319+
<wuid>-48159ee9:1567f536160:-5c7e</wuid>
320+
<transparent>false</transparent>
321+
<auto_size>false</auto_size>
322+
<text>Input:</text>
323+
<scripts />
324+
<height>20</height>
325+
<border_width>1</border_width>
326+
<scale_options>
327+
<width_scalable>true</width_scalable>
328+
<height_scalable>true</height_scalable>
329+
<keep_wh_ratio>false</keep_wh_ratio>
330+
</scale_options>
331+
<visible>true</visible>
332+
<vertical_alignment>1</vertical_alignment>
333+
<border_color>
334+
<color name="ISIS_Border" red="0" green="0" blue="0" />
335+
</border_color>
336+
<widget_type>Label</widget_type>
337+
<wrap_words>true</wrap_words>
338+
<background_color>
339+
<color name="ISIS_Label_Background" red="240" green="240" blue="240" />
340+
</background_color>
341+
<width>49</width>
342+
<x>6</x>
343+
<name>InputLabel</name>
344+
<y>6</y>
345+
<foreground_color>
346+
<color name="ISIS_Standard_Text" red="0" green="0" blue="0" />
347+
</foreground_color>
348+
<actions hook="false" hook_all="false" />
349+
<show_scrollbar>false</show_scrollbar>
350+
<font>
351+
<opifont.name fontName="Segoe UI" height="9" style="1">ISIS_Label_NEW</opifont.name>
352+
</font>
353+
</widget>
354+
<widget typeId="org.csstudio.opibuilder.widgets.TextInput" version="1.0">
355+
<precision>0</precision>
356+
<tooltip>$(pv_name)
357+
$(pv_value)</tooltip>
358+
<horizontal_alignment>0</horizontal_alignment>
359+
<rules />
360+
<pv_value />
361+
<auto_size>false</auto_size>
362+
<text>0.0</text>
363+
<rotation_angle>0.0</rotation_angle>
364+
<show_units>true</show_units>
365+
<height>20</height>
366+
<multiline_input>false</multiline_input>
367+
<border_width>1</border_width>
368+
<visible>true</visible>
369+
<pv_name>$(PV_ROOT):GEN:SP</pv_name>
370+
<selector_type>0</selector_type>
371+
<border_color>
372+
<color name="ISIS_Border" red="0" green="0" blue="0" />
373+
</border_color>
374+
<precision_from_pv>true</precision_from_pv>
375+
<widget_type>Text Input</widget_type>
376+
<confirm_message></confirm_message>
377+
<name>InputSP</name>
378+
<actions hook="false" hook_all="false" />
379+
<border_style>3</border_style>
380+
<forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
381+
<enabled>true</enabled>
382+
<wuid>-48159ee9:1567f536160:-5a01</wuid>
383+
<transparent>false</transparent>
384+
<scripts />
385+
<border_alarm_sensitive>false</border_alarm_sensitive>
386+
<scale_options>
387+
<width_scalable>true</width_scalable>
388+
<height_scalable>true</height_scalable>
389+
<keep_wh_ratio>false</keep_wh_ratio>
390+
</scale_options>
391+
<vertical_alignment>1</vertical_alignment>
392+
<backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
393+
<format_type>0</format_type>
394+
<limits_from_pv>false</limits_from_pv>
395+
<background_color>
396+
<color name="ISIS_Textbox_Background" red="255" green="255" blue="255" />
397+
</background_color>
398+
<width>673</width>
399+
<x>60</x>
400+
<y>6</y>
401+
<maximum>1.7976931348623157E308</maximum>
402+
<foreground_color>
403+
<color name="ISIS_Standard_Text" red="0" green="0" blue="0" />
404+
</foreground_color>
405+
<minimum>-1.7976931348623157E308</minimum>
406+
<font>
407+
<opifont.name fontName="Segoe UI" height="9" style="0">ISIS_Value_NEW</opifont.name>
408+
</font>
409+
</widget>
410+
</widget>
274411
</display>

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ from org.csstudio.opibuilder.scriptUtil import ConsoleUtil
242242
<tooltip></tooltip>
243243
<rules />
244244
<enabled>true</enabled>
245-
<wuid>-e89b52e:15993563eb1:-76ef</wuid>
245+
<wuid>152945a9:159bcb97ba7:-7ef1</wuid>
246246
<auto_size>false</auto_size>
247247
<scripts />
248248
<height>482</height>
@@ -254,7 +254,6 @@ from org.csstudio.opibuilder.scriptUtil import ConsoleUtil
254254
</scale_options>
255255
<macros>
256256
<include_parent_macros>true</include_parent_macros>
257-
<EURO_NUM>2</EURO_NUM>
258257
</macros>
259258
<visible>true</visible>
260259
<group_name></group_name>
@@ -336,7 +335,6 @@ from org.csstudio.opibuilder.scriptUtil import ConsoleUtil
336335
</scale_options>
337336
<macros>
338337
<include_parent_macros>true</include_parent_macros>
339-
<EURO_NUM>2</EURO_NUM>
340338
</macros>
341339
<visible>true</visible>
342340
<group_name></group_name>
@@ -418,7 +416,6 @@ from org.csstudio.opibuilder.scriptUtil import ConsoleUtil
418416
</scale_options>
419417
<macros>
420418
<include_parent_macros>true</include_parent_macros>
421-
<EURO_NUM>3</EURO_NUM>
422419
</macros>
423420
<visible>true</visible>
424421
<group_name></group_name>

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ $(trace_0_y_pv_value)</tooltip>
235235
<color name="ISIS_OPI_Background" red="240" green="240" blue="240" />
236236
</background_color>
237237
<width>217</width>
238-
<x>360</x>
238+
<x>390</x>
239239
<name>Controls</name>
240240
<y>390</y>
241241
<foreground_color>
@@ -512,7 +512,7 @@ $(pv_value)</tooltip>
512512
<background_color>
513513
<color name="ISIS_OPI_Background" red="240" green="240" blue="240" />
514514
</background_color>
515-
<width>151</width>
515+
<width>181</width>
516516
<x>210</x>
517517
<name>Readings</name>
518518
<y>390</y>
@@ -641,11 +641,11 @@ $(pv_value)</tooltip>
641641
<widget_type>Text Update</widget_type>
642642
<backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
643643
<wrap_words>false</wrap_words>
644-
<format_type>0</format_type>
644+
<format_type>6</format_type>
645645
<background_color>
646646
<color name="ISIS_Label_Background" red="240" green="240" blue="240" />
647647
</background_color>
648-
<width>64</width>
648+
<width>97</width>
649649
<x>54</x>
650650
<name>VoltageRBV</name>
651651
<y>6</y>
@@ -692,11 +692,11 @@ $(pv_value)</tooltip>
692692
<widget_type>Text Update</widget_type>
693693
<backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
694694
<wrap_words>false</wrap_words>
695-
<format_type>0</format_type>
695+
<format_type>6</format_type>
696696
<background_color>
697697
<color name="ISIS_Label_Background" red="240" green="240" blue="240" />
698698
</background_color>
699-
<width>64</width>
699+
<width>97</width>
700700
<x>54</x>
701701
<name>CurrentRBV</name>
702702
<y>36</y>

0 commit comments

Comments
 (0)