Merge branch 'master' into 'master'

Master

See merge request !7

NON-APPROVED/lebt-010_vac/LEBT.bob

@@ -291,21 +291,6 @@
     <height>86</height>
     <resize>1</resize>
   </widget>
-  <widget type="embedded" version="2.0.0">
-    <name>$(SEC)-$(SUBSEC):$(DIS)-VVA-$(IDX)</name>
-    <file>widgets/vva-vvf-vvg/vac_angle-vva.bob</file>
-    <macros>
-      <DEV>VVA</DEV>
-      <IDX>01100</IDX>
-      <SEC>ISrc</SEC>
-      <VALVE_TYPE>vva</VALVE_TYPE>
-    </macros>
-    <x>20</x>
-    <y>438</y>
-    <width>135</width>
-    <height>72</height>
-    <resize>2</resize>
-  </widget>
   <widget type="embedded" version="2.0.0">
     <name>$(SEC)-$(SUBSEC):$(DIS)-VVMC-$(IDX)</name>
     <file>widgets/vvmc/vac_vvmc.bob</file>
@@ -986,7 +971,7 @@
     <vertical_alignment>1</vertical_alignment>
   </widget>
   <widget type="embedded" version="2.0.0">
-    <name>vgr</name>
+    <name>$(SEC)-$(SUBSEC):$(DIS)-$(DEV)-$(IDX)</name>
     <file>widgets/vgr/vac_vgr.bob</file>
     <macros>
       <DEV>VGR</DEV>
@@ -1026,7 +1011,7 @@
     <resize>2</resize>
   </widget>
   <widget type="action_button" version="3.0.0">
-    <name>Action Button</name>
+    <name>Open Diagnostics Action</name>
     <actions>
       <action type="open_display">
         <file>diagnostics.bob</file>
@@ -1050,4 +1035,128 @@
     <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&lt;VEnum&gt;(0, "Invalid", "Opened", "Closed")</pv_name>
+      <symbols>
+        <symbol>widgets/symbols/vva/vva invalid.png</symbol>
+        <symbol>widgets/symbols/vva/vva open.png</symbol>
+        <symbol>widgets/symbols/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>

NON-APPROVED/lebt-010_vac/faceplates/vpg/vac-vpg-popup.bob

@@ -134,8 +134,8 @@
     </border_color>
   </widget>
   <widget type="led" version="2.0.0">
-    <name>ATMStartEnaCmd</name>
-    <pv_name>$(vacPREFIX):ATMStartEnaCmd</pv_name>
+    <name>ATMStartEnaStR</name>
+    <pv_name>$(vacPREFIX):ATMStartEnaStR</pv_name>
     <x>10</x>
     <y>378</y>
     <off_color>
@@ -155,7 +155,7 @@
     <tooltip>$(pv_name) / $(pv_value)</tooltip>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>Label ATMStartEnaCmd</name>
+    <name>Label ATMStartEnaStR</name>
     <text>ATM Start Enabled</text>
     <x>30</x>
     <y>378</y>