From 6b1a0268841ca40f026cc96dc0340f43e654e4b9 Mon Sep 17 00:00:00 2001
From: Joao Paulo Martins <joaopaulo.martins@esss.se>
Date: Tue, 28 Jul 2020 18:07:45 +0200
Subject: [PATCH] Minor changes, ready for RFQ
---
.../ts2-010rfc-rflps/00_main_4klystrons.bob | 55 ++++++++++++++-----
.../TS2/ts2-010rfc-rflps/01_mainRFQ.bob | 2 +-
.../TS2/ts2-010rfc-rflps/rflpsMainRFQ.bob | 12 ++--
.../support/01_main_warnings_v02.bob | 2 +-
4 files changed, 48 insertions(+), 23 deletions(-)
diff --git a/NON-APPROVED/TS2/ts2-010rfc-rflps/00_main_4klystrons.bob b/NON-APPROVED/TS2/ts2-010rfc-rflps/00_main_4klystrons.bob
index f938cf33..0e16aa58 100644
--- a/NON-APPROVED/TS2/ts2-010rfc-rflps/00_main_4klystrons.bob
+++ b/NON-APPROVED/TS2/ts2-010rfc-rflps/00_main_4klystrons.bob
@@ -94,6 +94,11 @@
<font name="Header 2" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
</font>
</font>
+ <background_color use_class="true">
+ <color name="Background" red="220" green="225" blue="221">
+ </color>
+ </background_color>
+ <transparent use_class="true">true</transparent>
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
</widget>
@@ -139,10 +144,11 @@ Actual Machine State read-back</tooltip>
<font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
</font>
</font>
- <foreground_color use_class="true">
- <color name="Text" red="25" green="25" blue="25">
+ <background_color use_class="true">
+ <color name="Background" red="220" green="225" blue="221">
</color>
- </foreground_color>
+ </background_color>
+ <transparent use_class="true">true</transparent>
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
</widget>
@@ -225,10 +231,11 @@ Actual Machine State read-back</tooltip>
<font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
</font>
</font>
- <foreground_color use_class="true">
- <color name="Text" red="25" green="25" blue="25">
+ <background_color use_class="true">
+ <color name="Background" red="220" green="225" blue="221">
</color>
- </foreground_color>
+ </background_color>
+ <transparent use_class="true">true</transparent>
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
</widget>
@@ -311,10 +318,11 @@ Actual Machine State read-back</tooltip>
<font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
</font>
</font>
- <foreground_color use_class="true">
- <color name="Text" red="25" green="25" blue="25">
+ <background_color use_class="true">
+ <color name="Background" red="220" green="225" blue="221">
</color>
- </foreground_color>
+ </background_color>
+ <transparent use_class="true">true</transparent>
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
</widget>
@@ -375,6 +383,11 @@ Actual Machine State read-back</tooltip>
<font name="Header 2" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
</font>
</font>
+ <background_color use_class="true">
+ <color name="Background" red="220" green="225" blue="221">
+ </color>
+ </background_color>
+ <transparent use_class="true">true</transparent>
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
</widget>
@@ -417,6 +430,11 @@ Actual Machine State read-back</tooltip>
<font name="Header 2" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
</font>
</font>
+ <background_color use_class="true">
+ <color name="Background" red="220" green="225" blue="221">
+ </color>
+ </background_color>
+ <transparent use_class="true">true</transparent>
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
</widget>
@@ -459,6 +477,11 @@ Actual Machine State read-back</tooltip>
<font name="Header 2" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
</font>
</font>
+ <background_color use_class="true">
+ <color name="Background" red="220" green="225" blue="221">
+ </color>
+ </background_color>
+ <transparent use_class="true">true</transparent>
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
</widget>
@@ -523,10 +546,11 @@ Actual Machine State read-back</tooltip>
<font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
</font>
</font>
- <foreground_color use_class="true">
- <color name="Text" red="25" green="25" blue="25">
+ <background_color use_class="true">
+ <color name="Background" red="220" green="225" blue="221">
</color>
- </foreground_color>
+ </background_color>
+ <transparent use_class="true">true</transparent>
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
</widget>
@@ -609,10 +633,11 @@ Actual Machine State read-back</tooltip>
<font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
</font>
</font>
- <foreground_color use_class="true">
- <color name="Text" red="25" green="25" blue="25">
+ <background_color use_class="true">
+ <color name="Background" red="220" green="225" blue="221">
</color>
- </foreground_color>
+ </background_color>
+ <transparent use_class="true">true</transparent>
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
</widget>
diff --git a/NON-APPROVED/TS2/ts2-010rfc-rflps/01_mainRFQ.bob b/NON-APPROVED/TS2/ts2-010rfc-rflps/01_mainRFQ.bob
index 0ef94dac..e5393e32 100644
--- a/NON-APPROVED/TS2/ts2-010rfc-rflps/01_mainRFQ.bob
+++ b/NON-APPROVED/TS2/ts2-010rfc-rflps/01_mainRFQ.bob
@@ -47,10 +47,10 @@
</widget>
<widget type="embedded" version="2.0.0">
<name>Linking Container</name>
+ <file>rflpsMainRFQ.bob</file>
<macros>
<SIMIOCSTAT>RFQ-SIM</SIMIOCSTAT>
</macros>
- <file>rflpsMainRFQ.bob</file>
<x>20</x>
<y>70</y>
<width>2280</width>
diff --git a/NON-APPROVED/TS2/ts2-010rfc-rflps/rflpsMainRFQ.bob b/NON-APPROVED/TS2/ts2-010rfc-rflps/rflpsMainRFQ.bob
index a075e3ce..6e1a671c 100644
--- a/NON-APPROVED/TS2/ts2-010rfc-rflps/rflpsMainRFQ.bob
+++ b/NON-APPROVED/TS2/ts2-010rfc-rflps/rflpsMainRFQ.bob
@@ -2,7 +2,7 @@
<display version="2.0.0">
<name>rflpsMainRFQ</name>
<macros>
- <DEVICE>FIM-110</DEVICE>
+ <DEVICE>RFS-FIM-110</DEVICE>
</macros>
<width>2280</width>
<height>1200</height>
@@ -152,7 +152,7 @@
</widget>
<widget type="combo" version="2.0.0">
<name>Device prefix combo_4</name>
- <pv_name>$(PREFIX):CPU-OPMODE</pv_name>
+ <pv_name>$(PREFIX):RFS-CPU-OPMODE</pv_name>
<x>1170</x>
<y>15</y>
<width>160</width>
@@ -164,7 +164,7 @@ Change the Operation mode of the Amplifier</tooltip>
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_36</name>
- <pv_name>$(PREFIX):CPU-OPMODE-RB</pv_name>
+ <pv_name>$(PREFIX):RFS-CPU-OPMODE-RB</pv_name>
<x>1340</x>
<y>15</y>
<width>120</width>
@@ -227,7 +227,7 @@ Operation Mode read-back</tooltip>
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_123</name>
- <pv_name>$(PREFIX):CPU-ACTSTATE-RB</pv_name>
+ <pv_name>$(PREFIX):RFS-CPU-ACTSTATE-RB</pv_name>
<x>1671</x>
<y>15</y>
<width>80</width>
@@ -276,7 +276,7 @@ Actual Machine State read-back</tooltip>
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_128</name>
- <pv_name>$(PREFIX):CPU-WRNACKREQ-RB</pv_name>
+ <pv_name>$(PREFIX):RFS-CPU-WRNACKREQ-RB</pv_name>
<x>2054</x>
<y>15</y>
<width>90</width>
@@ -306,7 +306,7 @@ One or more signals are being interlocked or may require an acknowledge.</toolti
</widget>
<widget type="bool_button" version="2.0.0">
<name>RESET_BUTTON_4</name>
- <pv_name>$(PREFIX):CPU-RST</pv_name>
+ <pv_name>$(PREFIX):RFS-CPU-RST</pv_name>
<x>2155</x>
<y>15</y>
<off_label>PLC Reset</off_label>
diff --git a/NON-APPROVED/TS2/ts2-010rfc-rflps/support/01_main_warnings_v02.bob b/NON-APPROVED/TS2/ts2-010rfc-rflps/support/01_main_warnings_v02.bob
index 18872c74..13858202 100644
--- a/NON-APPROVED/TS2/ts2-010rfc-rflps/support/01_main_warnings_v02.bob
+++ b/NON-APPROVED/TS2/ts2-010rfc-rflps/support/01_main_warnings_v02.bob
@@ -110,7 +110,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_60</name>
- <pv_name>$(PREFIX):FIM-110:STAT-RB</pv_name>
+ <pv_name>$(PREFIX):RFS-FIM-110:STAT-RB</pv_name>
<x>10</x>
<y>12</y>
<width>90</width>
--
GitLab