diff --git a/base/uk.ac.stfc.isis.ibex.opis/resources/hifi_main_cryomag.opi b/base/uk.ac.stfc.isis.ibex.opis/resources/hifi_main_cryomag.opi index e767a68641..67e960a31d 100644 --- a/base/uk.ac.stfc.isis.ibex.opis/resources/hifi_main_cryomag.opi +++ b/base/uk.ac.stfc.isis.ibex.opis/resources/hifi_main_cryomag.opi @@ -1,6 +1,6 @@ - + - + false -1 @@ -8,11 +8,11 @@ false - + 5.1.0 - + 6 600 @@ -20,9 +20,9 @@ true $(P)$(CRYOMAG) - - - + + + true true true @@ -34,13 +34,13 @@ -1 -1 - + false - + - + 0 1 @@ -49,21 +49,21 @@ ISIS_Header1_NEW - + 37 0 System_Label - + true true false - + false HIFI Main Cryomagnet - + false 1 true @@ -75,73 +75,73 @@ 6 - + 0 - + - + 0 1 true - + - 553 + 451 true true 10 Tabbed Container - + true true false - + - + true Default - + - + Operation - + true Default - + - + Ramp Table 2 - + true Tabbed Container - 607 + 757 a21544:1785f472377:-7d4e 6 42 - + - + - + 0 1 @@ -151,38 +151,38 @@ Default - + - 524 + 417 false true Operation - + true true false - + true - + true true Grouping Container - 605 + 755 a21544:1785f472377:-7d4d 1 1 - + false - + - + 0 1 @@ -191,39 +191,39 @@ ISIS_Label_NEW - + 20 2 Label_2 - + true true false - + false Voltage out: - + false 1 true Label - 85 + 114 true a21544:1785f472377:-7cf9 6 - 78 + 102 - + false - + - + 0 1 @@ -232,39 +232,39 @@ ISIS_Label_NEW - + 20 2 Label - + true true false - + false Target: - + false 1 true Label - 85 + 114 true a21544:1785f472377:-7cf8 6 6 - + false - + - + 0 1 @@ -273,42 +273,42 @@ ISIS_Label_NEW - + 20 2 Label_1 - + true true false - + false Output: - + false 1 true Label - 85 + 114 true a21544:1785f472377:-7cf7 6 30 - + false false false - + true - + 0 1 @@ -318,7 +318,7 @@ false - + 0 20 @@ -327,15 +327,15 @@ 0 true $(PV_ROOT):OUTPUT - + 0.0 - + true true false - + true ###### $(pv_name) @@ -347,17 +347,17 @@ $(pv_value) 79 false a21544:1785f472377:-7cf6 - 102 + 131 30 - + false - + - + 0 1 @@ -366,42 +366,42 @@ $(pv_value) ISIS_Label_NEW - + 20 2 Label_15 - + true true false - + false - Coil: - + Persist: + false 1 true Label - 85 + 114 true a21544:1785f472377:-7cf5 6 54 - + false false false - + true - + 0 1 @@ -411,7 +411,7 @@ $(pv_value) false - + 0 20 @@ -419,16 +419,16 @@ $(pv_value) Text Update_1 0 true - $(PV_ROOT):OUTPUT:COIL - + $(PV_ROOT):OUTPUT:PERSIST + 0.0 - + true true false - + true ###### $(pv_name) @@ -440,31 +440,31 @@ $(pv_value) 79 false a21544:1785f472377:-7cf4 - 102 + 131 54 - + false false false - + false - + 3 1 - + true ISIS_Value_NEW false - + 0 20 @@ -476,16 +476,16 @@ $(pv_value) Text Input_1 0 true - $(PV_ROOT):OUTPUT:SP - + $(PV_ROOT):TARGET:SP + 0.0 - + true true false - + 0 true @@ -497,20 +497,20 @@ $(pv_value) Text Input 90 a21544:1785f472377:-7cf3 - 97 + 131 6 - + false false false - + true - + 0 1 @@ -520,7 +520,7 @@ $(pv_value) false - + 0 20 @@ -529,15 +529,15 @@ $(pv_value) 0 true $(PV_ROOT):OUTPUT:VOLT - + 0.0 - + true true false - + true ###### $(pv_name) @@ -549,17 +549,17 @@ $(pv_value) 79 false a21544:1785f472377:-7cf2 - 102 - 78 + 131 + 102 - + false - + - + 0 1 @@ -568,42 +568,42 @@ $(pv_value) ISIS_Label_NEW - + 20 2 Label_16 - + true true false - + false Ramp rate: - + false 1 true Label - 85 + 114 true a21544:1785f472377:-7cf1 6 - 102 + 126 - + false false false - + true - + 0 1 @@ -613,7 +613,7 @@ $(pv_value) false - + 0 20 @@ -622,15 +622,15 @@ $(pv_value) 0 true $(PV_ROOT):RAMP:RATE - + 0.0 - + true true false - + true ###### $(pv_name) @@ -642,17 +642,17 @@ $(pv_value) 79 false a21544:1785f472377:-7cf0 - 102 - 102 + 131 + 126 - + false - + - + 0 1 @@ -661,39 +661,39 @@ $(pv_value) ISIS_Label_NEW - + 20 2 Label_17 - + true true false - + false Ready: - + false 1 true Label - 85 + 114 true a21544:1785f472377:-7cef 6 - 126 + 150 - + false - + - + 0 1 @@ -702,48 +702,48 @@ $(pv_value) ISIS_Label_NEW - + 20 2 Label_18 - + true true false - + false Ramping: - + false 1 true Label - 85 + 114 true a21544:1785f472377:-7cee 6 - 150 + 174 - + false false - + -1 true - + 0 1 3 - + 0 true @@ -753,27 +753,27 @@ $(pv_value) false - + 25 power_led_2 - + OFF - + ON $(PV_ROOT):READY - - + + true true true - + false false $(pv_name) @@ -782,26 +782,26 @@ $(pv_value) LED 25 a21544:1785f472377:-7ced - 102 - 123 + 131 + 147 - + false false - + -1 true - + 0 1 3 - + 0 true @@ -811,27 +811,27 @@ $(pv_value) false - + 25 power_led_1 - + OFF - + ON $(PV_ROOT):RAMP:RAMPING - - + + true true true - + false false $(pv_name) @@ -840,17 +840,17 @@ $(pv_value) LED 25 a21544:1785f472377:-7cec - 102 - 150 + 131 + 174 - + false - + - + 0 1 @@ -859,42 +859,42 @@ $(pv_value) ISIS_Label_NEW - + 20 2 Label_19 - + true true false - + false Time to target: - + false 1 true Label - 85 + 114 true a21544:1785f472377:-7ceb 6 - 174 + 198 - + false false false - + true - + 0 1 @@ -904,7 +904,7 @@ $(pv_value) false - + 0 20 @@ -913,15 +913,15 @@ $(pv_value) 0 true $(PV_ROOT):TARGET:TIME - + 0.0 - + true true false - + true ###### $(pv_name) @@ -933,17 +933,17 @@ $(pv_value) 79 false a21544:1785f472377:-7cea - 102 - 174 + 131 + 198 - + false - + - + 0 1 @@ -952,42 +952,42 @@ $(pv_value) ISIS_Label_NEW - + 20 2 Label_20 - + true true false - + false Status: - + false 1 true Label - 85 + 114 true a21544:1785f472377:-7ce9 6 228 - + false false false - + true - + 1 1 @@ -997,24 +997,24 @@ $(pv_value) false - + 0 - 79 + 25 0 Text Update_5 0 true $(PV_ROOT):STAT - + 0.0 - + true true false - + true ###### $(pv_name) @@ -1023,17 +1023,25 @@ $(pv_value) 1 true Text Update - 175 + 228 false a21544:1785f472377:-7ce8 - 6 - 258 + 131 + 225 - + + + $(pv_name) + 1 + 10 + + + + false - + 0 1 @@ -1043,79 +1051,58 @@ $(pv_value) false - + 28 - + Button_1 - 0 + 1 $(PV_ROOT):START:SP - - + + + + + false + + $(PV_ROOT):READY + + + + Please wait for ready indicator. + + $(PV_ROOT):READY + + true true false - + Go false - $(pv_name) -$(pv_value) + $(pv_name) $(pv_value) true Action Button 90 a21544:1785f472377:-7ca0 - 30 + 18 357 - - false - - - - 0 - 1 - true - - ISIS_Button_NEW - - false - - - - 28 - - Button_1 - 0 - $(PV_ROOT):PAUSE:SP - - - - true - true - false - - - - Pause - false - $(pv_name) -$(pv_value) - true - Action Button - 90 - a21544:1785f472377:-7c94 - 30 - 401 - - - + + + $(pv_name) + 1 + 10 + + + + false - + 0 1 @@ -1125,21 +1112,21 @@ $(pv_value) false - + 28 - + Button_1 - 0 - $(PV_ROOT):ABORT:SP - - + 1 + $(PV_ROOT):ABORT + + true true false - + Abort false @@ -1149,26 +1136,26 @@ $(pv_value) Action Button 90 a21544:1785f472377:-7c88 - 30 - 445 + 286 + 357 - + false false - + -1 true - + 0 1 3 - + 0 true @@ -1178,27 +1165,27 @@ $(pv_value) false - + 25 LED - + OFF - + ON $(PV_ROOT):TRIP - - + + true true true - + false false $(pv_name) @@ -1207,17 +1194,17 @@ $(pv_value) LED 25 a21544:1785f472377:-7c7c - 95 - 477 + 345 + 3 - + false - + - + 0 1 @@ -1226,38 +1213,38 @@ $(pv_value) ISIS_Label_NEW - + 20 2 Label_18 - + true true false - + false Trip: - + false 1 true Label - 85 + 84 true a21544:1785f472377:-7c70 - 6 - 480 + 250 + 3 - + - + - + 3 1 @@ -1266,17 +1253,17 @@ $(pv_value) Default - + - - 451 + + 409 true Linking Container hifi_main_cryomag_advanced.opi 3 - + true true @@ -1285,30 +1272,603 @@ $(pv_value) EmbeddedScript - importPackage(Packages.org.csstudio.opibuilder.scriptUtil); + + widget.setPropertyValue("visible",false);]]> =1 - + true Linking Container 355 -42e62b4f:17863c76ae3:-7e88 - 216 + 396 6 + + + false + false + + + + -1 + true + + + + 0 + 1 + 3 + + + + 0 + true + true + + Default + + false + + + + 25 + LED + + + + OFF + + + + ON + $(PV_ROOT):QUENCH + + + + true + true + true + + + false + false + $(pv_name) +$(pv_value) + true + LED + 25 + 6e7a7c88:181b41a0ae9:-7d44 + 345 + 27 + + + + false + + + + + + + 0 + 1 + true + + ISIS_Label_NEW + + + + + 20 + 2 + Label_18 + + + true + true + false + + + false + Quench: + + false + 1 + true + Label + 84 + true + 6e7a7c88:181b41a0ae9:-7d43 + 250 + 27 + + + + false + + + + + + + 0 + 1 + true + + ISIS_Label_NEW + + + + + 20 + 2 + Label_3 + + + true + true + false + + + false + Heater on: + + false + 1 + true + Label + 84 + true + 6e7a7c88:181b41a0ae9:-7d42 + 250 + 51 + + + + false + false + + + + -1 + true + + + + 0 + 1 + 3 + + + + 0 + true + true + + Default + + false + + + + 25 + power_led_2 + + + + OFF + + + + ON + $(PV_ROOT):HEATER:STAT + + + + true + true + true + + + false + false + $(pv_name) +$(pv_value) + true + LED + 25 + 6e7a7c88:181b41a0ae9:-7d41 + 345 + 51 + + + + false + + + + + + + 0 + 1 + true + + ISIS_Label_NEW + + + + + 20 + 2 + Label_4 + + + true + true + false + + + false + Switch status: + + false + 1 + true + Label + 114 + true + 6e7a7c88:181b41a0ae9:-7d40 + 6 + 254 + + + + + $(pv_name) + $(value) + 10 + + + + + false + false + + + + false + + + + 0 + 1 + false + + ISIS_Button_NEW + + false + + + + 44 + false + true + Ramp_Leads + $(PV_ROOT):RAMP:LEADS:SP + + + + + true + + + true + + $(PV_ROOT):PERSIST:SP + $(PV_ROOT):RAMP:LEADS:SP + + + + Locked when not persistant. + + $(PV_ROOT):PERSIST:SP + + + + true + true + false + + + + + + $(pv_name) $(pv_value) + true + Choice Button + 171 + 6e7a7c88:181b41a0ae9:-7d3e + 206 + 300 + + + + + $(pv_name) + $(value) + 10 + + + + + false + false + + + + false + + + + 0 + 1 + true + + ISIS_Button_NEW + + false + + + + 44 + false + true + PM + $(PV_ROOT):PERSIST:SP + + + + + false + + $(PV_ROOT):RAMP:LEADS:SP + + + + Locked When Leads at 0. + + $(PV_ROOT):RAMP:LEADS:SP + + + + true + true + false + + + + + + $(pv_name) $(pv_value) + true + Choice Button + 171 + 6e7a7c88:181b41a0ae9:-7d3d + 22 + 300 + + + + + $(pv_name) + $(value) + 10 + + + + + false + false + + + + false + + + + 0 + 1 + true + + ISIS_Button_NEW + + false + + + + 28 + true + true + PM + $(PV_ROOT):PAUSE:SP + + + + true + true + false + + + + + + $(pv_name) $(pv_value) + true + Choice Button + 130 + 6e7a7c88:181b41a0ae9:-7b6d + 132 + 357 + + + + false + + + + + + + 0 + 1 + true + + ISIS_Label_NEW + + + + + 20 + 2 + Label_15 + + + true + true + false + + + false + Magnet: + + false + 1 + true + Label + 114 + true + 6e7a7c88:181b41a0ae9:-7b56 + 6 + 78 + + + + false + false + false + + + + true + + + + 0 + 1 + true + + ISIS_Value_NEW + + false + + + + 0 + 20 + 0 + Text Update_1 + 0 + true + $(PV_ROOT):OUTPUT:COIL + + 0.0 + + + true + true + false + + + true + ###### + $(pv_name) +$(pv_value) + true + 1 + true + Text Update + 79 + false + 6e7a7c88:181b41a0ae9:-7b55 + 131 + 78 + + + + false + false + false + + + + true + + + + 1 + 1 + true + + ISIS_Value_NEW + + false + + + + 0 + 25 + 0 + Text Update_5 + 0 + true + $(PV_ROOT):SWITCH:STAT + + 0.0 + + + true + true + false + + + true + ###### + $(pv_name) +$(pv_value) + true + 1 + true + Text Update + 228 + false + 6e7a7c88:181b41a0ae9:-7b4d + 131 + 254 + - + - + - + 0 1 @@ -1318,37 +1878,37 @@ else Default - + - 524 + 417 false true Ramp Table - + true true false - + true - + true false Grouping Container - 605 + 755 a21544:1785f472377:-7d4c 1 1 - + false - + 0 1 @@ -1358,25 +1918,25 @@ else false - + 1 - + Dummy 0 - - - + + + true true false - + - + false - + true Action Button 1 @@ -1384,4 +1944,4 @@ else 6 42 - + \ No newline at end of file diff --git a/base/uk.ac.stfc.isis.ibex.opis/resources/hifi_main_cryomag_advanced.opi b/base/uk.ac.stfc.isis.ibex.opis/resources/hifi_main_cryomag_advanced.opi index 987ee4dce0..41ca2f7afd 100644 --- a/base/uk.ac.stfc.isis.ibex.opis/resources/hifi_main_cryomag_advanced.opi +++ b/base/uk.ac.stfc.isis.ibex.opis/resources/hifi_main_cryomag_advanced.opi @@ -1,6 +1,6 @@ - + - + false -1 @@ -8,20 +8,20 @@ false - + 5.1.0 - + 6 600 true - - - + + + true true true @@ -32,64 +32,23 @@ -42e62b4f:17863c76ae3:-7e8d -1 -1 - - - false - - - - 0 - 1 - true - - ISIS_Button_NEW - - false - - - - 28 - - Button_1 - 0 - $(PV_ROOT):OUTPUTMODE - - - - true - true - false - - - - Persistent - false - $(pv_name) -$(pv_value) - true - Action Button - 90 - -42e62b4f:17863c76ae3:-7e73 - 251 - 8 - - + false false - + -1 true - + 0 1 3 - + 0 true @@ -99,27 +58,27 @@ $(pv_value) false - + 25 LED - + OFF - + ON $(PV_ROOT):QUENCH - - + + true true true - + false false $(pv_name) @@ -128,17 +87,17 @@ $(pv_value) LED 25 -42e62b4f:17863c76ae3:-7e63 - 167 - 43 + 222 + 9 - + false - + - + 0 1 @@ -147,48 +106,48 @@ $(pv_value) ISIS_Label_NEW - + 20 2 Label_18 - + true true false - + false Quench: - + false 1 true Label - 168 + 217 true -42e62b4f:17863c76ae3:-7e62 0 - 46 + 12 - + false false - + -1 true - + 0 1 3 - + 0 true @@ -198,27 +157,27 @@ $(pv_value) false - + 25 LED_1 - + OFF - + ON $(PV_ROOT):MAGNET:TEMP:INRANGE - - + + true true true - + false false $(pv_name) @@ -227,17 +186,17 @@ $(pv_value) LED 25 -42e62b4f:17863c76ae3:-7e57 - 167 - 69 + 222 + 35 - + false - + - + 0 1 @@ -246,48 +205,48 @@ $(pv_value) ISIS_Label_NEW - + 20 2 Label_1 - + true true false - + false Temperature out of range: - + false 1 true Label - 168 + 217 true -42e62b4f:17863c76ae3:-7e56 0 - 72 + 38 - + false false - + -1 true - + 0 1 3 - + 0 true @@ -297,27 +256,27 @@ $(pv_value) false - + 25 LED_2 - + OFF - + ON - $(PV_ROOT):MAGNET:TOOHOT - - + $(PV_ROOT):MAGNET:TEMP:TOOHOT + + true true true - + false false $(pv_name) @@ -326,17 +285,17 @@ $(pv_value) LED 25 -42e62b4f:17863c76ae3:-7e4b - 167 - 99 + 222 + 65 - + false - + - + 0 1 @@ -345,39 +304,39 @@ $(pv_value) ISIS_Label_NEW - + 20 2 Label_2 - + true true false - + false Too hot: - + false 1 true Label - 168 + 217 true -42e62b4f:17863c76ae3:-7e4a 0 - 102 + 68 - + false - + - + 0 1 @@ -386,48 +345,48 @@ $(pv_value) ISIS_Label_NEW - + 20 2 Label_3 - + true true false - + false Heater on: - + false 1 true Label - 168 + 217 true -42e62b4f:17863c76ae3:-7e3e 0 - 132 + 98 - + false false - + -1 true - + 0 1 3 - + 0 true @@ -437,27 +396,27 @@ $(pv_value) false - + 25 power_led_2 - + OFF - + ON $(PV_ROOT):HEATER:STAT - - + + true true true - + false false $(pv_name) @@ -466,99 +425,17 @@ $(pv_value) LED 25 -42e62b4f:17863c76ae3:-7e36 - 167 - 129 - - - - false - - - - 0 - 1 - true - - ISIS_Button_NEW - - false - - - - 28 - - Button_1 - 0 - $(PV_ROOT):OUTPUTMODE - - - - true - true - false - - - - Heater at B - false - $(pv_name) -$(pv_value) - true - Action Button - 90 - -42e62b4f:17863c76ae3:-7e21 - 78 - 162 - - - - false - - - - 0 - 1 - true - - ISIS_Button_NEW - - false - - - - 28 - - Button_2 - 0 - $(PV_ROOT):OUTPUTMODE - - - - true - true - false - - - - Keep leads at B - false - $(pv_name) -$(pv_value) - true - Action Button - 90 - -42e62b4f:17863c76ae3:-7e19 - 78 - 198 + 222 + 95 - + false - + - + 0 1 @@ -567,21 +444,21 @@ $(pv_value) ISIS_Label_NEW - + 20 2 Label_4 - + true true false - + false Switch status: - + false 1 true @@ -590,18 +467,18 @@ $(pv_value) true -42e62b4f:17863c76ae3:-7e0d 0 - 277 + 243 - + false false - + true - + 0 1 @@ -611,23 +488,23 @@ $(pv_value) false - + 100 false true Radio Box $(PV_ROOT):SWITCH:STAT - - + + true true false - + - + $(pv_name) $(pv_value) @@ -636,16 +513,16 @@ $(pv_value) 100 -42e62b4f:17863c76ae3:-7e09 173 - 237 + 203 - + false - + - + 0 1 @@ -654,21 +531,21 @@ $(pv_value) ISIS_Label_NEW - + 20 2 Label_5 - + true true false - + false Compressors: - + false 1 true @@ -677,18 +554,18 @@ $(pv_value) true -42e62b4f:17863c76ae3:-7dfe 0 - 376 + 342 - + false false - + true - + 0 1 @@ -698,23 +575,23 @@ $(pv_value) false - + 100 false true Radio Box_1 $(PV_ROOT):SWITCH:STAT - - + + true true false - + - + $(pv_name) $(pv_value) @@ -723,106 +600,120 @@ $(pv_value) 100 -42e62b4f:17863c76ae3:-7dfd 173 - 336 + 302 - - - false - - - + + + false - + 0 1 true - ISIS_Label_NEW + ISIS_Button_NEW + false - + - 20 - 2 - Label_6 - + 1 + + Dummy + 0 + + + true true false - - false - Persistent - - false - 1 + + + + false + true - Label - 168 - true - -42e62b4f:17863c76ae3:-7de1 + Action Button + 1 + -648922a4:1624e4fa0bd:-7f69 0 - 12 + 68 - - + + + + $(pv_name) + $(value) + 10 + + + + false - false false - + - true + false - + 0 1 true - ISIS_Value_NEW + ISIS_Button_NEW false - + - 0 - 20 - 0 - Text Update_1 - 0 - true - $(PV_ROOT):OUTPUT - - 0.0 - + 44 + false + true + Ramp_Leads + $(PV_ROOT):RAMP:LEADS:SP + + true true false - - true - ###### + + + + $(pv_name) $(pv_value) - true - 1 true - Text Update - 79 - false - -42e62b4f:17863c76ae3:-7dd9 - 173 - 12 + Choice Button + 106 + 177488ce:181af49e92c:-7efd + 182 + 146 - - + + + + $(pv_name) + $(value) + 10 + + + + + false + false + + + false - + 0 1 @@ -832,30 +723,31 @@ $(pv_value) false - + - 1 - - Dummy - 0 - - - + 44 + false + true + PM + $(PV_ROOT):PERSIST:SP + + true true false - - - - false - + + + + + $(pv_name) +$(pv_value) true - Action Button - 1 - -648922a4:1624e4fa0bd:-7f69 - 0 - 102 + Choice Button + 106 + 177488ce:181af49e92c:-7efc + 62 + 146 - + \ No newline at end of file