From 9c7c09330ca3c4adf3521936f19460fb0f805219 Mon Sep 17 00:00:00 2001 From: Emilio Asensi <emilio.asensiconejero@esss.se> Date: Fri, 18 Sep 2020 14:39:36 +0200 Subject: [PATCH] Updates on TS2 Water Skid OPI --- .../TS2/ts2-cryomodule/interlocks.bob | 4 +- .../ts2-wtrc/CWM-CWS05/10-Top/Overview.bob | 71 +++++++------- .../CWM-CWS05/99-Shared/Embedded/FT.bob | 1 + .../CWM-CWS05/99-Shared/Embedded/PT.bob | 1 + .../CWM-CWS05/99-Shared/Embedded/TT.bob | 1 + .../CWM-CWS05/99-Shared/Embedded/YCV.bob | 1 + .../ts2-wtrc/CWM-CWS05/99-Shared/Sub/CT.bob | 17 ++++ .../ts2-wtrc/CWM-CWS05/99-Shared/Sub/FT.bob | 6 ++ .../CWM-CWS05/99-Shared/Sub/FT515.bob | 11 +++ .../ts2-wtrc/CWM-CWS05/99-Shared/Sub/P.bob | 7 ++ .../ts2-wtrc/CWM-CWS05/99-Shared/Sub/PT.bob | 5 + .../CWM-CWS05/99-Shared/Sub/PT501.bob | 5 + .../CWM-CWS05/99-Shared/Sub/PT511.bob | 98 ++++++++++++++++++- .../CWM-CWS05/99-Shared/Sub/PT566_577.bob | 9 ++ .../ts2-wtrc/CWM-CWS05/99-Shared/Sub/SYS.bob | 11 ++- .../ts2-wtrc/CWM-CWS05/99-Shared/Sub/TT.bob | 5 + .../CWM-CWS05/99-Shared/Sub/TT514.bob | 13 +++ .../CWM-CWS05/99-Shared/Sub/TT565_575.bob | 9 ++ .../ts2-wtrc/CWM-CWS05/99-Shared/Sub/YCV.bob | 10 ++ 19 files changed, 246 insertions(+), 39 deletions(-) diff --git a/NON-APPROVED/TS2/ts2-cryomodule/interlocks.bob b/NON-APPROVED/TS2/ts2-cryomodule/interlocks.bob index 30acefda..0f0d9dc5 100644 --- a/NON-APPROVED/TS2/ts2-cryomodule/interlocks.bob +++ b/NON-APPROVED/TS2/ts2-cryomodule/interlocks.bob @@ -248,7 +248,7 @@ </widget> <widget type="label" version="2.0.0"> <name>I3_label_text_5</name> - <text>PT-003 < 1500 mBar</text> + <text>PT-003 < 1350 mBar (back after 1150 mBar)</text> <x>215</x> <y>180</y> <width>300</width> @@ -339,7 +339,7 @@ </widget> <widget type="label" version="2.0.0"> <name>I3_label_text_6</name> - <text>PT-003 > 1500 mBar OR LT > 90% during Night</text> + <text>PT-003 < 1500 mBar OR LT < 90% during Night</text> <x>215</x> <y>211</y> <width>300</width> diff --git a/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/10-Top/Overview.bob b/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/10-Top/Overview.bob index d0488e05..f9abdd56 100644 --- a/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/10-Top/Overview.bob +++ b/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/10-Top/Overview.bob @@ -284,6 +284,7 @@ <y>710</y> <width>170</width> <height>30</height> + <precision>2</precision> <vertical_alignment>1</vertical_alignment> </widget> <widget type="label" version="2.0.0"> @@ -360,6 +361,7 @@ <y>850</y> <width>170</width> <height>30</height> + <precision>2</precision> <vertical_alignment>1</vertical_alignment> </widget> <widget type="label" version="2.0.0"> @@ -379,6 +381,7 @@ <y>890</y> <width>170</width> <height>30</height> + <precision>2</precision> <vertical_alignment>1</vertical_alignment> </widget> <widget type="group" version="2.0.0"> @@ -1029,40 +1032,6 @@ <height>40</height> <tooltip>$(actions)</tooltip> </widget> - <widget type="label" version="2.0.0"> - <name>Label_19</name> - <text>iGotHeartbeat:</text> - <x>50</x> - <y>1030</y> - <width>120</width> - <height>30</height> - <horizontal_alignment>2</horizontal_alignment> - </widget> - <widget type="label" version="2.0.0"> - <name>Label_20</name> - <text>iKickAlive:</text> - <x>50</x> - <y>1070</y> - <width>120</width> - <height>30</height> - <horizontal_alignment>2</horizontal_alignment> - </widget> - <widget type="textupdate" version="2.0.0"> - <name>Text Update_11</name> - <pv_name>$(sectName):Ctrl-PLC-001:iGotHeartbeat</pv_name> - <x>180</x> - <y>1030</y> - <width>140</width> - <height>30</height> - </widget> - <widget type="textupdate" version="2.0.0"> - <name>Text Update_12</name> - <pv_name>$(sectName):Ctrl-PLC-001:iKickAlive</pv_name> - <x>180</x> - <y>1070</y> - <width>140</width> - <height>30</height> - </widget> <widget type="rectangle" version="2.0.0"> <name>GroupBackground_24</name> <x>20</x> @@ -1181,4 +1150,38 @@ <height>30</height> <vertical_alignment>1</vertical_alignment> </widget> + <widget type="label" version="2.0.0"> + <name>Label_20</name> + <text>AliveR:</text> + <x>70</x> + <y>1030</y> + <width>90</width> + <height>30</height> + <horizontal_alignment>2</horizontal_alignment> + </widget> + <widget type="label" version="2.0.0"> + <name>Label_21</name> + <text>CommsOK:</text> + <x>70</x> + <y>1070</y> + <width>90</width> + <height>30</height> + <horizontal_alignment>2</horizontal_alignment> + </widget> + <widget type="textupdate" version="2.0.0"> + <name>Text Update_21</name> + <pv_name>$(sectName):Ctrl-PLC-001:AliveR</pv_name> + <x>170</x> + <y>1030</y> + <width>150</width> + <height>30</height> + </widget> + <widget type="textupdate" version="2.0.0"> + <name>Text Update_22</name> + <pv_name>$(sectName):Ctrl-PLC-001:CommsOK</pv_name> + <x>170</x> + <y>1070</y> + <width>150</width> + <height>30</height> + </widget> </display> diff --git a/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Embedded/FT.bob b/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Embedded/FT.bob index 93bc984c..b3381a87 100644 --- a/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Embedded/FT.bob +++ b/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Embedded/FT.bob @@ -37,6 +37,7 @@ <y>10</y> <width>130</width> <height>30</height> + <precision>2</precision> <vertical_alignment>1</vertical_alignment> </widget> <widget type="action_button" version="3.0.0"> diff --git a/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Embedded/PT.bob b/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Embedded/PT.bob index 20434a1d..612b3db0 100644 --- a/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Embedded/PT.bob +++ b/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Embedded/PT.bob @@ -37,6 +37,7 @@ <y>10</y> <width>130</width> <height>30</height> + <precision>2</precision> <vertical_alignment>1</vertical_alignment> </widget> <widget type="action_button" version="3.0.0"> diff --git a/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Embedded/TT.bob b/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Embedded/TT.bob index d71da65c..baf4cee3 100644 --- a/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Embedded/TT.bob +++ b/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Embedded/TT.bob @@ -37,6 +37,7 @@ <y>10</y> <width>130</width> <height>30</height> + <precision>2</precision> <vertical_alignment>1</vertical_alignment> </widget> <widget type="action_button" version="3.0.0"> diff --git a/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Embedded/YCV.bob b/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Embedded/YCV.bob index e8f403c2..ea5382b4 100644 --- a/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Embedded/YCV.bob +++ b/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Embedded/YCV.bob @@ -37,6 +37,7 @@ <y>10</y> <width>130</width> <height>30</height> + <precision>2</precision> <vertical_alignment>1</vertical_alignment> </widget> <widget type="action_button" version="3.0.0"> diff --git a/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Sub/CT.bob b/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Sub/CT.bob index 22704d0d..f428da69 100644 --- a/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Sub/CT.bob +++ b/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Sub/CT.bob @@ -112,6 +112,7 @@ <y>130</y> <width>160</width> <height>30</height> + <precision>2</precision> <vertical_alignment>1</vertical_alignment> </widget> <widget type="label" version="2.0.0"> @@ -131,6 +132,7 @@ <y>170</y> <width>160</width> <height>30</height> + <precision>2</precision> <vertical_alignment>1</vertical_alignment> </widget> <widget type="rectangle" version="2.0.0"> @@ -247,6 +249,7 @@ <y>310</y> <width>80</width> <height>30</height> + <precision>2</precision> <vertical_alignment>1</vertical_alignment> </widget> <widget type="textupdate" version="2.0.0"> @@ -256,6 +259,7 @@ <y>350</y> <width>80</width> <height>30</height> + <precision>2</precision> <vertical_alignment>1</vertical_alignment> </widget> <widget type="rectangle" version="2.0.0"> @@ -321,6 +325,7 @@ <x>520</x> <y>130</y> <height>30</height> + <precision>2</precision> <vertical_alignment>1</vertical_alignment> </widget> <widget type="label" version="2.0.0"> @@ -397,6 +402,7 @@ <y>310</y> <width>90</width> <height>30</height> + <precision>2</precision> <vertical_alignment>1</vertical_alignment> </widget> <widget type="label" version="2.0.0"> @@ -416,6 +422,7 @@ <y>350</y> <width>90</width> <height>30</height> + <precision>2</precision> <vertical_alignment>1</vertical_alignment> </widget> <widget type="rectangle" version="2.0.0"> @@ -482,6 +489,7 @@ <y>490</y> <width>90</width> <height>30</height> + <precision>2</precision> <vertical_alignment>1</vertical_alignment> </widget> <widget type="label" version="2.0.0"> @@ -501,6 +509,7 @@ <y>530</y> <width>90</width> <height>30</height> + <precision>2</precision> <vertical_alignment>1</vertical_alignment> </widget> <widget type="rectangle" version="2.0.0"> @@ -576,6 +585,7 @@ <x>520</x> <y>170</y> <height>30</height> + <precision>2</precision> <vertical_alignment>1</vertical_alignment> </widget> <widget type="spinner" version="2.0.0"> @@ -585,6 +595,7 @@ <y>130</y> <height>30</height> <format>0</format> + <precision>2</precision> <show_units>true</show_units> </widget> <widget type="spinner" version="2.0.0"> @@ -595,6 +606,7 @@ <width>80</width> <height>30</height> <format>0</format> + <precision>2</precision> <show_units>true</show_units> </widget> <widget type="spinner" version="2.0.0"> @@ -605,6 +617,7 @@ <width>80</width> <height>30</height> <format>0</format> + <precision>2</precision> <show_units>true</show_units> </widget> <widget type="spinner" version="2.0.0"> @@ -615,6 +628,7 @@ <width>90</width> <height>30</height> <format>0</format> + <precision>2</precision> <show_units>true</show_units> </widget> <widget type="spinner" version="2.0.0"> @@ -625,6 +639,7 @@ <width>90</width> <height>30</height> <format>0</format> + <precision>2</precision> <show_units>true</show_units> </widget> <widget type="spinner" version="2.0.0"> @@ -635,6 +650,7 @@ <width>90</width> <height>30</height> <format>0</format> + <precision>2</precision> <show_units>true</show_units> </widget> <widget type="spinner" version="2.0.0"> @@ -645,6 +661,7 @@ <width>90</width> <height>30</height> <format>0</format> + <precision>2</precision> <show_units>true</show_units> </widget> </display> diff --git a/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Sub/FT.bob b/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Sub/FT.bob index 24b081bb..c45adea0 100644 --- a/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Sub/FT.bob +++ b/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Sub/FT.bob @@ -111,6 +111,7 @@ <y>130</y> <width>140</width> <height>30</height> + <precision>2</precision> <vertical_alignment>1</vertical_alignment> </widget> <widget type="textupdate" version="2.0.0"> @@ -120,6 +121,7 @@ <y>170</y> <width>140</width> <height>30</height> + <precision>2</precision> <vertical_alignment>1</vertical_alignment> </widget> <widget type="label" version="2.0.0"> @@ -313,6 +315,7 @@ <y>130</y> <width>90</width> <height>30</height> + <precision>2</precision> <vertical_alignment>1</vertical_alignment> </widget> <widget type="textupdate" version="2.0.0"> @@ -322,6 +325,7 @@ <y>170</y> <width>90</width> <height>30</height> + <precision>2</precision> <vertical_alignment>1</vertical_alignment> </widget> <widget type="spinner" version="2.0.0"> @@ -332,6 +336,7 @@ <width>90</width> <height>30</height> <format>0</format> + <precision>2</precision> <show_units>true</show_units> </widget> <widget type="spinner" version="2.0.0"> @@ -342,6 +347,7 @@ <width>90</width> <height>30</height> <format>0</format> + <precision>2</precision> <show_units>true</show_units> </widget> </display> diff --git a/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Sub/FT515.bob b/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Sub/FT515.bob index 98dccaa4..2342422b 100644 --- a/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Sub/FT515.bob +++ b/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Sub/FT515.bob @@ -112,6 +112,7 @@ <y>130</y> <width>140</width> <height>30</height> + <precision>2</precision> <vertical_alignment>1</vertical_alignment> </widget> <widget type="textupdate" version="2.0.0"> @@ -121,6 +122,7 @@ <y>170</y> <width>140</width> <height>30</height> + <precision>2</precision> <vertical_alignment>1</vertical_alignment> </widget> <widget type="label" version="2.0.0"> @@ -314,6 +316,7 @@ <y>130</y> <width>90</width> <height>30</height> + <precision>2</precision> <vertical_alignment>1</vertical_alignment> </widget> <widget type="textupdate" version="2.0.0"> @@ -323,6 +326,7 @@ <y>170</y> <width>90</width> <height>30</height> + <precision>2</precision> <vertical_alignment>1</vertical_alignment> </widget> <widget type="rectangle" version="2.0.0"> @@ -389,6 +393,7 @@ <y>310</y> <width>90</width> <height>30</height> + <precision>2</precision> <vertical_alignment>1</vertical_alignment> </widget> <widget type="textupdate" version="2.0.0"> @@ -398,6 +403,7 @@ <y>350</y> <width>90</width> <height>30</height> + <precision>2</precision> <vertical_alignment>1</vertical_alignment> </widget> <widget type="label" version="2.0.0"> @@ -494,6 +500,7 @@ <y>490</y> <width>140</width> <height>30</height> + <precision>2</precision> <vertical_alignment>1</vertical_alignment> </widget> <widget type="led" version="2.0.0"> @@ -514,6 +521,7 @@ <width>90</width> <height>30</height> <format>0</format> + <precision>2</precision> <show_units>true</show_units> </widget> <widget type="spinner" version="2.0.0"> @@ -524,6 +532,7 @@ <width>90</width> <height>30</height> <format>0</format> + <precision>2</precision> <show_units>true</show_units> </widget> <widget type="spinner" version="2.0.0"> @@ -534,6 +543,7 @@ <width>90</width> <height>30</height> <format>0</format> + <precision>2</precision> <show_units>true</show_units> </widget> <widget type="spinner" version="2.0.0"> @@ -544,6 +554,7 @@ <width>90</width> <height>30</height> <format>0</format> + <precision>2</precision> <show_units>true</show_units> </widget> </display> diff --git a/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Sub/P.bob b/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Sub/P.bob index 0f107b3d..79bcdd91 100644 --- a/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Sub/P.bob +++ b/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Sub/P.bob @@ -121,6 +121,7 @@ <y>170</y> <width>200</width> <height>30</height> + <precision>2</precision> <vertical_alignment>1</vertical_alignment> </widget> <widget type="label" version="2.0.0"> @@ -363,6 +364,7 @@ <y>350</y> <height>30</height> <format>0</format> + <precision>2</precision> <show_units>true</show_units> </widget> <widget type="action_button" version="3.0.0"> @@ -459,6 +461,7 @@ <y>530</y> <height>30</height> <format>0</format> + <precision>2</precision> <show_units>true</show_units> </widget> <widget type="spinner" version="2.0.0"> @@ -468,6 +471,7 @@ <y>570</y> <height>30</height> <format>0</format> + <precision>2</precision> <show_units>true</show_units> </widget> <widget type="label" version="2.0.0"> @@ -521,6 +525,7 @@ <x>180</x> <y>530</y> <height>30</height> + <precision>2</precision> <vertical_alignment>1</vertical_alignment> </widget> <widget type="textupdate" version="2.0.0"> @@ -529,6 +534,7 @@ <x>180</x> <y>570</y> <height>30</height> + <precision>2</precision> <vertical_alignment>1</vertical_alignment> </widget> <widget type="textupdate" version="2.0.0"> @@ -545,6 +551,7 @@ <x>180</x> <y>350</y> <height>30</height> + <precision>2</precision> <vertical_alignment>1</vertical_alignment> </widget> </display> diff --git a/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Sub/PT.bob b/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Sub/PT.bob index dade1fa0..810cb306 100644 --- a/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Sub/PT.bob +++ b/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Sub/PT.bob @@ -142,6 +142,7 @@ <y>130</y> <width>90</width> <height>30</height> + <precision>2</precision> <vertical_alignment>1</vertical_alignment> </widget> <widget type="textupdate" version="2.0.0"> @@ -151,6 +152,7 @@ <y>170</y> <width>90</width> <height>30</height> + <precision>2</precision> <vertical_alignment>1</vertical_alignment> </widget> <widget type="rectangle" version="2.0.0"> @@ -284,6 +286,7 @@ <y>130</y> <width>160</width> <height>30</height> + <precision>2</precision> <vertical_alignment>1</vertical_alignment> </widget> <widget type="led" version="2.0.0"> @@ -314,6 +317,7 @@ <width>90</width> <height>30</height> <format>0</format> + <precision>2</precision> <show_units>true</show_units> </widget> <widget type="spinner" version="2.0.0"> @@ -324,6 +328,7 @@ <width>90</width> <height>30</height> <format>0</format> + <precision>2</precision> <show_units>true</show_units> </widget> </display> diff --git a/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Sub/PT501.bob b/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Sub/PT501.bob index 38d17b88..99705739 100644 --- a/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Sub/PT501.bob +++ b/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Sub/PT501.bob @@ -142,6 +142,7 @@ <y>130</y> <width>90</width> <height>30</height> + <precision>2</precision> <vertical_alignment>1</vertical_alignment> </widget> <widget type="textupdate" version="2.0.0"> @@ -151,6 +152,7 @@ <y>170</y> <width>90</width> <height>30</height> + <precision>2</precision> <vertical_alignment>1</vertical_alignment> </widget> <widget type="rectangle" version="2.0.0"> @@ -284,6 +286,7 @@ <y>130</y> <width>160</width> <height>30</height> + <precision>2</precision> <vertical_alignment>1</vertical_alignment> </widget> <widget type="led" version="2.0.0"> @@ -314,6 +317,7 @@ <width>90</width> <height>30</height> <format>0</format> + <precision>2</precision> <show_units>true</show_units> </widget> <widget type="spinner" version="2.0.0"> @@ -324,6 +328,7 @@ <width>90</width> <height>30</height> <format>0</format> + <precision>2</precision> <show_units>true</show_units> </widget> </display> diff --git a/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Sub/PT511.bob b/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Sub/PT511.bob index e06c576a..05c53bef 100644 --- a/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Sub/PT511.bob +++ b/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Sub/PT511.bob @@ -9,7 +9,7 @@ <LABBCM>LAB-BCM08</LABBCM> </macros> <width>790</width> - <height>450</height> + <height>480</height> <background_color> <color name="BACKGROUND" red="220" green="225" blue="221"> </color> @@ -53,7 +53,7 @@ <x>370</x> <y>70</y> <width>400</width> - <height>260</height> + <height>380</height> <line_width>0</line_width> <background_color> <color name="GROUP-BORDER" red="150" green="155" blue="151"> @@ -142,6 +142,7 @@ <y>130</y> <width>90</width> <height>30</height> + <precision>2</precision> <vertical_alignment>1</vertical_alignment> </widget> <widget type="textupdate" version="2.0.0"> @@ -151,6 +152,7 @@ <y>170</y> <width>90</width> <height>30</height> + <precision>2</precision> <vertical_alignment>1</vertical_alignment> </widget> <widget type="rectangle" version="2.0.0"> @@ -284,6 +286,7 @@ <y>130</y> <width>170</width> <height>30</height> + <precision>2</precision> <vertical_alignment>1</vertical_alignment> </widget> <widget type="led" version="2.0.0"> @@ -367,6 +370,7 @@ <y>230</y> <width>90</width> <height>30</height> + <precision>2</precision> <vertical_alignment>1</vertical_alignment> </widget> <widget type="textupdate" version="2.0.0"> @@ -376,6 +380,7 @@ <y>270</y> <width>90</width> <height>30</height> + <precision>2</precision> <vertical_alignment>1</vertical_alignment> </widget> <widget type="led" version="2.0.0"> @@ -429,6 +434,7 @@ <y>190</y> <width>80</width> <height>30</height> + <precision>2</precision> <vertical_alignment>1</vertical_alignment> </widget> <widget type="textupdate" version="2.0.0"> @@ -438,6 +444,7 @@ <y>230</y> <width>80</width> <height>30</height> + <precision>2</precision> <vertical_alignment>1</vertical_alignment> </widget> <widget type="label" version="2.0.0"> @@ -458,7 +465,9 @@ <width>90</width> <height>30</height> <format>0</format> + <precision>2</precision> <show_units>true</show_units> + <increment>loc://Increment</increment> </widget> <widget type="spinner" version="2.0.0"> <name>Text Update_19</name> @@ -468,7 +477,9 @@ <width>90</width> <height>30</height> <format>0</format> + <precision>2</precision> <show_units>true</show_units> + <increment>loc://Increment</increment> </widget> <widget type="spinner" version="2.0.0"> <name>Text Update_20</name> @@ -478,7 +489,9 @@ <width>90</width> <height>30</height> <format>0</format> + <precision>2</precision> <show_units>true</show_units> + <increment>loc://Increment</increment> </widget> <widget type="spinner" version="2.0.0"> <name>Text Update_21</name> @@ -488,7 +501,9 @@ <width>90</width> <height>30</height> <format>0</format> + <precision>2</precision> <show_units>true</show_units> + <increment>loc://Increment</increment> </widget> <widget type="spinner" version="2.0.0"> <name>Text Update_22</name> @@ -498,7 +513,9 @@ <width>80</width> <height>30</height> <format>0</format> + <precision>2</precision> <show_units>true</show_units> + <increment>loc://Increment</increment> </widget> <widget type="spinner" version="2.0.0"> <name>Text Update_23</name> @@ -508,6 +525,83 @@ <width>80</width> <height>30</height> <format>0</format> + <precision>2</precision> <show_units>true</show_units> + <increment>loc://Increment</increment> + </widget> + <widget type="rectangle" version="2.0.0"> + <name>BGGrey03-background_22</name> + <x>390</x> + <y>320</y> + <width>360</width> + <height>50</height> + <line_width>0</line_width> + <background_color> + <color name="GROUP-BACKGROUND" red="200" green="205" blue="201"> + </color> + </background_color> + <corner_width>5</corner_width> + <corner_height>5</corner_height> + </widget> + <widget type="textentry" version="3.0.0"> + <name>Text Entry</name> + <pv_name>loc://Increment</pv_name> + <x>650</x> + <y>330</y> + <width>90</width> + <height>30</height> + <precision>2</precision> + </widget> + <widget type="label" version="2.0.0"> + <name>Label_31</name> + <text>Increment:</text> + <x>540</x> + <y>330</y> + <height>30</height> + <horizontal_alignment>2</horizontal_alignment> + <vertical_alignment>1</vertical_alignment> + </widget> + <widget type="rectangle" version="2.0.0"> + <name>BGGrey03-background_23</name> + <x>390</x> + <y>383</y> + <width>360</width> + <height>50</height> + <line_width>0</line_width> + <background_color> + <color name="GROUP-BACKGROUND" red="200" green="205" blue="201"> + </color> + </background_color> + <corner_width>5</corner_width> + <corner_height>5</corner_height> + </widget> + <widget type="action_button" version="3.0.0"> + <name>Action Button_1</name> + <actions> + <action type="write_pv"> + <pv_name>CWM-CWS05:WtrC-PT-511:HMIParamsDisabled</pv_name> + <value>1</value> + <description>Write PV</description> + </action> + </actions> + <text>FORCE</text> + <x>590</x> + <y>395</y> + <width>130</width> + <tooltip>$(actions)</tooltip> + </widget> + <widget type="action_button" version="3.0.0"> + <name>Action Button</name> + <actions> + <action type="write_pv"> + <pv_name>CWM-CWS05:WtrC-PT-511:AlignParams</pv_name> + <value>1</value> + <description>Write PV</description> + </action> + </actions> + <text>ALIGN</text> + <x>420</x> + <y>395</y> + <width>130</width> </widget> </display> diff --git a/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Sub/PT566_577.bob b/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Sub/PT566_577.bob index 59030548..1d46912a 100644 --- a/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Sub/PT566_577.bob +++ b/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Sub/PT566_577.bob @@ -142,6 +142,7 @@ <y>130</y> <width>90</width> <height>30</height> + <precision>2</precision> <vertical_alignment>1</vertical_alignment> </widget> <widget type="textupdate" version="2.0.0"> @@ -151,6 +152,7 @@ <y>170</y> <width>90</width> <height>30</height> + <precision>2</precision> <vertical_alignment>1</vertical_alignment> </widget> <widget type="rectangle" version="2.0.0"> @@ -284,6 +286,7 @@ <y>130</y> <width>160</width> <height>30</height> + <precision>2</precision> <vertical_alignment>1</vertical_alignment> </widget> <widget type="led" version="2.0.0"> @@ -367,6 +370,7 @@ <y>230</y> <width>90</width> <height>30</height> + <precision>2</precision> <vertical_alignment>1</vertical_alignment> </widget> <widget type="textupdate" version="2.0.0"> @@ -376,6 +380,7 @@ <y>270</y> <width>90</width> <height>30</height> + <precision>2</precision> <vertical_alignment>1</vertical_alignment> </widget> <widget type="led" version="2.0.0"> @@ -406,6 +411,7 @@ <width>90</width> <height>30</height> <format>0</format> + <precision>2</precision> <show_units>true</show_units> </widget> <widget type="spinner" version="2.0.0"> @@ -416,6 +422,7 @@ <width>90</width> <height>30</height> <format>0</format> + <precision>2</precision> <show_units>true</show_units> </widget> <widget type="spinner" version="2.0.0"> @@ -426,6 +433,7 @@ <width>90</width> <height>30</height> <format>0</format> + <precision>2</precision> <show_units>true</show_units> </widget> <widget type="spinner" version="2.0.0"> @@ -436,6 +444,7 @@ <width>90</width> <height>30</height> <format>0</format> + <precision>2</precision> <show_units>true</show_units> </widget> </display> diff --git a/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Sub/SYS.bob b/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Sub/SYS.bob index 00ac3550..a520f42e 100644 --- a/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Sub/SYS.bob +++ b/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Sub/SYS.bob @@ -532,7 +532,7 @@ <name>Action Button_2</name> <actions> <action type="write_pv"> - <pv_name>$(sectName)::Cmd_StopSystemAuto</pv_name> + <pv_name>$(sectName)::Cmd_StartSystemAuto</pv_name> <value>1</value> <description>Start</description> </action> @@ -1217,6 +1217,7 @@ <y>390</y> <width>240</width> <height>30</height> + <precision>2</precision> <vertical_alignment>1</vertical_alignment> </widget> <widget type="label" version="2.0.0"> @@ -1236,6 +1237,7 @@ <y>430</y> <width>240</width> <height>30</height> + <precision>2</precision> <vertical_alignment>1</vertical_alignment> </widget> <widget type="label" version="2.0.0"> @@ -1255,6 +1257,7 @@ <y>470</y> <width>240</width> <height>30</height> + <precision>2</precision> <vertical_alignment>1</vertical_alignment> </widget> <widget type="label" version="2.0.0"> @@ -1321,6 +1324,7 @@ <y>390</y> <width>240</width> <height>30</height> + <precision>2</precision> <vertical_alignment>1</vertical_alignment> </widget> <widget type="label" version="2.0.0"> @@ -1340,6 +1344,7 @@ <y>430</y> <width>240</width> <height>30</height> + <precision>2</precision> <vertical_alignment>1</vertical_alignment> </widget> <widget type="label" version="2.0.0"> @@ -1359,6 +1364,7 @@ <y>470</y> <width>240</width> <height>30</height> + <precision>2</precision> <vertical_alignment>1</vertical_alignment> </widget> <widget type="label" version="2.0.0"> @@ -1425,6 +1431,7 @@ <y>390</y> <width>240</width> <height>30</height> + <precision>2</precision> <vertical_alignment>1</vertical_alignment> </widget> <widget type="label" version="2.0.0"> @@ -1444,6 +1451,7 @@ <y>430</y> <width>240</width> <height>30</height> + <precision>2</precision> <vertical_alignment>1</vertical_alignment> </widget> <widget type="label" version="2.0.0"> @@ -1463,6 +1471,7 @@ <y>470</y> <width>240</width> <height>30</height> + <precision>2</precision> <vertical_alignment>1</vertical_alignment> </widget> <widget type="label" version="2.0.0"> diff --git a/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Sub/TT.bob b/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Sub/TT.bob index 702c1adc..ea175cb8 100644 --- a/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Sub/TT.bob +++ b/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Sub/TT.bob @@ -162,6 +162,7 @@ <y>130</y> <width>90</width> <height>30</height> + <precision>2</precision> <vertical_alignment>1</vertical_alignment> </widget> <widget type="textupdate" version="2.0.0"> @@ -171,6 +172,7 @@ <y>170</y> <width>90</width> <height>30</height> + <precision>2</precision> <vertical_alignment>1</vertical_alignment> </widget> <widget type="rectangle" version="2.0.0"> @@ -304,6 +306,7 @@ <y>130</y> <width>160</width> <height>30</height> + <precision>2</precision> <vertical_alignment>1</vertical_alignment> </widget> <widget type="spinner" version="2.0.0"> @@ -314,6 +317,7 @@ <width>90</width> <height>30</height> <format>0</format> + <precision>2</precision> <show_units>true</show_units> </widget> <widget type="spinner" version="2.0.0"> @@ -324,6 +328,7 @@ <width>90</width> <height>30</height> <format>0</format> + <precision>2</precision> <show_units>true</show_units> </widget> </display> diff --git a/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Sub/TT514.bob b/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Sub/TT514.bob index b430504b..7dc4a57e 100644 --- a/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Sub/TT514.bob +++ b/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Sub/TT514.bob @@ -179,6 +179,7 @@ <y>130</y> <width>160</width> <height>30</height> + <precision>2</precision> <vertical_alignment>1</vertical_alignment> </widget> <widget type="rectangle" version="2.0.0"> @@ -275,6 +276,7 @@ <y>130</y> <width>80</width> <height>30</height> + <precision>2</precision> <vertical_alignment>1</vertical_alignment> </widget> <widget type="textupdate" version="2.0.0"> @@ -284,6 +286,7 @@ <y>170</y> <width>80</width> <height>30</height> + <precision>2</precision> <vertical_alignment>1</vertical_alignment> </widget> <widget type="led" version="2.0.0"> @@ -367,6 +370,7 @@ <y>230</y> <width>80</width> <height>30</height> + <precision>2</precision> <vertical_alignment>1</vertical_alignment> </widget> <widget type="textupdate" version="2.0.0"> @@ -376,6 +380,7 @@ <y>270</y> <width>80</width> <height>30</height> + <precision>2</precision> <vertical_alignment>1</vertical_alignment> </widget> <widget type="led" version="2.0.0"> @@ -462,6 +467,7 @@ <y>490</y> <width>140</width> <height>30</height> + <precision>2</precision> <vertical_alignment>1</vertical_alignment> </widget> <widget type="led" version="2.0.0"> @@ -538,6 +544,7 @@ <y>270</y> <width>160</width> <height>30</height> + <precision>2</precision> <vertical_alignment>1</vertical_alignment> </widget> <widget type="label" version="2.0.0"> @@ -557,6 +564,7 @@ <y>310</y> <width>160</width> <height>30</height> + <precision>2</precision> <vertical_alignment>1</vertical_alignment> </widget> <widget type="label" version="2.0.0"> @@ -576,6 +584,7 @@ <y>350</y> <width>160</width> <height>30</height> + <precision>2</precision> <vertical_alignment>1</vertical_alignment> </widget> <widget type="spinner" version="2.0.0"> @@ -586,6 +595,7 @@ <width>80</width> <height>30</height> <format>0</format> + <precision>2</precision> <show_units>true</show_units> </widget> <widget type="spinner" version="2.0.0"> @@ -596,6 +606,7 @@ <width>80</width> <height>30</height> <format>0</format> + <precision>2</precision> <show_units>true</show_units> </widget> <widget type="spinner" version="2.0.0"> @@ -606,6 +617,7 @@ <width>80</width> <height>30</height> <format>0</format> + <precision>2</precision> <show_units>true</show_units> </widget> <widget type="spinner" version="2.0.0"> @@ -616,6 +628,7 @@ <width>80</width> <height>30</height> <format>0</format> + <precision>2</precision> <show_units>true</show_units> </widget> </display> diff --git a/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Sub/TT565_575.bob b/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Sub/TT565_575.bob index 2da336f5..b10f96c1 100644 --- a/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Sub/TT565_575.bob +++ b/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Sub/TT565_575.bob @@ -178,6 +178,7 @@ <y>130</y> <width>160</width> <height>30</height> + <precision>2</precision> <vertical_alignment>1</vertical_alignment> </widget> <widget type="rectangle" version="2.0.0"> @@ -274,6 +275,7 @@ <y>130</y> <width>90</width> <height>30</height> + <precision>2</precision> <vertical_alignment>1</vertical_alignment> </widget> <widget type="textupdate" version="2.0.0"> @@ -283,6 +285,7 @@ <y>170</y> <width>90</width> <height>30</height> + <precision>2</precision> <vertical_alignment>1</vertical_alignment> </widget> <widget type="led" version="2.0.0"> @@ -366,6 +369,7 @@ <y>230</y> <width>90</width> <height>30</height> + <precision>2</precision> <vertical_alignment>1</vertical_alignment> </widget> <widget type="textupdate" version="2.0.0"> @@ -375,6 +379,7 @@ <y>270</y> <width>90</width> <height>30</height> + <precision>2</precision> <vertical_alignment>1</vertical_alignment> </widget> <widget type="led" version="2.0.0"> @@ -405,6 +410,7 @@ <width>90</width> <height>30</height> <format>0</format> + <precision>2</precision> <show_units>true</show_units> </widget> <widget type="spinner" version="2.0.0"> @@ -415,6 +421,7 @@ <width>90</width> <height>30</height> <format>0</format> + <precision>2</precision> <show_units>true</show_units> </widget> <widget type="spinner" version="2.0.0"> @@ -425,6 +432,7 @@ <width>90</width> <height>30</height> <format>0</format> + <precision>2</precision> <show_units>true</show_units> </widget> <widget type="spinner" version="2.0.0"> @@ -435,6 +443,7 @@ <width>90</width> <height>30</height> <format>0</format> + <precision>2</precision> <show_units>true</show_units> </widget> </display> diff --git a/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Sub/YCV.bob b/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Sub/YCV.bob index 95f4d3dc..10a741b7 100644 --- a/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Sub/YCV.bob +++ b/NON-APPROVED/TS2/ts2-wtrc/CWM-CWS05/99-Shared/Sub/YCV.bob @@ -121,6 +121,7 @@ <y>90</y> <width>240</width> <height>30</height> + <precision>2</precision> <vertical_alignment>1</vertical_alignment> </widget> <widget type="action_button" version="3.0.0"> @@ -398,6 +399,7 @@ <y>230</y> <width>170</width> <height>30</height> + <precision>2</precision> <vertical_alignment>1</vertical_alignment> </widget> <widget type="textupdate" version="2.0.0"> @@ -416,6 +418,7 @@ <y>410</y> <width>90</width> <height>30</height> + <precision>2</precision> <vertical_alignment>1</vertical_alignment> </widget> <widget type="textupdate" version="2.0.0"> @@ -425,6 +428,7 @@ <y>450</y> <width>90</width> <height>30</height> + <precision>2</precision> <vertical_alignment>1</vertical_alignment> </widget> <widget type="textupdate" version="2.0.0"> @@ -452,6 +456,7 @@ <y>230</y> <width>90</width> <height>30</height> + <precision>2</precision> <vertical_alignment>1</vertical_alignment> </widget> <widget type="textupdate" version="2.0.0"> @@ -461,6 +466,7 @@ <y>270</y> <width>90</width> <height>30</height> + <precision>2</precision> <vertical_alignment>1</vertical_alignment> </widget> <widget type="spinner" version="2.0.0"> @@ -471,6 +477,7 @@ <width>90</width> <height>30</height> <format>0</format> + <precision>2</precision> <show_units>true</show_units> </widget> <widget type="spinner" version="2.0.0"> @@ -481,6 +488,7 @@ <width>90</width> <height>30</height> <format>0</format> + <precision>2</precision> <show_units>true</show_units> </widget> <widget type="spinner" version="2.0.0"> @@ -491,6 +499,7 @@ <width>90</width> <height>30</height> <format>0</format> + <precision>2</precision> <show_units>true</show_units> </widget> <widget type="spinner" version="2.0.0"> @@ -501,6 +510,7 @@ <width>90</width> <height>30</height> <format>0</format> + <precision>2</precision> <show_units>true</show_units> </widget> <widget type="combo" version="2.0.0"> -- GitLab