From 8011c0bf2c89717284c3fa1fe0684d53a32c62ba Mon Sep 17 00:00:00 2001
From: Emilio Asensi <emilio.asensiconejero@esss.se>
Date: Wed, 10 Mar 2021 12:15:34 +0100
Subject: [PATCH] Minor updates
---
.../EH_HeaterSupply_Analog_Faceplate.bob | 13 +---
...ADVControl_Faceplate_AutoConf_embedded.bob | 76 +++++++------------
.../Valves/CV_ControlVALVE_Faceplate.bob | 13 +---
NON-APPROVED/TS2/ts2-cryomodule/TS2_main4.bob | 5 +-
4 files changed, 40 insertions(+), 67 deletions(-)
diff --git a/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/Heaters/EH_HeaterSupply_Analog_Faceplate.bob b/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/Heaters/EH_HeaterSupply_Analog_Faceplate.bob
index 8c294e6e..b7e92c97 100644
--- a/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/Heaters/EH_HeaterSupply_Analog_Faceplate.bob
+++ b/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/Heaters/EH_HeaterSupply_Analog_Faceplate.bob
@@ -1925,10 +1925,6 @@
<x>133</x>
<y>184</y>
<width>41</width>
- <line_color>
- <color name="WHITE" red="255" green="255" blue="255">
- </color>
- </line_color>
<points>
<point x="0.0" y="20.0">
</point>
@@ -1939,6 +1935,10 @@
<point x="40.32786885245899" y="0.0">
</point>
</points>
+ <line_color>
+ <color name="WHITE" red="255" green="255" blue="255">
+ </color>
+ </line_color>
</widget>
</widget>
<widget type="action_button" version="3.0.0">
@@ -1952,11 +1952,6 @@
<target>window</target>
<description>Open Display</description>
</action>
- <action type="write_pv">
- <pv_name>${WIDSec}:${WIDDis}-${WIDAmConf}:P_Controlled_Devie_Name</pv_name>
- <value>${ControlledDevice}</value>
- <description>SetControlledDevice</description>
- </action>
</actions>
<text>PID</text>
<x>15</x>
diff --git a/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/PIDControls/PID_ADVControl_Faceplate_AutoConf_embedded.bob b/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/PIDControls/PID_ADVControl_Faceplate_AutoConf_embedded.bob
index 8354f460..dc8994a4 100644
--- a/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/PIDControls/PID_ADVControl_Faceplate_AutoConf_embedded.bob
+++ b/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/PIDControls/PID_ADVControl_Faceplate_AutoConf_embedded.bob
@@ -185,11 +185,11 @@
</background_color>
<vertical_alignment>1</vertical_alignment>
</widget>
- <widget type="textupdate" version="2.0.0">
+ <widget type="label" version="2.0.0">
<name>MET_ProcessSetpoint_1</name>
- <pv_name>${SecSubPID}:${Dis}-PID-${IndexPID}:Measured_Value_Msg</pv_name>
+ <text>${MeasureValue}</text>
<x>18</x>
- <y>65</y>
+ <y>60</y>
<width>133</width>
<height>46</height>
<font>
@@ -200,30 +200,8 @@
<color red="255" green="254" blue="253">
</color>
</background_color>
- <transparent>true</transparent>
- <precision>2</precision>
- <show_units>false</show_units>
<horizontal_alignment>2</horizontal_alignment>
<tooltip>Measurement Value</tooltip>
- <border_alarm_sensitive>false</border_alarm_sensitive>
- </widget>
- <widget type="textupdate" version="2.0.0">
- <name>MET_EGU3_1</name>
- <pv_name>${SecSubPID}:${Dis}-PID-${IndexPID}:ProcValueEGU</pv_name>
- <x>188</x>
- <y>117</y>
- <width>86</width>
- <height>30</height>
- <font>
- <font family="Source Sans Pro" style="REGULAR" size="25.0">
- </font>
- </font>
- <background_color>
- <color red="255" green="254" blue="253">
- </color>
- </background_color>
- <transparent>true</transparent>
- <tooltip>Engineering Unit</tooltip>
</widget>
<widget type="textupdate" version="2.0.0">
<name>MET_ProcessSetpoint_2</name>
@@ -247,6 +225,23 @@
<tooltip>Measurement Value</tooltip>
<border_alarm_sensitive>false</border_alarm_sensitive>
</widget>
+ <widget type="label" version="2.0.0">
+ <name>MET_EGU3</name>
+ <text>${MeasureValueEGU}</text>
+ <x>167</x>
+ <y>122</y>
+ <width>86</width>
+ <height>30</height>
+ <font>
+ <font family="Source Sans Pro" style="REGULAR" size="20.0">
+ </font>
+ </font>
+ <background_color>
+ <color red="255" green="254" blue="253">
+ </color>
+ </background_color>
+ <tooltip>Engineering Unit</tooltip>
+ </widget>
</widget>
<widget type="group" version="2.0.0">
<name>group.op.modes</name>
@@ -2064,10 +2059,6 @@
<x>135</x>
<y>119</y>
<width>41</width>
- <line_color>
- <color name="WHITE" red="255" green="255" blue="255">
- </color>
- </line_color>
<points>
<point x="0.0" y="20.0">
</point>
@@ -2078,6 +2069,10 @@
<point x="40.32786885245899" y="0.0">
</point>
</points>
+ <line_color>
+ <color name="WHITE" red="255" green="255" blue="255">
+ </color>
+ </line_color>
</widget>
<widget type="label" version="2.0.0">
<name>LB_Setpoint EGU</name>
@@ -2096,11 +2091,11 @@
</background_color>
<vertical_alignment>1</vertical_alignment>
</widget>
- <widget type="textupdate" version="2.0.0">
- <name>MET_EGU3</name>
- <pv_name>${SecSubPID}:${Dis}-PID-${IndexPID}:ProcValueEGU</pv_name>
+ <widget type="label" version="2.0.0">
+ <name>MET_EGU3_1</name>
+ <text>${MeasureValueEGU}</text>
<x>118</x>
- <y>49</y>
+ <y>47</y>
<width>86</width>
<height>30</height>
<font>
@@ -2111,7 +2106,6 @@
<color red="255" green="254" blue="253">
</color>
</background_color>
- <transparent>true</transparent>
<tooltip>Engineering Unit</tooltip>
</widget>
</widget>
@@ -3727,19 +3721,6 @@
</rules>
</widget>
</widget>
- <widget type="embedded" version="2.0.0">
- <name>Embedded Display</name>
- <file>FacePlate_AutoConf.bob</file>
- <macros>
- <WIDAmConf>Virt-AMCONF</WIDAmConf>
- <WIDDis>Cryo</WIDDis>
- <WIDSecSub>TS2-010</WIDSecSub>
- </macros>
- <x>448</x>
- <y>17</y>
- <width>481</width>
- <height>665</height>
- </widget>
</children>
</tab>
</tabs>
@@ -3747,6 +3728,7 @@
<y>60</y>
<width>943</width>
<height>720</height>
+ <active_tab>2</active_tab>
</widget>
<widget type="rectangle" version="2.0.0">
<name>Header Bar</name>
diff --git a/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/Valves/CV_ControlVALVE_Faceplate.bob b/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/Valves/CV_ControlVALVE_Faceplate.bob
index 09ead7fb..5fe9db2f 100755
--- a/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/Valves/CV_ControlVALVE_Faceplate.bob
+++ b/NON-APPROVED/ICS_OPI_LIBRARY/DeviceTypes/Valves/CV_ControlVALVE_Faceplate.bob
@@ -1930,10 +1930,6 @@
<x>133</x>
<y>184</y>
<width>41</width>
- <line_color>
- <color name="WHITE" red="255" green="255" blue="255">
- </color>
- </line_color>
<points>
<point x="0.0" y="20.0">
</point>
@@ -1944,16 +1940,15 @@
<point x="40.32786885245899" y="0.0">
</point>
</points>
+ <line_color>
+ <color name="WHITE" red="255" green="255" blue="255">
+ </color>
+ </line_color>
</widget>
</widget>
<widget type="action_button" version="3.0.0">
<name>PIDScreen_Button_1</name>
<actions execute_as_one="true">
- <action type="write_pv">
- <pv_name>${WIDSec}:${WIDDis}-${WIDAmConf}:P_Controlled_Devie_Name</pv_name>
- <value>${ControlledDevice}</value>
- <description>SetControlledDevice</description>
- </action>
<action type="open_display">
<file>../PIDControls/PID_ADVControl_Faceplate_AutoConf_embedded.bob</file>
<target>window</target>
diff --git a/NON-APPROVED/TS2/ts2-cryomodule/TS2_main4.bob b/NON-APPROVED/TS2/ts2-cryomodule/TS2_main4.bob
index 5f8e7957..9146546a 100644
--- a/NON-APPROVED/TS2/ts2-cryomodule/TS2_main4.bob
+++ b/NON-APPROVED/TS2/ts2-cryomodule/TS2_main4.bob
@@ -706,16 +706,17 @@
<macros>
<ControlledDevice>CV-001</ControlledDevice>
<MeasureValue>LT-001</MeasureValue>
+ <MeasureValueEGU>%</MeasureValueEGU>
<ProcessValue>TS2-010CRM:Cryo-LT-001</ProcessValue>
<ProcessValueEGU>%</ProcessValueEGU>
<WIDAmConf>Virt-AMCONF</WIDAmConf>
<WIDDev>CV</WIDDev>
<WIDDis>Cryo</WIDDis>
<WIDIndex>001</WIDIndex>
- <WIDIndexPID>CV01</WIDIndexPID>
+ <WIDIndexPID>001a</WIDIndexPID>
<WIDSec>TS2-010</WIDSec>
<WIDSecSub>TS2-010CRM</WIDSecSub>
- <WIDSecSubPID>TS2-010CDL</WIDSecSubPID>
+ <WIDSecSubPID>TS2-010CRM</WIDSecSubPID>
</macros>
<file>../../ICS_OPI_LIBRARY/DeviceTypes/Valves/CV_ControlVALVE_BlockIcon_Horizontal_Compact.bob</file>
<x>2347</x>
--
GitLab