Skip to content

Commit 8b52d70

Browse files
Tom-WillemsenJohn-Holt-Tessella
authored andcommitted
Review comments
1 parent 5262a7b commit 8b52d70

File tree

1 file changed

+170
-17
lines changed

1 file changed

+170
-17
lines changed

base/uk.ac.stfc.isis.ibex.opis/resources/couette_cell.opi

Lines changed: 170 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -664,7 +664,7 @@ pv.setValue(2)
664664
<background_color>
665665
<color name="ISIS_OPI_Background" red="240" green="240" blue="240" />
666666
</background_color>
667-
<width>277</width>
667+
<width>355</width>
668668
<x>6</x>
669669
<name>Velocity</name>
670670
<y>240</y>
@@ -704,8 +704,8 @@ pv.setValue(2)
704704
<background_color>
705705
<color name="ISIS_Label_Background" red="240" green="240" blue="240" />
706706
</background_color>
707-
<width>109</width>
708-
<x>6</x>
707+
<width>102</width>
708+
<x>0</x>
709709
<name>Label</name>
710710
<y>6</y>
711711
<foreground_color>
@@ -746,7 +746,7 @@ pv.setValue(2)
746746
<color name="ISIS_Label_Background" red="240" green="240" blue="240" />
747747
</background_color>
748748
<width>102</width>
749-
<x>13</x>
749+
<x>0</x>
750750
<name>Label_1</name>
751751
<y>30</y>
752752
<foreground_color>
@@ -786,8 +786,8 @@ pv.setValue(2)
786786
<background_color>
787787
<color name="ISIS_Label_Background" red="240" green="240" blue="240" />
788788
</background_color>
789-
<width>109</width>
790-
<x>6</x>
789+
<width>102</width>
790+
<x>0</x>
791791
<name>Label_15</name>
792792
<y>54</y>
793793
<foreground_color>
@@ -838,8 +838,8 @@ $(pv_value)</tooltip>
838838
<background_color>
839839
<color name="ISIS_Label_Background" red="240" green="240" blue="240" />
840840
</background_color>
841-
<width>85</width>
842-
<x>126</x>
841+
<width>103</width>
842+
<x>108</x>
843843
<name>Text Update_1</name>
844844
<y>54</y>
845845
<foreground_color>
@@ -879,8 +879,8 @@ $(pv_value)</tooltip>
879879
<background_color>
880880
<color name="ISIS_Textbox_Background" red="255" green="255" blue="255" />
881881
</background_color>
882-
<width>115</width>
883-
<x>126</x>
882+
<width>109</width>
883+
<x>216</x>
884884
<name>Combo</name>
885885
<y>26</y>
886886
<foreground_color>
@@ -935,8 +935,8 @@ $(pv_value)</tooltip>
935935
<background_color>
936936
<color name="ISIS_Textbox_Background" red="255" green="255" blue="255" />
937937
</background_color>
938-
<width>115</width>
939-
<x>126</x>
938+
<width>109</width>
939+
<x>216</x>
940940
<y>6</y>
941941
<maximum>1.7976931348623157E308</maximum>
942942
<foreground_color>
@@ -947,6 +947,108 @@ $(pv_value)</tooltip>
947947
<opifont.name fontName="Segoe UI" height="9" style="0">ISIS_Value_NEW</opifont.name>
948948
</font>
949949
</widget>
950+
<widget typeId="org.csstudio.opibuilder.widgets.TextUpdate" version="1.0">
951+
<border_style>0</border_style>
952+
<forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
953+
<precision>0</precision>
954+
<tooltip>$(pv_name)
955+
$(pv_value)</tooltip>
956+
<horizontal_alignment>0</horizontal_alignment>
957+
<rules />
958+
<enabled>true</enabled>
959+
<wuid>-58df6ed6:162e37c685d:-7ef2</wuid>
960+
<transparent>true</transparent>
961+
<pv_value />
962+
<auto_size>false</auto_size>
963+
<text>######</text>
964+
<rotation_angle>0.0</rotation_angle>
965+
<scripts />
966+
<border_alarm_sensitive>true</border_alarm_sensitive>
967+
<show_units>true</show_units>
968+
<height>20</height>
969+
<border_width>1</border_width>
970+
<scale_options>
971+
<width_scalable>true</width_scalable>
972+
<height_scalable>true</height_scalable>
973+
<keep_wh_ratio>false</keep_wh_ratio>
974+
</scale_options>
975+
<visible>true</visible>
976+
<pv_name>$(PV_ROOT):MOTOR:VEL:SP:RBV</pv_name>
977+
<vertical_alignment>1</vertical_alignment>
978+
<border_color>
979+
<color name="ISIS_Border" red="0" green="0" blue="0" />
980+
</border_color>
981+
<precision_from_pv>true</precision_from_pv>
982+
<widget_type>Text Update</widget_type>
983+
<backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
984+
<wrap_words>false</wrap_words>
985+
<format_type>0</format_type>
986+
<background_color>
987+
<color name="ISIS_Label_Background" red="240" green="240" blue="240" />
988+
</background_color>
989+
<width>103</width>
990+
<x>108</x>
991+
<name>Text Update_1</name>
992+
<y>6</y>
993+
<foreground_color>
994+
<color name="ISIS_Standard_Text" red="0" green="0" blue="0" />
995+
</foreground_color>
996+
<actions hook="false" hook_all="false" />
997+
<font>
998+
<opifont.name fontName="Segoe UI" height="9" style="0">ISIS_Value_NEW</opifont.name>
999+
</font>
1000+
</widget>
1001+
<widget typeId="org.csstudio.opibuilder.widgets.TextUpdate" version="1.0">
1002+
<border_style>0</border_style>
1003+
<forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
1004+
<precision>0</precision>
1005+
<tooltip>$(pv_name)
1006+
$(pv_value)</tooltip>
1007+
<horizontal_alignment>0</horizontal_alignment>
1008+
<rules />
1009+
<enabled>true</enabled>
1010+
<wuid>-58df6ed6:162e37c685d:-7eeb</wuid>
1011+
<transparent>true</transparent>
1012+
<pv_value />
1013+
<auto_size>false</auto_size>
1014+
<text>######</text>
1015+
<rotation_angle>0.0</rotation_angle>
1016+
<scripts />
1017+
<border_alarm_sensitive>true</border_alarm_sensitive>
1018+
<show_units>true</show_units>
1019+
<height>20</height>
1020+
<border_width>1</border_width>
1021+
<scale_options>
1022+
<width_scalable>true</width_scalable>
1023+
<height_scalable>true</height_scalable>
1024+
<keep_wh_ratio>false</keep_wh_ratio>
1025+
</scale_options>
1026+
<visible>true</visible>
1027+
<pv_name>$(PV_ROOT):MOTOR:VEL:MODE</pv_name>
1028+
<vertical_alignment>1</vertical_alignment>
1029+
<border_color>
1030+
<color name="ISIS_Border" red="0" green="0" blue="0" />
1031+
</border_color>
1032+
<precision_from_pv>true</precision_from_pv>
1033+
<widget_type>Text Update</widget_type>
1034+
<backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
1035+
<wrap_words>false</wrap_words>
1036+
<format_type>0</format_type>
1037+
<background_color>
1038+
<color name="ISIS_Label_Background" red="240" green="240" blue="240" />
1039+
</background_color>
1040+
<width>103</width>
1041+
<x>108</x>
1042+
<name>Text Update_1</name>
1043+
<y>30</y>
1044+
<foreground_color>
1045+
<color name="ISIS_Standard_Text" red="0" green="0" blue="0" />
1046+
</foreground_color>
1047+
<actions hook="false" hook_all="false" />
1048+
<font>
1049+
<opifont.name fontName="Segoe UI" height="9" style="0">ISIS_Value_NEW</opifont.name>
1050+
</font>
1051+
</widget>
9501052
</widget>
9511053
<widget typeId="org.csstudio.opibuilder.widgets.groupingContainer" version="1.0">
9521054
<border_style>13</border_style>
@@ -976,9 +1078,9 @@ $(pv_value)</tooltip>
9761078
<color name="ISIS_OPI_Background" red="240" green="240" blue="240" />
9771079
</background_color>
9781080
<width>355</width>
979-
<x>282</x>
1081+
<x>6</x>
9801082
<name>Sequence</name>
981-
<y>78</y>
1083+
<y>348</y>
9821084
<foreground_color>
9831085
<color name="ISIS_OPI_Foreground" red="192" green="192" blue="192" />
9841086
</foreground_color>
@@ -2079,7 +2181,7 @@ $(pv_value)</tooltip>
20792181
</scale_options>
20802182
<items_from_pv>true</items_from_pv>
20812183
<visible>true</visible>
2082-
<pv_name>$(PV_ROOT):READBACK:INHIBIT</pv_name>
2184+
<pv_name>$(PV_ROOT):READBACK:INHIBIT:SP</pv_name>
20832185
<border_color>
20842186
<color name="ISIS_Border" red="0" green="0" blue="0" />
20852187
</border_color>
@@ -2088,8 +2190,8 @@ $(pv_value)</tooltip>
20882190
<background_color>
20892191
<color name="ISIS_Textbox_Background" red="255" green="255" blue="255" />
20902192
</background_color>
2091-
<width>90</width>
2092-
<x>174</x>
2193+
<width>72</width>
2194+
<x>246</x>
20932195
<name>Combo</name>
20942196
<y>180</y>
20952197
<foreground_color>
@@ -2141,5 +2243,56 @@ $(pv_value)</tooltip>
21412243
<opifont.name fontName="Segoe UI" height="9" style="1">ISIS_Label_NEW</opifont.name>
21422244
</font>
21432245
</widget>
2246+
<widget typeId="org.csstudio.opibuilder.widgets.TextUpdate" version="1.0">
2247+
<border_style>0</border_style>
2248+
<forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
2249+
<precision>0</precision>
2250+
<tooltip>$(pv_name)
2251+
$(pv_value)</tooltip>
2252+
<horizontal_alignment>0</horizontal_alignment>
2253+
<rules />
2254+
<enabled>true</enabled>
2255+
<wuid>-58df6ed6:162e37c685d:-7efe</wuid>
2256+
<transparent>true</transparent>
2257+
<pv_value />
2258+
<auto_size>false</auto_size>
2259+
<text>######</text>
2260+
<rotation_angle>0.0</rotation_angle>
2261+
<scripts />
2262+
<border_alarm_sensitive>true</border_alarm_sensitive>
2263+
<show_units>true</show_units>
2264+
<height>20</height>
2265+
<border_width>1</border_width>
2266+
<scale_options>
2267+
<width_scalable>true</width_scalable>
2268+
<height_scalable>true</height_scalable>
2269+
<keep_wh_ratio>false</keep_wh_ratio>
2270+
</scale_options>
2271+
<visible>true</visible>
2272+
<pv_name>$(PV_ROOT):READBACK:INHIBIT</pv_name>
2273+
<vertical_alignment>1</vertical_alignment>
2274+
<border_color>
2275+
<color name="ISIS_Border" red="0" green="0" blue="0" />
2276+
</border_color>
2277+
<precision_from_pv>true</precision_from_pv>
2278+
<widget_type>Text Update</widget_type>
2279+
<backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
2280+
<wrap_words>false</wrap_words>
2281+
<format_type>0</format_type>
2282+
<background_color>
2283+
<color name="ISIS_Label_Background" red="240" green="240" blue="240" />
2284+
</background_color>
2285+
<width>73</width>
2286+
<x>174</x>
2287+
<name>Text Update_1</name>
2288+
<y>184</y>
2289+
<foreground_color>
2290+
<color name="ISIS_Standard_Text" red="0" green="0" blue="0" />
2291+
</foreground_color>
2292+
<actions hook="false" hook_all="false" />
2293+
<font>
2294+
<opifont.name fontName="Segoe UI" height="9" style="0">ISIS_Value_NEW</opifont.name>
2295+
</font>
2296+
</widget>
21442297
</widget>
21452298
</display>

0 commit comments

Comments
 (0)