From 0ce2d8ece93ac80f5ff5d27bfc32cc18ceb93c42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kriszti=C3=A1n=20L=C3=B6ki?= <krisztian.loki@ess.eu>
Date: Thu, 6 Feb 2020 18:31:56 +0100
Subject: [PATCH] Show sensor types separately
---
.../Faceplate/vac_ctrl_mks946_937b_module.bob | 129 ++++++++++++++++--
1 file changed, 120 insertions(+), 9 deletions(-)
diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/veg/Faceplate/vac_ctrl_mks946_937b_module.bob b/NON-APPROVED/COMMON/DEVICES/vacuum/veg/Faceplate/vac_ctrl_mks946_937b_module.bob
index f0d52a8c..30a968a2 100644
--- a/NON-APPROVED/COMMON/DEVICES/vacuum/veg/Faceplate/vac_ctrl_mks946_937b_module.bob
+++ b/NON-APPROVED/COMMON/DEVICES/vacuum/veg/Faceplate/vac_ctrl_mks946_937b_module.bob
@@ -474,11 +474,11 @@
<vertical_alignment>1</vertical_alignment>
</widget>
<widget type="textupdate" version="2.0.0">
- <name>SensorTypesA</name>
- <pv_name>${DEVICENAME}:ModA:SensorTypesR</pv_name>
+ <name>SensorTypeA1</name>
+ <pv_name>${DEVICENAME}:A1:SensorTypeR</pv_name>
<x>140</x>
<y>178</y>
- <width>104</width>
+ <width>49</width>
<height>25</height>
<background_color>
<color name="BLUE-BACKGROUND" red="195" green="226" blue="225">
@@ -486,13 +486,50 @@
</background_color>
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
+ <rules>
+ <rule name="Width" prop_id="width" out_exp="false">
+ <exp bool_exp="pvStr0 == """>
+ <value>104</value>
+ </exp>
+ <pv_name>$(DEVICENAME):A2:SensorTypeR</pv_name>
+ </rule>
+ <rule name="Visibility" prop_id="visible" out_exp="false">
+ <exp bool_exp="pvStr0 == "" and pvStr1 == "NC"">
+ <value>false</value>
+ </exp>
+ <pv_name>$(DEVICENAME):A2:SensorTypeR</pv_name>
+ <pv_name>$(pv_name)</pv_name>
+ </rule>
+ </rules>
</widget>
<widget type="textupdate" version="2.0.0">
- <name>SensorTypesB</name>
- <pv_name>${DEVICENAME}:ModB:SensorTypesR</pv_name>
+ <name>SensorTypeA2</name>
+ <pv_name>${DEVICENAME}:A2:SensorTypeR</pv_name>
+ <x>195</x>
+ <y>178</y>
+ <width>49</width>
+ <height>25</height>
+ <background_color>
+ <color name="BLUE-BACKGROUND" red="195" green="226" blue="225">
+ </color>
+ </background_color>
+ <horizontal_alignment>1</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ <rules>
+ <rule name="Visibility" prop_id="visible" out_exp="false">
+ <exp bool_exp="pvStr0 == """>
+ <value>false</value>
+ </exp>
+ <pv_name>$(pv_name)</pv_name>
+ </rule>
+ </rules>
+ </widget>
+ <widget type="textupdate" version="2.0.0">
+ <name>SensorTypeB1</name>
+ <pv_name>${DEVICENAME}:B1:SensorTypeR</pv_name>
<x>250</x>
<y>178</y>
- <width>104</width>
+ <width>49</width>
<height>25</height>
<background_color>
<color name="BLUE-BACKGROUND" red="195" green="226" blue="225">
@@ -500,13 +537,79 @@
</background_color>
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
+ <rules>
+ <rule name="Width" prop_id="width" out_exp="false">
+ <exp bool_exp="pvStr0 == """>
+ <value>104</value>
+ </exp>
+ <pv_name>$(DEVICENAME):B2:SensorTypeR</pv_name>
+ </rule>
+ <rule name="Visibility" prop_id="visible" out_exp="false">
+ <exp bool_exp="pvStr0 == "" and pvStr1 == "NC"">
+ <value>false</value>
+ </exp>
+ <pv_name>$(DEVICENAME):B2:SensorTypeR</pv_name>
+ <pv_name>$(pv_name)</pv_name>
+ </rule>
+ </rules>
</widget>
<widget type="textupdate" version="2.0.0">
- <name>SensorTypesC</name>
- <pv_name>${DEVICENAME}:ModC:SensorTypesR</pv_name>
+ <name>SensorTypeB2</name>
+ <pv_name>${DEVICENAME}:B2:SensorTypeR</pv_name>
+ <x>305</x>
+ <y>178</y>
+ <width>49</width>
+ <height>25</height>
+ <background_color>
+ <color name="BLUE-BACKGROUND" red="195" green="226" blue="225">
+ </color>
+ </background_color>
+ <horizontal_alignment>1</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ <rules>
+ <rule name="Visibility" prop_id="visible" out_exp="false">
+ <exp bool_exp="pvStr0 == """>
+ <value>false</value>
+ </exp>
+ <pv_name>$(pv_name)</pv_name>
+ </rule>
+ </rules>
+ </widget>
+ <widget type="textupdate" version="2.0.0">
+ <name>SensorTypeC1</name>
+ <pv_name>${DEVICENAME}:C1:SensorTypeR</pv_name>
<x>360</x>
<y>178</y>
- <width>104</width>
+ <width>49</width>
+ <height>25</height>
+ <background_color>
+ <color name="BLUE-BACKGROUND" red="195" green="226" blue="225">
+ </color>
+ </background_color>
+ <horizontal_alignment>1</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ <rules>
+ <rule name="Width" prop_id="width" out_exp="false">
+ <exp bool_exp="pvStr0 == """>
+ <value>104</value>
+ </exp>
+ <pv_name>$(DEVICENAME):C2:SensorTypeR</pv_name>
+ </rule>
+ <rule name="Visibility" prop_id="visible" out_exp="false">
+ <exp bool_exp="pvStr0 == "" and pvStr1 == "NC"">
+ <value>false</value>
+ </exp>
+ <pv_name>$(DEVICENAME):C2:SensorTypeR</pv_name>
+ <pv_name>$(pv_name)</pv_name>
+ </rule>
+ </rules>
+ </widget>
+ <widget type="textupdate" version="2.0.0">
+ <name>SensorTypeC2</name>
+ <pv_name>${DEVICENAME}:C2:SensorTypeR</pv_name>
+ <x>415</x>
+ <y>178</y>
+ <width>49</width>
<height>25</height>
<background_color>
<color name="BLUE-BACKGROUND" red="195" green="226" blue="225">
@@ -514,6 +617,14 @@
</background_color>
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
+ <rules>
+ <rule name="Visibility" prop_id="visible" out_exp="false">
+ <exp bool_exp="pvStr0 == """>
+ <value>false</value>
+ </exp>
+ <pv_name>$(pv_name)</pv_name>
+ </rule>
+ </rules>
</widget>
</widget>
</display>
--
GitLab