diff --git a/NON-APPROVED/lebt-010_vac/LEBT.bob b/NON-APPROVED/lebt-010_vac/LEBT.bob
index f69eab5d4b97020d64669d4076f1656765b8208c..28d14aeed9d0b2b776852398890f245db0a893b2 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,161 @@
</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>
+ <widget type="embedded" version="2.0.0">
+ <name>$(SEC)-$(SUBSEC):$(DIS)-VVMC-$(IDX)</name>
+ <file>widgets/vvmc/vac_vvmc.bob</file>
+ <macros>
+ <CONTROLLER>$(SEC)-$(SUBSEC):$(DIS)-VEVMC-$(IDX)</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 +277,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 +289,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>$(SEC)-$(SUBSEC):$(DIS)-VEVMC-$(IDX)</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 +332,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 +526,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 +738,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>
@@ -916,75 +1150,6 @@
<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 +1176,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>