From 3cb4cf9547b2a9b23574b3f521d6d499e86759e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kriszti=C3=A1n=20L=C3=B6ki?= <krisztian.loki@ess.eu>
Date: Wed, 10 Jun 2020 16:05:00 +0200
Subject: [PATCH] Got rid of interlock_color_animation.js
---
.../COMMON/interlock_color_animation.js | 88 -------------------
.../DEVICES/vacuum/vpp-vpdp/vac_vpp-vpdp.bob | 9 --
.../COMMON/DEVICES/vacuum/vpt/vac_vpt.bob | 9 --
.../DEVICES/vacuum/vva/vac_angle-vva.bob | 9 --
.../DEVICES/vacuum/vva/vac_straight-vva.bob | 9 --
.../COMMON/DEVICES/vacuum/vvf/vac_vvf.bob | 9 --
.../COMMON/DEVICES/vacuum/vvg/vac_vvg.bob | 9 --
.../vacuum/vvs/interlock_color_animation.js | 85 ------------------
.../COMMON/DEVICES/vacuum/vvs/vac_vvs.bob | 36 --------
9 files changed, 263 deletions(-)
delete mode 100644 NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/interlock_color_animation.js
delete mode 100644 NON-APPROVED/COMMON/DEVICES/vacuum/vvs/interlock_color_animation.js
diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/interlock_color_animation.js b/NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/interlock_color_animation.js
deleted file mode 100644
index 1aabdc22..00000000
--- a/NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/interlock_color_animation.js
+++ /dev/null
@@ -1,88 +0,0 @@
-PVUtil = org.csstudio.display.builder.runtime.script.PVUtil;
-ScriptUtil = org.csstudio.display.builder.runtime.script.ScriptUtil;
-
-var pvHealthy = 0;
-var pvTripped = 0;
-var pvOverriden = 0;
-var pvDisabled = 0;
-
-var pvSymbol = pvs[0];
-
-var sum = 0;
-var isValid = 0;
-var visible = true;
-var colorID = 0;
-
-var debug = widget.getEffectiveMacros().getValue("DEBUG");
-if (debug) {
- debug = debug[0];
- switch (debug) {
- case '1':
- case 'Y':
- case 'y':
- case 'T':
- case 't':
- debug = true;
- break;
-
- default:
- debug = false;
- }
-}
-else
- debug = false;
-
-if (debug)
- Logger = org.csstudio.display.builder.runtime.script.ScriptUtil.getLogger();
-else {
- Logger = new Object();
- Logger.info = function() {}
- Logger.warning = function() {}
- Logger.severe = function(text) { org.csstudio.display.builder.runtime.script.ScriptUtil.getLogger().severe(text);}
-}
-
-function log_pv(pv) {
- Logger.info(pv + ": " + PVUtil.getString(pv));
-}
-
-
-try {
- pvHealthy = 1 * PVUtil.getInt(pvs[1]);
- pvTripped = 2 * PVUtil.getInt(pvs[2]);
- pvOverriden = 4 * PVUtil.getInt(pvs[3]);
- pvDisabled = 1 * PVUtil.getInt(pvs[4]);
-
- log_pv(pvs[1]);
- log_pv(pvs[2]);
- log_pv(pvs[3]);
- log_pv(pvs[4]);
-
- sum = pvHealthy | pvTripped | pvOverriden | pvDisabled;
- isValid = (sum & (sum - 1)) == 0 ? 1 : 0;
-
- if (isValid == 0) {
- Logger.severe(pvSymbol + ": Invalid combination");
- } else if (pvTripped) {
- Logger.info(pvSymbol + ": TRIPPED");
- colorID = 2;
- } else if (pvOverriden) {
- Logger.info(pvSymbol + ": OVERRIDEN");
- colorID = 3;
- } else if (pvDisabled) {
- Logger.info(pvSymbol + ": DISABLED");
- colorID = 4;
- visible = false;
- } else if (pvHealthy) {
- Logger.info(pvSymbol + ": HEALTHY");
- colorID = 1;
- } else {
- Logger.severe(pvSymbol + ": Unknown combination:" + sum);
- }
- if (colorID != PVUtil.getInt(pvSymbol))
- Logger.severe(pvSymbol + ": State mismatch:" + colorID + " vs " + PVUtil.getInt(pvSymbol));
-} catch (err) {
- Logger.severe("NO CONNECTION: " + err);
-}
-
-//pvSymbol.write(colorID);
-//widget.setPropertyValue("visible", visible);
diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/vpp-vpdp/vac_vpp-vpdp.bob b/NON-APPROVED/COMMON/DEVICES/vacuum/vpp-vpdp/vac_vpp-vpdp.bob
index 866c41fc..686f5bf5 100644
--- a/NON-APPROVED/COMMON/DEVICES/vacuum/vpp-vpdp/vac_vpp-vpdp.bob
+++ b/NON-APPROVED/COMMON/DEVICES/vacuum/vpp-vpdp/vac_vpp-vpdp.bob
@@ -165,15 +165,6 @@
<pv_name>$(pv_name)</pv_name>
</rule>
</rules>
- <scripts>
- <script file="../COMMON/interlock_color_animation.js" check_connections="false">
- <pv_name>$(pv_name)</pv_name>
- <pv_name>$(vacPREFIX):ITLck:HltyR</pv_name>
- <pv_name>$(vacPREFIX):ITLck:TrpR</pv_name>
- <pv_name>$(vacPREFIX):ITLck:OvRidnR</pv_name>
- <pv_name>$(vacPREFIX):ITLck:DisR</pv_name>
- </script>
- </scripts>
<tooltip>$(pv_value)</tooltip>
<border_alarm_sensitive>false</border_alarm_sensitive>
</widget>
diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/vpt/vac_vpt.bob b/NON-APPROVED/COMMON/DEVICES/vacuum/vpt/vac_vpt.bob
index c20772d8..f20071b3 100644
--- a/NON-APPROVED/COMMON/DEVICES/vacuum/vpt/vac_vpt.bob
+++ b/NON-APPROVED/COMMON/DEVICES/vacuum/vpt/vac_vpt.bob
@@ -165,15 +165,6 @@
<pv_name>$(pv_name)</pv_name>
</rule>
</rules>
- <scripts>
- <script file="../COMMON/interlock_color_animation.js" check_connections="false">
- <pv_name>$(pv_name)</pv_name>
- <pv_name>$(vacPREFIX):ITLck:HltyR</pv_name>
- <pv_name>$(vacPREFIX):ITLck:TrpR</pv_name>
- <pv_name>$(vacPREFIX):ITLck:OvRidnR</pv_name>
- <pv_name>$(vacPREFIX):ITLck:DisR</pv_name>
- </script>
- </scripts>
<tooltip>$(pv_value)</tooltip>
<border_alarm_sensitive>false</border_alarm_sensitive>
</widget>
diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/vva/vac_angle-vva.bob b/NON-APPROVED/COMMON/DEVICES/vacuum/vva/vac_angle-vva.bob
index 2e3ca00c..8710acb2 100644
--- a/NON-APPROVED/COMMON/DEVICES/vacuum/vva/vac_angle-vva.bob
+++ b/NON-APPROVED/COMMON/DEVICES/vacuum/vva/vac_angle-vva.bob
@@ -170,15 +170,6 @@
<pv_name>$(pv_name)</pv_name>
</rule>
</rules>
- <scripts>
- <script file="../COMMON/interlock_color_animation.js" check_connections="false">
- <pv_name>$(pv_name)</pv_name>
- <pv_name>$(vacPREFIX):ITLck:HltyR</pv_name>
- <pv_name>$(vacPREFIX):ITLck:TrpR</pv_name>
- <pv_name>$(vacPREFIX):ITLck:OvRidnR</pv_name>
- <pv_name>$(vacPREFIX):ITLck:DisR</pv_name>
- </script>
- </scripts>
<tooltip>$(pv_value)</tooltip>
<border_alarm_sensitive>false</border_alarm_sensitive>
</widget>
diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/vva/vac_straight-vva.bob b/NON-APPROVED/COMMON/DEVICES/vacuum/vva/vac_straight-vva.bob
index 29efff85..46179f36 100644
--- a/NON-APPROVED/COMMON/DEVICES/vacuum/vva/vac_straight-vva.bob
+++ b/NON-APPROVED/COMMON/DEVICES/vacuum/vva/vac_straight-vva.bob
@@ -168,15 +168,6 @@
<pv_name>$(pv_name)</pv_name>
</rule>
</rules>
- <scripts>
- <script file="../COMMON/interlock_color_animation.js" check_connections="false">
- <pv_name>$(pv_name)</pv_name>
- <pv_name>$(vacPREFIX):ITLck:HltyR</pv_name>
- <pv_name>$(vacPREFIX):ITLck:TrpR</pv_name>
- <pv_name>$(vacPREFIX):ITLck:OvRidnR</pv_name>
- <pv_name>$(vacPREFIX):ITLck:DisR</pv_name>
- </script>
- </scripts>
<tooltip>$(pv_value)</tooltip>
<border_alarm_sensitive>false</border_alarm_sensitive>
</widget>
diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/vvf/vac_vvf.bob b/NON-APPROVED/COMMON/DEVICES/vacuum/vvf/vac_vvf.bob
index 23b38c75..60260e75 100644
--- a/NON-APPROVED/COMMON/DEVICES/vacuum/vvf/vac_vvf.bob
+++ b/NON-APPROVED/COMMON/DEVICES/vacuum/vvf/vac_vvf.bob
@@ -168,15 +168,6 @@
<pv_name>$(pv_name)</pv_name>
</rule>
</rules>
- <scripts>
- <script file="../COMMON/interlock_color_animation.js" check_connections="false">
- <pv_name>$(pv_name)</pv_name>
- <pv_name>$(vacPREFIX):ITLck:HltyR</pv_name>
- <pv_name>$(vacPREFIX):ITLck:TrpR</pv_name>
- <pv_name>$(vacPREFIX):ITLck:OvRidnR</pv_name>
- <pv_name>$(vacPREFIX):ITLck:DisR</pv_name>
- </script>
- </scripts>
<tooltip>$(pv_value)</tooltip>
<border_alarm_sensitive>false</border_alarm_sensitive>
</widget>
diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/vvg/vac_vvg.bob b/NON-APPROVED/COMMON/DEVICES/vacuum/vvg/vac_vvg.bob
index 56ec45fc..94c812bf 100644
--- a/NON-APPROVED/COMMON/DEVICES/vacuum/vvg/vac_vvg.bob
+++ b/NON-APPROVED/COMMON/DEVICES/vacuum/vvg/vac_vvg.bob
@@ -168,15 +168,6 @@
<pv_name>$(pv_name)</pv_name>
</rule>
</rules>
- <scripts>
- <script file="../COMMON/interlock_color_animation.js" check_connections="false">
- <pv_name>$(pv_name)</pv_name>
- <pv_name>$(vacPREFIX):ITLck:HltyR</pv_name>
- <pv_name>$(vacPREFIX):ITLck:TrpR</pv_name>
- <pv_name>$(vacPREFIX):ITLck:OvRidnR</pv_name>
- <pv_name>$(vacPREFIX):ITLck:DisR</pv_name>
- </script>
- </scripts>
<tooltip>$(pv_value)</tooltip>
<border_alarm_sensitive>false</border_alarm_sensitive>
</widget>
diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/vvs/interlock_color_animation.js b/NON-APPROVED/COMMON/DEVICES/vacuum/vvs/interlock_color_animation.js
deleted file mode 100644
index 143e9e21..00000000
--- a/NON-APPROVED/COMMON/DEVICES/vacuum/vvs/interlock_color_animation.js
+++ /dev/null
@@ -1,85 +0,0 @@
-PVUtil = org.csstudio.display.builder.runtime.script.PVUtil;
-ScriptUtil = org.csstudio.display.builder.runtime.script.ScriptUtil;
-
-var pvHealthy = 0;
-var pvTripped = 0;
-var pvOverriden = 0;
-var pvDisabled = 0;
-
-var pvSymbol = pvs[0];
-
-var sum = 0;
-var isValid = 0;
-var colorID = 0;
-
-var debug = widget.getEffectiveMacros().getValue("DEBUG");
-if (debug) {
- debug = debug[0];
- switch (debug) {
- case '1':
- case 'Y':
- case 'y':
- case 'T':
- case 't':
- debug = true;
- break;
-
- default:
- debug = false;
- }
-}
-else
- debug = false;
-
-if (debug)
- Logger = org.csstudio.display.builder.runtime.script.ScriptUtil.getLogger();
-else {
- Logger = new Object();
- Logger.info = function() {}
- Logger.warning = function() {}
- Logger.severe = function(text) { org.csstudio.display.builder.runtime.script.ScriptUtil.getLogger().severe(text);}
-}
-
-function log_pv(pv) {
- Logger.info(pv + ": " + PVUtil.getString(pv));
-}
-
-try {
- pvHealthy = 1 * PVUtil.getInt(pvs[1]);
- pvTripped = 2 * PVUtil.getInt(pvs[2]);
- pvOverriden = 4 * PVUtil.getInt(pvs[3]);
- pvDisabled = 1 * PVUtil.getInt(pvs[4]);
-
- log_pv(pvs[1]);
- log_pv(pvs[2]);
- log_pv(pvs[3]);
- log_pv(pvs[4]);
-
- sum = pvHealthy | pvTripped | pvOverriden | pvDisabled;
- isValid = (sum & (sum - 1)) == 0 ? 1 : 0;
-
- if (isValid == 0) {
- Logger.severe(pvSymbol + ": Invalid combination");
- } else if (pvTripped) {
- Logger.info(pvSymbol + ": TRIPPED");
- colorID = 2;
- } else if (pvOverriden) {
- Logger.info(pvSymbol + ": OVERRIDEN");
- colorID = 3;
- } else if (pvDisabled) {
- Logger.info(pvSymbol + ": DISABLED");
- colorID = 4;
- } else if (pvHealthy) {
- Logger.info(pvSymbol + ": HEALTHY");
- colorID = 1;
- } else {
- Logger.severe(pvSymbol + ": Unknown combination:" + sum);
- }
-
- if (colorID != PVUtil.getInt(pvSymbol))
- Logger.severe(pvSymbol + ": State mismatch:" + colorID + " vs " + PVUtil.getInt(pvSymbol));
-} catch (err) {
- Logger.severe("NO CONNECTION: " + err);
-}
-
-//pvSymbol.write(colorID);
diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/vvs/vac_vvs.bob b/NON-APPROVED/COMMON/DEVICES/vacuum/vvs/vac_vvs.bob
index 9d5720b5..d502fae3 100644
--- a/NON-APPROVED/COMMON/DEVICES/vacuum/vvs/vac_vvs.bob
+++ b/NON-APPROVED/COMMON/DEVICES/vacuum/vvs/vac_vvs.bob
@@ -152,15 +152,6 @@
<pv_name>$(vacPREFIX):Prev:1:ITLckStatR</pv_name>
</rule>
</rules>
- <scripts>
- <script file="interlock_color_animation.js" check_connections="false">
- <pv_name>$(vacPREFIX):Prev:1:ITLckStatR</pv_name>
- <pv_name>$(vacPREFIX):ITLck:Prev:1:HltyR</pv_name>
- <pv_name>$(vacPREFIX):ITLck:Prev:1:TrpR</pv_name>
- <pv_name>$(vacPREFIX):ITLck:Prev:1:OvRidnR</pv_name>
- <pv_name>$(vacPREFIX):ITLck:Prev:1:DisR</pv_name>
- </script>
- </scripts>
<tooltip>Invalid</tooltip>
</widget>
<widget type="rectangle" version="2.0.0">
@@ -219,15 +210,6 @@
<pv_name>$(vacPREFIX):Prev:2:ITLckStatR</pv_name>
</rule>
</rules>
- <scripts>
- <script file="interlock_color_animation.js" check_connections="false">
- <pv_name>$(vacPREFIX):Prev:2:ITLckStatR</pv_name>
- <pv_name>$(vacPREFIX):ITLck:Prev:2:HltyR</pv_name>
- <pv_name>$(vacPREFIX):ITLck:Prev:2:TrpR</pv_name>
- <pv_name>$(vacPREFIX):ITLck:Prev:2:OvRidnR</pv_name>
- <pv_name>$(vacPREFIX):ITLck:Prev:2:DisR</pv_name>
- </script>
- </scripts>
<tooltip>Invalid</tooltip>
</widget>
<widget type="rectangle" version="2.0.0">
@@ -286,15 +268,6 @@
<pv_name>$(vacPREFIX):Next:1:ITLckStatR</pv_name>
</rule>
</rules>
- <scripts>
- <script file="interlock_color_animation.js" check_connections="false">
- <pv_name>$(vacPREFIX):Next:1:ITLckStatR</pv_name>
- <pv_name>$(vacPREFIX):ITLck:Next:1:HltyR</pv_name>
- <pv_name>$(vacPREFIX):ITLck:Next:1:TrpR</pv_name>
- <pv_name>$(vacPREFIX):ITLck:Next:1:OvRidnR</pv_name>
- <pv_name>$(vacPREFIX):ITLck:Next:1:DisR</pv_name>
- </script>
- </scripts>
<tooltip>Invalid</tooltip>
</widget>
<widget type="action_button" version="3.0.0">
@@ -377,15 +350,6 @@
<pv_name>$(vacPREFIX):Next:2:ITLckStatR</pv_name>
</rule>
</rules>
- <scripts>
- <script file="interlock_color_animation.js" check_connections="false">
- <pv_name>$(vacPREFIX):Next:2:ITLckStatR</pv_name>
- <pv_name>$(vacPREFIX):ITLck:Next:2:HltyR</pv_name>
- <pv_name>$(vacPREFIX):ITLck:Next:2:TrpR</pv_name>
- <pv_name>$(vacPREFIX):ITLck:Next:2:OvRidnR</pv_name>
- <pv_name>$(vacPREFIX):ITLck:Next:2:DisR</pv_name>
- </script>
- </scripts>
<tooltip>Invalid</tooltip>
</widget>
<widget type="action_button" version="3.0.0">
--
GitLab