From 88bc51b4bc816db3ecc3be4189f4ae709edf169d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kriszti=C3=A1n=20L=C3=B6ki?= <krisztian.loki@ess.eu>
Date: Mon, 1 Feb 2021 11:58:35 +0100
Subject: [PATCH] Added zone searched background
---
NON-APPROVED/pss1-pss/PSS1_PSS_Area.bob | 134 +++++++++++++++---
.../pss1-pss/embedded_displays/esos.bob | 3 +
2 files changed, 114 insertions(+), 23 deletions(-)
diff --git a/NON-APPROVED/pss1-pss/PSS1_PSS_Area.bob b/NON-APPROVED/pss1-pss/PSS1_PSS_Area.bob
index 1681fb69..db6575e6 100644
--- a/NON-APPROVED/pss1-pss/PSS1_PSS_Area.bob
+++ b/NON-APPROVED/pss1-pss/PSS1_PSS_Area.bob
@@ -63,29 +63,6 @@
<corner_width>5</corner_width>
<corner_height>5</corner_height>
</widget>
- <widget type="rectangle" version="2.0.0">
- <name>Rectangle_26</name>
- <x>193</x>
- <y>709</y>
- <width>623</width>
- <line_width>0</line_width>
- <background_color>
- <color name="Button_Background" red="236" green="236" blue="236">
- </color>
- </background_color>
- </widget>
- <widget type="rectangle" version="2.0.0">
- <name>Rectangle_27</name>
- <x>749</x>
- <y>701</y>
- <width>77</width>
- <height>36</height>
- <line_width>0</line_width>
- <background_color>
- <color name="Button_Background" red="236" green="236" blue="236">
- </color>
- </background_color>
- </widget>
<widget type="group" version="2.0.0">
<name>Permits</name>
<x>654</x>
@@ -512,6 +489,117 @@
</rules>
<tooltip>$(actions)</tooltip>
</widget>
+ <widget type="group" version="2.0.0">
+ <name>Zone 2 Searched Group</name>
+ <x>103</x>
+ <y>625</y>
+ <width>457</width>
+ <height>155</height>
+ <style>3</style>
+ <transparent>true</transparent>
+ <rules>
+ <rule name="Visibility" prop_id="visible" out_exp="true">
+ <exp bool_exp="True">
+ <expression>pvInt0</expression>
+ </exp>
+ <pv_name>AccPSS-Z2:PSS-Area-1:ZoneSearched</pv_name>
+ </rule>
+ </rules>
+ <widget type="rectangle" version="2.0.0">
+ <name>Zone2 110</name>
+ <x>97</x>
+ <width>45</width>
+ <height>36</height>
+ <line_width>0</line_width>
+ <background_color>
+ <color name="BLUE-BACKGROUND" red="195" green="226" blue="225">
+ </color>
+ </background_color>
+ </widget>
+ <widget type="rectangle" version="2.0.0">
+ <name>Zone2 100</name>
+ <x>362</x>
+ <width>45</width>
+ <height>36</height>
+ <line_width>0</line_width>
+ <background_color>
+ <color name="BLUE-BACKGROUND" red="195" green="226" blue="225">
+ </color>
+ </background_color>
+ </widget>
+ <widget type="rectangle" version="2.0.0">
+ <name>Zone 2 searched background</name>
+ <y>35</y>
+ <width>457</width>
+ <height>120</height>
+ <line_width>0</line_width>
+ <background_color>
+ <color name="BLUE-BACKGROUND" red="195" green="226" blue="225">
+ </color>
+ </background_color>
+ </widget>
+ </widget>
+ <widget type="group" version="2.0.0">
+ <name>Zone 1 Searched Group</name>
+ <x>561</x>
+ <y>571</y>
+ <width>438</width>
+ <height>210</height>
+ <style>3</style>
+ <rules>
+ <rule name="Visibility" prop_id="visible" out_exp="true">
+ <exp bool_exp="True">
+ <expression>pvInt0</expression>
+ </exp>
+ <pv_name>AccPSS-Z1:PSS-Area-1:ZoneSearched</pv_name>
+ </rule>
+ </rules>
+ <widget type="rectangle" version="2.0.0">
+ <name>Zone 1 FEB</name>
+ <x>240</x>
+ <width>198</width>
+ <height>90</height>
+ <line_width>0</line_width>
+ <background_color>
+ <color name="BLUE-BACKGROUND" red="195" green="226" blue="225">
+ </color>
+ </background_color>
+ </widget>
+ <widget type="rectangle" version="2.0.0">
+ <name>Zone 1 searched background</name>
+ <y>90</y>
+ <width>438</width>
+ <height>120</height>
+ <line_width>0</line_width>
+ <background_color>
+ <color name="BLUE-BACKGROUND" red="195" green="226" blue="225">
+ </color>
+ </background_color>
+ </widget>
+ </widget>
+ <widget type="rectangle" version="2.0.0">
+ <name>Zone DTL-MEBT-RFQ line</name>
+ <x>193</x>
+ <y>709</y>
+ <width>623</width>
+ <line_width>0</line_width>
+ <background_color>
+ <color name="Button_Background" red="236" green="236" blue="236">
+ </color>
+ </background_color>
+ </widget>
+ <widget type="rectangle" version="2.0.0">
+ <name>Zone1 ISrc line</name>
+ <x>749</x>
+ <y>701</y>
+ <width>77</width>
+ <height>36</height>
+ <line_width>0</line_width>
+ <background_color>
+ <color name="Button_Background" red="236" green="236" blue="236">
+ </color>
+ </background_color>
+ </widget>
<widget type="label" version="2.0.0">
<name>Zone_2</name>
<text>ZONE 2</text>
diff --git a/NON-APPROVED/pss1-pss/embedded_displays/esos.bob b/NON-APPROVED/pss1-pss/embedded_displays/esos.bob
index cd25b575..ac74666c 100644
--- a/NON-APPROVED/pss1-pss/embedded_displays/esos.bob
+++ b/NON-APPROVED/pss1-pss/embedded_displays/esos.bob
@@ -16,6 +16,7 @@
<color name="Background" red="220" green="225" blue="221">
</color>
</background_color>
+ <transparent>true</transparent>
</widget>
<widget type="label" version="2.0.0">
<name>ESOS $(ESOS_IDX)</name>
@@ -32,6 +33,7 @@
<width>28</width>
<height>28</height>
<resize>2</resize>
+ <transparent>true</transparent>
</widget>
<widget type="embedded" version="2.0.0">
<name>ESOB</name>
@@ -40,5 +42,6 @@
<width>28</width>
<height>28</height>
<resize>2</resize>
+ <transparent>true</transparent>
</widget>
</display>
--
GitLab