Skip to content

Commit 7168060

Browse files
pheestpheest
authored
Merge pull request #1514 from ISISComputingGroup/Ticket6100_fermi_chopper_support
Ticket6100
2 parents d5c4a2b + a55d826 commit 7168060

File tree

3 files changed

+1787
-1743
lines changed

3 files changed

+1787
-1743
lines changed

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

Lines changed: 87 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -42,64 +42,6 @@ from org.csstudio.opibuilder.scriptUtil import ConsoleUtil
4242
<wuid>-336ad6f:141c65e96ed:-7fff</wuid>
4343
<x>0</x>
4444
<y>0</y>
45-
<widget typeId="org.csstudio.opibuilder.widgets.TextInput" version="2.0.0">
46-
<actions hook="false" hook_all="false" />
47-
<alarm_pulsing>false</alarm_pulsing>
48-
<auto_size>false</auto_size>
49-
<backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
50-
<background_color>
51-
<color name="ISIS_Title_Background" red="255" green="255" blue="255" />
52-
</background_color>
53-
<border_alarm_sensitive>false</border_alarm_sensitive>
54-
<border_color>
55-
<color name="ISIS_Border" red="0" green="0" blue="0" />
56-
</border_color>
57-
<border_style>1</border_style>
58-
<border_width>1</border_width>
59-
<confirm_message></confirm_message>
60-
<enabled>true</enabled>
61-
<font>
62-
<opifont.name fontName="Arial" height="18" style="1" pixels="false">ISIS_Header1</opifont.name>
63-
</font>
64-
<forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
65-
<foreground_color>
66-
<color name="ISIS_Standard_Text" red="0" green="0" blue="0" />
67-
</foreground_color>
68-
<format_type>0</format_type>
69-
<height>40</height>
70-
<horizontal_alignment>1</horizontal_alignment>
71-
<limits_from_pv>false</limits_from_pv>
72-
<maximum>1.7976931348623157E308</maximum>
73-
<minimum>-1.7976931348623157E308</minimum>
74-
<multiline_input>false</multiline_input>
75-
<name>SKF G5 Chopper Controllers</name>
76-
<next_focus>0</next_focus>
77-
<password_input>false</password_input>
78-
<precision>0</precision>
79-
<precision_from_pv>true</precision_from_pv>
80-
<pv_name></pv_name>
81-
<pv_value />
82-
<read_only>true</read_only>
83-
<rules />
84-
<scale_options>
85-
<width_scalable>true</width_scalable>
86-
<height_scalable>true</height_scalable>
87-
<keep_wh_ratio>false</keep_wh_ratio>
88-
</scale_options>
89-
<scripts />
90-
<show_native_border>true</show_native_border>
91-
<show_units>true</show_units>
92-
<style>1</style>
93-
<text>SKF G5 Chopper Controllers</text>
94-
<tooltip>$(pv_name)
95-
$(pv_value)</tooltip>
96-
<visible>true</visible>
97-
<widget_type>Text Input</widget_type>
98-
<width>350</width>
99-
<wuid>-336ad6f:141c65e96ed:-7fc4</wuid>
100-
<x>5</x>
101-
<y>5</y>
102-
</widget>
10345
<widget typeId="org.csstudio.opibuilder.widgets.tab" version="1.0.0">
10446
<actions hook="false" hook_all="false" />
10547
<active_tab>0</active_tab>
@@ -207,8 +149,8 @@ $(pv_value)</tooltip>
207149
<widget_type>Tabbed Container</widget_type>
208150
<width>800</width>
209151
<wuid>-79218abf:1443f89c4ee:-7cb5</wuid>
210-
<x>0</x>
211-
<y>50</y>
152+
<x>5</x>
153+
<y>80</y>
212154
<widget typeId="org.csstudio.opibuilder.widgets.groupingContainer" version="1.0.0">
213155
<actions hook="false" hook_all="false" />
214156
<background_color>
@@ -243,7 +185,7 @@ $(pv_value)</tooltip>
243185
<show_scrollbar>true</show_scrollbar>
244186
<tooltip></tooltip>
245187
<transparent>true</transparent>
246-
<visible>false</visible>
188+
<visible>true</visible>
247189
<widget_type>Grouping Container</widget_type>
248190
<width>798</width>
249191
<wuid>-79218abf:1443f89c4ee:-7cb4</wuid>
@@ -653,7 +595,7 @@ $(pv_value)</tooltip>
653595
<show_scrollbar>true</show_scrollbar>
654596
<tooltip></tooltip>
655597
<transparent>true</transparent>
656-
<visible>true</visible>
598+
<visible>false</visible>
657599
<widget_type>Grouping Container</widget_type>
658600
<width>798</width>
659601
<wuid>6f199733:17e6cf01588:-7efd</wuid>
@@ -747,6 +689,7 @@ $(pv_value)</tooltip>
747689
<pv trig="true">$(PV_ROOT)_03:READY</pv>
748690
<pv trig="true">$(PV_ROOT)_04:READY</pv>
749691
<pv trig="true">$(PV_ROOT)_05:READY</pv>
692+
<pv trig="true">$(PV_ROOT)_06:READY</pv>
750693
</path>
751694
</scripts>
752695
<show_units>true</show_units>
@@ -803,4 +746,86 @@ $(pv_value)</tooltip>
803746
<x>0</x>
804747
<y>12</y>
805748
</widget>
749+
<widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
750+
<actions hook="false" hook_all="false" />
751+
<auto_size>false</auto_size>
752+
<background_color>
753+
<color name="ISIS_Title_Background_NEW" red="240" green="240" blue="240" />
754+
</background_color>
755+
<border_color>
756+
<color name="ISIS_Border" red="0" green="0" blue="0" />
757+
</border_color>
758+
<border_style>0</border_style>
759+
<border_width>1</border_width>
760+
<enabled>true</enabled>
761+
<font>
762+
<opifont.name fontName="Segoe UI" height="18" style="1" pixels="false">ISIS_Header1_NEW</opifont.name>
763+
</font>
764+
<foreground_color>
765+
<color name="ISIS_Standard_Text" red="0" green="0" blue="0" />
766+
</foreground_color>
767+
<height>37</height>
768+
<horizontal_alignment>0</horizontal_alignment>
769+
<name>Label</name>
770+
<rules />
771+
<scale_options>
772+
<width_scalable>true</width_scalable>
773+
<height_scalable>true</height_scalable>
774+
<keep_wh_ratio>false</keep_wh_ratio>
775+
</scale_options>
776+
<scripts />
777+
<show_scrollbar>false</show_scrollbar>
778+
<text>SKF G5 Chopper Controllers</text>
779+
<tooltip></tooltip>
780+
<transparent>false</transparent>
781+
<vertical_alignment>1</vertical_alignment>
782+
<visible>true</visible>
783+
<widget_type>Label</widget_type>
784+
<width>331</width>
785+
<wrap_words>true</wrap_words>
786+
<wuid>-6be08b9e:18506520459:-79a1</wuid>
787+
<x>5</x>
788+
<y>6</y>
789+
</widget>
790+
<widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
791+
<actions hook="false" hook_all="false" />
792+
<auto_size>false</auto_size>
793+
<background_color>
794+
<color name="ISIS_Label_Background" red="240" green="240" blue="240" />
795+
</background_color>
796+
<border_color>
797+
<color name="ISIS_Border" red="0" green="0" blue="0" />
798+
</border_color>
799+
<border_style>0</border_style>
800+
<border_width>1</border_width>
801+
<enabled>true</enabled>
802+
<font>
803+
<opifont.name fontName="Segoe UI" height="14" style="1" pixels="false">ISIS_Header2_NEW</opifont.name>
804+
</font>
805+
<foreground_color>
806+
<color name="ISIS_Standard_Text" red="0" green="0" blue="0" />
807+
</foreground_color>
808+
<height>37</height>
809+
<horizontal_alignment>0</horizontal_alignment>
810+
<name>Label_1</name>
811+
<rules />
812+
<scale_options>
813+
<width_scalable>true</width_scalable>
814+
<height_scalable>true</height_scalable>
815+
<keep_wh_ratio>false</keep_wh_ratio>
816+
</scale_options>
817+
<scripts />
818+
<show_scrollbar>false</show_scrollbar>
819+
<text>$(NAME)</text>
820+
<tooltip></tooltip>
821+
<transparent>false</transparent>
822+
<vertical_alignment>1</vertical_alignment>
823+
<visible>true</visible>
824+
<widget_type>Label</widget_type>
825+
<width>775</width>
826+
<wrap_words>true</wrap_words>
827+
<wuid>-6be08b9e:18506520459:-79a0</wuid>
828+
<x>5</x>
829+
<y>42</y>
830+
</widget>
806831
</display>

0 commit comments

Comments
 (0)