From 92f228ded3988e7fe368411ca61158e543a38895 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kriszti=C3=A1n=20L=C3=B6ki?= <krisztian.loki@ess.eu>
Date: Tue, 20 Oct 2020 12:53:08 +0200
Subject: [PATCH] Updated VPDP and VPT tooltip
---
NON-APPROVED/COMMON/DEVICES/vacuum/vpp-vpdp/vac_vpp-vpdp.bob | 5 +++--
NON-APPROVED/COMMON/DEVICES/vacuum/vpt/vac_vpt.bob | 5 +++--
2 files changed, 6 insertions(+), 4 deletions(-)
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 e41de95e..5f354b4a 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
@@ -90,11 +90,12 @@
</action>
</actions>
<rules>
- <rule name="Tooltip" prop_id="tooltip" out_exp="true">
+ <rule name="Type" prop_id="tooltip" out_exp="true">
<exp bool_exp="true">
- <expression>pvStr0</expression>
+ <expression>pvStr0 + "\nType: " + pvStr1</expression>
</exp>
<pv_name>$(pv_name)</pv_name>
+ <pv_name>$(vacPREFIX):ControllerConfigR</pv_name>
</rule>
</rules>
<tooltip>$(pv_value)</tooltip>
diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/vpt/vac_vpt.bob b/NON-APPROVED/COMMON/DEVICES/vacuum/vpt/vac_vpt.bob
index 121e9f22..1e328440 100644
--- a/NON-APPROVED/COMMON/DEVICES/vacuum/vpt/vac_vpt.bob
+++ b/NON-APPROVED/COMMON/DEVICES/vacuum/vpt/vac_vpt.bob
@@ -91,9 +91,10 @@
</actions>
<rules>
<rule name="Speed" prop_id="tooltip" out_exp="true">
- <exp bool_exp="True">
- <expression>pvStr0</expression>
+ <exp bool_exp="true">
+ <expression>pvStr0 + "\nSpeed: " + pvStr1</expression>
</exp>
+ <pv_name>$(pv_name)</pv_name>
<pv_name>$(CONTROLLER):SpdR</pv_name>
</rule>
</rules>
--
GitLab