From 5ae03a9b99f0894cccf998950a49492fbee2cb0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kriszti=C3=A1n=20L=C3=B6ki?= <krisztian.loki@ess.eu>
Date: Thu, 18 Jun 2020 12:32:15 +0200
Subject: [PATCH] Converted pressure_status.js to Python
---
.../vacuum/COMMON/Faceplate/pressure_status.js | 18 ------------------
.../vacuum/COMMON/Faceplate/pressure_status.py | 14 ++++++++++++++
.../vacuum/vgc/Faceplate/vac_mks-vgc-brief.bob | 2 +-
.../vacuum/vgc/Faceplate/vac_tpg-vgc-brief.bob | 2 +-
.../vacuum/vgd/Faceplate/vac_mks-vgd-brief.bob | 2 +-
.../vacuum/vgd/Faceplate/vac_mks-vgd.bob | 2 +-
.../vacuum/vgp/Faceplate/vac_mks-vgp-brief.bob | 2 +-
.../vacuum/vgp/Faceplate/vac_mks-vgp.bob | 2 +-
.../vvmc/Faceplate/vac_mks-vvmc-brief.bob | 2 +-
.../vacuum/vvmc/Faceplate/vac_mks-vvmc.bob | 2 +-
10 files changed, 22 insertions(+), 26 deletions(-)
delete mode 100644 NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/Faceplate/pressure_status.js
create mode 100644 NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/Faceplate/pressure_status.py
diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/Faceplate/pressure_status.js b/NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/Faceplate/pressure_status.js
deleted file mode 100644
index 12cc1dc6..00000000
--- a/NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/Faceplate/pressure_status.js
+++ /dev/null
@@ -1,18 +0,0 @@
-PVUtil = org.csstudio.display.builder.runtime.script.PVUtil;
-
-var tooltip = "$(pv_name)\n$(pv_value)";
-
-try
-{
- var pvStat = PVUtil.getString(pvs[0]);
- var pvPrsStr = pvs[1];
-
- if (pvStat != "ON" && pvStat != "Open") // && pvStat != "UNDER-RANGE" && pvStat != "OVER-RANGE")
- {
- tooltip += "\n" + PVUtil.getString(pvPrsStr);
- }
-} catch (err)
-{
-}
-
-widget.setPropertyValue("tooltip", tooltip);
diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/Faceplate/pressure_status.py b/NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/Faceplate/pressure_status.py
new file mode 100644
index 00000000..3982fa7f
--- /dev/null
+++ b/NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/Faceplate/pressure_status.py
@@ -0,0 +1,14 @@
+from org.csstudio.display.builder.runtime.script import PVUtil
+
+tooltip = "$(pv_name)\n$(pv_value)"
+
+try:
+ pvStat = PVUtil.getString(pvs[0]).upper()
+ pvPrsStr = pvs[1]
+
+ if pvStat != "ON" and pvStat != "OPEN": # and pvStat != "UNDER-RANGE" and pvStat != "OVER-RANGE":
+ tooltip += "\n" + PVUtil.getString(pvPrsStr)
+except:
+ pass
+
+widget.setPropertyValue("tooltip", tooltip)
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 fa189316..5977f41a 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
@@ -113,7 +113,7 @@
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
<scripts>
- <script file="../../COMMON/Faceplate/pressure_status.js">
+ <script file="../../COMMON/Faceplate/pressure_status.py">
<pv_name>$(DEVICENAME):PrsStatR</pv_name>
<pv_name>$(DEVICENAME):PrsR-STR</pv_name>
</script>
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 372bac58..2bd1853b 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
@@ -120,7 +120,7 @@
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
<scripts>
- <script file="../../COMMON/Faceplate/pressure_status.js">
+ <script file="../../COMMON/Faceplate/pressure_status.py">
<pv_name>$(DEVICENAME):PrsStatR</pv_name>
<pv_name>$(DEVICENAME):GaugeStatR</pv_name>
</script>
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 b3c93ad1..beee972f 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
@@ -113,7 +113,7 @@
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
<scripts>
- <script file="../../COMMON/Faceplate/pressure_status.js">
+ <script file="../../COMMON/Faceplate/pressure_status.py">
<pv_name>$(DEVICENAME):PrsStatR</pv_name>
<pv_name>$(DEVICENAME):PrsR-STR</pv_name>
</script>
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 75faeb9f..5d2f6719 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
@@ -245,7 +245,7 @@
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
<scripts>
- <script file="../../COMMON/Faceplate/pressure_status.js">
+ <script file="../../COMMON/Faceplate/pressure_status.py">
<pv_name>$(DEVICENAME):PrsStatR</pv_name>
<pv_name>$(DEVICENAME):PrsR-STR</pv_name>
</script>
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 3a9d52f2..2b277b17 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
@@ -113,7 +113,7 @@
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
<scripts>
- <script file="../../COMMON/Faceplate/pressure_status.js">
+ <script file="../../COMMON/Faceplate/pressure_status.py">
<pv_name>$(DEVICENAME):PrsStatR</pv_name>
<pv_name>$(DEVICENAME):PrsR-STR</pv_name>
</script>
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 63bb2a05..8eeefc06 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
@@ -245,7 +245,7 @@
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
<scripts>
- <script file="../../COMMON/Faceplate/pressure_status.js">
+ <script file="../../COMMON/Faceplate/pressure_status.py">
<pv_name>$(DEVICENAME):PrsStatR</pv_name>
<pv_name>$(DEVICENAME):PrsR-STR</pv_name>
</script>
diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/vvmc/Faceplate/vac_mks-vvmc-brief.bob b/NON-APPROVED/COMMON/DEVICES/vacuum/vvmc/Faceplate/vac_mks-vvmc-brief.bob
index 005fe456..43fcced2 100644
--- a/NON-APPROVED/COMMON/DEVICES/vacuum/vvmc/Faceplate/vac_mks-vvmc-brief.bob
+++ b/NON-APPROVED/COMMON/DEVICES/vacuum/vvmc/Faceplate/vac_mks-vvmc-brief.bob
@@ -113,7 +113,7 @@
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
<scripts>
- <script file="../../COMMON/Faceplate/pressure_status.js">
+ <script file="../../COMMON/Faceplate/pressure_status.py">
<pv_name>$(DEVICENAME):FlwStatR</pv_name>
<pv_name>$(DEVICENAME):FlwR-STR</pv_name>
</script>
diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/vvmc/Faceplate/vac_mks-vvmc.bob b/NON-APPROVED/COMMON/DEVICES/vacuum/vvmc/Faceplate/vac_mks-vvmc.bob
index 429f5a81..d48390e6 100644
--- a/NON-APPROVED/COMMON/DEVICES/vacuum/vvmc/Faceplate/vac_mks-vvmc.bob
+++ b/NON-APPROVED/COMMON/DEVICES/vacuum/vvmc/Faceplate/vac_mks-vvmc.bob
@@ -150,7 +150,7 @@
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
<scripts>
- <script file="../../COMMON/Faceplate/pressure_status.js">
+ <script file="../../COMMON/Faceplate/pressure_status.py">
<pv_name>$(DEVICENAME):FlwStatR</pv_name>
<pv_name>$(DEVICENAME):FlwR-STR</pv_name>
</script>
--
GitLab