From 5132e9368c89aa90987a26dd1a3e8634b5e9be67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kriszti=C3=A1n=20L=C3=B6ki?= <krisztian.loki@ess.eu>
Date: Tue, 9 Jun 2020 13:56:10 +0200
Subject: [PATCH] Updates related to TPG
---
.../vacuum/COMMON/Faceplate/gauge_status.js | 12 +++-
.../Faceplate/vac_gauge-tpg-relay-control.bob | 11 ++++
.../Faceplate/vac_gauge-tpg-relay-status.bob | 11 ++++
.../DEVICES/vacuum/COMMON/gauge_isvalid.py | 13 +++++
.../COMMON/DEVICES/vacuum/COMMON/isvalid.py | 5 +-
.../vgc/Faceplate/vac_mks-vgc-brief.bob | 56 ++++++++++---------
.../vacuum/vgc/Faceplate/vac_mks-vgc.bob | 1 -
.../vgc/Faceplate/vac_tpg-vgc-brief.bob | 32 ++++++-----
.../vacuum/vgc/Faceplate/vac_tpg-vgc.bob | 7 +--
.../COMMON/DEVICES/vacuum/vgc/vac_vgc.bob | 3 +-
.../vgd/Faceplate/vac_mks-vgd-brief.bob | 44 ++++++++-------
.../vacuum/vgd/Faceplate/vac_mks-vgd.bob | 1 -
.../COMMON/DEVICES/vacuum/vgd/vac_vgd.bob | 3 +-
.../vgp/Faceplate/vac_mks-vgp-brief.bob | 32 ++++++-----
.../vacuum/vgp/Faceplate/vac_mks-vgp.bob | 1 -
.../COMMON/DEVICES/vacuum/vgp/vac_vgp.bob | 3 +-
16 files changed, 147 insertions(+), 88 deletions(-)
create mode 100644 NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/gauge_isvalid.py
diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/Faceplate/gauge_status.js b/NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/Faceplate/gauge_status.js
index 0312baab..3703d4a1 100644
--- a/NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/Faceplate/gauge_status.js
+++ b/NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/Faceplate/gauge_status.js
@@ -4,6 +4,14 @@ var valid = pvs[0];
var type = pvs[1];
var chan = pvs[2];
-widget.setPropertyValue("text", PVUtil.getString(type) + " @ " + PVUtil.getString(chan));
+if (PVUtil.getLong(valid))
+{
+ widget.setPropertyValue("text", PVUtil.getString(chan));
+ widget.setPropertyValue("transparent", "true");
+}
+else
+{
+ widget.setPropertyValue("text", PVUtil.getString(type) + " @ " + PVUtil.getString(chan));
+ widget.setPropertyValue("transparent", "false");
+}
widget.setPropertyValue("tooltip", "Gauge " + PVUtil.getString(type) + " @ channel " + PVUtil.getString(chan));
-widget.setPropertyValue("transparent", PVUtil.getLong(valid) ? "true" : "false");
diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/Faceplate/vac_gauge-tpg-relay-control.bob b/NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/Faceplate/vac_gauge-tpg-relay-control.bob
index db3f9998..97f65f0d 100644
--- a/NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/Faceplate/vac_gauge-tpg-relay-control.bob
+++ b/NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/Faceplate/vac_gauge-tpg-relay-control.bob
@@ -58,6 +58,17 @@
<format>6</format>
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
+ <rules>
+ <rule name="Validity check" prop_id="background_color" out_exp="false">
+ <exp bool_exp="pvInt0 == 0">
+ <value>
+ <color name="ERROR" red="252" green="13" blue="27">
+ </color>
+ </value>
+ </exp>
+ <pv_name>$(DEVICENAME):Rly$(RELAY):ValidR</pv_name>
+ </rule>
+ </rules>
</widget>
<widget type="textentry" version="3.0.0">
<name>HighSPS</name>
diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/Faceplate/vac_gauge-tpg-relay-status.bob b/NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/Faceplate/vac_gauge-tpg-relay-status.bob
index e917a7a6..d009f49f 100644
--- a/NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/Faceplate/vac_gauge-tpg-relay-status.bob
+++ b/NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/Faceplate/vac_gauge-tpg-relay-status.bob
@@ -56,6 +56,17 @@
<show_units>false</show_units>
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
+ <rules>
+ <rule name="Validity Check" prop_id="background_color" out_exp="false">
+ <exp bool_exp="pvInt0 == 0">
+ <value>
+ <color name="ERROR" red="252" green="13" blue="27">
+ </color>
+ </value>
+ </exp>
+ <pv_name>$(DEVICENAME):Rly$(RELAY):ValidR</pv_name>
+ </rule>
+ </rules>
</widget>
<widget type="led" version="2.0.0">
<name>Relay State</name>
diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/gauge_isvalid.py b/NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/gauge_isvalid.py
new file mode 100644
index 00000000..a2a7c074
--- /dev/null
+++ b/NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/gauge_isvalid.py
@@ -0,0 +1,13 @@
+from org.csstudio.display.builder.runtime.script import PVUtil
+from org.csstudio.display.builder.model.properties import NamedWidgetColor
+from org.csstudio.display.builder.model.persist import WidgetColorService
+
+try:
+ if PVUtil.getSeverityString(pvs[0]) != "INVALID" and PVUtil.getLong(pvs[0]) == 1 and PVUtil.getLong(pvs[1]) == 1:
+ color = WidgetColorService.getColor("Background")
+ else:
+ raise Exception()
+except:
+ color = WidgetColorService.getColor("INVALID")
+
+widget.setPropertyValue('background_color', color)
diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/isvalid.py b/NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/isvalid.py
index 2a8651c4..ad9dfe00 100644
--- a/NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/isvalid.py
+++ b/NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/isvalid.py
@@ -2,11 +2,12 @@ from org.csstudio.display.builder.runtime.script import PVUtil
from org.csstudio.display.builder.model.properties import NamedWidgetColor
from org.csstudio.display.builder.model.persist import WidgetColorService
-color = WidgetColorService.getColor("INVALID")
try:
if PVUtil.getSeverityString(pvs[0]) != "INVALID" and PVUtil.getLong(pvs[0]) == 1:
color = WidgetColorService.getColor("Background")
+ else:
+ raise Exception()
except:
- pass
+ color = WidgetColorService.getColor("INVALID")
widget.setPropertyValue('background_color', color)
diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/vgc/Faceplate/vac_mks-vgc-brief.bob b/NON-APPROVED/COMMON/DEVICES/vacuum/vgc/Faceplate/vac_mks-vgc-brief.bob
index 5d802b9c..ed7bfa95 100644
--- a/NON-APPROVED/COMMON/DEVICES/vacuum/vgc/Faceplate/vac_mks-vgc-brief.bob
+++ b/NON-APPROVED/COMMON/DEVICES/vacuum/vgc/Faceplate/vac_mks-vgc-brief.bob
@@ -37,15 +37,18 @@
</color>
</background_color>
<transparent>false</transparent>
- <horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
</widget>
- <widget type="textupdate" version="2.0.0">
- <name>Channel</name>
- <pv_name>$(DEVICENAME):ChanR</pv_name>
- <x>371</x>
+ <widget type="label" version="2.0.0">
+ <name>Status</name>
+ <text>XX @ Yy</text>
+ <x>326</x>
<y>5</y>
- <width>25</width>
+ <width>70</width>
+ <font>
+ <font name="SMALL-MONO-BOLD" family="Source Code Pro" style="BOLD" size="14.0">
+ </font>
+ </font>
<foreground_color>
<color name="WHITE" red="255" green="255" blue="255">
</color>
@@ -54,16 +57,17 @@
<color name="ERROR" red="252" green="13" blue="27">
</color>
</background_color>
- <horizontal_alignment>1</horizontal_alignment>
+ <transparent>false</transparent>
+ <horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
- <rules>
- <rule name="Validity" prop_id="transparent" out_exp="true">
- <exp bool_exp="true">
- <expression>pvInt0</expression>
- </exp>
+ <scripts>
+ <script file="../../COMMON/Faceplate/gauge_status.js">
<pv_name>$(DEVICENAME):ValidR</pv_name>
- </rule>
- </rules>
+ <pv_name>$(DEVICENAME):SensorTypeR</pv_name>
+ <pv_name>$(DEVICENAME):ChanR</pv_name>
+ </script>
+ </scripts>
+ <tooltip>NA</tooltip>
</widget>
<widget type="label" version="2.0.0">
<name>Pressure</name>
@@ -117,14 +121,14 @@
</widget>
<widget type="embedded" version="2.0.0">
<name>Relay 1</name>
- <file>../../COMMON/Faceplate/vac_gauge-mks-relay-status.bob</file>
<macros>
<RELAY>1</RELAY>
</macros>
+ <file>../../COMMON/Faceplate/vac_gauge-mks-relay-status.bob</file>
<x>10</x>
<y>85</y>
- <width>92</width>
- <height>58</height>
+ <width>90</width>
+ <height>56</height>
<resize>2</resize>
<transparent>true</transparent>
</widget>
@@ -148,14 +152,14 @@
</widget>
<widget type="embedded" version="2.0.0">
<name>Relay 2</name>
- <file>../../COMMON/Faceplate/vac_gauge-mks-relay-status.bob</file>
<macros>
<RELAY>2</RELAY>
</macros>
+ <file>../../COMMON/Faceplate/vac_gauge-mks-relay-status.bob</file>
<x>108</x>
<y>85</y>
- <width>92</width>
- <height>58</height>
+ <width>90</width>
+ <height>56</height>
<resize>2</resize>
<transparent>true</transparent>
</widget>
@@ -179,14 +183,14 @@
</widget>
<widget type="embedded" version="2.0.0">
<name>Relay 3</name>
- <file>../../COMMON/Faceplate/vac_gauge-mks-relay-status.bob</file>
<macros>
<RELAY>3</RELAY>
</macros>
+ <file>../../COMMON/Faceplate/vac_gauge-mks-relay-status.bob</file>
<x>206</x>
<y>85</y>
- <width>92</width>
- <height>58</height>
+ <width>90</width>
+ <height>56</height>
<resize>2</resize>
<transparent>true</transparent>
</widget>
@@ -210,14 +214,14 @@
</widget>
<widget type="embedded" version="2.0.0">
<name>Relay 4</name>
- <file>../../COMMON/Faceplate/vac_gauge-mks-relay-status.bob</file>
<macros>
<RELAY>4</RELAY>
</macros>
+ <file>../../COMMON/Faceplate/vac_gauge-mks-relay-status.bob</file>
<x>304</x>
<y>85</y>
- <width>92</width>
- <height>58</height>
+ <width>90</width>
+ <height>56</height>
<resize>2</resize>
<transparent>true</transparent>
</widget>
diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/vgc/Faceplate/vac_mks-vgc.bob b/NON-APPROVED/COMMON/DEVICES/vacuum/vgc/Faceplate/vac_mks-vgc.bob
index f1b32d50..9d880f4e 100644
--- a/NON-APPROVED/COMMON/DEVICES/vacuum/vgc/Faceplate/vac_mks-vgc.bob
+++ b/NON-APPROVED/COMMON/DEVICES/vacuum/vgc/Faceplate/vac_mks-vgc.bob
@@ -34,7 +34,6 @@
</color>
</background_color>
<transparent>false</transparent>
- <horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
</widget>
<widget type="label" version="2.0.0">
diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/vgc/Faceplate/vac_tpg-vgc-brief.bob b/NON-APPROVED/COMMON/DEVICES/vacuum/vgc/Faceplate/vac_tpg-vgc-brief.bob
index 276c23b9..5d132fe6 100644
--- a/NON-APPROVED/COMMON/DEVICES/vacuum/vgc/Faceplate/vac_tpg-vgc-brief.bob
+++ b/NON-APPROVED/COMMON/DEVICES/vacuum/vgc/Faceplate/vac_tpg-vgc-brief.bob
@@ -44,15 +44,18 @@
</color>
</background_color>
<transparent>false</transparent>
- <horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
</widget>
- <widget type="textupdate" version="2.0.0">
- <name>Channel</name>
- <pv_name>$(DEVICENAME):ChanR</pv_name>
- <x>340</x>
+ <widget type="label" version="2.0.0">
+ <name>Status</name>
+ <text>XX @ Yy</text>
+ <x>295</x>
<y>5</y>
- <width>25</width>
+ <width>70</width>
+ <font>
+ <font name="SMALL-MONO-BOLD" family="Source Code Pro" style="BOLD" size="14.0">
+ </font>
+ </font>
<foreground_color>
<color name="WHITE" red="255" green="255" blue="255">
</color>
@@ -61,16 +64,17 @@
<color name="ERROR" red="252" green="13" blue="27">
</color>
</background_color>
- <horizontal_alignment>1</horizontal_alignment>
+ <transparent>false</transparent>
+ <horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
- <rules>
- <rule name="Validity" prop_id="transparent" out_exp="true">
- <exp bool_exp="true">
- <expression>pvInt0</expression>
- </exp>
+ <scripts>
+ <script file="../../COMMON/Faceplate/gauge_status.js">
<pv_name>$(DEVICENAME):ValidR</pv_name>
- </rule>
- </rules>
+ <pv_name>$(DEVICENAME):SensorTypeR</pv_name>
+ <pv_name>$(DEVICENAME):ChanR</pv_name>
+ </script>
+ </scripts>
+ <tooltip>NA</tooltip>
</widget>
<widget type="label" version="2.0.0">
<name>Pressure</name>
diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/vgc/Faceplate/vac_tpg-vgc.bob b/NON-APPROVED/COMMON/DEVICES/vacuum/vgc/Faceplate/vac_tpg-vgc.bob
index 6cee6cf8..bc259e01 100644
--- a/NON-APPROVED/COMMON/DEVICES/vacuum/vgc/Faceplate/vac_tpg-vgc.bob
+++ b/NON-APPROVED/COMMON/DEVICES/vacuum/vgc/Faceplate/vac_tpg-vgc.bob
@@ -43,7 +43,6 @@
</color>
</background_color>
<transparent>false</transparent>
- <horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
</widget>
<widget type="label" version="2.0.0">
@@ -66,7 +65,7 @@
</color>
</background_color>
<transparent>false</transparent>
- <horizontal_alignment>1</horizontal_alignment>
+ <horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
<scripts>
<script file="../../COMMON/Faceplate/gauge_status.js">
@@ -129,10 +128,10 @@
</widget>
<widget type="embedded" version="2.0.0">
<name>TPG Gauge Relay Control 1</name>
- <file>../../COMMON/Faceplate/vac_gauge-tpg-relay-control.bob</file>
<macros>
<RELAY>1</RELAY>
</macros>
+ <file>../../COMMON/Faceplate/vac_gauge-tpg-relay-control.bob</file>
<x>90</x>
<y>40</y>
<width>212</width>
@@ -160,10 +159,10 @@
</widget>
<widget type="embedded" version="2.0.0">
<name>TPG Gauge Relay Control 2</name>
- <file>../../COMMON/Faceplate/vac_gauge-tpg-relay-control.bob</file>
<macros>
<RELAY>2</RELAY>
</macros>
+ <file>../../COMMON/Faceplate/vac_gauge-tpg-relay-control.bob</file>
<x>314</x>
<y>40</y>
<width>212</width>
diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/vgc/vac_vgc.bob b/NON-APPROVED/COMMON/DEVICES/vacuum/vgc/vac_vgc.bob
index 0b43dae0..9b5a71b5 100644
--- a/NON-APPROVED/COMMON/DEVICES/vacuum/vgc/vac_vgc.bob
+++ b/NON-APPROVED/COMMON/DEVICES/vacuum/vgc/vac_vgc.bob
@@ -16,8 +16,9 @@
</rule>
</rules>
<scripts>
- <script file="../COMMON/isvalid.py" check_connections="false">
+ <script file="../COMMON/gauge_isvalid.py" check_connections="false">
<pv_name>$(vacPREFIX):ValidR</pv_name>
+ <pv_name>$(vacPREFIX):RlyValidR</pv_name>
</script>
</scripts>
<widget type="polyline" version="2.0.0">
diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/vgd/Faceplate/vac_mks-vgd-brief.bob b/NON-APPROVED/COMMON/DEVICES/vacuum/vgd/Faceplate/vac_mks-vgd-brief.bob
index 7a17a7f0..b8b050f3 100644
--- a/NON-APPROVED/COMMON/DEVICES/vacuum/vgd/Faceplate/vac_mks-vgd-brief.bob
+++ b/NON-APPROVED/COMMON/DEVICES/vacuum/vgd/Faceplate/vac_mks-vgd-brief.bob
@@ -37,15 +37,18 @@
</color>
</background_color>
<transparent>false</transparent>
- <horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
</widget>
- <widget type="textupdate" version="2.0.0">
- <name>Channel</name>
- <pv_name>$(DEVICENAME):ChanR</pv_name>
- <x>340</x>
+ <widget type="label" version="2.0.0">
+ <name>Status</name>
+ <text>XX @ Yy</text>
+ <x>295</x>
<y>5</y>
- <width>25</width>
+ <width>70</width>
+ <font>
+ <font name="SMALL-MONO-BOLD" family="Source Code Pro" style="BOLD" size="14.0">
+ </font>
+ </font>
<foreground_color>
<color name="WHITE" red="255" green="255" blue="255">
</color>
@@ -54,16 +57,17 @@
<color name="ERROR" red="252" green="13" blue="27">
</color>
</background_color>
- <horizontal_alignment>1</horizontal_alignment>
+ <transparent>false</transparent>
+ <horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
- <rules>
- <rule name="Validity" prop_id="transparent" out_exp="true">
- <exp bool_exp="true">
- <expression>pvInt0</expression>
- </exp>
+ <scripts>
+ <script file="../../COMMON/Faceplate/gauge_status.js">
<pv_name>$(DEVICENAME):ValidR</pv_name>
- </rule>
- </rules>
+ <pv_name>$(DEVICENAME):SensorTypeR</pv_name>
+ <pv_name>$(DEVICENAME):ChanR</pv_name>
+ </script>
+ </scripts>
+ <tooltip>NA</tooltip>
</widget>
<widget type="label" version="2.0.0">
<name>Pressure</name>
@@ -117,14 +121,14 @@
</widget>
<widget type="embedded" version="2.0.0">
<name>Relay 1</name>
- <file>../../COMMON/Faceplate/vac_gauge-mks-relay-status.bob</file>
<macros>
<RELAY>1</RELAY>
</macros>
+ <file>../../COMMON/Faceplate/vac_gauge-mks-relay-status.bob</file>
<x>108</x>
<y>85</y>
- <width>92</width>
- <height>58</height>
+ <width>90</width>
+ <height>56</height>
<resize>2</resize>
<transparent>true</transparent>
</widget>
@@ -148,14 +152,14 @@
</widget>
<widget type="embedded" version="2.0.0">
<name>Relay 2</name>
- <file>../../COMMON/Faceplate/vac_gauge-mks-relay-status.bob</file>
<macros>
<RELAY>2</RELAY>
</macros>
+ <file>../../COMMON/Faceplate/vac_gauge-mks-relay-status.bob</file>
<x>206</x>
<y>85</y>
- <width>92</width>
- <height>58</height>
+ <width>90</width>
+ <height>56</height>
<resize>2</resize>
<transparent>true</transparent>
</widget>
diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/vgd/Faceplate/vac_mks-vgd.bob b/NON-APPROVED/COMMON/DEVICES/vacuum/vgd/Faceplate/vac_mks-vgd.bob
index f4c7747d..a9d03197 100644
--- a/NON-APPROVED/COMMON/DEVICES/vacuum/vgd/Faceplate/vac_mks-vgd.bob
+++ b/NON-APPROVED/COMMON/DEVICES/vacuum/vgd/Faceplate/vac_mks-vgd.bob
@@ -34,7 +34,6 @@
</color>
</background_color>
<transparent>false</transparent>
- <horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
</widget>
<widget type="label" version="2.0.0">
diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/vgd/vac_vgd.bob b/NON-APPROVED/COMMON/DEVICES/vacuum/vgd/vac_vgd.bob
index 6916008c..071c89ff 100644
--- a/NON-APPROVED/COMMON/DEVICES/vacuum/vgd/vac_vgd.bob
+++ b/NON-APPROVED/COMMON/DEVICES/vacuum/vgd/vac_vgd.bob
@@ -16,8 +16,9 @@
</rule>
</rules>
<scripts>
- <script file="../COMMON/isvalid.py" check_connections="false">
+ <script file="../COMMON/gauge_isvalid.py" check_connections="false">
<pv_name>$(vacPREFIX):ValidR</pv_name>
+ <pv_name>$(vacPREFIX):RlyValidR</pv_name>
</script>
</scripts>
<widget type="polyline" version="2.0.0">
diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/vgp/Faceplate/vac_mks-vgp-brief.bob b/NON-APPROVED/COMMON/DEVICES/vacuum/vgp/Faceplate/vac_mks-vgp-brief.bob
index a80a8aa4..a9b1b99b 100644
--- a/NON-APPROVED/COMMON/DEVICES/vacuum/vgp/Faceplate/vac_mks-vgp-brief.bob
+++ b/NON-APPROVED/COMMON/DEVICES/vacuum/vgp/Faceplate/vac_mks-vgp-brief.bob
@@ -37,15 +37,18 @@
</color>
</background_color>
<transparent>false</transparent>
- <horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
</widget>
- <widget type="textupdate" version="2.0.0">
- <name>Channel</name>
- <pv_name>$(DEVICENAME):ChanR</pv_name>
- <x>340</x>
+ <widget type="label" version="2.0.0">
+ <name>Status</name>
+ <text>XX @ Yy</text>
+ <x>295</x>
<y>5</y>
- <width>25</width>
+ <width>70</width>
+ <font>
+ <font name="SMALL-MONO-BOLD" family="Source Code Pro" style="BOLD" size="14.0">
+ </font>
+ </font>
<foreground_color>
<color name="WHITE" red="255" green="255" blue="255">
</color>
@@ -54,16 +57,17 @@
<color name="ERROR" red="252" green="13" blue="27">
</color>
</background_color>
- <horizontal_alignment>1</horizontal_alignment>
+ <transparent>false</transparent>
+ <horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
- <rules>
- <rule name="Validity" prop_id="transparent" out_exp="true">
- <exp bool_exp="true">
- <expression>pvInt0</expression>
- </exp>
+ <scripts>
+ <script file="../../COMMON/Faceplate/gauge_status.js">
<pv_name>$(DEVICENAME):ValidR</pv_name>
- </rule>
- </rules>
+ <pv_name>$(DEVICENAME):SensorTypeR</pv_name>
+ <pv_name>$(DEVICENAME):ChanR</pv_name>
+ </script>
+ </scripts>
+ <tooltip>NA</tooltip>
</widget>
<widget type="label" version="2.0.0">
<name>Pressure</name>
diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/vgp/Faceplate/vac_mks-vgp.bob b/NON-APPROVED/COMMON/DEVICES/vacuum/vgp/Faceplate/vac_mks-vgp.bob
index 14c7d88b..2318c4a5 100644
--- a/NON-APPROVED/COMMON/DEVICES/vacuum/vgp/Faceplate/vac_mks-vgp.bob
+++ b/NON-APPROVED/COMMON/DEVICES/vacuum/vgp/Faceplate/vac_mks-vgp.bob
@@ -34,7 +34,6 @@
</color>
</background_color>
<transparent>false</transparent>
- <horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
</widget>
<widget type="label" version="2.0.0">
diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/vgp/vac_vgp.bob b/NON-APPROVED/COMMON/DEVICES/vacuum/vgp/vac_vgp.bob
index c43ad64f..2c7727d5 100644
--- a/NON-APPROVED/COMMON/DEVICES/vacuum/vgp/vac_vgp.bob
+++ b/NON-APPROVED/COMMON/DEVICES/vacuum/vgp/vac_vgp.bob
@@ -16,8 +16,9 @@
</rule>
</rules>
<scripts>
- <script file="../COMMON/isvalid.py" check_connections="false">
+ <script file="../COMMON/gauge_isvalid.py" check_connections="false">
<pv_name>$(vacPREFIX):ValidR</pv_name>
+ <pv_name>$(vacPREFIX):RlyValidR</pv_name>
</script>
</scripts>
<widget type="polyline" version="2.0.0">
--
GitLab