diff --git a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Beam/em_Beam-and-Systems-Permit.bob b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Beam/em_Beam-and-Systems-Permit.bob
index a0ae23284b35724b14de1008a38dc410db34cb47..16f1cb50e83106a4297de1c24acb78bac7ee2ac1 100644
--- a/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Beam/em_Beam-and-Systems-Permit.bob
+++ b/NON-APPROVED/COMMON/OPERATOR-OVERVIEW-OPIS/EmbeddedScreens/Beam/em_Beam-and-Systems-Permit.bob
@@ -2,10 +2,6 @@
<display version="2.0.0">
<name>Beam and Systems Permit</name>
<class></class>
- <macros>
- <BeamPermit>loc://beampermit</BeamPermit>
- <SystemPermit>loc://systempermit</SystemPermit>
- </macros>
<width>450</width>
<height>430</height>
<background_color>
@@ -226,7 +222,7 @@
<description>Validate</description>
</action>
</actions>
- <text>Validate</text>
+ <text>Re-activate</text>
<x>210</x>
<y>60</y>
<width>180</width>
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 4f06e31a5bdc84cef3aba6ea9fe92417ee780287..22704d0d64d3211cf2c7249b3273f53aa5e60cfb 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
@@ -8,7 +8,7 @@
<LABAMC>Ctrl-AMC-005</LABAMC>
<LABBCM>LAB-BCM08</LABBCM>
</macros>
- <width>720</width>
+ <width>790</width>
<height>610</height>
<background_color>
<color name="BACKGROUND" red="220" green="225" blue="221">
@@ -19,7 +19,7 @@
<class>TITLE-BAR</class>
<x use_class="true">0</x>
<y use_class="true">0</y>
- <width>720</width>
+ <width>790</width>
<height use_class="true">50</height>
<line_width use_class="true">0</line_width>
<background_color use_class="true">
@@ -33,7 +33,7 @@
<text>TS2 Water Skid : $(sectName):$(DevName)</text>
<x use_class="true">20</x>
<y use_class="true">0</y>
- <width>670</width>
+ <width>750</width>
<height use_class="true">50</height>
<font use_class="true">
<font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
@@ -137,7 +137,7 @@
<name>GroupBackground_7</name>
<x>370</x>
<y>250</y>
- <width>330</width>
+ <width>400</width>
<height>160</height>
<line_width>0</line_width>
<background_color>
@@ -152,7 +152,7 @@
<text>Alarms</text>
<x>370</x>
<y>250</y>
- <width>330</width>
+ <width>400</width>
<height>50</height>
<font>
<font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
@@ -170,7 +170,7 @@
<name>BGGrey03-background_16</name>
<x>390</x>
<y>300</y>
- <width>290</width>
+ <width>360</width>
<height>90</height>
<line_width>0</line_width>
<background_color>
@@ -223,7 +223,7 @@
<widget type="label" version="2.0.0">
<name>Label_20</name>
<text>Limit:</text>
- <x>500</x>
+ <x>490</x>
<y>310</y>
<width>60</width>
<height>30</height>
@@ -233,7 +233,7 @@
<widget type="label" version="2.0.0">
<name>Label_21</name>
<text>Limit:</text>
- <x>500</x>
+ <x>490</x>
<y>350</y>
<width>60</width>
<height>30</height>
@@ -242,19 +242,19 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_11</name>
- <pv_name>$(sectName):$(DevName):Limit_HI</pv_name>
- <x>570</x>
+ <pv_name>$(sectName):$(DevName):Limit_HI-RB</pv_name>
+ <x>560</x>
<y>310</y>
- <width>90</width>
+ <width>80</width>
<height>30</height>
<vertical_alignment>1</vertical_alignment>
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_12</name>
- <pv_name>$(sectName):$(DevName):Limit_HIHI</pv_name>
- <x>570</x>
+ <pv_name>$(sectName):$(DevName):Limit_HIHI-RB</pv_name>
+ <x>560</x>
<y>350</y>
- <width>90</width>
+ <width>80</width>
<height>30</height>
<vertical_alignment>1</vertical_alignment>
</widget>
@@ -262,7 +262,7 @@
<name>GroupBackground_9</name>
<x>370</x>
<y>70</y>
- <width>330</width>
+ <width>400</width>
<height>160</height>
<line_width>0</line_width>
<background_color>
@@ -277,7 +277,7 @@
<text>Parameters</text>
<x>370</x>
<y>70</y>
- <width>330</width>
+ <width>400</width>
<height>50</height>
<font>
<font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
@@ -295,7 +295,7 @@
<name>BGGrey03-background_18</name>
<x>390</x>
<y>120</y>
- <width>290</width>
+ <width>360</width>
<height>90</height>
<line_width>0</line_width>
<background_color>
@@ -317,10 +317,9 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_15</name>
- <pv_name>$(sectName):$(DevName):Threshold</pv_name>
+ <pv_name>$(sectName):$(DevName):Threshold-RB</pv_name>
<x>520</x>
<y>130</y>
- <width>140</width>
<height>30</height>
<vertical_alignment>1</vertical_alignment>
</widget>
@@ -334,15 +333,6 @@
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
</widget>
- <widget type="textupdate" version="2.0.0">
- <name>Text Update_16</name>
- <pv_name>$(sectName):$(DevName):Setpoint_DeadBand</pv_name>
- <x>520</x>
- <y>170</y>
- <width>140</width>
- <height>30</height>
- <vertical_alignment>1</vertical_alignment>
- </widget>
<widget type="rectangle" version="2.0.0">
<name>GroupBackground_10</name>
<x>20</x>
@@ -392,39 +382,39 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_28</name>
- <text>Maximum:</text>
+ <text>Max:</text>
<x>50</x>
<y>310</y>
- <width>110</width>
+ <width>60</width>
<height>30</height>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_17</name>
- <pv_name>$(sectName):$(DevName):Scale_Max</pv_name>
- <x>170</x>
+ <pv_name>$(sectName):$(DevName):Scale_Max-RB</pv_name>
+ <x>120</x>
<y>310</y>
- <width>140</width>
+ <width>90</width>
<height>30</height>
<vertical_alignment>1</vertical_alignment>
</widget>
<widget type="label" version="2.0.0">
<name>Label_29</name>
- <text>Minimum:</text>
+ <text>Min:</text>
<x>50</x>
<y>350</y>
- <width>110</width>
+ <width>60</width>
<height>30</height>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_18</name>
- <pv_name>$(sectName):$(DevName):Scale_Min</pv_name>
- <x>170</x>
+ <pv_name>$(sectName):$(DevName):Scale_Min-RB</pv_name>
+ <x>120</x>
<y>350</y>
- <width>140</width>
+ <width>90</width>
<height>30</height>
<vertical_alignment>1</vertical_alignment>
</widget>
@@ -480,17 +470,17 @@
<text>High:</text>
<x>50</x>
<y>490</y>
- <width>110</width>
+ <width>60</width>
<height>30</height>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_19</name>
- <pv_name>$(sectName):$(DevName):Calib_High</pv_name>
- <x>170</x>
+ <pv_name>$(sectName):$(DevName):Calib_High-RB</pv_name>
+ <x>120</x>
<y>490</y>
- <width>140</width>
+ <width>90</width>
<height>30</height>
<vertical_alignment>1</vertical_alignment>
</widget>
@@ -499,17 +489,17 @@
<text>Low:</text>
<x>50</x>
<y>530</y>
- <width>110</width>
+ <width>60</width>
<height>30</height>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_20</name>
- <pv_name>$(sectName):$(DevName):Calib_Low</pv_name>
- <x>170</x>
+ <pv_name>$(sectName):$(DevName):Calib_Low-RB</pv_name>
+ <x>120</x>
<y>530</y>
- <width>140</width>
+ <width>90</width>
<height>30</height>
<vertical_alignment>1</vertical_alignment>
</widget>
@@ -517,7 +507,7 @@
<name>GroupBackground_12</name>
<x>370</x>
<y>430</y>
- <width>330</width>
+ <width>400</width>
<height>120</height>
<line_width>0</line_width>
<background_color>
@@ -532,7 +522,7 @@
<text>IO Status</text>
<x>370</x>
<y>430</y>
- <width>330</width>
+ <width>400</width>
<height>50</height>
<font>
<font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
@@ -550,7 +540,7 @@
<name>BGGrey03-background_17</name>
<x>390</x>
<y>480</y>
- <width>290</width>
+ <width>360</width>
<height>50</height>
<line_width>0</line_width>
<background_color>
@@ -580,4 +570,81 @@
</color>
</on_color>
</widget>
+ <widget type="textupdate" version="2.0.0">
+ <name>Text Update_21</name>
+ <pv_name>$(sectName):$(DevName):Setpoint_DeadBand-RB</pv_name>
+ <x>520</x>
+ <y>170</y>
+ <height>30</height>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="spinner" version="2.0.0">
+ <name>Text Update_22</name>
+ <pv_name>$(sectName):$(DevName):Threshold</pv_name>
+ <x>630</x>
+ <y>130</y>
+ <height>30</height>
+ <format>0</format>
+ <show_units>true</show_units>
+ </widget>
+ <widget type="spinner" version="2.0.0">
+ <name>Text Update_23</name>
+ <pv_name>$(sectName):$(DevName):Limit_HI</pv_name>
+ <x>650</x>
+ <y>310</y>
+ <width>80</width>
+ <height>30</height>
+ <format>0</format>
+ <show_units>true</show_units>
+ </widget>
+ <widget type="spinner" version="2.0.0">
+ <name>Text Update_24</name>
+ <pv_name>$(sectName):$(DevName):Limit_HIHI</pv_name>
+ <x>650</x>
+ <y>350</y>
+ <width>80</width>
+ <height>30</height>
+ <format>0</format>
+ <show_units>true</show_units>
+ </widget>
+ <widget type="spinner" version="2.0.0">
+ <name>Text Update_25</name>
+ <pv_name>$(sectName):$(DevName):Calib_Low</pv_name>
+ <x>220</x>
+ <y>530</y>
+ <width>90</width>
+ <height>30</height>
+ <format>0</format>
+ <show_units>true</show_units>
+ </widget>
+ <widget type="spinner" version="2.0.0">
+ <name>Text Update_26</name>
+ <pv_name>$(sectName):$(DevName):Calib_High</pv_name>
+ <x>220</x>
+ <y>490</y>
+ <width>90</width>
+ <height>30</height>
+ <format>0</format>
+ <show_units>true</show_units>
+ </widget>
+ <widget type="spinner" version="2.0.0">
+ <name>Text Update_27</name>
+ <pv_name>$(sectName):$(DevName):Scale_Max</pv_name>
+ <x>220</x>
+ <y>310</y>
+ <width>90</width>
+ <height>30</height>
+ <format>0</format>
+ <show_units>true</show_units>
+ </widget>
+ <widget type="spinner" version="2.0.0">
+ <name>Text Update_28</name>
+ <pv_name>$(sectName):$(DevName):Scale_Min</pv_name>
+ <x>220</x>
+ <y>350</y>
+ <width>90</width>
+ <height>30</height>
+ <format>0</format>
+ <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 7b7b9b771400ec20069efc73619057578845e490..24b081bb1c9a00463134ef5f9bb9cde557439252 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
@@ -8,7 +8,6 @@
<LABAMC>Ctrl-AMC-005</LABAMC>
<LABBCM>LAB-BCM08</LABBCM>
</macros>
- <width>720</width>
<height>390</height>
<background_color>
<color name="BACKGROUND" red="220" green="225" blue="221">
@@ -52,7 +51,7 @@
<class>TITLE-BAR</class>
<x use_class="true">0</x>
<y use_class="true">0</y>
- <width>720</width>
+ <width>800</width>
<height use_class="true">50</height>
<line_width use_class="true">0</line_width>
<background_color use_class="true">
@@ -66,7 +65,7 @@
<text>TS2 Water Skid : $(sectName):$(DevName)</text>
<x use_class="true">20</x>
<y use_class="true">0</y>
- <width>680</width>
+ <width>760</width>
<height use_class="true">50</height>
<font use_class="true">
<font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
@@ -204,7 +203,7 @@
<name>GroupBackground_13</name>
<x>370</x>
<y>70</y>
- <width>330</width>
+ <width>410</width>
<height>160</height>
<line_width>0</line_width>
<background_color>
@@ -219,7 +218,7 @@
<text>Alarms</text>
<x>370</x>
<y>70</y>
- <width>330</width>
+ <width>410</width>
<height>50</height>
<font>
<font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
@@ -237,7 +236,7 @@
<name>BGGrey03-background_18</name>
<x>390</x>
<y>120</y>
- <width>290</width>
+ <width>370</width>
<height>90</height>
<line_width>0</line_width>
<background_color>
@@ -290,7 +289,7 @@
<widget type="label" version="2.0.0">
<name>Label_25</name>
<text>Limit:</text>
- <x>500</x>
+ <x>480</x>
<y>130</y>
<width>60</width>
<height>30</height>
@@ -300,7 +299,7 @@
<widget type="label" version="2.0.0">
<name>Label_26</name>
<text>Limit:</text>
- <x>500</x>
+ <x>480</x>
<y>170</y>
<width>60</width>
<height>30</height>
@@ -309,8 +308,8 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_11</name>
- <pv_name>$(sectName):$(DevName):Limit_LO</pv_name>
- <x>570</x>
+ <pv_name>$(sectName):$(DevName):Limit_LO-RB</pv_name>
+ <x>550</x>
<y>130</y>
<width>90</width>
<height>30</height>
@@ -318,11 +317,31 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_12</name>
- <pv_name>$(sectName):$(DevName):Limit_LOLO</pv_name>
- <x>570</x>
+ <pv_name>$(sectName):$(DevName):Limit_LOLO-RB</pv_name>
+ <x>550</x>
<y>170</y>
<width>90</width>
<height>30</height>
<vertical_alignment>1</vertical_alignment>
</widget>
+ <widget type="spinner" version="2.0.0">
+ <name>Text Update_13</name>
+ <pv_name>$(sectName):$(DevName):Limit_LO</pv_name>
+ <x>650</x>
+ <y>130</y>
+ <width>90</width>
+ <height>30</height>
+ <format>0</format>
+ <show_units>true</show_units>
+ </widget>
+ <widget type="spinner" version="2.0.0">
+ <name>Text Update_14</name>
+ <pv_name>$(sectName):$(DevName):Limit_LOLO</pv_name>
+ <x>650</x>
+ <y>170</y>
+ <width>90</width>
+ <height>30</height>
+ <format>0</format>
+ <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 75d806ca0cb502078cfcfee7a9b4457f019ef278..98dccaa492c18c222039d437a7f919f500872249 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
@@ -8,7 +8,7 @@
<LABAMC>Ctrl-AMC-005</LABAMC>
<LABBCM>LAB-BCM08</LABBCM>
</macros>
- <width>720</width>
+ <width>790</width>
<height>570</height>
<background_color>
<color name="BACKGROUND" red="220" green="225" blue="221">
@@ -52,7 +52,7 @@
<class>TITLE-BAR</class>
<x use_class="true">0</x>
<y use_class="true">0</y>
- <width>720</width>
+ <width>790</width>
<height use_class="true">50</height>
<line_width use_class="true">0</line_width>
<background_color use_class="true">
@@ -66,7 +66,7 @@
<text>TS2 Water Skid : $(sectName):$(DevName)</text>
<x use_class="true">20</x>
<y use_class="true">0</y>
- <width>680</width>
+ <width>750</width>
<height use_class="true">50</height>
<font use_class="true">
<font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
@@ -137,7 +137,7 @@
<name>GroupBackground_12</name>
<x>370</x>
<y>250</y>
- <width>330</width>
+ <width>400</width>
<height>160</height>
<line_width>0</line_width>
<background_color>
@@ -152,7 +152,7 @@
<text>Faults</text>
<x>370</x>
<y>250</y>
- <width>330</width>
+ <width>400</width>
<height>50</height>
<font>
<font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
@@ -170,7 +170,7 @@
<name>BGGrey03-background_17</name>
<x>390</x>
<y>300</y>
- <width>290</width>
+ <width>360</width>
<height>90</height>
<line_width>0</line_width>
<background_color>
@@ -204,7 +204,7 @@
<name>GroupBackground_13</name>
<x>370</x>
<y>70</y>
- <width>330</width>
+ <width>400</width>
<height>160</height>
<line_width>0</line_width>
<background_color>
@@ -219,7 +219,7 @@
<text>Alarms</text>
<x>370</x>
<y>70</y>
- <width>330</width>
+ <width>400</width>
<height>50</height>
<font>
<font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
@@ -237,7 +237,7 @@
<name>BGGrey03-background_18</name>
<x>390</x>
<y>120</y>
- <width>290</width>
+ <width>360</width>
<height>90</height>
<line_width>0</line_width>
<background_color>
@@ -290,7 +290,7 @@
<widget type="label" version="2.0.0">
<name>Label_25</name>
<text>Limit:</text>
- <x>500</x>
+ <x>480</x>
<y>130</y>
<width>60</width>
<height>30</height>
@@ -300,7 +300,7 @@
<widget type="label" version="2.0.0">
<name>Label_26</name>
<text>Limit:</text>
- <x>500</x>
+ <x>480</x>
<y>170</y>
<width>60</width>
<height>30</height>
@@ -309,8 +309,8 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_11</name>
- <pv_name>$(sectName):$(DevName):Limit_LO</pv_name>
- <x>570</x>
+ <pv_name>$(sectName):$(DevName):Limit_LO-RB</pv_name>
+ <x>550</x>
<y>130</y>
<width>90</width>
<height>30</height>
@@ -318,8 +318,8 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_12</name>
- <pv_name>$(sectName):$(DevName):Limit_LOLO</pv_name>
- <x>570</x>
+ <pv_name>$(sectName):$(DevName):Limit_LOLO-RB</pv_name>
+ <x>550</x>
<y>170</y>
<width>90</width>
<height>30</height>
@@ -375,37 +375,37 @@
<widget type="label" version="2.0.0">
<name>Label_5</name>
<text>Max:</text>
- <x>50</x>
+ <x>60</x>
<y>310</y>
- <width>120</width>
+ <width>60</width>
<height>30</height>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_6</name>
- <pv_name>$(sectName):$(DevName):Flow_Max</pv_name>
- <x>180</x>
+ <pv_name>$(sectName):$(DevName):Flow_Max-RB</pv_name>
+ <x>130</x>
<y>310</y>
- <width>140</width>
+ <width>90</width>
<height>30</height>
<vertical_alignment>1</vertical_alignment>
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_7</name>
- <pv_name>$(sectName):$(DevName):Flow_Min</pv_name>
- <x>180</x>
+ <pv_name>$(sectName):$(DevName):Flow_Min-RB</pv_name>
+ <x>130</x>
<y>350</y>
- <width>140</width>
+ <width>90</width>
<height>30</height>
<vertical_alignment>1</vertical_alignment>
</widget>
<widget type="label" version="2.0.0">
<name>Label_7</name>
<text>Min:</text>
- <x>50</x>
+ <x>60</x>
<y>350</y>
- <width>120</width>
+ <width>60</width>
<height>30</height>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -506,4 +506,44 @@
</color>
</on_color>
</widget>
+ <widget type="spinner" version="2.0.0">
+ <name>Text Update_13</name>
+ <pv_name>$(sectName):$(DevName):Limit_LO</pv_name>
+ <x>650</x>
+ <y>130</y>
+ <width>90</width>
+ <height>30</height>
+ <format>0</format>
+ <show_units>true</show_units>
+ </widget>
+ <widget type="spinner" version="2.0.0">
+ <name>Text Update_14</name>
+ <pv_name>$(sectName):$(DevName):Limit_LOLO</pv_name>
+ <x>650</x>
+ <y>170</y>
+ <width>90</width>
+ <height>30</height>
+ <format>0</format>
+ <show_units>true</show_units>
+ </widget>
+ <widget type="spinner" version="2.0.0">
+ <name>Text Update_15</name>
+ <pv_name>$(sectName):$(DevName):Flow_Min</pv_name>
+ <x>230</x>
+ <y>350</y>
+ <width>90</width>
+ <height>30</height>
+ <format>0</format>
+ <show_units>true</show_units>
+ </widget>
+ <widget type="spinner" version="2.0.0">
+ <name>Text Update_16</name>
+ <pv_name>$(sectName):$(DevName):Flow_Max</pv_name>
+ <x>230</x>
+ <y>310</y>
+ <width>90</width>
+ <height>30</height>
+ <format>0</format>
+ <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 b6e82834f72bd5932f8a16afe8b3ad95b8d9fc51..0f107b3d1237aa39c874e7cb44f389d3c64189f8 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
@@ -8,8 +8,8 @@
<LABAMC>Ctrl-AMC-005</LABAMC>
<LABBCM>LAB-BCM08</LABBCM>
</macros>
- <width>2260</width>
- <height>1350</height>
+ <width>1100</width>
+ <height>690</height>
<background_color>
<color name="BACKGROUND" red="220" green="225" blue="221">
</color>
@@ -359,7 +359,7 @@
<widget type="spinner" version="2.0.0">
<name>Text Update_13</name>
<pv_name>$(sectName):$(DevName):ManSpeedCtrlP</pv_name>
- <x>180</x>
+ <x>290</x>
<y>350</y>
<height>30</height>
<format>0</format>
@@ -455,7 +455,7 @@
<widget type="spinner" version="2.0.0">
<name>Text Update_14</name>
<pv_name>$(sectName):$(DevName):SpeedStpPressure</pv_name>
- <x>180</x>
+ <x>290</x>
<y>530</y>
<height>30</height>
<format>0</format>
@@ -464,7 +464,7 @@
<widget type="spinner" version="2.0.0">
<name>Text Update_15</name>
<pv_name>$(sectName):$(DevName):SpeedStpFlow</pv_name>
- <x>180</x>
+ <x>290</x>
<y>570</y>
<height>30</height>
<format>0</format>
@@ -493,7 +493,7 @@
<widget type="combo" version="2.0.0">
<name>Text Update_16</name>
<pv_name>$(sectName):$(DevName):SpeedCtrlMethod</pv_name>
- <x>180</x>
+ <x>290</x>
<y>610</y>
<background_color>
<color name="Write_Background" red="224" green="217" blue="202">
@@ -518,7 +518,7 @@
<widget type="textupdate" version="2.0.0">
<name>Text Update_17</name>
<pv_name>$(sectName):$(DevName):SpeedStpPressure-RB</pv_name>
- <x>290</x>
+ <x>180</x>
<y>530</y>
<height>30</height>
<vertical_alignment>1</vertical_alignment>
@@ -526,7 +526,7 @@
<widget type="textupdate" version="2.0.0">
<name>Text Update_18</name>
<pv_name>$(sectName):$(DevName):SpeedStpFlow-RB</pv_name>
- <x>290</x>
+ <x>180</x>
<y>570</y>
<height>30</height>
<vertical_alignment>1</vertical_alignment>
@@ -534,7 +534,7 @@
<widget type="textupdate" version="2.0.0">
<name>Text Update_19</name>
<pv_name>$(sectName):$(DevName):SpeedCtrlMethod-RB</pv_name>
- <x>290</x>
+ <x>180</x>
<y>610</y>
<height>30</height>
<vertical_alignment>1</vertical_alignment>
@@ -542,7 +542,7 @@
<widget type="textupdate" version="2.0.0">
<name>Text Update_20</name>
<pv_name>$(sectName):$(DevName):ManSpeedCtrlP-RB</pv_name>
- <x>290</x>
+ <x>180</x>
<y>350</y>
<height>30</height>
<vertical_alignment>1</vertical_alignment>
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 e1d30332fa07eeb1d0a69aefa2237c209e432d8a..dade1fa073c16fb85fa64da6baf8a2d6d34ce5d7 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
@@ -8,7 +8,7 @@
<LABAMC>Ctrl-AMC-005</LABAMC>
<LABBCM>LAB-BCM08</LABBCM>
</macros>
- <width>720</width>
+ <width>790</width>
<height>350</height>
<background_color>
<color name="BACKGROUND" red="220" green="225" blue="221">
@@ -19,7 +19,7 @@
<class>TITLE-BAR</class>
<x use_class="true">0</x>
<y use_class="true">0</y>
- <width>720</width>
+ <width>790</width>
<height use_class="true">50</height>
<line_width use_class="true">0</line_width>
<background_color use_class="true">
@@ -33,7 +33,7 @@
<text>TS2 Water Skid : $(sectName):$(DevName)</text>
<x use_class="true">20</x>
<y use_class="true">0</y>
- <width>680</width>
+ <width>750</width>
<height use_class="true">50</height>
<font use_class="true">
<font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
@@ -52,7 +52,7 @@
<name>GroupBackground_7</name>
<x>370</x>
<y>70</y>
- <width>330</width>
+ <width>400</width>
<height>160</height>
<line_width>0</line_width>
<background_color>
@@ -67,7 +67,7 @@
<text>Alarms</text>
<x>370</x>
<y>70</y>
- <width>330</width>
+ <width>400</width>
<height>50</height>
<font>
<font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
@@ -85,7 +85,7 @@
<name>BGGrey03-background_16</name>
<x>390</x>
<y>120</y>
- <width>290</width>
+ <width>360</width>
<height>90</height>
<line_width>0</line_width>
<background_color>
@@ -118,7 +118,7 @@
<widget type="label" version="2.0.0">
<name>Label_20</name>
<text>Limit:</text>
- <x>500</x>
+ <x>480</x>
<y>130</y>
<width>60</width>
<height>30</height>
@@ -128,7 +128,7 @@
<widget type="label" version="2.0.0">
<name>Label_21</name>
<text>Limit:</text>
- <x>500</x>
+ <x>480</x>
<y>170</y>
<width>60</width>
<height>30</height>
@@ -137,8 +137,8 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_11</name>
- <pv_name>$(sectName):$(DevName):Limit_HI</pv_name>
- <x>570</x>
+ <pv_name>$(sectName):$(DevName):Limit_HI-RB</pv_name>
+ <x>550</x>
<y>130</y>
<width>90</width>
<height>30</height>
@@ -146,8 +146,8 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_12</name>
- <pv_name>$(sectName):$(DevName):Limit_HIHI</pv_name>
- <x>570</x>
+ <pv_name>$(sectName):$(DevName):Limit_HIHI-RB</pv_name>
+ <x>550</x>
<y>170</y>
<width>90</width>
<height>30</height>
@@ -306,4 +306,24 @@
</color>
</on_color>
</widget>
+ <widget type="spinner" version="2.0.0">
+ <name>Text Update_14</name>
+ <pv_name>$(sectName):$(DevName):Limit_HIHI</pv_name>
+ <x>650</x>
+ <y>170</y>
+ <width>90</width>
+ <height>30</height>
+ <format>0</format>
+ <show_units>true</show_units>
+ </widget>
+ <widget type="spinner" version="2.0.0">
+ <name>Text Update_15</name>
+ <pv_name>$(sectName):$(DevName):Limit_HI</pv_name>
+ <x>650</x>
+ <y>130</y>
+ <width>90</width>
+ <height>30</height>
+ <format>0</format>
+ <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 4cb4b269ac1eb7e70264cfbefd60754c06328c1d..38d17b88cfbf76d6cdf58d05dd66cac0db873c21 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
@@ -8,7 +8,7 @@
<LABAMC>Ctrl-AMC-005</LABAMC>
<LABBCM>LAB-BCM08</LABBCM>
</macros>
- <width>720</width>
+ <width>790</width>
<height>350</height>
<background_color>
<color name="BACKGROUND" red="220" green="225" blue="221">
@@ -19,7 +19,7 @@
<class>TITLE-BAR</class>
<x use_class="true">0</x>
<y use_class="true">0</y>
- <width>720</width>
+ <width>790</width>
<height use_class="true">50</height>
<line_width use_class="true">0</line_width>
<background_color use_class="true">
@@ -33,7 +33,7 @@
<text>TS2 Water Skid : $(sectName):$(DevName)</text>
<x use_class="true">20</x>
<y use_class="true">0</y>
- <width>680</width>
+ <width>750</width>
<height use_class="true">50</height>
<font use_class="true">
<font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
@@ -52,7 +52,7 @@
<name>GroupBackground_7</name>
<x>370</x>
<y>70</y>
- <width>330</width>
+ <width>400</width>
<height>160</height>
<line_width>0</line_width>
<background_color>
@@ -67,7 +67,7 @@
<text>Alarms</text>
<x>370</x>
<y>70</y>
- <width>330</width>
+ <width>400</width>
<height>50</height>
<font>
<font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
@@ -85,7 +85,7 @@
<name>BGGrey03-background_16</name>
<x>390</x>
<y>120</y>
- <width>290</width>
+ <width>360</width>
<height>90</height>
<line_width>0</line_width>
<background_color>
@@ -118,7 +118,7 @@
<widget type="label" version="2.0.0">
<name>Label_20</name>
<text>Limit:</text>
- <x>500</x>
+ <x>480</x>
<y>130</y>
<width>60</width>
<height>30</height>
@@ -128,7 +128,7 @@
<widget type="label" version="2.0.0">
<name>Label_21</name>
<text>Limit:</text>
- <x>500</x>
+ <x>480</x>
<y>170</y>
<width>60</width>
<height>30</height>
@@ -137,8 +137,8 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_11</name>
- <pv_name>$(sectName):$(DevName):Limit_LO</pv_name>
- <x>570</x>
+ <pv_name>$(sectName):$(DevName):Limit_LO-RB</pv_name>
+ <x>550</x>
<y>130</y>
<width>90</width>
<height>30</height>
@@ -146,8 +146,8 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_12</name>
- <pv_name>$(sectName):$(DevName):Limit_LOLO</pv_name>
- <x>570</x>
+ <pv_name>$(sectName):$(DevName):Limit_LOLO-RB</pv_name>
+ <x>550</x>
<y>170</y>
<width>90</width>
<height>30</height>
@@ -306,4 +306,24 @@
</color>
</on_color>
</widget>
+ <widget type="spinner" version="2.0.0">
+ <name>Text Update_14</name>
+ <pv_name>$(sectName):$(DevName):Limit_LO</pv_name>
+ <x>650</x>
+ <y>130</y>
+ <width>90</width>
+ <height>30</height>
+ <format>0</format>
+ <show_units>true</show_units>
+ </widget>
+ <widget type="spinner" version="2.0.0">
+ <name>Text Update_15</name>
+ <pv_name>$(sectName):$(DevName):Limit_LOLO</pv_name>
+ <x>650</x>
+ <y>170</y>
+ <width>90</width>
+ <height>30</height>
+ <format>0</format>
+ <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 5dc479391fc3b19d122a30b93c28c2822840ac1d..e06c576ac87876323093e2e3985d5ebe88251dd8 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
@@ -8,7 +8,7 @@
<LABAMC>Ctrl-AMC-005</LABAMC>
<LABBCM>LAB-BCM08</LABBCM>
</macros>
- <width>720</width>
+ <width>790</width>
<height>450</height>
<background_color>
<color name="BACKGROUND" red="220" green="225" blue="221">
@@ -19,7 +19,7 @@
<class>TITLE-BAR</class>
<x use_class="true">0</x>
<y use_class="true">0</y>
- <width>720</width>
+ <width>790</width>
<height use_class="true">50</height>
<line_width use_class="true">0</line_width>
<background_color use_class="true">
@@ -33,7 +33,7 @@
<text>TS2 Water Skid : $(sectName):$(DevName)</text>
<x use_class="true">20</x>
<y use_class="true">0</y>
- <width>680</width>
+ <width>750</width>
<height use_class="true">50</height>
<font use_class="true">
<font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
@@ -52,7 +52,7 @@
<name>GroupBackground_7</name>
<x>370</x>
<y>70</y>
- <width>330</width>
+ <width>400</width>
<height>260</height>
<line_width>0</line_width>
<background_color>
@@ -67,7 +67,7 @@
<text>Alarms</text>
<x>370</x>
<y>70</y>
- <width>330</width>
+ <width>400</width>
<height>50</height>
<font>
<font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
@@ -85,7 +85,7 @@
<name>BGGrey03-background_16</name>
<x>390</x>
<y>120</y>
- <width>290</width>
+ <width>360</width>
<height>90</height>
<line_width>0</line_width>
<background_color>
@@ -118,7 +118,7 @@
<widget type="label" version="2.0.0">
<name>Label_20</name>
<text>Limit:</text>
- <x>500</x>
+ <x>480</x>
<y>130</y>
<width>60</width>
<height>30</height>
@@ -128,7 +128,7 @@
<widget type="label" version="2.0.0">
<name>Label_21</name>
<text>Limit:</text>
- <x>500</x>
+ <x>480</x>
<y>170</y>
<width>60</width>
<height>30</height>
@@ -137,8 +137,8 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_11</name>
- <pv_name>$(sectName):$(DevName):Limit_HI</pv_name>
- <x>570</x>
+ <pv_name>$(sectName):$(DevName):Limit_HI-RB</pv_name>
+ <x>550</x>
<y>130</y>
<width>90</width>
<height>30</height>
@@ -146,8 +146,8 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_12</name>
- <pv_name>$(sectName):$(DevName):Limit_HIHI</pv_name>
- <x>570</x>
+ <pv_name>$(sectName):$(DevName):Limit_HIHI-RB</pv_name>
+ <x>550</x>
<y>170</y>
<width>90</width>
<height>30</height>
@@ -272,7 +272,7 @@
<text>Measured:</text>
<x>50</x>
<y>130</y>
- <width>90</width>
+ <width>80</width>
<height>30</height>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -280,9 +280,9 @@
<widget type="textupdate" version="2.0.0">
<name>Text Update_13</name>
<pv_name>$(sectName):$(DevName):Press_MeasValue</pv_name>
- <x>150</x>
+ <x>140</x>
<y>130</y>
- <width>160</width>
+ <width>170</width>
<height>30</height>
<vertical_alignment>1</vertical_alignment>
</widget>
@@ -310,7 +310,7 @@
<name>BGGrey03-background_19</name>
<x>390</x>
<y>220</y>
- <width>290</width>
+ <width>360</width>
<height>90</height>
<line_width>0</line_width>
<background_color>
@@ -343,7 +343,7 @@
<widget type="label" version="2.0.0">
<name>Label_26</name>
<text>Limit:</text>
- <x>500</x>
+ <x>480</x>
<y>230</y>
<width>60</width>
<height>30</height>
@@ -353,7 +353,7 @@
<widget type="label" version="2.0.0">
<name>Label_27</name>
<text>Limit:</text>
- <x>500</x>
+ <x>480</x>
<y>270</y>
<width>60</width>
<height>30</height>
@@ -362,8 +362,8 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_14</name>
- <pv_name>$(sectName):$(DevName):Limit_LO</pv_name>
- <x>570</x>
+ <pv_name>$(sectName):$(DevName):Limit_LO-RB</pv_name>
+ <x>550</x>
<y>230</y>
<width>90</width>
<height>30</height>
@@ -371,8 +371,8 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_15</name>
- <pv_name>$(sectName):$(DevName):Limit_LOLO</pv_name>
- <x>570</x>
+ <pv_name>$(sectName):$(DevName):Limit_LOLO-RB</pv_name>
+ <x>550</x>
<y>270</y>
<width>90</width>
<height>30</height>
@@ -417,26 +417,26 @@
<text>Maximum:</text>
<x>50</x>
<y>190</y>
- <width>90</width>
+ <width>80</width>
<height>30</height>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_16</name>
- <pv_name>$(sectName):$(DevName):Pressure_Max</pv_name>
- <x>150</x>
+ <pv_name>$(sectName):$(DevName):Pressure_Max-RB</pv_name>
+ <x>140</x>
<y>190</y>
- <width>160</width>
+ <width>80</width>
<height>30</height>
<vertical_alignment>1</vertical_alignment>
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_17</name>
- <pv_name>$(sectName):$(DevName):Pressure_Min</pv_name>
- <x>150</x>
+ <pv_name>$(sectName):$(DevName):Pressure_Min-RB</pv_name>
+ <x>140</x>
<y>230</y>
- <width>160</width>
+ <width>80</width>
<height>30</height>
<vertical_alignment>1</vertical_alignment>
</widget>
@@ -445,9 +445,69 @@
<text>Minimum:</text>
<x>50</x>
<y>230</y>
- <width>90</width>
+ <width>80</width>
<height>30</height>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
</widget>
+ <widget type="spinner" version="2.0.0">
+ <name>Text Update_18</name>
+ <pv_name>$(sectName):$(DevName):Limit_HI</pv_name>
+ <x>650</x>
+ <y>130</y>
+ <width>90</width>
+ <height>30</height>
+ <format>0</format>
+ <show_units>true</show_units>
+ </widget>
+ <widget type="spinner" version="2.0.0">
+ <name>Text Update_19</name>
+ <pv_name>$(sectName):$(DevName):Limit_HIHI</pv_name>
+ <x>650</x>
+ <y>170</y>
+ <width>90</width>
+ <height>30</height>
+ <format>0</format>
+ <show_units>true</show_units>
+ </widget>
+ <widget type="spinner" version="2.0.0">
+ <name>Text Update_20</name>
+ <pv_name>$(sectName):$(DevName):Limit_LO</pv_name>
+ <x>650</x>
+ <y>230</y>
+ <width>90</width>
+ <height>30</height>
+ <format>0</format>
+ <show_units>true</show_units>
+ </widget>
+ <widget type="spinner" version="2.0.0">
+ <name>Text Update_21</name>
+ <pv_name>$(sectName):$(DevName):Limit_LOLO</pv_name>
+ <x>650</x>
+ <y>270</y>
+ <width>90</width>
+ <height>30</height>
+ <format>0</format>
+ <show_units>true</show_units>
+ </widget>
+ <widget type="spinner" version="2.0.0">
+ <name>Text Update_22</name>
+ <pv_name>$(sectName):$(DevName):Pressure_Min</pv_name>
+ <x>230</x>
+ <y>230</y>
+ <width>80</width>
+ <height>30</height>
+ <format>0</format>
+ <show_units>true</show_units>
+ </widget>
+ <widget type="spinner" version="2.0.0">
+ <name>Text Update_23</name>
+ <pv_name>$(sectName):$(DevName):Pressure_Max</pv_name>
+ <x>230</x>
+ <y>190</y>
+ <width>80</width>
+ <height>30</height>
+ <format>0</format>
+ <show_units>true</show_units>
+ </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 6d38bd4f087dc464080acc0291bde94045e43d1b..590305480c58a0474f6550da79ca87d19b73b84c 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
@@ -8,7 +8,7 @@
<LABAMC>Ctrl-AMC-005</LABAMC>
<LABBCM>LAB-BCM08</LABBCM>
</macros>
- <width>720</width>
+ <width>790</width>
<height>350</height>
<background_color>
<color name="BACKGROUND" red="220" green="225" blue="221">
@@ -19,7 +19,7 @@
<class>TITLE-BAR</class>
<x use_class="true">0</x>
<y use_class="true">0</y>
- <width>720</width>
+ <width>790</width>
<height use_class="true">50</height>
<line_width use_class="true">0</line_width>
<background_color use_class="true">
@@ -33,7 +33,7 @@
<text>TS2 Water Skid : $(sectName):$(DevName)</text>
<x use_class="true">20</x>
<y use_class="true">0</y>
- <width>680</width>
+ <width>750</width>
<height use_class="true">50</height>
<font use_class="true">
<font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
@@ -52,7 +52,7 @@
<name>GroupBackground_7</name>
<x>370</x>
<y>70</y>
- <width>330</width>
+ <width>400</width>
<height>260</height>
<line_width>0</line_width>
<background_color>
@@ -67,7 +67,7 @@
<text>Alarms</text>
<x>370</x>
<y>70</y>
- <width>330</width>
+ <width>400</width>
<height>50</height>
<font>
<font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
@@ -85,7 +85,7 @@
<name>BGGrey03-background_16</name>
<x>390</x>
<y>120</y>
- <width>290</width>
+ <width>360</width>
<height>90</height>
<line_width>0</line_width>
<background_color>
@@ -118,7 +118,7 @@
<widget type="label" version="2.0.0">
<name>Label_20</name>
<text>Limit:</text>
- <x>500</x>
+ <x>480</x>
<y>130</y>
<width>60</width>
<height>30</height>
@@ -128,7 +128,7 @@
<widget type="label" version="2.0.0">
<name>Label_21</name>
<text>Limit:</text>
- <x>500</x>
+ <x>480</x>
<y>170</y>
<width>60</width>
<height>30</height>
@@ -137,8 +137,8 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_11</name>
- <pv_name>$(sectName):$(DevName):Limit_HI</pv_name>
- <x>570</x>
+ <pv_name>$(sectName):$(DevName):Limit_HI-RB</pv_name>
+ <x>550</x>
<y>130</y>
<width>90</width>
<height>30</height>
@@ -146,8 +146,8 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_12</name>
- <pv_name>$(sectName):$(DevName):Limit_HIHI</pv_name>
- <x>570</x>
+ <pv_name>$(sectName):$(DevName):Limit_HIHI-RB</pv_name>
+ <x>550</x>
<y>170</y>
<width>90</width>
<height>30</height>
@@ -310,7 +310,7 @@
<name>BGGrey03-background_19</name>
<x>390</x>
<y>220</y>
- <width>290</width>
+ <width>360</width>
<height>90</height>
<line_width>0</line_width>
<background_color>
@@ -343,7 +343,7 @@
<widget type="label" version="2.0.0">
<name>Label_26</name>
<text>Limit:</text>
- <x>500</x>
+ <x>480</x>
<y>230</y>
<width>60</width>
<height>30</height>
@@ -353,7 +353,7 @@
<widget type="label" version="2.0.0">
<name>Label_27</name>
<text>Limit:</text>
- <x>500</x>
+ <x>480</x>
<y>270</y>
<width>60</width>
<height>30</height>
@@ -362,8 +362,8 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_14</name>
- <pv_name>$(sectName):$(DevName):Limit_LO</pv_name>
- <x>570</x>
+ <pv_name>$(sectName):$(DevName):Limit_LO-RB</pv_name>
+ <x>550</x>
<y>230</y>
<width>90</width>
<height>30</height>
@@ -371,8 +371,8 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_15</name>
- <pv_name>$(sectName):$(DevName):Limit_LOLO</pv_name>
- <x>570</x>
+ <pv_name>$(sectName):$(DevName):Limit_LOLO-RB</pv_name>
+ <x>550</x>
<y>270</y>
<width>90</width>
<height>30</height>
@@ -398,4 +398,44 @@
</color>
</on_color>
</widget>
+ <widget type="spinner" version="2.0.0">
+ <name>Text Update_16</name>
+ <pv_name>$(sectName):$(DevName):Limit_HI</pv_name>
+ <x>650</x>
+ <y>130</y>
+ <width>90</width>
+ <height>30</height>
+ <format>0</format>
+ <show_units>true</show_units>
+ </widget>
+ <widget type="spinner" version="2.0.0">
+ <name>Text Update_17</name>
+ <pv_name>$(sectName):$(DevName):Limit_HIHI</pv_name>
+ <x>650</x>
+ <y>170</y>
+ <width>90</width>
+ <height>30</height>
+ <format>0</format>
+ <show_units>true</show_units>
+ </widget>
+ <widget type="spinner" version="2.0.0">
+ <name>Text Update_18</name>
+ <pv_name>$(sectName):$(DevName):Limit_LO</pv_name>
+ <x>650</x>
+ <y>230</y>
+ <width>90</width>
+ <height>30</height>
+ <format>0</format>
+ <show_units>true</show_units>
+ </widget>
+ <widget type="spinner" version="2.0.0">
+ <name>Text Update_19</name>
+ <pv_name>$(sectName):$(DevName):Limit_LOLO</pv_name>
+ <x>650</x>
+ <y>270</y>
+ <width>90</width>
+ <height>30</height>
+ <format>0</format>
+ <show_units>true</show_units>
+ </widget>
</display>
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 bb7547eb4c5cbf5f5901d0931a25d138d8e53aa2..702c1adc576ce503614896e3a5cf18a22131d2fc 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
@@ -8,7 +8,7 @@
<LABAMC>Ctrl-AMC-005</LABAMC>
<LABBCM>LAB-BCM08</LABBCM>
</macros>
- <width>720</width>
+ <width>790</width>
<height>350</height>
<background_color>
<color name="BACKGROUND" red="220" green="225" blue="221">
@@ -19,7 +19,7 @@
<class>TITLE-BAR</class>
<x use_class="true">0</x>
<y use_class="true">0</y>
- <width>720</width>
+ <width>790</width>
<height use_class="true">50</height>
<line_width use_class="true">0</line_width>
<background_color use_class="true">
@@ -33,7 +33,7 @@
<text>TS2 Water Skid : $(sectName):$(DevName)</text>
<x use_class="true">20</x>
<y use_class="true">0</y>
- <width>680</width>
+ <width>750</width>
<height use_class="true">50</height>
<font use_class="true">
<font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
@@ -52,7 +52,7 @@
<name>GroupBackground_7</name>
<x>370</x>
<y>70</y>
- <width>330</width>
+ <width>400</width>
<height>160</height>
<line_width>0</line_width>
<background_color>
@@ -67,7 +67,7 @@
<text>Alarms</text>
<x>370</x>
<y>70</y>
- <width>330</width>
+ <width>400</width>
<height>50</height>
<font>
<font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
@@ -85,7 +85,7 @@
<name>BGGrey03-background_16</name>
<x>390</x>
<y>120</y>
- <width>290</width>
+ <width>360</width>
<height>90</height>
<line_width>0</line_width>
<background_color>
@@ -138,7 +138,7 @@
<widget type="label" version="2.0.0">
<name>Label_20</name>
<text>Limit:</text>
- <x>500</x>
+ <x>480</x>
<y>130</y>
<width>60</width>
<height>30</height>
@@ -148,7 +148,7 @@
<widget type="label" version="2.0.0">
<name>Label_21</name>
<text>Limit:</text>
- <x>500</x>
+ <x>480</x>
<y>170</y>
<width>60</width>
<height>30</height>
@@ -157,8 +157,8 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_11</name>
- <pv_name>$(sectName):$(DevName):Limit_HI</pv_name>
- <x>570</x>
+ <pv_name>$(sectName):$(DevName):Limit_HI-RB</pv_name>
+ <x>550</x>
<y>130</y>
<width>90</width>
<height>30</height>
@@ -166,8 +166,8 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_12</name>
- <pv_name>$(sectName):$(DevName):Limit_HIHI</pv_name>
- <x>570</x>
+ <pv_name>$(sectName):$(DevName):Limit_HIHI-RB</pv_name>
+ <x>550</x>
<y>170</y>
<width>90</width>
<height>30</height>
@@ -306,4 +306,24 @@
<height>30</height>
<vertical_alignment>1</vertical_alignment>
</widget>
+ <widget type="spinner" version="2.0.0">
+ <name>Text Update_14</name>
+ <pv_name>$(sectName):$(DevName):Limit_HI</pv_name>
+ <x>650</x>
+ <y>130</y>
+ <width>90</width>
+ <height>30</height>
+ <format>0</format>
+ <show_units>true</show_units>
+ </widget>
+ <widget type="spinner" version="2.0.0">
+ <name>Text Update_15</name>
+ <pv_name>$(sectName):$(DevName):Limit_HIHI</pv_name>
+ <x>650</x>
+ <y>170</y>
+ <width>90</width>
+ <height>30</height>
+ <format>0</format>
+ <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 a3f86a5eeacbd11f61d168e3d9ccbbdaa9afe551..b430504b4c38854076274a428239ac694d002332 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
@@ -8,7 +8,7 @@
<LABAMC>Ctrl-AMC-005</LABAMC>
<LABBCM>LAB-BCM08</LABBCM>
</macros>
- <width>720</width>
+ <width>780</width>
<height>570</height>
<background_color>
<color name="BACKGROUND" red="220" green="225" blue="221">
@@ -19,7 +19,7 @@
<class>TITLE-BAR</class>
<x use_class="true">0</x>
<y use_class="true">0</y>
- <width>720</width>
+ <width>780</width>
<height use_class="true">50</height>
<line_width use_class="true">0</line_width>
<background_color use_class="true">
@@ -33,7 +33,7 @@
<text>TS2 Water Skid : $(sectName):$(DevName)</text>
<x use_class="true">20</x>
<y use_class="true">0</y>
- <width>680</width>
+ <width>740</width>
<height use_class="true">50</height>
<font use_class="true">
<font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
@@ -52,7 +52,7 @@
<name>GroupBackground_12</name>
<x>370</x>
<y>350</y>
- <width>330</width>
+ <width>390</width>
<height>120</height>
<line_width>0</line_width>
<background_color>
@@ -67,7 +67,7 @@
<text>IO Status</text>
<x>370</x>
<y>350</y>
- <width>330</width>
+ <width>390</width>
<height>50</height>
<font>
<font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
@@ -85,7 +85,7 @@
<name>BGGrey03-background_17</name>
<x>390</x>
<y>400</y>
- <width>290</width>
+ <width>350</width>
<height>50</height>
<line_width>0</line_width>
<background_color>
@@ -185,7 +185,7 @@
<name>GroupBackground_8</name>
<x>370</x>
<y>70</y>
- <width>330</width>
+ <width>390</width>
<height>260</height>
<line_width>0</line_width>
<background_color>
@@ -200,7 +200,7 @@
<text>Alarms</text>
<x>370</x>
<y>70</y>
- <width>330</width>
+ <width>390</width>
<height>50</height>
<font>
<font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
@@ -218,7 +218,7 @@
<name>BGGrey03-background_19</name>
<x>390</x>
<y>120</y>
- <width>290</width>
+ <width>350</width>
<height>90</height>
<line_width>0</line_width>
<background_color>
@@ -251,7 +251,7 @@
<widget type="label" version="2.0.0">
<name>Label_26</name>
<text>Limit:</text>
- <x>500</x>
+ <x>480</x>
<y>130</y>
<width>60</width>
<height>30</height>
@@ -261,7 +261,7 @@
<widget type="label" version="2.0.0">
<name>Label_27</name>
<text>Limit:</text>
- <x>500</x>
+ <x>480</x>
<y>170</y>
<width>60</width>
<height>30</height>
@@ -270,19 +270,19 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_14</name>
- <pv_name>$(sectName):$(DevName):Limit_HI</pv_name>
- <x>570</x>
+ <pv_name>$(sectName):$(DevName):Limit_HI-RB</pv_name>
+ <x>550</x>
<y>130</y>
- <width>90</width>
+ <width>80</width>
<height>30</height>
<vertical_alignment>1</vertical_alignment>
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_15</name>
- <pv_name>$(sectName):$(DevName):Limit_HIHI</pv_name>
- <x>570</x>
+ <pv_name>$(sectName):$(DevName):Limit_HIHI-RB</pv_name>
+ <x>550</x>
<y>170</y>
- <width>90</width>
+ <width>80</width>
<height>30</height>
<vertical_alignment>1</vertical_alignment>
</widget>
@@ -310,7 +310,7 @@
<name>BGGrey03-background_20</name>
<x>390</x>
<y>220</y>
- <width>290</width>
+ <width>350</width>
<height>90</height>
<line_width>0</line_width>
<background_color>
@@ -343,7 +343,7 @@
<widget type="label" version="2.0.0">
<name>Label_30</name>
<text>Limit:</text>
- <x>500</x>
+ <x>480</x>
<y>230</y>
<width>60</width>
<height>30</height>
@@ -353,7 +353,7 @@
<widget type="label" version="2.0.0">
<name>Label_31</name>
<text>Limit:</text>
- <x>500</x>
+ <x>480</x>
<y>270</y>
<width>60</width>
<height>30</height>
@@ -362,19 +362,19 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_16</name>
- <pv_name>$(sectName):$(DevName):Limit_LO</pv_name>
- <x>570</x>
+ <pv_name>$(sectName):$(DevName):Limit_LO-RB</pv_name>
+ <x>550</x>
<y>230</y>
- <width>90</width>
+ <width>80</width>
<height>30</height>
<vertical_alignment>1</vertical_alignment>
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_17</name>
- <pv_name>$(sectName):$(DevName):Limit_LOLO</pv_name>
- <x>570</x>
+ <pv_name>$(sectName):$(DevName):Limit_LOLO-RB</pv_name>
+ <x>550</x>
<y>270</y>
- <width>90</width>
+ <width>80</width>
<height>30</height>
<vertical_alignment>1</vertical_alignment>
</widget>
@@ -578,4 +578,44 @@
<height>30</height>
<vertical_alignment>1</vertical_alignment>
</widget>
+ <widget type="spinner" version="2.0.0">
+ <name>Text Update_21</name>
+ <pv_name>$(sectName):$(DevName):Limit_HI</pv_name>
+ <x>640</x>
+ <y>130</y>
+ <width>80</width>
+ <height>30</height>
+ <format>0</format>
+ <show_units>true</show_units>
+ </widget>
+ <widget type="spinner" version="2.0.0">
+ <name>Text Update_22</name>
+ <pv_name>$(sectName):$(DevName):Limit_HIHI</pv_name>
+ <x>640</x>
+ <y>170</y>
+ <width>80</width>
+ <height>30</height>
+ <format>0</format>
+ <show_units>true</show_units>
+ </widget>
+ <widget type="spinner" version="2.0.0">
+ <name>Text Update_23</name>
+ <pv_name>$(sectName):$(DevName):Limit_LO</pv_name>
+ <x>640</x>
+ <y>230</y>
+ <width>80</width>
+ <height>30</height>
+ <format>0</format>
+ <show_units>true</show_units>
+ </widget>
+ <widget type="spinner" version="2.0.0">
+ <name>Text Update_24</name>
+ <pv_name>$(sectName):$(DevName):Limit_LOLO</pv_name>
+ <x>640</x>
+ <y>270</y>
+ <width>80</width>
+ <height>30</height>
+ <format>0</format>
+ <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 cf96e7cfa6ffce11febd84315f857813d43482c8..2da336f5c81d0216b034cd4af9193bf886145876 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
@@ -8,7 +8,6 @@
<LABAMC>Ctrl-AMC-005</LABAMC>
<LABBCM>LAB-BCM08</LABBCM>
</macros>
- <width>720</width>
<height>350</height>
<background_color>
<color name="BACKGROUND" red="220" green="225" blue="221">
@@ -19,7 +18,7 @@
<class>TITLE-BAR</class>
<x use_class="true">0</x>
<y use_class="true">0</y>
- <width>720</width>
+ <width>800</width>
<height use_class="true">50</height>
<line_width use_class="true">0</line_width>
<background_color use_class="true">
@@ -33,7 +32,7 @@
<text>TS2 Water Skid : $(sectName):$(DevName)</text>
<x use_class="true">20</x>
<y use_class="true">0</y>
- <width>680</width>
+ <width>760</width>
<height use_class="true">50</height>
<font use_class="true">
<font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
@@ -185,7 +184,7 @@
<name>GroupBackground_8</name>
<x>370</x>
<y>70</y>
- <width>330</width>
+ <width>410</width>
<height>260</height>
<line_width>0</line_width>
<background_color>
@@ -200,7 +199,7 @@
<text>Alarms</text>
<x>370</x>
<y>70</y>
- <width>330</width>
+ <width>410</width>
<height>50</height>
<font>
<font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
@@ -218,7 +217,7 @@
<name>BGGrey03-background_19</name>
<x>390</x>
<y>120</y>
- <width>290</width>
+ <width>370</width>
<height>90</height>
<line_width>0</line_width>
<background_color>
@@ -251,7 +250,7 @@
<widget type="label" version="2.0.0">
<name>Label_26</name>
<text>Limit:</text>
- <x>500</x>
+ <x>480</x>
<y>130</y>
<width>60</width>
<height>30</height>
@@ -261,7 +260,7 @@
<widget type="label" version="2.0.0">
<name>Label_27</name>
<text>Limit:</text>
- <x>500</x>
+ <x>480</x>
<y>170</y>
<width>60</width>
<height>30</height>
@@ -270,8 +269,8 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_14</name>
- <pv_name>$(sectName):$(DevName):Limit_HI</pv_name>
- <x>570</x>
+ <pv_name>$(sectName):$(DevName):Limit_HI-RB</pv_name>
+ <x>550</x>
<y>130</y>
<width>90</width>
<height>30</height>
@@ -279,8 +278,8 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_15</name>
- <pv_name>$(sectName):$(DevName):Limit_HIHI</pv_name>
- <x>570</x>
+ <pv_name>$(sectName):$(DevName):Limit_HIHI-RB</pv_name>
+ <x>550</x>
<y>170</y>
<width>90</width>
<height>30</height>
@@ -310,7 +309,7 @@
<name>BGGrey03-background_20</name>
<x>390</x>
<y>220</y>
- <width>290</width>
+ <width>370</width>
<height>90</height>
<line_width>0</line_width>
<background_color>
@@ -343,7 +342,7 @@
<widget type="label" version="2.0.0">
<name>Label_30</name>
<text>Limit:</text>
- <x>500</x>
+ <x>480</x>
<y>230</y>
<width>60</width>
<height>30</height>
@@ -353,7 +352,7 @@
<widget type="label" version="2.0.0">
<name>Label_31</name>
<text>Limit:</text>
- <x>500</x>
+ <x>480</x>
<y>270</y>
<width>60</width>
<height>30</height>
@@ -362,8 +361,8 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_16</name>
- <pv_name>$(sectName):$(DevName):Limit_LO</pv_name>
- <x>570</x>
+ <pv_name>$(sectName):$(DevName):Limit_LO-RB</pv_name>
+ <x>550</x>
<y>230</y>
<width>90</width>
<height>30</height>
@@ -371,8 +370,8 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_17</name>
- <pv_name>$(sectName):$(DevName):Limit_LOLO</pv_name>
- <x>570</x>
+ <pv_name>$(sectName):$(DevName):Limit_LOLO-RB</pv_name>
+ <x>550</x>
<y>270</y>
<width>90</width>
<height>30</height>
@@ -398,4 +397,44 @@
</color>
</on_color>
</widget>
+ <widget type="spinner" version="2.0.0">
+ <name>Text Update_18</name>
+ <pv_name>$(sectName):$(DevName):Limit_HI</pv_name>
+ <x>650</x>
+ <y>130</y>
+ <width>90</width>
+ <height>30</height>
+ <format>0</format>
+ <show_units>true</show_units>
+ </widget>
+ <widget type="spinner" version="2.0.0">
+ <name>Text Update_19</name>
+ <pv_name>$(sectName):$(DevName):Limit_HIHI</pv_name>
+ <x>650</x>
+ <y>170</y>
+ <width>90</width>
+ <height>30</height>
+ <format>0</format>
+ <show_units>true</show_units>
+ </widget>
+ <widget type="spinner" version="2.0.0">
+ <name>Text Update_20</name>
+ <pv_name>$(sectName):$(DevName):Limit_LO</pv_name>
+ <x>650</x>
+ <y>230</y>
+ <width>90</width>
+ <height>30</height>
+ <format>0</format>
+ <show_units>true</show_units>
+ </widget>
+ <widget type="spinner" version="2.0.0">
+ <name>Text Update_21</name>
+ <pv_name>$(sectName):$(DevName):Limit_LOLO</pv_name>
+ <x>650</x>
+ <y>270</y>
+ <width>90</width>
+ <height>30</height>
+ <format>0</format>
+ <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 cb39fd300841d17c3ac906472e8c6623a08c9647..95f4d3dccc3bb11c668a2a94d1c0aea7d2782b87 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
@@ -8,7 +8,7 @@
<LABAMC>Ctrl-AMC-005</LABAMC>
<LABBCM>LAB-BCM08</LABBCM>
</macros>
- <width>720</width>
+ <width>740</width>
<height>530</height>
<background_color>
<color name="BACKGROUND" red="220" green="225" blue="221">
@@ -18,7 +18,7 @@
<name>GroupBackground_7</name>
<x>370</x>
<y>170</y>
- <width>330</width>
+ <width>350</width>
<height>160</height>
<line_width>0</line_width>
<background_color>
@@ -46,7 +46,7 @@
<name>GroupBackground_5</name>
<x>20</x>
<y>60</y>
- <width>680</width>
+ <width>700</width>
<height>90</height>
<line_width>0</line_width>
<background_color>
@@ -61,7 +61,7 @@
<class>TITLE-BAR</class>
<x use_class="true">0</x>
<y use_class="true">0</y>
- <width>720</width>
+ <width>740</width>
<height use_class="true">50</height>
<line_width use_class="true">0</line_width>
<background_color use_class="true">
@@ -75,7 +75,7 @@
<text>TS2 Water Skid : $(sectName):$(DevName)</text>
<x use_class="true">20</x>
<y use_class="true">0</y>
- <width>680</width>
+ <width>700</width>
<height use_class="true">50</height>
<font use_class="true">
<font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
@@ -94,7 +94,7 @@
<name>BGGrey03-background_11</name>
<x>40</x>
<y>80</y>
- <width>640</width>
+ <width>660</width>
<height>50</height>
<line_width>0</line_width>
<background_color>
@@ -107,7 +107,7 @@
<widget type="label" version="2.0.0">
<name>Label_4</name>
<text>Status:</text>
- <x>60</x>
+ <x>80</x>
<y>90</y>
<width>90</width>
<height>30</height>
@@ -117,7 +117,7 @@
<widget type="textupdate" version="2.0.0">
<name>Text Update_4</name>
<pv_name>$(sectName):$(DevName):OpeningPosition</pv_name>
- <x>160</x>
+ <x>180</x>
<y>90</y>
<width>240</width>
<height>30</height>
@@ -133,7 +133,7 @@
</action>
</actions>
<text>Close</text>
- <x>520</x>
+ <x>540</x>
<y>90</y>
<tooltip>$(actions)</tooltip>
</widget>
@@ -147,7 +147,7 @@
</action>
</actions>
<text>Open</text>
- <x>410</x>
+ <x>430</x>
<y>90</y>
<tooltip>$(actions)</tooltip>
</widget>
@@ -169,7 +169,7 @@
<name>BGGrey03-background_13</name>
<x>390</x>
<y>220</y>
- <width>290</width>
+ <width>310</width>
<height>90</height>
<line_width>0</line_width>
<background_color>
@@ -203,7 +203,7 @@
<text>Scales</text>
<x>370</x>
<y>170</y>
- <width>330</width>
+ <width>350</width>
<height>50</height>
<font>
<font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
@@ -261,7 +261,7 @@
<name>GroupBackground_10</name>
<x>370</x>
<y>350</y>
- <width>330</width>
+ <width>350</width>
<height>160</height>
<line_width>0</line_width>
<background_color>
@@ -303,7 +303,7 @@
<name>BGGrey03-background_15</name>
<x>390</x>
<y>400</y>
- <width>290</width>
+ <width>310</width>
<height>90</height>
<line_width>0</line_width>
<background_color>
@@ -337,7 +337,7 @@
<text>Calibration</text>
<x>370</x>
<y>350</y>
- <width>330</width>
+ <width>350</width>
<height>50</height>
<font>
<font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
@@ -402,28 +402,28 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_7</name>
- <pv_name>$(sectName):$(DevName):OpeningCtrl</pv_name>
+ <pv_name>$(sectName):$(DevName):OpeningCtrl-RB</pv_name>
<x>140</x>
<y>270</y>
- <width>170</width>
+ <width>80</width>
<height>30</height>
<vertical_alignment>1</vertical_alignment>
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_10</name>
- <pv_name>$(sectName):$(DevName):Calib_High</pv_name>
+ <pv_name>$(sectName):$(DevName):Calib_High-RB</pv_name>
<x>490</x>
<y>410</y>
- <width>170</width>
+ <width>90</width>
<height>30</height>
<vertical_alignment>1</vertical_alignment>
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_11</name>
- <pv_name>$(sectName):$(DevName):Calib_Low</pv_name>
+ <pv_name>$(sectName):$(DevName):Calib_Low-RB</pv_name>
<x>490</x>
<y>450</y>
- <width>170</width>
+ <width>90</width>
<height>30</height>
<vertical_alignment>1</vertical_alignment>
</widget>
@@ -450,7 +450,7 @@
<pv_name>$(sectName):$(DevName):Scale_Max-RB</pv_name>
<x>490</x>
<y>230</y>
- <width>170</width>
+ <width>90</width>
<height>30</height>
<vertical_alignment>1</vertical_alignment>
</widget>
@@ -459,8 +459,59 @@
<pv_name>$(sectName):$(DevName):Scale_Min-RB</pv_name>
<x>490</x>
<y>270</y>
- <width>170</width>
+ <width>90</width>
<height>30</height>
<vertical_alignment>1</vertical_alignment>
</widget>
+ <widget type="spinner" version="2.0.0">
+ <name>Text Update_18</name>
+ <pv_name>$(sectName):$(DevName):Scale_Min</pv_name>
+ <x>590</x>
+ <y>270</y>
+ <width>90</width>
+ <height>30</height>
+ <format>0</format>
+ <show_units>true</show_units>
+ </widget>
+ <widget type="spinner" version="2.0.0">
+ <name>Text Update_19</name>
+ <pv_name>$(sectName):$(DevName):Scale_Max</pv_name>
+ <x>590</x>
+ <y>230</y>
+ <width>90</width>
+ <height>30</height>
+ <format>0</format>
+ <show_units>true</show_units>
+ </widget>
+ <widget type="spinner" version="2.0.0">
+ <name>Text Update_20</name>
+ <pv_name>$(sectName):$(DevName):Calib_High</pv_name>
+ <x>590</x>
+ <y>410</y>
+ <width>90</width>
+ <height>30</height>
+ <format>0</format>
+ <show_units>true</show_units>
+ </widget>
+ <widget type="spinner" version="2.0.0">
+ <name>Text Update_21</name>
+ <pv_name>$(sectName):$(DevName):Calib_Low</pv_name>
+ <x>590</x>
+ <y>450</y>
+ <width>90</width>
+ <height>30</height>
+ <format>0</format>
+ <show_units>true</show_units>
+ </widget>
+ <widget type="combo" version="2.0.0">
+ <name>Text Update_8</name>
+ <pv_name>$(sectName):$(DevName):OpeningCtrl</pv_name>
+ <x>230</x>
+ <y>270</y>
+ <width>80</width>
+ <background_color>
+ <color name="Write_Background" red="224" green="217" blue="202">
+ </color>
+ </background_color>
+ </widget>
</display>
diff --git a/NON-APPROVED/TS2/ts2-wtrc/ts2-wtrc.bob b/NON-APPROVED/TS2/ts2-wtrc/ts2-wtrc.bob
index 4f5cb65b9084ec31a04390cda3b4f0cecd2d54e4..257838636dfb8cfeb4dc6df0953bd0f3554d4abb 100644
--- a/NON-APPROVED/TS2/ts2-wtrc/ts2-wtrc.bob
+++ b/NON-APPROVED/TS2/ts2-wtrc/ts2-wtrc.bob
@@ -10,10 +10,6 @@
</macros>
<width>1060</width>
<height>620</height>
- <background_color>
- <color red="220" green="225" blue="221">
- </color>
- </background_color>
<widget type="polyline" version="2.0.0">
<name>Pipe 10000_95</name>
<x>980</x>
@@ -45,11 +41,11 @@
<y>190</y>
<width>10</width>
<line_color>
- <color name="Grid" red="128" green="128" blue="128">
+ <color name="Grid" red="169" green="169" blue="169">
</color>
</line_color>
<background_color>
- <color name="Background" red="255" green="255" blue="255">
+ <color name="Background" red="220" green="225" blue="221">
</color>
</background_color>
</widget>
@@ -59,11 +55,11 @@
<y>190</y>
<width>10</width>
<line_color>
- <color name="Grid" red="128" green="128" blue="128">
+ <color name="Grid" red="169" green="169" blue="169">
</color>
</line_color>
<background_color>
- <color name="Background" red="255" green="255" blue="255">
+ <color name="Background" red="220" green="225" blue="221">
</color>
</background_color>
</widget>
@@ -73,11 +69,11 @@
<y>190</y>
<width>10</width>
<line_color>
- <color name="Grid" red="128" green="128" blue="128">
+ <color name="Grid" red="169" green="169" blue="169">
</color>
</line_color>
<background_color>
- <color name="Background" red="255" green="255" blue="255">
+ <color name="Background" red="220" green="225" blue="221">
</color>
</background_color>
</widget>
@@ -87,11 +83,11 @@
<y>190</y>
<width>10</width>
<line_color>
- <color name="Grid" red="128" green="128" blue="128">
+ <color name="Grid" red="169" green="169" blue="169">
</color>
</line_color>
<background_color>
- <color name="Background" red="255" green="255" blue="255">
+ <color name="Background" red="220" green="225" blue="221">
</color>
</background_color>
</widget>
@@ -101,11 +97,11 @@
<y>190</y>
<width>10</width>
<line_color>
- <color name="Grid" red="128" green="128" blue="128">
+ <color name="Grid" red="169" green="169" blue="169">
</color>
</line_color>
<background_color>
- <color name="Background" red="255" green="255" blue="255">
+ <color name="Background" red="220" green="225" blue="221">
</color>
</background_color>
</widget>
@@ -115,11 +111,11 @@
<y>190</y>
<width>10</width>
<line_color>
- <color name="Grid" red="128" green="128" blue="128">
+ <color name="Grid" red="169" green="169" blue="169">
</color>
</line_color>
<background_color>
- <color name="Background" red="255" green="255" blue="255">
+ <color name="Background" red="220" green="225" blue="221">
</color>
</background_color>
</widget>
@@ -129,11 +125,11 @@
<y>190</y>
<width>10</width>
<line_color>
- <color name="Grid" red="128" green="128" blue="128">
+ <color name="Grid" red="169" green="169" blue="169">
</color>
</line_color>
<background_color>
- <color name="Background" red="255" green="255" blue="255">
+ <color name="Background" red="220" green="225" blue="221">
</color>
</background_color>
</widget>
@@ -143,11 +139,11 @@
<y>190</y>
<width>10</width>
<line_color>
- <color name="Grid" red="128" green="128" blue="128">
+ <color name="Grid" red="169" green="169" blue="169">
</color>
</line_color>
<background_color>
- <color name="Background" red="255" green="255" blue="255">
+ <color name="Background" red="220" green="225" blue="221">
</color>
</background_color>
</widget>
@@ -158,11 +154,11 @@
<width>5</width>
<height>10</height>
<line_color>
- <color name="Grid" red="128" green="128" blue="128">
+ <color name="Grid" red="169" green="169" blue="169">
</color>
</line_color>
<background_color>
- <color name="Background" red="255" green="255" blue="255">
+ <color name="Background" red="220" green="225" blue="221">
</color>
</background_color>
</widget>
@@ -173,11 +169,11 @@
<width>5</width>
<height>10</height>
<line_color>
- <color name="Grid" red="128" green="128" blue="128">
+ <color name="Grid" red="169" green="169" blue="169">
</color>
</line_color>
<background_color>
- <color name="Background" red="255" green="255" blue="255">
+ <color name="Background" red="220" green="225" blue="221">
</color>
</background_color>
</widget>
@@ -189,7 +185,7 @@
<height>200</height>
<line_width>1</line_width>
<line_color>
- <color name="Grid" red="128" green="128" blue="128">
+ <color name="Grid" red="169" green="169" blue="169">
</color>
</line_color>
<transparent>true</transparent>
@@ -203,7 +199,7 @@
<height>200</height>
<line_width>1</line_width>
<line_color>
- <color name="Grid" red="128" green="128" blue="128">
+ <color name="Grid" red="169" green="169" blue="169">
</color>
</line_color>
<transparent>true</transparent>
@@ -216,7 +212,7 @@
<width>880</width>
<height>1</height>
<line_color>
- <color name="Grid" red="128" green="128" blue="128">
+ <color name="Grid" red="169" green="169" blue="169">
</color>
</line_color>
<points>
@@ -234,7 +230,7 @@
<width>800</width>
<height>35</height>
<font>
- <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+ <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
</font>
</font>
<background_color>
@@ -258,11 +254,11 @@
<width>90</width>
<height>117</height>
<line_color>
- <color name="Text" red="0" green="0" blue="0">
+ <color name="Text" red="25" green="25" blue="25">
</color>
</line_color>
<background_color>
- <color name="Grid" red="128" green="128" blue="128">
+ <color name="Grid" red="169" green="169" blue="169">
</color>
</background_color>
</widget>
@@ -1323,4 +1319,11 @@
<height>65</height>
<tooltip>$(name)</tooltip>
</widget>
+ <widget type="action_button" version="3.0.0">
+ <name>Action Button</name>
+ <text>Expert</text>
+ <x>950</x>
+ <y>10</y>
+ <tooltip>$(actions)</tooltip>
+ </widget>
</display>