From 246cefdf966ce9ef093b367b9b5f357896721a58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kriszti=C3=A1n=20L=C3=B6ki?= <krisztian.loki@ess.eu>
Date: Mon, 3 May 2021 17:07:24 +0200
Subject: [PATCH] Inlined operation mode
---
NON-APPROVED/pss1-pss/PSS1_PSS_Area.bob | 108 +++++++++++++++-
.../embedded_displays/operation_mode.bob | 122 ------------------
2 files changed, 104 insertions(+), 126 deletions(-)
delete mode 100644 NON-APPROVED/pss1-pss/embedded_displays/operation_mode.bob
diff --git a/NON-APPROVED/pss1-pss/PSS1_PSS_Area.bob b/NON-APPROVED/pss1-pss/PSS1_PSS_Area.bob
index cf2f891b..ec2ba93c 100644
--- a/NON-APPROVED/pss1-pss/PSS1_PSS_Area.bob
+++ b/NON-APPROVED/pss1-pss/PSS1_PSS_Area.bob
@@ -107,6 +107,16 @@
</widget>
<widget type="group" version="2.0.0">
<name>Mode of Operation</name>
+ <macros>
+ <MODE_ALARM>Alarm Mode</MODE_ALARM>
+ <MODE_BEAM_ON>Beam On</MODE_BEAM_ON>
+ <MODE_OPEN_ACCESS>Open Access</MODE_OPEN_ACCESS>
+ <MODE_RESTRICTED_ACCESS>Restricted\nAccess</MODE_RESTRICTED_ACCESS>
+ <MODE_RM_INTERLOCK>RM Interlock</MODE_RM_INTERLOCK>
+ <MODE_RP_SURVEY>RP Survey</MODE_RP_SURVEY>
+ <MODE_SEARCH>Search</MODE_SEARCH>
+ <MODE_TUNNEL_CLOSED>Tunnel Closed</MODE_TUNNEL_CLOSED>
+ </macros>
<x>20</x>
<y>153</y>
<height>120</height>
@@ -140,14 +150,104 @@
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
</widget>
- <widget type="embedded" version="2.0.0">
- <name>Operation Mode</name>
- <file>embedded_displays/operation_mode.bob</file>
+ <widget type="multi_state_led" version="2.0.0">
+ <name>PSSMode</name>
+ <pv_name>AccPSS:PSS-Area-1:PSSMode</pv_name>
<x>40</x>
<y>50</y>
<width>220</width>
<height>50</height>
- <resize>2</resize>
+ <font>
+ <font family="Source Sans Pro Semibold" style="REGULAR" size="21.0">
+ </font>
+ </font>
+ <foreground_color>
+ <color name="WHITE" red="255" green="255" blue="255">
+ </color>
+ </foreground_color>
+ <line_color>
+ <color name="RED" red="252" green="13" blue="27">
+ </color>
+ </line_color>
+ <square>true</square>
+ <rules>
+ <rule name="Line color" prop_id="line_color" out_exp="false">
+ <exp bool_exp="pvInt0">
+ <value>
+ <color name="GREEN" red="61" green="216" blue="61">
+ </color>
+ </value>
+ </exp>
+ <pv_name>$(pv_name)</pv_name>
+ </rule>
+ </rules>
+ <states>
+ <state>
+ <value>0</value>
+ <label>$(MODE_ALARM)</label>
+ <color>
+ <color name="RED-BORDER" red="150" green="8" blue="16">
+ </color>
+ </color>
+ </state>
+ <state>
+ <value>1</value>
+ <label>$(MODE_OPEN_ACCESS)</label>
+ <color>
+ <color name="GREEN-BORDER" red="40" green="140" blue="40">
+ </color>
+ </color>
+ </state>
+ <state>
+ <value>2</value>
+ <label>Search</label>
+ <color>
+ <color name="GREEN-BORDER" red="40" green="140" blue="40">
+ </color>
+ </color>
+ </state>
+ <state>
+ <value>3</value>
+ <label>$(MODE_TUNNEL_CLOSED)</label>
+ <color>
+ <color name="GREEN-BORDER" red="40" green="140" blue="40">
+ </color>
+ </color>
+ </state>
+ <state>
+ <value>4</value>
+ <label>$(MODE_BEAM_ON)</label>
+ <color>
+ <color name="GREEN-BORDER" red="40" green="140" blue="40">
+ </color>
+ </color>
+ </state>
+ <state>
+ <value>5</value>
+ <label>RM Interlock</label>
+ <color>
+ <color name="GREEN-BORDER" red="40" green="140" blue="40">
+ </color>
+ </color>
+ </state>
+ <state>
+ <value>6</value>
+ <label>$(MODE_RP_SURVEY)</label>
+ <color>
+ <color name="GREEN-BORDER" red="40" green="140" blue="40">
+ </color>
+ </color>
+ </state>
+ <state>
+ <value>7</value>
+ <label>Restricted Access</label>
+ <color>
+ <color name="GREEN-BORDER" red="40" green="140" blue="40">
+ </color>
+ </color>
+ </state>
+ </states>
+ <fallback_label>INVALID</fallback_label>
</widget>
</widget>
<widget type="group" version="2.0.0">
diff --git a/NON-APPROVED/pss1-pss/embedded_displays/operation_mode.bob b/NON-APPROVED/pss1-pss/embedded_displays/operation_mode.bob
deleted file mode 100644
index b23ef676..00000000
--- a/NON-APPROVED/pss1-pss/embedded_displays/operation_mode.bob
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<display version="2.0.0">
- <name>PSS Operation mode</name>
- <macros>
- <MODE_ALARM>Alarm Mode</MODE_ALARM>
- <MODE_BEAM_ON>Beam On</MODE_BEAM_ON>
- <MODE_OPEN_ACCESS>Open Access</MODE_OPEN_ACCESS>
- <MODE_RESTRICTED_ACCESS>Restricted\nAccess</MODE_RESTRICTED_ACCESS>
- <MODE_RM_INTERLOCK>RM Interlock</MODE_RM_INTERLOCK>
- <MODE_RP_SURVEY>RP Survey</MODE_RP_SURVEY>
- <MODE_SEARCH>Search</MODE_SEARCH>
- <MODE_TUNNEL_CLOSED>Tunnel Closed</MODE_TUNNEL_CLOSED>
- </macros>
- <width>220</width>
- <height>50</height>
- <widget type="multi_state_led" version="2.0.0">
- <name>PSSMode</name>
- <pv_name>AccPSS:PSS-Area-1:PSSMode</pv_name>
- <width>220</width>
- <height>50</height>
- <font>
- <font family="Source Sans Pro Semibold" style="REGULAR" size="21.0">
- </font>
- </font>
- <foreground_color>
- <color name="WHITE" red="255" green="255" blue="255">
- </color>
- </foreground_color>
- <line_color>
- <color name="RED" red="252" green="13" blue="27">
- </color>
- </line_color>
- <square>true</square>
- <rules>
- <rule name="Line color" prop_id="line_color" out_exp="false">
- <exp bool_exp="pvInt0">
- <value>
- <color name="GREEN" red="61" green="216" blue="61">
- </color>
- </value>
- </exp>
- <pv_name>$(pv_name)</pv_name>
- </rule>
- <rule name="Font color" prop_id="foreground_color" out_exp="false">
- <exp bool_exp="pvInt0">
- <value>
- <color name="GROUP-BORDER" red="150" green="155" blue="151">
- </color>
- </value>
- </exp>
- <pv_name>$(pv_name)</pv_name>
- </rule>
- </rules>
- <states>
- <state>
- <value>0</value>
- <label>$(MODE_ALARM)</label>
- <color>
- <color name="RED-BORDER" red="150" green="8" blue="16">
- </color>
- </color>
- </state>
- <state>
- <value>1</value>
- <label>$(MODE_OPEN_ACCESS)</label>
- <color>
- <color name="GREEN-BORDER" red="40" green="140" blue="40">
- </color>
- </color>
- </state>
- <state>
- <value>2</value>
- <label>Search</label>
- <color>
- <color name="GREEN-BORDER" red="40" green="140" blue="40">
- </color>
- </color>
- </state>
- <state>
- <value>3</value>
- <label>$(MODE_TUNNEL_CLOSED)</label>
- <color>
- <color name="GREEN-BORDER" red="40" green="140" blue="40">
- </color>
- </color>
- </state>
- <state>
- <value>4</value>
- <label>$(MODE_BEAM_ON)</label>
- <color>
- <color name="GREEN-BORDER" red="40" green="140" blue="40">
- </color>
- </color>
- </state>
- <state>
- <value>5</value>
- <label>RM Interlock</label>
- <color>
- <color name="GREEN-BORDER" red="40" green="140" blue="40">
- </color>
- </color>
- </state>
- <state>
- <value>6</value>
- <label>$(MODE_RP_SURVEY)</label>
- <color>
- <color name="GREEN-BORDER" red="40" green="140" blue="40">
- </color>
- </color>
- </state>
- <state>
- <value>7</value>
- <label>Restricted Access</label>
- <color>
- <color name="GREEN-BORDER" red="40" green="140" blue="40">
- </color>
- </color>
- </state>
- </states>
- <fallback_label>INVALID</fallback_label>
- </widget>
-</display>
--
GitLab