diff --git a/NON-APPROVED/CONTROL-ROOM/central-services/cooling-water-low-system/skid-isrc/skid-isrc.bob b/NON-APPROVED/CONTROL-ROOM/central-services/cooling-water-low-system/skid-isrc/skid-isrc.bob
index 29890bfd1063227ff61e78608d19b8d9c6447151..3f966c786415377e14096d53ff49c813ae4f2228 100644
--- a/NON-APPROVED/CONTROL-ROOM/central-services/cooling-water-low-system/skid-isrc/skid-isrc.bob
+++ b/NON-APPROVED/CONTROL-ROOM/central-services/cooling-water-low-system/skid-isrc/skid-isrc.bob
@@ -458,6 +458,7 @@ print 'Hello'
<pv_name>CWL-CWS01:WtrC-PT-KF104:MeasValue</pv_name>
<x>10</x>
<y>5</y>
+ <precision>2</precision>
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
</widget>
@@ -1440,6 +1441,7 @@ print 'Hello'
<pv_name>CWL-CWS01:WtrC-PT-BP101:MeasValue</pv_name>
<x>10</x>
<y>5</y>
+ <precision>2</precision>
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
</widget>
@@ -1582,6 +1584,7 @@ print 'Hello'
<pv_name>CWL-CWS01:WtrC-CT-KF111:MeasValue</pv_name>
<x>10</x>
<y>5</y>
+ <precision>3</precision>
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
</widget>
@@ -1814,6 +1817,7 @@ print 'Hello'
<pv_name>CWL-CWS01:WtrC-PDT-BP104:MeasValue</pv_name>
<x>10</x>
<y>5</y>
+ <precision>2</precision>
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
</widget>
@@ -1866,6 +1870,7 @@ print 'Hello'
<pv_name>CWL-CWS01:WtrC-PT-KF107:MeasValue</pv_name>
<x>10</x>
<y>5</y>
+ <precision>2</precision>
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
</widget>
@@ -1918,6 +1923,7 @@ print 'Hello'
<pv_name>CWL-CWS01:WtrC-TT-KF109:MeasValue</pv_name>
<x>10</x>
<y>5</y>
+ <precision>1</precision>
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
</widget>
@@ -2595,6 +2601,7 @@ print 'Hello'
<pv_name>CWL-CWS01:WtrC-PT-KF115:MeasValue</pv_name>
<x>10</x>
<y>5</y>
+ <precision>2</precision>
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
</widget>
@@ -2647,6 +2654,7 @@ print 'Hello'
<pv_name>CWL-CWS01:WtrC-TT-KF114:MeasValue</pv_name>
<x>10</x>
<y>5</y>
+ <precision>1</precision>
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
</widget>
@@ -2899,6 +2907,7 @@ print 'Hello'
<pv_name>CWL-CWS01:WtrC-TT-KF117:MeasValue</pv_name>
<x>10</x>
<y>5</y>
+ <precision>1</precision>
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
</widget>
@@ -2951,6 +2960,7 @@ print 'Hello'
<pv_name>CWL-CWS01:WtrC-PT-KF118:MeasValue</pv_name>
<x>10</x>
<y>5</y>
+ <precision>2</precision>
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
</widget>
@@ -3022,6 +3032,7 @@ print 'Hello'
<pv_name>CWL-CWS01:WtrC-FT-KF113:MeasValue</pv_name>
<x>10</x>
<y>5</y>
+ <precision>1</precision>
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
</widget>
@@ -3055,6 +3066,7 @@ print 'Hello'
<pv_name>CWL-CWS01:WtrC-FT-KF112:MeasValue</pv_name>
<x>10</x>
<y>5</y>
+ <precision>1</precision>
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
</widget>
@@ -3107,6 +3119,7 @@ print 'Hello'
<pv_name>CWL-CWS01:WtrC-PT-KF105:MeasValue</pv_name>
<x>10</x>
<y>5</y>
+ <precision>2</precision>
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
</widget>
@@ -3327,6 +3340,7 @@ print 'Hello'
<pv_name>CWL-CWS01:WtrC-PT-KF106:MeasValue</pv_name>
<x>10</x>
<y>5</y>
+ <precision>2</precision>
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
</widget>
@@ -3704,6 +3718,7 @@ print 'Hello'
<pv_name>CWL-CWS01:WtrC-TT-KF110:MeasValue</pv_name>
<x>10</x>
<y>5</y>
+ <precision>1</precision>
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
</widget>
@@ -3756,6 +3771,7 @@ print 'Hello'
<pv_name>CWL-CWS01:WtrC-PT-KF108:MeasValue</pv_name>
<x>10</x>
<y>5</y>
+ <precision>2</precision>
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
</widget>
@@ -3876,6 +3892,7 @@ print 'Hello'
<pv_name>CWL-CWS01:WtrC-TT-KF102:MeasValue</pv_name>
<x>10</x>
<y>5</y>
+ <precision>1</precision>
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
</widget>
@@ -3928,6 +3945,7 @@ print 'Hello'
<pv_name>CWL-CWS01:WtrC-PT-KF101:MeasValue</pv_name>
<x>10</x>
<y>5</y>
+ <precision>2</precision>
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
</widget>
diff --git a/NON-APPROVED/lebt-010_vac/ComTa.bob b/NON-APPROVED/lebt-010_vac/CommissioningTank.bob
similarity index 100%
rename from NON-APPROVED/lebt-010_vac/ComTa.bob
rename to NON-APPROVED/lebt-010_vac/CommissioningTank.bob
diff --git a/NON-APPROVED/lebt-010_vac/LEBT.bob b/NON-APPROVED/lebt-010_vac/LEBT.bob
index 11a946a8383b658316e60284b560fb278080209e..8c749c65e48cd1fbefc253032c9b44213e91b6c8 100644
--- a/NON-APPROVED/lebt-010_vac/LEBT.bob
+++ b/NON-APPROVED/lebt-010_vac/LEBT.bob
@@ -34,9 +34,71 @@
<vertical_alignment>1</vertical_alignment>
<wrap_words>false</wrap_words>
</widget>
+ <widget type="action_button" version="3.0.0">
+ <name>Open Diagnostics Action</name>
+ <actions>
+ <action type="open_display">
+ <file>diagnostics.bob</file>
+ <target>standalone</target>
+ <description>Open Display</description>
+ </action>
+ </actions>
+ <text>Open Diagnostics</text>
+ <x>1700</x>
+ <y>10</y>
+ <width>150</width>
+ <height>60</height>
+ <font>
+ <font name="GROUP-HEADER" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
+ </font>
+ </font>
+ <foreground_color>
+ <color name="BLACK-TEXT" red="255" green="255" blue="255">
+ </color>
+ </foreground_color>
+ <transparent>true</transparent>
+ <tooltip>$(actions)</tooltip>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>ISRC-010</name>
+ <text>ISRC-010</text>
+ <x>75</x>
+ <y>150</y>
+ <width>150</width>
+ <height>50</height>
+ <font>
+ <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
+ </font>
+ </font>
+ <foreground_color>
+ <color name="Grid" red="169" green="169" blue="169">
+ </color>
+ </foreground_color>
+ <horizontal_alignment>1</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="polyline" version="2.0.0">
+ <name>ISRC Separator</name>
+ <y>102</y>
+ <width>300</width>
+ <height>539</height>
+ <line_color>
+ <color name="Grid" red="169" green="169" blue="169">
+ </color>
+ </line_color>
+ <line_style>1</line_style>
+ <points>
+ <point x="300.0" y="0.0">
+ </point>
+ <point x="300.0" y="539.0000721446255">
+ </point>
+ <point x="0.0" y="539.0">
+ </point>
+ </points>
+ </widget>
<widget type="polyline" version="2.0.0">
<name>From Hydrogen</name>
- <x>92</x>
+ <x>81</x>
<y>495</y>
<width>24</width>
<height>76</height>
@@ -47,10 +109,176 @@
</point>
</points>
</widget>
+ <widget type="embedded" version="2.0.0">
+ <name>Hydrogen bottle</name>
+ <file>widgets/gas_bottle/gas_bottle.bob</file>
+ <macros>
+ <Gas>H2</Gas>
+ </macros>
+ <x>62</x>
+ <y>555</y>
+ <width>38</width>
+ <height>86</height>
+ <resize>1</resize>
+ </widget>
+ <widget type="group" version="2.0.0">
+ <name>$(SEC)-$(SUBSEC):$(DIS)-$(DEV)-$(IDX) Group</name>
+ <macros>
+ <DEV>VVA</DEV>
+ <IDX>01100</IDX>
+ <SEC>ISrc</SEC>
+ </macros>
+ <x>10</x>
+ <y>439</y>
+ <width>135</width>
+ <height>72</height>
+ <style>3</style>
+ <transparent>true</transparent>
+ <widget type="label" version="2.0.0">
+ <name>Device</name>
+ <text>$(DEV)</text>
+ <width>40</width>
+ <font>
+ <font name="TINY-MONO-PLAIN" family="Source Code Pro" style="REGULAR" size="12.0">
+ </font>
+ </font>
+ <horizontal_alignment>2</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>Index</name>
+ <text>$(IDX)</text>
+ <y>30</y>
+ <width>40</width>
+ <font>
+ <font name="TINY-MONO-PLAIN" family="Source Code Pro" style="REGULAR" size="12.0">
+ </font>
+ </font>
+ <horizontal_alignment>2</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="polyline" version="2.0.0">
+ <name>PIPE_RIGHT</name>
+ <x>96</x>
+ <width>37</width>
+ <height>50</height>
+ <points>
+ <point x="0.0" y="25.0">
+ </point>
+ <point x="37.0" y="25.0">
+ </point>
+ </points>
+ </widget>
+ <widget type="polyline" version="2.0.0">
+ <name>PIPE_BELOW</name>
+ <x>46</x>
+ <y>50</y>
+ <width>50</width>
+ <points>
+ <point x="25.0" y="0.0">
+ </point>
+ <point x="25.0" y="20.0">
+ </point>
+ </points>
+ </widget>
+ <widget type="symbol" version="2.0.0">
+ <name>Symbol</name>
+ <pv_name>loc://$(SEC)-$(SUBSEC):$(DIS)-$(DEV)-$(IDX):UI:StatusR<VEnum>(0, "Invalid", "Opened", "Closed")</pv_name>
+ <symbols>
+ <symbol>$(ROOT)/COMMON/DEVICES/vacuum/vva/vva-invalid.png</symbol>
+ <symbol>$(ROOT)/COMMON/DEVICES/vacuum/vva/vva-open.png</symbol>
+ <symbol>$(ROOT)/COMMON/DEVICES/vacuum/vva/vva-closed.png</symbol>
+ </symbols>
+ <x>46</x>
+ <width>50</width>
+ <height>50</height>
+ <background_color>
+ <color name="WHITE" red="255" green="255" blue="255">
+ </color>
+ </background_color>
+ <rules>
+ <rule name="Tooltip" prop_id="tooltip" out_exp="true">
+ <exp bool_exp="true">
+ <expression>pvStr0</expression>
+ </exp>
+ <pv_name>$(pv_name)</pv_name>
+ </rule>
+ </rules>
+ <scripts>
+ <script file="EmbeddedJs" check_connections="false">
+ <text><![CDATA[PVUtil = org.csstudio.display.builder.runtime.script.PVUtil;
+ScriptUtil = org.csstudio.display.builder.runtime.script.ScriptUtil;
+Logger = org.csstudio.display.builder.runtime.script.ScriptUtil.getLogger();
+
+var pvOpen = 0;
+
+var pvSymbol = pvs[0];
+
+var colorID = 0;
+
+function log_pv(pv) {
+ Logger.info(pv + ": " + PVUtil.getString(pv));
+}
+
+try {
+ pvOpen = PVUtil.getInt(pvs[1]);
+
+ log_pv(pvs[1]);
+
+ if (pvOpen) {
+ Logger.info(pvSymbol + ": OPEN");
+ colorID = 1;
+ } else {
+ Logger.info(pvSymbol + ": CLOSED");
+ colorID = 2;
+ }
+} catch (err) {
+ Logger.severe("NO CONNECTION: " + err);
+}
+
+pvSymbol.write(colorID);
+]]></text>
+ <pv_name trigger="false">$(pv_name)</pv_name>
+ <pv_name>$(SEC)-$(SUBSEC):$(DIS)-$(DEV)-$(IDX):OpenR</pv_name>
+ </script>
+ </scripts>
+ <tooltip>$(pv_value)</tooltip>
+ </widget>
+ <widget type="action_button" version="3.0.0">
+ <name>Open Faceplate</name>
+ <actions>
+ <action type="open_display">
+ <file>faceplates/vvx/vac_isrc-vva.bob</file>
+ <target>standalone</target>
+ <description>Open Display</description>
+ </action>
+ </actions>
+ <text></text>
+ <width>46</width>
+ <height>50</height>
+ <transparent>true</transparent>
+ <tooltip>Open faceplate</tooltip>
+ </widget>
+ </widget>
+ <widget type="embedded" version="2.0.0">
+ <name>$(SEC)-$(SUBSEC):$(DIS)-VVMC-$(IDX)</name>
+ <file>widgets/vvmc/vac_vvmc.bob</file>
+ <macros>
+ <CONTROLLER>ISrc-$(SUBSEC):$(DIS)-VEVMC-01100</CONTROLLER>
+ <DEV>VVMC</DEV>
+ <IDX>01100</IDX>
+ <SEC>ISrc</SEC>
+ </macros>
+ <x>142</x>
+ <y>423</y>
+ <width>135</width>
+ <height>72</height>
+ <resize>2</resize>
+ </widget>
<widget type="label" version="2.0.0">
<name>Source</name>
<text>Source</text>
- <x>160</x>
+ <x>149</x>
<y>498</y>
<width>44</width>
<height>16</height>
@@ -64,7 +292,7 @@
</widget>
<widget type="polyline" version="2.0.0">
<name>Arrow Source</name>
- <x>209</x>
+ <x>198</x>
<y>507</y>
<width>50</width>
<height>1</height>
@@ -76,24 +304,39 @@
</point>
</points>
</widget>
+ <widget type="embedded" version="2.0.0">
+ <name>$(SEC)-$(SUBSEC):$(DIS)-$(DEV)-$(IDX)</name>
+ <file>widgets/vgc-vgd-vgp/vac_vgc-vgd-vgp.bob</file>
+ <macros>
+ <CONTROLLER>ISrc-$(SUBSEC):$(DIS)-VEVMC-01100</CONTROLLER>
+ <DEV>VGD</DEV>
+ <GAUGE_TYPE>vgd</GAUGE_TYPE>
+ <IDX>01100</IDX>
+ <PIPE_RIGHT>true</PIPE_RIGHT>
+ <SEC>ISrc</SEC>
+ </macros>
+ <x>142</x>
+ <y>530</y>
+ <width>135</width>
+ <height>72</height>
+ <resize>2</resize>
+ </widget>
<widget type="polyline" version="2.0.0">
- <name>From VVMC-04100</name>
- <x>287</x>
- <y>464</y>
+ <name>From ISrc VVMC-01100</name>
+ <x>276</x>
+ <y>463</y>
<width>2</width>
- <height>44</height>
+ <height>95</height>
<points>
<point x="0.0" y="0.0">
</point>
- <point x="2.0" y="0.0">
- </point>
- <point x="2.0" y="44.0">
+ <point x="0.0" y="95.00000000000001">
</point>
</points>
</widget>
<widget type="polyline" version="2.0.0">
<name>Pipe Source</name>
- <x>260</x>
+ <x>249</x>
<y>507</y>
<width>1750</width>
<height>1</height>
@@ -104,6 +347,24 @@
</point>
</points>
</widget>
+ <widget type="label" version="2.0.0">
+ <name>LEBT-010</name>
+ <text>LEBT-010</text>
+ <x>1216</x>
+ <y>150</y>
+ <width>150</width>
+ <height>50</height>
+ <font>
+ <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
+ </font>
+ </font>
+ <foreground_color>
+ <color name="Grid" red="169" green="169" blue="169">
+ </color>
+ </foreground_color>
+ <horizontal_alignment>1</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
<widget type="polyline" version="2.0.0">
<name>Pipe 10000</name>
<x>460</x>
@@ -280,32 +541,6 @@
</point>
</points>
</widget>
- <widget type="embedded" version="2.0.0">
- <name>Hydrogen bottle</name>
- <file>widgets/gas_bottle/gas_bottle.bob</file>
- <macros>
- <Gas>H2</Gas>
- </macros>
- <x>73</x>
- <y>555</y>
- <width>38</width>
- <height>86</height>
- <resize>1</resize>
- </widget>
- <widget type="embedded" version="2.0.0">
- <name>$(SEC)-$(SUBSEC):$(DIS)-VVMC-$(IDX)</name>
- <file>widgets/vvmc/vac_vvmc.bob</file>
- <macros>
- <DEV>VVMC</DEV>
- <IDX>01100</IDX>
- <SEC>ISrc</SEC>
- </macros>
- <x>153</x>
- <y>423</y>
- <width>135</width>
- <height>72</height>
- <resize>2</resize>
- </widget>
<widget type="embedded" version="2.0.0">
<name>$(SEC)-$(SUBSEC):$(DIS)-VVM-$(IDX)</name>
<file>widgets/vvm/vac_angle-vvm.bob</file>
@@ -518,6 +753,20 @@
<height>72</height>
<resize>2</resize>
</widget>
+ <widget type="embedded" version="2.0.0">
+ <name>$(SEC)-$(SUBSEC):$(DIS)-$(DEV)-$(IDX)</name>
+ <file>widgets/vgr/vac_vgr.bob</file>
+ <macros>
+ <DEV>VGR</DEV>
+ <IDX>10000</IDX>
+ <PIPE_LEFT>true</PIPE_LEFT>
+ </macros>
+ <x>461</x>
+ <y>402</y>
+ <width>135</width>
+ <height>72</height>
+ <resize>2</resize>
+ </widget>
<widget type="embedded" version="2.0.0">
<name>$(SEC)-$(SUBSEC):$(DIS)-VGD-$(IDX)</name>
<file>widgets/vgc-vgd-vgp/vac_vgc-vgd-vgp.bob</file>
@@ -910,81 +1159,12 @@
</widget>
<widget type="embedded" version="2.0.0">
<name>Commissioning Tank</name>
- <file>ComTa.bob</file>
+ <file>CommissioningTank.bob</file>
<x>1895</x>
<width>912</width>
<height>902</height>
<resize>2</resize>
</widget>
- <widget type="polyline" version="2.0.0">
- <name>ISRC Separator</name>
- <y>102</y>
- <width>300</width>
- <height>539</height>
- <line_color>
- <color name="Grid" red="169" green="169" blue="169">
- </color>
- </line_color>
- <line_style>1</line_style>
- <points>
- <point x="300.0" y="0.0">
- </point>
- <point x="300.0" y="539.0000721446255">
- </point>
- <point x="0.0" y="539.0">
- </point>
- </points>
- </widget>
- <widget type="label" version="2.0.0">
- <name>ISRC-010</name>
- <text>ISRC-010</text>
- <x>75</x>
- <y>150</y>
- <width>150</width>
- <height>50</height>
- <font>
- <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
- </font>
- </font>
- <foreground_color>
- <color name="Grid" red="169" green="169" blue="169">
- </color>
- </foreground_color>
- <horizontal_alignment>1</horizontal_alignment>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- <widget type="label" version="2.0.0">
- <name>LEBT-010</name>
- <text>LEBT-010</text>
- <x>1216</x>
- <y>150</y>
- <width>150</width>
- <height>50</height>
- <font>
- <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
- </font>
- </font>
- <foreground_color>
- <color name="Grid" red="169" green="169" blue="169">
- </color>
- </foreground_color>
- <horizontal_alignment>1</horizontal_alignment>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- <widget type="embedded" version="2.0.0">
- <name>$(SEC)-$(SUBSEC):$(DIS)-$(DEV)-$(IDX)</name>
- <file>widgets/vgr/vac_vgr.bob</file>
- <macros>
- <DEV>VGR</DEV>
- <IDX>10000</IDX>
- <PIPE_LEFT>true</PIPE_LEFT>
- </macros>
- <x>461</x>
- <y>402</y>
- <width>135</width>
- <height>72</height>
- <resize>2</resize>
- </widget>
<widget type="embedded" version="2.0.0">
<name>$(SEC)-$(SUBSEC):$(DIS)-$(DEV)-$(IDX)</name>
<file>widgets/vpg/vac-vpg.bob</file>
@@ -1011,153 +1191,4 @@
<height>344</height>
<resize>2</resize>
</widget>
- <widget type="action_button" version="3.0.0">
- <name>Open Diagnostics Action</name>
- <actions>
- <action type="open_display">
- <file>diagnostics.bob</file>
- <target>standalone</target>
- <description>Open Display</description>
- </action>
- </actions>
- <text>Open Diagnostics</text>
- <x>1700</x>
- <y>10</y>
- <width>150</width>
- <height>60</height>
- <font>
- <font name="GROUP-HEADER" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
- </font>
- </font>
- <foreground_color>
- <color name="BLACK-TEXT" red="255" green="255" blue="255">
- </color>
- </foreground_color>
- <transparent>true</transparent>
- <tooltip>$(actions)</tooltip>
- </widget>
- <widget type="group" version="2.0.0">
- <name>$(SEC)-$(SUBSEC):$(DIS)-$(DEV)-$(IDX) Group</name>
- <macros>
- <DEV>VVA</DEV>
- <IDX>01100</IDX>
- <SEC>ISrc</SEC>
- </macros>
- <x>21</x>
- <y>439</y>
- <width>135</width>
- <height>72</height>
- <style>3</style>
- <transparent>true</transparent>
- <widget type="label" version="2.0.0">
- <name>Device</name>
- <text>$(DEV)</text>
- <width>40</width>
- <font>
- <font name="TINY-MONO-PLAIN" family="Source Code Pro" style="REGULAR" size="12.0">
- </font>
- </font>
- <horizontal_alignment>2</horizontal_alignment>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- <widget type="label" version="2.0.0">
- <name>Index</name>
- <text>$(IDX)</text>
- <y>30</y>
- <width>40</width>
- <font>
- <font name="TINY-MONO-PLAIN" family="Source Code Pro" style="REGULAR" size="12.0">
- </font>
- </font>
- <horizontal_alignment>2</horizontal_alignment>
- <vertical_alignment>1</vertical_alignment>
- </widget>
- <widget type="polyline" version="2.0.0">
- <name>PIPE_RIGHT</name>
- <x>96</x>
- <width>37</width>
- <height>50</height>
- <points>
- <point x="0.0" y="25.0">
- </point>
- <point x="37.0" y="25.0">
- </point>
- </points>
- </widget>
- <widget type="polyline" version="2.0.0">
- <name>PIPE_BELOW</name>
- <x>46</x>
- <y>50</y>
- <width>50</width>
- <points>
- <point x="25.0" y="0.0">
- </point>
- <point x="25.0" y="20.0">
- </point>
- </points>
- </widget>
- <widget type="symbol" version="2.0.0">
- <name>Symbol</name>
- <pv_name>loc://$(SEC)-$(SUBSEC):$(DIS)-$(DEV)-$(IDX):UI:StatusR<VEnum>(0, "Invalid", "Opened", "Closed")</pv_name>
- <symbols>
- <symbol>$(ROOT)/COMMON/DEVICES/vacuum/vva/vva-invalid.png</symbol>
- <symbol>$(ROOT)/COMMON/DEVICES/vacuum/vva/vva-open.png</symbol>
- <symbol>$(ROOT)/COMMON/DEVICES/vacuum/vva/vva-closed.png</symbol>
- </symbols>
- <x>46</x>
- <width>50</width>
- <height>50</height>
- <background_color>
- <color name="WHITE" red="255" green="255" blue="255">
- </color>
- </background_color>
- <rules>
- <rule name="Tooltip" prop_id="tooltip" out_exp="true">
- <exp bool_exp="true">
- <expression>pvStr0</expression>
- </exp>
- <pv_name>$(pv_name)</pv_name>
- </rule>
- </rules>
- <scripts>
- <script file="EmbeddedJs" check_connections="false">
- <text><![CDATA[PVUtil = org.csstudio.display.builder.runtime.script.PVUtil;
-ScriptUtil = org.csstudio.display.builder.runtime.script.ScriptUtil;
-Logger = org.csstudio.display.builder.runtime.script.ScriptUtil.getLogger();
-
-var pvOpen = 0;
-
-var pvSymbol = pvs[0];
-
-var colorID = 0;
-
-function log_pv(pv) {
- Logger.info(pv + ": " + PVUtil.getString(pv));
-}
-
-try {
- pvOpen = PVUtil.getInt(pvs[1]);
-
- log_pv(pvs[1]);
-
- if (pvOpen) {
- Logger.info(pvSymbol + ": OPEN");
- colorID = 1;
- } else {
- Logger.info(pvSymbol + ": CLOSED");
- colorID = 2;
- }
-} catch (err) {
- Logger.severe("NO CONNECTION: " + err);
-}
-
-pvSymbol.write(colorID);
-]]></text>
- <pv_name trigger="false">$(pv_name)</pv_name>
- <pv_name>$(SEC)-$(SUBSEC):$(DIS)-$(DEV)-$(IDX):OpenR</pv_name>
- </script>
- </scripts>
- <tooltip>$(pv_value)</tooltip>
- </widget>
- </widget>
</display>
diff --git a/NON-APPROVED/lebt-010_vac/faceplates/vpp-vpdp/vac-vpdp-popup.bob b/NON-APPROVED/lebt-010_vac/faceplates/vpp-vpdp/vac-vpdp-popup.bob
index f877de7f9bb6407cdda321eb97613989f633b378..309e289bfe1d34a763d2ac0c535a1104a5dbf6bb 100644
--- a/NON-APPROVED/lebt-010_vac/faceplates/vpp-vpdp/vac-vpdp-popup.bob
+++ b/NON-APPROVED/lebt-010_vac/faceplates/vpp-vpdp/vac-vpdp-popup.bob
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<display version="2.0.0">
- <name>$(DEV)-$(IDX)</name>
+ <name>$(SEC)-$(SUBSEC):$(DIS)-$(DEV)-$(IDX)</name>
<macros>
<vacPREFIX>$(SEC)-$(SUBSEC):$(DIS)-$(DEV)-$(IDX)</vacPREFIX>
</macros>
diff --git a/NON-APPROVED/lebt-010_vac/faceplates/vpt/vac-vpt-popup.bob b/NON-APPROVED/lebt-010_vac/faceplates/vpt/vac-vpt-popup.bob
index ad26bbeb8de729e044f5accf8eac3ed4710c979d..84f419f9fd11b21f5148eb1f49b4ba33f747ba0c 100644
--- a/NON-APPROVED/lebt-010_vac/faceplates/vpt/vac-vpt-popup.bob
+++ b/NON-APPROVED/lebt-010_vac/faceplates/vpt/vac-vpt-popup.bob
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<display version="2.0.0">
- <name>$(DEV)-$(IDX)</name>
+ <name>$(SEC)-$(SUBSEC):$(DIS)-$(DEV)-$(IDX)</name>
<macros>
<vacPREFIX>$(SEC)-$(SUBSEC):$(DIS)-$(DEV)-$(IDX)</vacPREFIX>
</macros>
diff --git a/NON-APPROVED/lebt-010_vac/faceplates/vvx/vac-vv-popup.bob b/NON-APPROVED/lebt-010_vac/faceplates/vvx/vac-vv-popup.bob
index 919da63b84525ee0617bda87e45a4fa79a7b0e34..25a598ccfc83094652727282c5c9c417db7ad2a1 100644
--- a/NON-APPROVED/lebt-010_vac/faceplates/vvx/vac-vv-popup.bob
+++ b/NON-APPROVED/lebt-010_vac/faceplates/vvx/vac-vv-popup.bob
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<display version="2.0.0">
- <name>$(DEV)-$(IDX)</name>
+ <name>$(SEC)-$(SUBSEC):$(DIS)-$(DEV)-$(IDX)</name>
<macros>
<vacPREFIX>$(SEC)-$(SUBSEC):$(DIS)-$(DEV)-$(IDX)</vacPREFIX>
</macros>
diff --git a/NON-APPROVED/lebt-010_vac/faceplates/vvx/vac_isrc-vva.bob b/NON-APPROVED/lebt-010_vac/faceplates/vvx/vac_isrc-vva.bob
new file mode 100644
index 0000000000000000000000000000000000000000..c26bae0e1df7f3efb2c39cd5756e4aea3baf437f
--- /dev/null
+++ b/NON-APPROVED/lebt-010_vac/faceplates/vvx/vac_isrc-vva.bob
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<display version="2.0.0">
+ <name>$(SEC)-$(SUBSEC):$(DIS)-$(DEV)-$(IDX)</name>
+ <macros>
+ <vacPREFIX>$(SEC)-$(SUBSEC):$(DIS)-$(DEV)-$(IDX)</vacPREFIX>
+ </macros>
+ <width>300</width>
+ <height>190</height>
+ <widget type="rectangle" version="2.0.0">
+ <name>Background</name>
+ <width>300</width>
+ <height>190</height>
+ <line_color>
+ <color name="GROUP-BORDER" red="150" green="155" blue="151">
+ </color>
+ </line_color>
+ <background_color>
+ <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+ </color>
+ </background_color>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>Header</name>
+ <text>$(vacPREFIX)</text>
+ <width>300</width>
+ <height>35</height>
+ <font>
+ <font name="Header 2" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
+ </font>
+ </font>
+ <foreground_color>
+ <color name="WHITE" red="255" green="255" blue="255">
+ </color>
+ </foreground_color>
+ <background_color>
+ <color name="GROUP-BORDER" red="150" green="155" blue="151">
+ </color>
+ </background_color>
+ <transparent>false</transparent>
+ <horizontal_alignment>1</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="action_button" version="3.0.0">
+ <name>CloseCmd</name>
+ <actions>
+ <action type="write_pv">
+ <pv_name>$(pv_name)</pv_name>
+ <value>1</value>
+ </action>
+ </actions>
+ <pv_name>$(vacPREFIX):CloseCmd</pv_name>
+ <text>Close</text>
+ <x>10</x>
+ <y>135</y>
+ <width>135</width>
+ <height>35</height>
+ <font>
+ <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+ </font>
+ </font>
+ <rules>
+ <rule name="Enabled" prop_id="enabled" out_exp="true">
+ <exp bool_exp="True">
+ <expression>pvInt0</expression>
+ </exp>
+ <pv_name>$(vacPREFIX):ManualModeR</pv_name>
+ </rule>
+ </rules>
+ <tooltip>Close</tooltip>
+ <enabled>false</enabled>
+ </widget>
+ <widget type="action_button" version="3.0.0">
+ <name>OpenCmd</name>
+ <actions>
+ <action type="write_pv">
+ <pv_name>$(pv_name)</pv_name>
+ <value>1</value>
+ </action>
+ </actions>
+ <pv_name>$(vacPREFIX):OpenCmd</pv_name>
+ <text>Open</text>
+ <x>155</x>
+ <y>135</y>
+ <width>135</width>
+ <height>35</height>
+ <font>
+ <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+ </font>
+ </font>
+ <rules>
+ <rule name="Enabled" prop_id="enabled" out_exp="true">
+ <exp bool_exp="True">
+ <expression>pvInt0</expression>
+ </exp>
+ <pv_name>$(vacPREFIX):ManualModeR</pv_name>
+ </rule>
+ </rules>
+ <tooltip>Open</tooltip>
+ <enabled>false</enabled>
+ </widget>
+ <widget type="led" version="2.0.0">
+ <name>OpenR</name>
+ <pv_name>$(vacPREFIX):OpenR</pv_name>
+ <x>10</x>
+ <y>55</y>
+ <width>25</width>
+ <height>25</height>
+ <off_color>
+ <color name="LED-GREEN-OFF" red="90" green="110" blue="90">
+ </color>
+ </off_color>
+ <on_color>
+ <color name="LED-GREEN-ON" red="70" green="255" blue="70">
+ </color>
+ </on_color>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>Label OpenR</name>
+ <text>Open</text>
+ <x>41</x>
+ <y>55</y>
+ <width>200</width>
+ <height>25</height>
+ <vertical_alignment>1</vertical_alignment>
+ <tooltip>H2 Isolation Valve Open Feedback</tooltip>
+ </widget>
+ <widget type="led" version="2.0.0">
+ <name>OpenCmdRB</name>
+ <pv_name>$(vacPREFIX):OpenCmdRB</pv_name>
+ <x>10</x>
+ <y>90</y>
+ <width>25</width>
+ <height>25</height>
+ <off_color>
+ <color name="LED-GREEN-OFF" red="90" green="110" blue="90">
+ </color>
+ </off_color>
+ <on_color>
+ <color name="LED-GREEN-ON" red="70" green="255" blue="70">
+ </color>
+ </on_color>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>Label OpenCmdRB</name>
+ <text>Open Command Active</text>
+ <x>41</x>
+ <y>90</y>
+ <width>200</width>
+ <height>25</height>
+ <vertical_alignment>1</vertical_alignment>
+ <tooltip>H2 Isolation Valve Open Command</tooltip>
+ </widget>
+</display>
diff --git a/NON-APPROVED/lebt-010_vac/widgets/vgc-vgd-vgp/vac_vgc-vgd-vgp.bob b/NON-APPROVED/lebt-010_vac/widgets/vgc-vgd-vgp/vac_vgc-vgd-vgp.bob
index 600b2daca1bd8b8fc5bd0f80a4f564d68ffd5401..3b501c090ea39bf8bded79ed2458ec15472cc4d0 100644
--- a/NON-APPROVED/lebt-010_vac/widgets/vgc-vgd-vgp/vac_vgc-vgd-vgp.bob
+++ b/NON-APPROVED/lebt-010_vac/widgets/vgc-vgd-vgp/vac_vgc-vgd-vgp.bob
@@ -2,9 +2,9 @@
<display version="2.0.0">
<name>$(VGx)</name>
<macros>
- <vacROOT>$(ROOT=/ess-opis/NON-APPROVED)</vacROOT>
<VGx>$(GAUGE_TYPE=vgc)</VGx>
<vacPREFIX>$(SEC)-$(SUBSEC):$(DIS)-$(DEV)-$(IDX)</vacPREFIX>
+ <vacROOT>$(ROOT=/ess-opis/NON-APPROVED)</vacROOT>
</macros>
<width>133</width>
<height>70</height>
diff --git a/NON-APPROVED/lebt-010_vac/widgets/vvmc/symbol_color_animation.js b/NON-APPROVED/lebt-010_vac/widgets/vvmc/symbol_color_animation.js
index a1442c9e2ff09af0aeef6f72a1edca79af24a846..46c7f895296826d61b64d046a8088660d8671d96 100644
--- a/NON-APPROVED/lebt-010_vac/widgets/vvmc/symbol_color_animation.js
+++ b/NON-APPROVED/lebt-010_vac/widgets/vvmc/symbol_color_animation.js
@@ -2,7 +2,9 @@ PVUtil = org.csstudio.display.builder.runtime.script.PVUtil;
ScriptUtil = org.csstudio.display.builder.runtime.script.ScriptUtil;
Logger = org.csstudio.display.builder.runtime.script.ScriptUtil.getLogger();
-var pvMode = -1;
+var pvMode = -1;
+var pvInRange = 0;
+var pvRangeTimeout = 0;
var pvSymbol = pvs[0];
@@ -13,11 +15,15 @@ function log_pv(pv) {
}
try {
- pvStat = PVUtil.getString(pvs[1]);
- pvMode = PVUtil.getInt(pvs[2]);
+ pvStat = PVUtil.getString(pvs[1]);
+ pvMode = PVUtil.getInt(pvs[2]);
+ pvInRange = PVUtil.getInt(pvs[3]);
+ pvRangeTimeout = PVUtil.getInt(pvs[4]);
log_pv(pvs[1]);
log_pv(pvs[2]);
+ log_pv(pvs[3]);
+ log_pv(pvs[4]);
if (pvStat == "ON") {
switch (pvMode) {
@@ -25,16 +31,34 @@ try {
Logger.info(pvSymbol + ": Open");
colorID = 1;
break;
+
case 1:
Logger.info(pvSymbol + ": Closed");
colorID = 2;
+ break;
+
case 2:
+ Logger.info(pvSymbol + ": Setpoint");
+ if (pvRangeTimeout) {
+ Logger.info(pvSymbol + ": Flow range timeout");
+ colorID = 3;
+ } else if (pvInRange) {
+ Logger.info(pvSymbol + ": Flow in range");
+ colorID = 1;
+ } else {
+ Logger.info(pvSymbol + ": Flow not yet in range");
+ colorID = 0;
+ }
+
+ break;
+
case 3:
case 4:
case 5:
Logger.info(pvSymbol + ": NO-COLOR-CODES-FOR-STATE");
colorID = 0;
break;
+
default:
Logger.severe(pvSymbol + ": Unknown mode:" + pvMode);
break;
diff --git a/NON-APPROVED/lebt-010_vac/widgets/vvmc/vac_vvmc.bob b/NON-APPROVED/lebt-010_vac/widgets/vvmc/vac_vvmc.bob
index 76d351035793478b6c264457233144474975d2d4..06ac0e6ff72d4b16ceb1cad279db6313b6a335a9 100644
--- a/NON-APPROVED/lebt-010_vac/widgets/vvmc/vac_vvmc.bob
+++ b/NON-APPROVED/lebt-010_vac/widgets/vvmc/vac_vvmc.bob
@@ -58,6 +58,8 @@
<pv_name trigger="false">loc://$(vacPREFIX):UI:StatusR</pv_name>
<pv_name>$(vacPREFIX):FlwStatR</pv_name>
<pv_name>$(vacPREFIX):Mode-RB</pv_name>
+ <pv_name>$(vacPREFIX):FlwInRngR</pv_name>
+ <pv_name>$(vacPREFIX):FlwRngTimeoR</pv_name>
</script>
<script file="pressure.js">
<pv_name>$(vacPREFIX):FlwStatR</pv_name>