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 12cc1dc6b255e23fb5ad91586df1f6ebd3d3eb0c..0000000000000000000000000000000000000000 --- 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 0000000000000000000000000000000000000000..3982fa7f8529078d71910b8ffc4a6ea0e66bfc80 --- /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 fa189316c90ae62e1c8aadb904aba78beadf1e4d..5977f41a5b551c1e9d8f8ecc0bced7d81afdf987 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 372bac58fb74fa5eaa9ac6d97fef4d6574f90e80..2bd1853bc99c58857f13d6d1b2d3569cb72c82b4 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 b3c93ad1065a821ecfa080b6184d97255b4ff52f..beee972f180281b1c3dbfedab6ba5f4722ee32a7 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 75faeb9f47485b32bf5fd5a9f35b923418ba1a5b..5d2f67194060ccfa85ef0c0dc974a11d580cfd5f 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 3a9d52f2e99515964976cfa4cdfe73f01870f12a..2b277b17ec733d6d31e067a1ee576df6ccdb3a9a 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 63bb2a05d3324d2d2bc33070038a976ce106c527..8eeefc060fa5180cd342e3c45d9a7a9aab8b6723 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 005fe4568230fc15b3ebce992ba4b18208e9c8e0..43fcced22dcec8bc6d4a36263bf1fbdabf830b01 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 429f5a81f724ed65bd8ad2e05a96a348b1356d2c..d48390e6b8e86c600fa05a298189b2f52313706a 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>