diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/service_bar.bob b/NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/service_bar.bob
new file mode 100644
index 0000000000000000000000000000000000000000..4be906b765b4d8a2b6dccbac604d89e39870cb0b
--- /dev/null
+++ b/NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/service_bar.bob
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<display version="2.0.0">
+ <name>ServiceBar</name>
+ <width>406</width>
+ <height>80</height>
+ <widget type="group" version="2.0.0">
+ <name>Group</name>
+ <width>406</width>
+ <height>80</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>VacS-ACCV::$(SERVICE_SECTION)SrvStat-RB</pv_name>
+ </rule>
+ </rules>
+ <widget type="label" version="2.0.0">
+ <name>InService</name>
+ <text>Section in Service</text>
+ <width>406</width>
+ <height>80</height>
+ <font>
+ <font name="Header 2" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
+ </font>
+ </font>
+ <foreground_color>
+ <color name="RED-TEXT" red="255" green="255" blue="255">
+ </color>
+ </foreground_color>
+ <background_color>
+ <color name="ERROR" red="252" green="13" blue="27">
+ </color>
+ </background_color>
+ <transparent>false</transparent>
+ <horizontal_alignment>1</horizontal_alignment>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>Responsible</name>
+ <text>Responsible:</text>
+ <x>23</x>
+ <y>50</y>
+ <height>25</height>
+ <font>
+ <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
+ </font>
+ </font>
+ <foreground_color>
+ <color name="RED-TEXT" red="255" green="255" blue="255">
+ </color>
+ </foreground_color>
+ </widget>
+ <widget type="textupdate" version="2.0.0">
+ <name>SrvResp-RB</name>
+ <pv_name>VacS-ACCV::$(SERVICE_SECTION)SrvResp-RB</pv_name>
+ <x>129</x>
+ <y>50</y>
+ <width>250</width>
+ <height>25</height>
+ <horizontal_alignment>1</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ </widget>
+</display>
diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/service_button.bob b/NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/service_button.bob
new file mode 100644
index 0000000000000000000000000000000000000000..886e65719855d9e2da71de669facbd2702b3962d
--- /dev/null
+++ b/NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/service_button.bob
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<display version="2.0.0">
+ <name>ServiceButton</name>
+ <width>156</width>
+ <height>66</height>
+ <widget type="action_button" version="3.0.0">
+ <name>Action Button</name>
+ <actions execute_as_one="true">
+ <action type="open_display">
+ <file>service_config.bob</file>
+ <target>window</target>
+ <description>Open Service</description>
+ </action>
+ <action type="write_pv">
+ <pv_name>$(pv_name)</pv_name>
+ <value>1</value>
+ <description>Write PV</description>
+ </action>
+ </actions>
+ <pv_name>VacS-ACCV::as-is-system-expert</pv_name>
+ <text>Open
+Service</text>
+ <x>3</x>
+ <y>3</y>
+ <width>150</width>
+ <height>60</height>
+ <font>
+ <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
+ </font>
+ </font>
+ <rules>
+ <rule name="Visibility" prop_id="visible" out_exp="true">
+ <exp bool_exp="True">
+ <expression>not pvs[0].isReadonly()</expression>
+ </exp>
+ <pv_name>$(pv_name)</pv_name>
+ </rule>
+ </rules>
+ <tooltip>Open Service Configuration</tooltip>
+ </widget>
+</display>
diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/service_config.bob b/NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/service_config.bob
new file mode 100644
index 0000000000000000000000000000000000000000..58cb57e246e088a65e88282d7ce7ad514b57ea37
--- /dev/null
+++ b/NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/service_config.bob
@@ -0,0 +1,275 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<display version="2.0.0">
+ <name>$(SERVICE_SECTION) Section Service Config</name>
+ <width>660</width>
+ <height>320</height>
+ <widget type="rectangle" version="2.0.0">
+ <name>Title Rectangle</name>
+ <class>TITLE-BAR</class>
+ <x use_class="true">0</x>
+ <y use_class="true">0</y>
+ <width>660</width>
+ <height use_class="true">50</height>
+ <line_width use_class="true">0</line_width>
+ <background_color use_class="true">
+ <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
+ </color>
+ </background_color>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>Title</name>
+ <class>TITLE</class>
+ <text>$(SERVICE_SECTION) section service</text>
+ <x use_class="true">20</x>
+ <y use_class="true">0</y>
+ <width>450</width>
+ <height use_class="true">50</height>
+ <font use_class="true">
+ <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
+ </font>
+ </font>
+ <foreground_color use_class="true">
+ <color name="HEADER-TEXT" red="0" green="0" blue="0">
+ </color>
+ </foreground_color>
+ <transparent use_class="true">true</transparent>
+ <horizontal_alignment use_class="true">0</horizontal_alignment>
+ <vertical_alignment use_class="true">1</vertical_alignment>
+ <wrap_words use_class="true">false</wrap_words>
+ </widget>
+ <widget type="group" version="2.0.0">
+ <name>Current State</name>
+ <x>30</x>
+ <y>80</y>
+ <width>280</width>
+ <height>140</height>
+ <style>3</style>
+ <background_color>
+ <color name="BACKGROUND" red="220" green="225" blue="221">
+ </color>
+ </background_color>
+ <widget type="rectangle" version="2.0.0">
+ <name>CS-titlebar</name>
+ <width>280</width>
+ <height>140</height>
+ <line_width>2</line_width>
+ <line_color>
+ <color name="GROUP-BORDER" red="150" green="155" blue="151">
+ </color>
+ </line_color>
+ <background_color>
+ <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+ </color>
+ </background_color>
+ <corner_width>10</corner_width>
+ <corner_height>10</corner_height>
+ </widget>
+ <widget type="rectangle" version="2.0.0">
+ <name>CS-background</name>
+ <x>10</x>
+ <y>30</y>
+ <width>260</width>
+ <height>100</height>
+ <line_width>2</line_width>
+ <line_color>
+ <color name="GROUP-BORDER" red="150" green="155" blue="151">
+ </color>
+ </line_color>
+ <background_color>
+ <color name="BACKGROUND" red="220" green="225" blue="221">
+ </color>
+ </background_color>
+ <corner_width>5</corner_width>
+ <corner_height>5</corner_height>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>CS-title</name>
+ <text>Current State</text>
+ <x>10</x>
+ <width>260</width>
+ <height>30</height>
+ <font>
+ <font name="SUBSUB-GROUP-HEADER" family="Source Sans Pro" style="BOLD" size="16.0">
+ </font>
+ </font>
+ <horizontal_alignment>1</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="group" version="2.0.0">
+ <name>CS-content-group</name>
+ <x>10</x>
+ <y>30</y>
+ <width>260</width>
+ <height>100</height>
+ <style>3</style>
+ <transparent>true</transparent>
+ <widget type="textupdate" version="2.0.0">
+ <name>SrvStat-RB</name>
+ <pv_name>VacS-ACCV::$(SERVICE_SECTION)SrvStat-RB</pv_name>
+ <x>20</x>
+ <y>20</y>
+ <width>220</width>
+ <height>25</height>
+ <horizontal_alignment>1</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="textupdate" version="2.0.0">
+ <name>SrvResp-RB</name>
+ <pv_name>VacS-ACCV::$(SERVICE_SECTION)SrvResp-RB</pv_name>
+ <x>20</x>
+ <y>60</y>
+ <width>220</width>
+ <height>25</height>
+ <horizontal_alignment>1</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ </widget>
+ </widget>
+ <widget type="group" version="2.0.0">
+ <name>New State</name>
+ <x>350</x>
+ <y>80</y>
+ <width>280</width>
+ <height>140</height>
+ <style>3</style>
+ <background_color>
+ <color name="BACKGROUND" red="220" green="225" blue="221">
+ </color>
+ </background_color>
+ <widget type="rectangle" version="2.0.0">
+ <name>NS-titlebar</name>
+ <width>280</width>
+ <height>140</height>
+ <line_width>2</line_width>
+ <line_color>
+ <color name="GROUP-BORDER" red="150" green="155" blue="151">
+ </color>
+ </line_color>
+ <background_color>
+ <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+ </color>
+ </background_color>
+ <corner_width>10</corner_width>
+ <corner_height>10</corner_height>
+ </widget>
+ <widget type="rectangle" version="2.0.0">
+ <name>NS-background</name>
+ <x>10</x>
+ <y>30</y>
+ <width>260</width>
+ <height>100</height>
+ <line_width>2</line_width>
+ <line_color>
+ <color name="GROUP-BORDER" red="150" green="155" blue="151">
+ </color>
+ </line_color>
+ <background_color>
+ <color name="BACKGROUND" red="220" green="225" blue="221">
+ </color>
+ </background_color>
+ <corner_width>5</corner_width>
+ <corner_height>5</corner_height>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>NS-title</name>
+ <text>New State</text>
+ <x>10</x>
+ <width>260</width>
+ <height>30</height>
+ <font>
+ <font name="SUBSUB-GROUP-HEADER" family="Source Sans Pro" style="BOLD" size="16.0">
+ </font>
+ </font>
+ <horizontal_alignment>1</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="group" version="2.0.0">
+ <name>NS-content-group</name>
+ <x>10</x>
+ <y>30</y>
+ <width>260</width>
+ <height>100</height>
+ <style>3</style>
+ <transparent>true</transparent>
+ <widget type="choice" version="2.0.0">
+ <name>SrvStatS</name>
+ <pv_name>VacS-ACCV::$(SERVICE_SECTION)SrvStatS</pv_name>
+ <x>20</x>
+ <y>20</y>
+ <width>220</width>
+ <height>25</height>
+ <items>
+ <item>In Operation</item>
+ <item>In Service</item>
+ </items>
+ </widget>
+ <widget type="combo" version="2.0.0">
+ <name>SrvRespS</name>
+ <pv_name>VacS-ACCV::$(SERVICE_SECTION)SrvRespS</pv_name>
+ <x>20</x>
+ <y>60</y>
+ <width>220</width>
+ <height>25</height>
+ <rules>
+ <rule name="Enabled" prop_id="enabled" out_exp="true">
+ <exp bool_exp="True">
+ <expression>pvInt0</expression>
+ </exp>
+ <pv_name>VacS-ACCV::$(SERVICE_SECTION)SrvStatS</pv_name>
+ </rule>
+ </rules>
+ <items>
+ <item>Mattias Malmstrom</item>
+ <item>Niklas Cerovina</item>
+ <item>Fredrik Svensson</item>
+ <item>Ralf Huber</item>
+ <item>Thomas Cornes</item>
+ <item>Delphine Hardion</item>
+ <item>Marcelo Juni Ferreira</item>
+ <item>Hilko Spoelstra</item>
+ <item>Laurence Page</item>
+ <item>Artur Gevorgyan</item>
+ <item>Adrien Besson</item>
+ <item>Yong Kian Sin</item>
+ </items>
+ <items_from_pv>false</items_from_pv>
+ <editable>true</editable>
+ <enabled>false</enabled>
+ </widget>
+ </widget>
+ </widget>
+ <widget type="action_button" version="3.0.0">
+ <name>CommitSrvChangeS</name>
+ <actions execute_as_one="true">
+ <action type="write_pv">
+ <pv_name>$(pv_name)</pv_name>
+ <value>1</value>
+ <description>Commit</description>
+ </action>
+ <action type="execute">
+ <script file="EmbeddedPy">
+ <text><![CDATA[from org.csstudio.display.builder.runtime.script import ScriptUtil
+ScriptUtil.closeDisplay(widget)]]></text>
+ </script>
+ <description>Close window</description>
+ </action>
+ </actions>
+ <pv_name>VacS-ACCV::$(SERVICE_SECTION)CommitSrvChangeS</pv_name>
+ <text>Commit</text>
+ <x>400</x>
+ <y>260</y>
+ <width>230</width>
+ <rules>
+ <rule name="Enabled" prop_id="enabled" out_exp="false">
+ <exp bool_exp="pvInt0 == 0 or pvStr1 != """>
+ <value>true</value>
+ </exp>
+ <pv_name>VacS-ACCV::$(SERVICE_SECTION)SrvStatS</pv_name>
+ <pv_name>VacS-ACCV::$(SERVICE_SECTION)SrvRespS</pv_name>
+ </rule>
+ </rules>
+ <tooltip>Commit change</tooltip>
+ <enabled>false</enabled>
+ <show_confirm_dialog>true</show_confirm_dialog>
+ </widget>
+</display>
diff --git a/NON-APPROVED/lebt-010_vac/LEBT.bob b/NON-APPROVED/lebt-010_vac/LEBT.bob
index 5d661d83c5f58be710af61089cdb3cba1fdaed45..7f98f6bf5f16dcbc22c75a70ce661911da26283b 100644
--- a/NON-APPROVED/lebt-010_vac/LEBT.bob
+++ b/NON-APPROVED/lebt-010_vac/LEBT.bob
@@ -5,6 +5,7 @@
<DIS>Vac</DIS>
<ROOT>$(ESS_OPIS=/ess-opis)/NON-APPROVED</ROOT>
<SEC>LEBT</SEC>
+ <SERVICE_SECTION>$(SEC)</SERVICE_SECTION>
<SUBSEC>010</SUBSEC>
<WIDGET_ROOT>$(ROOT)/COMMON/DEVICES/vacuum</WIDGET_ROOT>
<vacSYMBOLS>$(ROOT)/COMMON/DEVICES/vacuum/symbols</vacSYMBOLS>
@@ -29,13 +30,22 @@
</color>
</foreground_color>
<background_color>
- <color name="Primary Blue" red="0" green="148" blue="202">
+ <color name="PRIMARY" red="0" green="148" blue="202">
</color>
</background_color>
<transparent>false</transparent>
<vertical_alignment>1</vertical_alignment>
<wrap_words>false</wrap_words>
</widget>
+ <widget type="embedded" version="2.0.0">
+ <name>ServiceBar</name>
+ <file>$(WIDGET_ROOT)/COMMON/service_bar.bob</file>
+ <x>600</x>
+ <width>406</width>
+ <height>80</height>
+ <resize>2</resize>
+ <transparent>true</transparent>
+ </widget>
<widget type="action_button" version="3.0.0">
<name>Open VGC Trends Action</name>
<actions>
@@ -52,14 +62,9 @@ VGC Trends</text>
<width>150</width>
<height>60</height>
<font>
- <font name="GROUP-HEADER" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
+ <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
</font>
</font>
- <foreground_color>
- <color name="BLACK-TEXT" red="255" green="255" blue="255">
- </color>
- </foreground_color>
- <transparent>true</transparent>
<tooltip>$(actions)</tooltip>
</widget>
<widget type="action_button" version="3.0.0">
@@ -78,14 +83,9 @@ Diagnostics</text>
<width>150</width>
<height>60</height>
<font>
- <font name="GROUP-HEADER" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
+ <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
</font>
</font>
- <foreground_color>
- <color name="BLACK-TEXT" red="255" green="255" blue="255">
- </color>
- </foreground_color>
- <transparent>true</transparent>
<tooltip>$(actions)</tooltip>
</widget>
<widget type="action_button" version="3.0.0">
@@ -104,16 +104,21 @@ Legend</text>
<width>150</width>
<height>60</height>
<font>
- <font name="GROUP-HEADER" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
+ <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
</font>
</font>
- <foreground_color>
- <color name="BLACK-TEXT" red="255" green="255" blue="255">
- </color>
- </foreground_color>
- <transparent>true</transparent>
<tooltip>$(actions)</tooltip>
</widget>
+ <widget type="embedded" version="2.0.0">
+ <name>Open Service Action</name>
+ <file>$(WIDGET_ROOT)/COMMON/service_button.bob</file>
+ <x>1900</x>
+ <y>7</y>
+ <width>156</width>
+ <height>66</height>
+ <resize>2</resize>
+ <transparent>true</transparent>
+ </widget>
<widget type="label" version="2.0.0">
<name>ISRC-010</name>
<text>ISRC-010</text>
diff --git a/NON-APPROVED/mebt-010_vac/MEBT.bob b/NON-APPROVED/mebt-010_vac/MEBT.bob
index d3c14f174c760a1c0ded858f2440b50e838ee58f..969a602a92253303c1a47dfd1085fe1064defe62 100644
--- a/NON-APPROVED/mebt-010_vac/MEBT.bob
+++ b/NON-APPROVED/mebt-010_vac/MEBT.bob
@@ -5,6 +5,7 @@
<DIS>Vac</DIS>
<ROOT>$(ESS_OPIS=/ess-opis)/NON-APPROVED</ROOT>
<SEC>MEBT</SEC>
+ <SERVICE_SECTION>$(SEC)</SERVICE_SECTION>
<SUBSEC>010</SUBSEC>
<WIDGET_ROOT>$(ROOT)/COMMON/DEVICES/vacuum</WIDGET_ROOT>
</macros>
@@ -28,13 +29,22 @@
</color>
</foreground_color>
<background_color>
- <color name="Primary Blue" red="0" green="148" blue="202">
+ <color name="PRIMARY" red="0" green="148" blue="202">
</color>
</background_color>
<transparent>false</transparent>
<vertical_alignment>1</vertical_alignment>
<wrap_words>false</wrap_words>
</widget>
+ <widget type="embedded" version="2.0.0">
+ <name>ServiceBar</name>
+ <file>$(WIDGET_ROOT)/COMMON/service_bar.bob</file>
+ <x>600</x>
+ <width>406</width>
+ <height>80</height>
+ <resize>2</resize>
+ <transparent>true</transparent>
+ </widget>
<widget type="action_button" version="3.0.0">
<name>Open VGC Trends Action</name>
<actions>
@@ -46,19 +56,14 @@
</actions>
<text>Open
VGC Trends</text>
- <x>1100</x>
+ <x>1034</x>
<y>10</y>
<width>150</width>
<height>60</height>
<font>
- <font name="GROUP-HEADER" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
+ <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
</font>
</font>
- <foreground_color>
- <color name="BLACK-TEXT" red="255" green="255" blue="255">
- </color>
- </foreground_color>
- <transparent>true</transparent>
<tooltip>$(actions)</tooltip>
</widget>
<widget type="action_button" version="3.0.0">
@@ -72,19 +77,14 @@ VGC Trends</text>
</actions>
<text>Open
Diagnostics</text>
- <x>1300</x>
+ <x>1234</x>
<y>10</y>
<width>150</width>
<height>60</height>
<font>
- <font name="GROUP-HEADER" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
+ <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
</font>
</font>
- <foreground_color>
- <color name="BLACK-TEXT" red="255" green="255" blue="255">
- </color>
- </foreground_color>
- <transparent>true</transparent>
<tooltip>$(actions)</tooltip>
</widget>
<widget type="action_button" version="3.0.0">
@@ -98,32 +98,25 @@ Diagnostics</text>
</actions>
<text>Open
Legend</text>
- <x>1500</x>
+ <x>1434</x>
<y>10</y>
<width>150</width>
<height>60</height>
<font>
- <font name="GROUP-HEADER" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
+ <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
</font>
</font>
- <foreground_color>
- <color name="BLACK-TEXT" red="255" green="255" blue="255">
- </color>
- </foreground_color>
- <transparent>true</transparent>
<tooltip>$(actions)</tooltip>
</widget>
- <widget type="polyline" version="2.0.0">
- <name>Pipe Main</name>
- <y>350</y>
- <width>1800</width>
- <height>1</height>
- <points>
- <point x="0.0" y="0.0">
- </point>
- <point x="1800.0" y="0.0">
- </point>
- </points>
+ <widget type="embedded" version="2.0.0">
+ <name>Open Service Action</name>
+ <file>$(WIDGET_ROOT)/COMMON/service_button.bob</file>
+ <x>1634</x>
+ <y>7</y>
+ <width>156</width>
+ <height>66</height>
+ <resize>2</resize>
+ <transparent>true</transparent>
</widget>
<widget type="group" version="2.0.0">
<name>$(SEC)-$(SECTOR)</name>
@@ -740,6 +733,18 @@ Legend</text>
<resize>2</resize>
</widget>
</widget>
+ <widget type="polyline" version="2.0.0">
+ <name>Pipe Main</name>
+ <y>350</y>
+ <width>1800</width>
+ <height>1</height>
+ <points>
+ <point x="0.0" y="0.0">
+ </point>
+ <point x="1800.0" y="0.0">
+ </point>
+ </points>
+ </widget>
<widget type="embedded" version="2.0.0">
<name>$(SEC)-$(SUBSEC):$(DIS)-$(DEV)-$(IDX)</name>
<macros>
diff --git a/NON-APPROVED/pss1-pss/PSS1_PSS_Area.bob b/NON-APPROVED/pss1-pss/PSS1_PSS_Area.bob
index e8443624b35057faa15a0be69edcdab72482c8c0..db6575e6a8a933eb06ab8a6db97dfd8dde428840 100644
--- a/NON-APPROVED/pss1-pss/PSS1_PSS_Area.bob
+++ b/NON-APPROVED/pss1-pss/PSS1_PSS_Area.bob
@@ -52,9 +52,9 @@
<widget type="rectangle" version="2.0.0">
<name>BGGrey03-background_2</name>
<x>20</x>
- <y>240</y>
+ <y>280</y>
<width>990</width>
- <height>570</height>
+ <height>530</height>
<line_width>0</line_width>
<background_color>
<color name="Background" red="220" green="225" blue="221">
@@ -63,35 +63,12 @@
<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>
<y>66</y>
<width>346</width>
- <height>110</height>
+ <height>134</height>
<style>3</style>
<widget type="led" version="2.0.0">
<name>ISrcHVPS_PermitOn</name>
@@ -236,6 +213,7 @@
<x>36</x>
<y>83</y>
<width>120</width>
+ <vertical_alignment>1</vertical_alignment>
<actions>
</actions>
</widget>
@@ -276,12 +254,8 @@
<x>210</x>
<y>3</y>
<width>120</width>
+ <vertical_alignment>1</vertical_alignment>
<actions>
- <action type="open_display">
- <file>popups/permits/dtl4.bob</file>
- <target>window</target>
- <description>Open Display</description>
- </action>
</actions>
</widget>
<widget type="action_button" version="3.0.0">
@@ -320,15 +294,9 @@
<text>MEBT1 buncher 1</text>
<x>210</x>
<y>29</y>
- <width>117</width>
- <height>23</height>
- <auto_size>true</auto_size>
+ <width>120</width>
+ <vertical_alignment>1</vertical_alignment>
<actions>
- <action type="open_display">
- <file>popups/permits/mebt1.bob</file>
- <target>window</target>
- <description>Open Display</description>
- </action>
</actions>
</widget>
<widget type="action_button" version="3.0.0">
@@ -343,8 +311,8 @@
<text></text>
<x>210</x>
<y>29</y>
- <width>117</width>
- <height>23</height>
+ <width>120</width>
+ <height>20</height>
<transparent>true</transparent>
<tooltip>$(actions)</tooltip>
</widget>
@@ -367,15 +335,9 @@
<text>MEBT2 buncher 2</text>
<x>210</x>
<y>56</y>
- <width>117</width>
- <height>23</height>
- <auto_size>true</auto_size>
+ <width>120</width>
+ <vertical_alignment>1</vertical_alignment>
<actions>
- <action type="open_display">
- <file>popups/permits/mebt2.bob</file>
- <target>window</target>
- <description>Open Display</description>
- </action>
</actions>
</widget>
<widget type="action_button" version="3.0.0">
@@ -390,8 +352,8 @@
<text></text>
<x>210</x>
<y>56</y>
- <width>117</width>
- <height>23</height>
+ <width>120</width>
+ <height>20</height>
<transparent>true</transparent>
<tooltip>$(actions)</tooltip>
</widget>
@@ -414,9 +376,13 @@
<text>MEBT3 buncher 3</text>
<x>210</x>
<y>83</y>
- <width>117</width>
- <height>23</height>
- <auto_size>true</auto_size>
+ <width>120</width>
+ <vertical_alignment>1</vertical_alignment>
+ <actions>
+ </actions>
+ </widget>
+ <widget type="action_button" version="3.0.0">
+ <name>AB_MEBT3_PermitOn</name>
<actions>
<action type="open_display">
<file>popups/permits/mebt3.bob</file>
@@ -424,22 +390,28 @@
<description>Open Display</description>
</action>
</actions>
+ <text></text>
+ <x>210</x>
+ <y>83</y>
+ <width>120</width>
+ <height>20</height>
+ <transparent>true</transparent>
+ <tooltip>$(actions)</tooltip>
</widget>
<widget type="action_button" version="3.0.0">
- <name>AB_MEBT3_PermitOn</name>
+ <name>AB_PLC Permit</name>
<actions>
<action type="open_display">
- <file>popups/permits/mebt3.bob</file>
+ <file>popups/permits/plc.bob</file>
<target>window</target>
<description>Open Display</description>
</action>
</actions>
- <text></text>
+ <text>PLC Permits</text>
<x>210</x>
- <y>83</y>
- <width>117</width>
+ <y>108</y>
+ <width>120</width>
<height>23</height>
- <transparent>true</transparent>
<tooltip>$(actions)</tooltip>
</widget>
</widget>
@@ -517,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>
@@ -929,9 +1012,9 @@ Exit Door 1</text>
</action>
</actions>
<text>PSS Camera - FEB</text>
- <x>25</x>
+ <x>30</x>
<y>330</y>
- <width>150</width>
+ <width>210</width>
<height>35</height>
<tooltip>$(actions)</tooltip>
</widget>
@@ -1346,9 +1429,9 @@ Exit Door 1</text>
</action>
</actions>
<text>PSS Camera - PAS</text>
- <x>25</x>
+ <x>30</x>
<y>375</y>
- <width>150</width>
+ <width>210</width>
<height>35</height>
<tooltip>$(actions)</tooltip>
</widget>
@@ -1365,9 +1448,9 @@ Exit Door 1</text>
</action>
</actions>
<text>Camera - Controlled Area</text>
- <x>25</x>
+ <x>30</x>
<y>420</y>
- <width>150</width>
+ <width>210</width>
<height>35</height>
<tooltip>$(actions)</tooltip>
</widget>
@@ -1381,9 +1464,9 @@ Exit Door 1</text>
</action>
</actions>
<text>MAS Details</text>
- <x>200</x>
+ <x>255</x>
<y>330</y>
- <width>150</width>
+ <width>180</width>
<height>35</height>
<tooltip>$(actions)</tooltip>
</widget>
@@ -1397,9 +1480,9 @@ Exit Door 1</text>
</action>
</actions>
<text>PAS Details</text>
- <x>200</x>
+ <x>255</x>
<y>375</y>
- <width>150</width>
+ <width>180</width>
<height>35</height>
<tooltip>$(actions)</tooltip>
</widget>
@@ -1824,10 +1907,18 @@ Exit Door 1</text>
<square>true</square>
<rules>
<rule name="Visibility" prop_id="visible" out_exp="true">
+ <exp bool_exp="not pvInt0">
+ <expression>False</expression>
+ </exp>
+ <exp bool_exp="pvInt1">
+ <expression>True</expression>
+ </exp>
<exp bool_exp="True">
- <expression>pvInt0</expression>
+ <expression>pvInt2</expression>
</exp>
<pv_name>$(pv_name)</pv_name>
+ <pv_name>KG-NCG:PSS-Area-1:DTL4isolationConfirmed</pv_name>
+ <pv_name>sim://flipflop(1)</pv_name>
</rule>
</rules>
</widget>
@@ -1844,10 +1935,18 @@ Exit Door 1</text>
<square>true</square>
<rules>
<rule name="Visibility" prop_id="visible" out_exp="true">
+ <exp bool_exp="not pvInt0">
+ <expression>False</expression>
+ </exp>
+ <exp bool_exp="pvInt1">
+ <expression>True</expression>
+ </exp>
<exp bool_exp="True">
- <expression>pvInt0</expression>
+ <expression>pvInt2</expression>
</exp>
<pv_name>$(pv_name)</pv_name>
+ <pv_name>KG-NCG:PSS-Area-1:DTL2DTL3isolationConfirmed</pv_name>
+ <pv_name>sim://flipflop(1)</pv_name>
</rule>
</rules>
</widget>
@@ -1864,10 +1963,18 @@ Exit Door 1</text>
<square>true</square>
<rules>
<rule name="Visibility" prop_id="visible" out_exp="true">
+ <exp bool_exp="not pvInt0">
+ <expression>False</expression>
+ </exp>
+ <exp bool_exp="pvInt1">
+ <expression>True</expression>
+ </exp>
<exp bool_exp="True">
- <expression>pvInt0</expression>
+ <expression>pvInt2</expression>
</exp>
<pv_name>$(pv_name)</pv_name>
+ <pv_name>KG-NCG:PSS-Area-1:DTL2DTL3isolationConfirmed</pv_name>
+ <pv_name>sim://flipflop(1)</pv_name>
</rule>
</rules>
</widget>
@@ -1884,10 +1991,18 @@ Exit Door 1</text>
<square>true</square>
<rules>
<rule name="Visibility" prop_id="visible" out_exp="true">
+ <exp bool_exp="not pvInt0">
+ <expression>False</expression>
+ </exp>
+ <exp bool_exp="pvInt1">
+ <expression>True</expression>
+ </exp>
<exp bool_exp="True">
- <expression>pvInt0</expression>
+ <expression>pvInt2</expression>
</exp>
<pv_name>$(pv_name)</pv_name>
+ <pv_name>KG-NCG:PSS-Area-1:RFQDTL1isolationConfirmed</pv_name>
+ <pv_name>sim://flipflop(1)</pv_name>
</rule>
</rules>
</widget>
@@ -1904,27 +2019,21 @@ Exit Door 1</text>
<square>true</square>
<rules>
<rule name="Visibility" prop_id="visible" out_exp="true">
+ <exp bool_exp="not pvInt0">
+ <expression>False</expression>
+ </exp>
+ <exp bool_exp="pvInt1">
+ <expression>True</expression>
+ </exp>
<exp bool_exp="True">
- <expression>pvInt0</expression>
+ <expression>pvInt2</expression>
</exp>
<pv_name>$(pv_name)</pv_name>
+ <pv_name>KG-NCG:PSS-Area-1:RFQDTL1isolationConfirmed</pv_name>
+ <pv_name>sim://flipflop(1)</pv_name>
</rule>
</rules>
</widget>
- <widget type="rectangle" version="2.0.0">
- <name>RFQ SCP</name>
- <x>478</x>
- <y>523</y>
- <width>20</width>
- <height>30</height>
- <visible>false</visible>
- <line_width>1</line_width>
- <line_color>
- <color name="Text" red="25" green="25" blue="25">
- </color>
- </line_color>
- <transparent>true</transparent>
- </widget>
<widget type="label" version="2.0.0">
<name>AMM_204</name>
<text>TSW
@@ -2046,10 +2155,10 @@ Door</text>
</widget>
<widget type="label" version="2.0.0">
<name>Permits</name>
- <text>Permits</text>
- <x>651</x>
+ <text>PSS Permits</text>
+ <x>654</x>
<y>31</y>
- <width>348</width>
+ <width>346</width>
<height>30</height>
<font>
<font name="Header 2" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
@@ -2421,7 +2530,7 @@ Door</text>
<name>Operation Mode</name>
<file>embedded_displays/operation_mode.bob</file>
<x>35</x>
- <y>185</y>
+ <y>213</y>
<width>960</width>
<height>56</height>
<resize>2</resize>
diff --git a/NON-APPROVED/pss1-pss/PSS1_PSS_Diagnostics.bob b/NON-APPROVED/pss1-pss/PSS1_PSS_Diagnostics.bob
index a5fb389ff8504fe352b3b34736088737274764c7..aac3935e2922d08d767fe1ddbdce604911f2ec41 100644
--- a/NON-APPROVED/pss1-pss/PSS1_PSS_Diagnostics.bob
+++ b/NON-APPROVED/pss1-pss/PSS1_PSS_Diagnostics.bob
@@ -5,9 +5,10 @@
<EMBEDDED_DIAG>embedded_displays/diagnostics</EMBEDDED_DIAG>
<GPLC>FEB-090:PSS-GPLC-1</GPLC>
<PLC>FEB-090:PSS-PLC-1</PLC>
+ <PLC_SYMBOLS>$(SYMBOLS)/plc</PLC_SYMBOLS>
<POPUP_DIAG>popups/diagnostics</POPUP_DIAG>
<SYMBOLS>symbols</SYMBOLS>
- <PLC_SYMBOLS>$(SYMBOLS)/plc</PLC_SYMBOLS>
+ <WIRE_PY>scripts/wire.py</WIRE_PY>
</macros>
<width>1500</width>
<height>1006</height>
@@ -65,7 +66,7 @@
<resize>2</resize>
</widget>
<widget type="polyline" version="2.0.0">
- <name>GCPU-CPU Wire</name>
+ <name>GCPU Wire</name>
<x>520</x>
<y>325</y>
<width>220</width>
@@ -86,92 +87,95 @@
</line_color>
<line_style>1</line_style>
<scripts>
- <script file="EmbeddedPy" check_connections="false">
- <text><![CDATA[# Embedded python script
-from org.csstudio.display.builder.runtime.script import PVUtil, ScriptUtil
-from org.csstudio.display.builder.model.persist import WidgetColorService
-
-line_style = 1 # dashed
-
-pvSevStr = "N/A"
-pvStatStr = "N/A"
-pvIntStr = "null"
-pvTime = ""
-
-try:
- pvSev = PVUtil.getSeverity(pvs[0])
- pvSevStr = PVUtil.getSeverityString(pvs[0])
- pvStatStr = PVUtil.getStatus(pvs[0])
-
- pvInt = PVUtil.getLong(pvs[0])
- pvIntStr = PVUtil.getString(pvs[0])
-
- pvTime = PVUtil.getTimeString(pvs[0])
-
-
- if pvSev == 3: # INVALID
- raise RuntimeError
-
- if pvInt == True and pvSev == 0:
- line_style = 0 # solid
- line_color = WidgetColorService.getColor("GREEN-BORDER")
- tooltip = "Healthy connection between Gateway and Process PLC"
- else:
- line_color = WidgetColorService.getColor("ERROR")
- tooltip = "NO connection between Gateway and Process PLC"
-except:
- line_color = WidgetColorService.getColor("DISCONNECTED")
- tooltip = "Unknown connection status between Gateway and Process PLC"
-
-widget.setPropertyValue('line_color', line_color)
-widget.setPropertyValue('line_style', line_style)
-widget.setPropertyValue('tooltip', tooltip + """
-{}
-{}, {} - {}, {}""".format(str(pvs[0]), pvIntStr, pvSevStr, pvStatStr, pvTime))]]></text>
+ <script file="$(WIRE_PY)" check_connections="false">
<pv_name>$(PLC):GCPU_ConnStat</pv_name>
</script>
</scripts>
<tooltip>N/A</tooltip>
</widget>
<widget type="polyline" version="2.0.0">
- <name>F Wire</name>
- <x>780</x>
+ <name>CPU Wire</name>
+ <x>777</x>
+ <y>320</y>
+ <width>180</width>
+ <height>85</height>
+ <points>
+ <point x="0.0" y="0.0">
+ </point>
+ <point x="0.0" y="85.0">
+ </point>
+ <point x="180.0" y="85.0">
+ </point>
+ <point x="180.0" y="0.0">
+ </point>
+ </points>
+ <line_color>
+ <color name="DISCONNECTED" red="105" green="77" blue="164">
+ </color>
+ </line_color>
+ <line_style>1</line_style>
+ <scripts>
+ <script file="$(WIRE_PY)" check_connections="false">
+ <pv_name>$(PLC):CPU_ConnStat</pv_name>
+ </script>
+ </scripts>
+ <tooltip>N/A</tooltip>
+ </widget>
+ <widget type="polyline" version="2.0.0">
+ <name>HMI Wire</name>
+ <x>980</x>
<y>325</y>
- <width>365</width>
- <height>75</height>
+ <width>165</width>
+ <height>70</height>
<points>
<point x="0.0" y="0.0">
</point>
- <point x="0.0" y="75.0">
+ <point x="0.0" y="70.0">
</point>
- <point x="364.99999999999994" y="75.0">
+ <point x="165.0" y="70.0">
</point>
- <point x="365.0" y="0.0">
+ <point x="165.0" y="0.0">
</point>
</points>
<line_color>
- <color name="GREEN-BORDER" red="40" green="140" blue="40">
+ <color name="DISCONNECTED" red="105" green="77" blue="164">
</color>
</line_color>
+ <line_style>1</line_style>
+ <scripts>
+ <script file="$(WIRE_PY)" check_connections="false">
+ <pv_name>$(PLC):HMI_ConnStat</pv_name>
+ </script>
+ </scripts>
+ <tooltip>N/A</tooltip>
</widget>
<widget type="polyline" version="2.0.0">
- <name>F Wire 2</name>
- <x>1145</x>
+ <name>PAS HMI Wire</name>
+ <x>972</x>
<y>325</y>
- <width>240</width>
- <height>75</height>
+ <width>410</width>
+ <height>80</height>
<points>
- <point x="0.0" y="75.0">
+ <point x="0.0" y="0.0">
+ </point>
+ <point x="0.0" y="80.0">
</point>
- <point x="239.99999999999991" y="75.0">
+ <point x="410.0" y="80.0">
</point>
- <point x="239.99999999999997" y="0.0">
+ <point x="410.0" y="0.0">
</point>
</points>
<line_color>
- <color name="GREEN-BORDER" red="40" green="140" blue="40">
+ <color name="DISCONNECTED" red="105" green="77" blue="164">
</color>
</line_color>
+ <line_style>1</line_style>
+ <scripts>
+ <script file="$(WIRE_PY)" check_connections="false">
+ <pv_name>$(PLC):PASHMI_ConnStat</pv_name>
+ </script>
+ </scripts>
+ <tooltip>N/A</tooltip>
</widget>
<widget type="group" version="2.0.0">
<name>GCPU</name>
@@ -262,14 +266,14 @@ widget.setPropertyValue('tooltip', tooltip + """
</widget>
<widget type="polyline" version="2.0.0">
<name>Switch Wire</name>
- <x>970</x>
+ <x>965</x>
<y>325</y>
<width>1</width>
<height>179</height>
<points>
<point x="0.0" y="0.0">
</point>
- <point x="0.0" y="178.99999999999997">
+ <point x="0.0" y="179.0">
</point>
</points>
<line_color>
@@ -352,7 +356,7 @@ widget.setPropertyValue('tooltip', tooltip + """
<wrap_words>false</wrap_words>
</widget>
<widget type="symbol" version="2.0.0">
- <name>Disconnected</name>
+ <name>HMI_ConnStat</name>
<pv_name>$(PLC):HMI_ConnStat</pv_name>
<symbols>
<symbol>$(SYMBOLS)/alarms/unconnected.svg</symbol>
@@ -432,7 +436,7 @@ widget.setPropertyValue('tooltip', tooltip + """
</color>
</line_color>
</widget>
- <widget type="polygon" version="2.0.0">
+ <widget type="polyline" version="2.0.0">
<name>RIO0 Wire</name>
<x>150</x>
<y>506</y>
@@ -445,11 +449,18 @@ widget.setPropertyValue('tooltip', tooltip + """
</point>
</points>
<line_color>
- <color name="GREEN-BORDER" red="40" green="140" blue="40">
+ <color name="DISCONNECTED" red="105" green="77" blue="164">
</color>
</line_color>
+ <line_style>1</line_style>
+ <scripts>
+ <script file="$(WIRE_PY)" check_connections="false">
+ <pv_name>FEB-010Row:CnPw-U-001:IM_ConnStat</pv_name>
+ </script>
+ </scripts>
+ <tooltip>N/A</tooltip>
</widget>
- <widget type="polygon" version="2.0.0">
+ <widget type="polyline" version="2.0.0">
<name>RIO1 Wire</name>
<x>410</x>
<y>506</y>
@@ -462,11 +473,18 @@ widget.setPropertyValue('tooltip', tooltip + """
</point>
</points>
<line_color>
- <color name="GREEN-BORDER" red="40" green="140" blue="40">
+ <color name="DISCONNECTED" red="105" green="77" blue="164">
</color>
</line_color>
+ <line_style>1</line_style>
+ <scripts>
+ <script file="$(WIRE_PY)">
+ <pv_name>FEB-010Row:CnPw-U-002:IM_ConnStat</pv_name>
+ </script>
+ </scripts>
+ <tooltip>N/A</tooltip>
</widget>
- <widget type="polygon" version="2.0.0">
+ <widget type="polyline" version="2.0.0">
<name>RIO2 Wire</name>
<x>651</x>
<y>506</y>
@@ -479,11 +497,18 @@ widget.setPropertyValue('tooltip', tooltip + """
</point>
</points>
<line_color>
- <color name="GREEN-BORDER" red="40" green="140" blue="40">
+ <color name="DISCONNECTED" red="105" green="77" blue="164">
</color>
</line_color>
+ <line_style>1</line_style>
+ <scripts>
+ <script file="$(WIRE_PY)">
+ <pv_name>FEB-010Row:CnPw-U-003:IM_ConnStat</pv_name>
+ </script>
+ </scripts>
+ <tooltip>N/A</tooltip>
</widget>
- <widget type="polygon" version="2.0.0">
+ <widget type="polyline" version="2.0.0">
<name>RIO3 Wire</name>
<x>891</x>
<y>506</y>
@@ -496,11 +521,18 @@ widget.setPropertyValue('tooltip', tooltip + """
</point>
</points>
<line_color>
- <color name="GREEN-BORDER" red="40" green="140" blue="40">
+ <color name="DISCONNECTED" red="105" green="77" blue="164">
</color>
</line_color>
+ <line_style>1</line_style>
+ <scripts>
+ <script file="$(WIRE_PY)">
+ <pv_name>FEB-010Row:CnPw-U-004:IM_ConnStat</pv_name>
+ </script>
+ </scripts>
+ <tooltip>N/A</tooltip>
</widget>
- <widget type="polygon" version="2.0.0">
+ <widget type="polyline" version="2.0.0">
<name>RIO4 Wire</name>
<x>1132</x>
<y>506</y>
@@ -513,11 +545,18 @@ widget.setPropertyValue('tooltip', tooltip + """
</point>
</points>
<line_color>
- <color name="GREEN-BORDER" red="40" green="140" blue="40">
+ <color name="DISCONNECTED" red="105" green="77" blue="164">
</color>
</line_color>
+ <line_style>1</line_style>
+ <scripts>
+ <script file="$(WIRE_PY)">
+ <pv_name>AccPSS-Z0:PSS-RIO-4:IM_ConnStat</pv_name>
+ </script>
+ </scripts>
+ <tooltip>N/A</tooltip>
</widget>
- <widget type="polygon" version="2.0.0">
+ <widget type="polyline" version="2.0.0">
<name>RIO5 Wire</name>
<x>1373</x>
<y>506</y>
@@ -530,9 +569,16 @@ widget.setPropertyValue('tooltip', tooltip + """
</point>
</points>
<line_color>
- <color name="GREEN-BORDER" red="40" green="140" blue="40">
+ <color name="DISCONNECTED" red="105" green="77" blue="164">
</color>
</line_color>
+ <line_style>1</line_style>
+ <scripts>
+ <script file="$(WIRE_PY)">
+ <pv_name>FEB-090:PSS-RIO-5:IM_ConnStat</pv_name>
+ </script>
+ </scripts>
+ <tooltip>N/A</tooltip>
</widget>
<widget type="embedded" version="2.0.0">
<name>PSS1 PSS $(CABINET) Cabinet</name>
diff --git a/NON-APPROVED/pss1-pss/embedded_displays/diagnostics/PLC_cabinet.bob b/NON-APPROVED/pss1-pss/embedded_displays/diagnostics/PLC_cabinet.bob
index 896ded098d72961cc71edcc679077f22fa03d6fc..a19382d6c340d6cc2f47fc028bdd62b9ac45b6d3 100644
--- a/NON-APPROVED/pss1-pss/embedded_displays/diagnostics/PLC_cabinet.bob
+++ b/NON-APPROVED/pss1-pss/embedded_displays/diagnostics/PLC_cabinet.bob
@@ -54,6 +54,7 @@
<description>Open Display</description>
</action>
</actions>
+ <pv_name>$(P):Cabinet_Stat</pv_name>
<text>PLC Cabinet</text>
<x>10</x>
<y>5</y>
@@ -62,6 +63,21 @@
<font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
</font>
</font>
+ <background_color>
+ <color name="ERROR" red="252" green="13" blue="27">
+ </color>
+ </background_color>
+ <rules>
+ <rule name="Background" prop_id="background_color" out_exp="false">
+ <exp bool_exp="pvInt0">
+ <value>
+ <color name="Button_Background" red="236" green="236" blue="236">
+ </color>
+ </value>
+ </exp>
+ <pv_name>$(P):Cabinet_Stat</pv_name>
+ </rule>
+ </rules>
<tooltip>$(actions)</tooltip>
</widget>
<widget type="label" version="2.0.0">
diff --git a/NON-APPROVED/pss1-pss/embedded_displays/diagnostics/RIO4_cabinet.bob b/NON-APPROVED/pss1-pss/embedded_displays/diagnostics/RIO4_cabinet.bob
index a129176ca9ca85b2d7daff93708f696f806e552d..f3a6b9228c808253c05ec877020079838936d77b 100644
--- a/NON-APPROVED/pss1-pss/embedded_displays/diagnostics/RIO4_cabinet.bob
+++ b/NON-APPROVED/pss1-pss/embedded_displays/diagnostics/RIO4_cabinet.bob
@@ -58,6 +58,7 @@
<description>Open Display</description>
</action>
</actions>
+ <pv_name>$(P):Cabinet_Stat</pv_name>
<text>$(CABINET) Cabinet</text>
<x>10</x>
<y>5</y>
@@ -66,6 +67,21 @@
<font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
</font>
</font>
+ <background_color>
+ <color name="ERROR" red="252" green="13" blue="27">
+ </color>
+ </background_color>
+ <rules>
+ <rule name="Background" prop_id="background_color" out_exp="false">
+ <exp bool_exp="pvInt0">
+ <value>
+ <color name="Button_Background" red="236" green="236" blue="236">
+ </color>
+ </value>
+ </exp>
+ <pv_name>$(pv_name)</pv_name>
+ </rule>
+ </rules>
<tooltip>$(actions)</tooltip>
</widget>
<widget type="label" version="2.0.0">
diff --git a/NON-APPROVED/pss1-pss/embedded_displays/diagnostics/RIO5_cabinet.bob b/NON-APPROVED/pss1-pss/embedded_displays/diagnostics/RIO5_cabinet.bob
index a8128d6f7539b2f1f9fad0355332b8298b4699ad..1975c622caf08d1910798a820d4f35b44c6888b5 100644
--- a/NON-APPROVED/pss1-pss/embedded_displays/diagnostics/RIO5_cabinet.bob
+++ b/NON-APPROVED/pss1-pss/embedded_displays/diagnostics/RIO5_cabinet.bob
@@ -72,6 +72,7 @@
<description>Open Display</description>
</action>
</actions>
+ <pv_name>$(P):Cabinet_Stat</pv_name>
<text>$(CABINET) Cabinet</text>
<x>10</x>
<y>5</y>
@@ -80,6 +81,21 @@
<font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
</font>
</font>
+ <background_color>
+ <color name="ERROR" red="252" green="13" blue="27">
+ </color>
+ </background_color>
+ <rules>
+ <rule name="Background" prop_id="background_color" out_exp="false">
+ <exp bool_exp="pvInt0">
+ <value>
+ <color name="Button_Background" red="236" green="236" blue="236">
+ </color>
+ </value>
+ </exp>
+ <pv_name>$(pv_name)</pv_name>
+ </rule>
+ </rules>
<tooltip>$(actions)</tooltip>
</widget>
<widget type="group" version="2.0.0">
diff --git a/NON-APPROVED/pss1-pss/embedded_displays/diagnostics/cabinet.bob b/NON-APPROVED/pss1-pss/embedded_displays/diagnostics/cabinet.bob
index df54d5db58b2235ae27965c7ba5e46bbe7d2ed3f..f53eacc60f379e56ed0454e395413eb49098855c 100644
--- a/NON-APPROVED/pss1-pss/embedded_displays/diagnostics/cabinet.bob
+++ b/NON-APPROVED/pss1-pss/embedded_displays/diagnostics/cabinet.bob
@@ -54,6 +54,7 @@
<description>Open Display</description>
</action>
</actions>
+ <pv_name>$(P):Cabinet_Stat</pv_name>
<text>$(CABINET) Cabinet</text>
<x>10</x>
<y>5</y>
@@ -62,6 +63,21 @@
<font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
</font>
</font>
+ <background_color>
+ <color name="ERROR" red="252" green="13" blue="27">
+ </color>
+ </background_color>
+ <rules>
+ <rule name="Background" prop_id="background_color" out_exp="false">
+ <exp bool_exp="pvInt0">
+ <value>
+ <color name="Button_Background" red="236" green="236" blue="236">
+ </color>
+ </value>
+ </exp>
+ <pv_name>$(pv_name)</pv_name>
+ </rule>
+ </rules>
<tooltip>$(actions)</tooltip>
</widget>
<widget type="label" version="2.0.0">
diff --git a/NON-APPROVED/pss1-pss/embedded_displays/esob.bob b/NON-APPROVED/pss1-pss/embedded_displays/esob.bob
index c038e073b0e52f7ee8ee234d0ff017ce789e1f37..35eeadd88ea63719aa3e3b6181c2c818dcfaa9be 100644
--- a/NON-APPROVED/pss1-pss/embedded_displays/esob.bob
+++ b/NON-APPROVED/pss1-pss/embedded_displays/esob.bob
@@ -19,7 +19,7 @@
<pv_name>$(ESOS):ESOBStat</pv_name>
<symbols>
<symbol>../symbols/esos/emergency-button-RED.svg</symbol>
- <symbol>../symbols/esos/emergency-button-ON.svg</symbol>
+ <symbol>../symbols/esos/emergency-button-OFF.svg</symbol>
</symbols>
<x>3</x>
<y>3</y>
diff --git a/NON-APPROVED/pss1-pss/embedded_displays/esos.bob b/NON-APPROVED/pss1-pss/embedded_displays/esos.bob
index cd25b5758d9cef1507a324dc467b60acfca2ab21..ac74666ca2498f352341050e7b938cf2f4877f05 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>
diff --git a/NON-APPROVED/pss1-pss/popups/diagnostics/PLC_cabinet_diagnostics.bob b/NON-APPROVED/pss1-pss/popups/diagnostics/PLC_cabinet_diagnostics.bob
index 2e977d8800d1b1199d2080c547f35de5cedf4de9..68de413e616cbde3def65972fef088dddbe0b0b6 100644
--- a/NON-APPROVED/pss1-pss/popups/diagnostics/PLC_cabinet_diagnostics.bob
+++ b/NON-APPROVED/pss1-pss/popups/diagnostics/PLC_cabinet_diagnostics.bob
@@ -9,6 +9,7 @@
<PLC_SYMBOLS>$(SYMBOLS)/plc</PLC_SYMBOLS>
<POPUP_DIAG>popups/diagnostics</POPUP_DIAG>
<SYMBOLS>../../symbols</SYMBOLS>
+ <WIRE_PY>../../scripts/wire.py</WIRE_PY>
</macros>
<width>1500</width>
<height>1006</height>
@@ -66,7 +67,7 @@
<resize>2</resize>
</widget>
<widget type="polyline" version="2.0.0">
- <name>GCPU-CPU Wire</name>
+ <name>GCPU Wire</name>
<x>520</x>
<y>325</y>
<width>220</width>
@@ -87,92 +88,95 @@
</line_color>
<line_style>1</line_style>
<scripts>
- <script file="EmbeddedPy" check_connections="false">
- <text><![CDATA[# Embedded python script
-from org.csstudio.display.builder.runtime.script import PVUtil, ScriptUtil
-from org.csstudio.display.builder.model.persist import WidgetColorService
-
-line_style = 1 # dashed
-
-pvSevStr = "N/A"
-pvStatStr = "N/A"
-pvIntStr = "null"
-pvTime = ""
-
-try:
- pvSev = PVUtil.getSeverity(pvs[0])
- pvSevStr = PVUtil.getSeverityString(pvs[0])
- pvStatStr = PVUtil.getStatus(pvs[0])
-
- pvInt = PVUtil.getLong(pvs[0])
- pvIntStr = PVUtil.getString(pvs[0])
-
- pvTime = PVUtil.getTimeString(pvs[0])
-
-
- if pvSev == 3: # INVALID
- raise RuntimeError
-
- if pvInt == True and pvSev == 0:
- line_style = 0 # solid
- line_color = WidgetColorService.getColor("GREEN-BORDER")
- tooltip = "Healthy connection between Gateway and Process PLC"
- else:
- line_color = WidgetColorService.getColor("ERROR")
- tooltip = "NO connection between Gateway and Process PLC"
-except:
- line_color = WidgetColorService.getColor("DISCONNECTED")
- tooltip = "Unknown connection status between Gateway and Process PLC"
-
-widget.setPropertyValue('line_color', line_color)
-widget.setPropertyValue('line_style', line_style)
-widget.setPropertyValue('tooltip', tooltip + """
-{}
-{}, {} - {}, {}""".format(str(pvs[0]), pvIntStr, pvSevStr, pvStatStr, pvTime))]]></text>
+ <script file="$(WIRE_PY)">
<pv_name>$(PLC):GCPU_ConnStat</pv_name>
</script>
</scripts>
<tooltip>N/A</tooltip>
</widget>
<widget type="polyline" version="2.0.0">
- <name>F Wire</name>
- <x>780</x>
+ <name>CPU Wire</name>
+ <x>777</x>
+ <y>320</y>
+ <width>180</width>
+ <height>85</height>
+ <points>
+ <point x="0.0" y="0.0">
+ </point>
+ <point x="0.0" y="85.0">
+ </point>
+ <point x="180.0" y="85.0">
+ </point>
+ <point x="180.0" y="0.0">
+ </point>
+ </points>
+ <line_color>
+ <color name="DISCONNECTED" red="105" green="77" blue="164">
+ </color>
+ </line_color>
+ <line_style>1</line_style>
+ <scripts>
+ <script file="$(WIRE_PY)">
+ <pv_name>$(PLC):CPU_ConnStat</pv_name>
+ </script>
+ </scripts>
+ <tooltip>N/A</tooltip>
+ </widget>
+ <widget type="polyline" version="2.0.0">
+ <name>HMI Wire</name>
+ <x>980</x>
<y>325</y>
- <width>365</width>
- <height>75</height>
+ <width>165</width>
+ <height>70</height>
<points>
<point x="0.0" y="0.0">
</point>
- <point x="0.0" y="75.0">
+ <point x="0.0" y="70.0">
</point>
- <point x="364.99999999999994" y="75.0">
+ <point x="164.99999999999997" y="70.0">
</point>
- <point x="365.0" y="0.0">
+ <point x="164.99999999999997" y="0.0">
</point>
</points>
<line_color>
- <color name="GREEN-BORDER" red="40" green="140" blue="40">
+ <color name="DISCONNECTED" red="105" green="77" blue="164">
</color>
</line_color>
+ <line_style>1</line_style>
+ <scripts>
+ <script file="$(WIRE_PY)">
+ <pv_name>$(PLC):HMI_ConnStat</pv_name>
+ </script>
+ </scripts>
+ <tooltip>N/A</tooltip>
</widget>
<widget type="polyline" version="2.0.0">
- <name>F Wire 2</name>
- <x>1145</x>
+ <name>PAS HMI Wire</name>
+ <x>972</x>
<y>325</y>
- <width>240</width>
- <height>75</height>
+ <width>410</width>
+ <height>80</height>
<points>
- <point x="0.0" y="75.0">
+ <point x="0.0" y="0.0">
+ </point>
+ <point x="0.0" y="80.0">
</point>
- <point x="239.99999999999991" y="75.0">
+ <point x="410.0" y="80.0">
</point>
- <point x="239.99999999999997" y="0.0">
+ <point x="410.0" y="0.0">
</point>
</points>
<line_color>
- <color name="GREEN-BORDER" red="40" green="140" blue="40">
+ <color name="DISCONNECTED" red="105" green="77" blue="164">
</color>
</line_color>
+ <line_style>1</line_style>
+ <scripts>
+ <script file="$(WIRE_PY)">
+ <pv_name>$(PLC):PASHMI_ConnStat</pv_name>
+ </script>
+ </scripts>
+ <tooltip>N/A</tooltip>
</widget>
<widget type="group" version="2.0.0">
<name>GCPU</name>
@@ -261,23 +265,6 @@ widget.setPropertyValue('tooltip', tooltip + """
<transparent>true</transparent>
</widget>
</widget>
- <widget type="polyline" version="2.0.0">
- <name>Switch Wire</name>
- <x>970</x>
- <y>325</y>
- <width>1</width>
- <height>179</height>
- <points>
- <point x="0.0" y="0.0">
- </point>
- <point x="0.0" y="178.99999999999997">
- </point>
- </points>
- <line_color>
- <color name="GREEN-BORDER" red="40" green="140" blue="40">
- </color>
- </line_color>
- </widget>
<widget type="group" version="2.0.0">
<name>Switch</name>
<x>890</x>
@@ -419,21 +406,30 @@ widget.setPropertyValue('tooltip', tooltip + """
<widget type="polyline" version="2.0.0">
<name>RIO Wire</name>
<x>340</x>
- <y>506</y>
- <width>632</width>
- <height>75</height>
+ <y>325</y>
+ <width>625</width>
+ <height>254</height>
<points>
- <point x="0.0" y="75.0">
+ <point x="0.0" y="254.0">
</point>
- <point x="0.0" y="0.0">
+ <point x="0.0" y="185.0">
+ </point>
+ <point x="625.0" y="185.0">
</point>
- <point x="632.0" y="0.0">
+ <point x="625.0" y="0.0">
</point>
</points>
<line_color>
- <color name="GREEN-BORDER" red="40" green="140" blue="40">
+ <color name="DISCONNECTED" red="105" green="77" blue="164">
</color>
</line_color>
+ <line_style>1</line_style>
+ <scripts>
+ <script file="$(WIRE_PY)">
+ <pv_name>$(P):IM_ConnStat</pv_name>
+ </script>
+ </scripts>
+ <tooltip>N/A</tooltip>
</widget>
<widget type="embedded" version="2.0.0">
<name>PSS1 PSS $(CABINET) Cabinet</name>
diff --git a/NON-APPROVED/pss1-pss/popups/key_exchange.bob b/NON-APPROVED/pss1-pss/popups/key_exchange.bob
index 661bdb2cad1d270be12c65f19b996fb09864e86b..4a9454ca73a6fc8683b172485cd5920562c3fccf 100644
--- a/NON-APPROVED/pss1-pss/popups/key_exchange.bob
+++ b/NON-APPROVED/pss1-pss/popups/key_exchange.bob
@@ -389,11 +389,10 @@
<font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
</font>
</font>
- <background_color use_class="true">
- <color name="Background" red="220" green="225" blue="221">
+ <foreground_color use_class="true">
+ <color name="Text" red="25" green="25" blue="25">
</color>
- </background_color>
- <transparent use_class="true">true</transparent>
+ </foreground_color>
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
</widget>
@@ -406,7 +405,7 @@
<points>
<point x="0.0" y="20.0">
</point>
- <point x="119.99999999999999" y="20.0">
+ <point x="120.0" y="20.0">
</point>
</points>
<line_width>1</line_width>
@@ -527,11 +526,10 @@
<font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
</font>
</font>
- <background_color use_class="true">
- <color name="Background" red="220" green="225" blue="221">
+ <foreground_color use_class="true">
+ <color name="Text" red="25" green="25" blue="25">
</color>
- </background_color>
- <transparent use_class="true">true</transparent>
+ </foreground_color>
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
</widget>
@@ -576,17 +574,17 @@
<width>70</width>
<height>70</height>
<off_label>Config.
-Management
+Mgmt
key</off_label>
<off_color>
<color name="WHITE" red="255" green="255" blue="255">
</color>
</off_color>
<on_label>Config.
-Management
+Mgmt
key</on_label>
<font>
- <font name="TINY-SANS-PLAIN" family="Source Sans Pro" style="REGULAR" size="12.0">
+ <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
</font>
</font>
<tooltip>Config. Management key
@@ -602,16 +600,16 @@ $(pv_value)</tooltip>
<height>70</height>
<off_label>Shielding
Config.
-Management</off_label>
+Mgmt</off_label>
<off_color>
<color name="WHITE" red="255" green="255" blue="255">
</color>
</off_color>
<on_label>Shielding
Config.
-Management</on_label>
+Mgmt</on_label>
<font>
- <font name="TINY-SANS-PLAIN" family="Source Sans Pro" style="REGULAR" size="12.0">
+ <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
</font>
</font>
<tooltip>Shielding Config. Management
@@ -625,18 +623,16 @@ $(pv_value)</tooltip>
<y>220</y>
<width>70</width>
<height>70</height>
- <off_label>Temporary
-Shielding wall
+ <off_label>TSW
key</off_label>
<off_color>
<color name="WHITE" red="255" green="255" blue="255">
</color>
</off_color>
- <on_label>Temporary
-Shielding wall
+ <on_label>TSW
key</on_label>
<font>
- <font name="TINY-SANS-PLAIN" family="Source Sans Pro" style="REGULAR" size="12.0">
+ <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
</font>
</font>
<tooltip>Temporary Shielding wall Key
@@ -659,7 +655,7 @@ key</off_label>
<on_label>Spare
key</on_label>
<font>
- <font name="TINY-SANS-PLAIN" family="Source Sans Pro" style="REGULAR" size="12.0">
+ <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
</font>
</font>
<tooltip>Spare key
@@ -682,7 +678,7 @@ key</off_label>
<on_label>Spare
key</on_label>
<font>
- <font name="TINY-SANS-PLAIN" family="Source Sans Pro" style="REGULAR" size="12.0">
+ <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
</font>
</font>
<tooltip>Spare key
@@ -709,11 +705,10 @@ $(pv_value)</tooltip>
<font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
</font>
</font>
- <background_color use_class="true">
- <color name="Background" red="220" green="225" blue="221">
+ <foreground_color use_class="true">
+ <color name="Text" red="25" green="25" blue="25">
</color>
- </background_color>
- <transparent use_class="true">true</transparent>
+ </foreground_color>
<vertical_alignment>1</vertical_alignment>
</widget>
<widget type="polyline" version="2.0.0">
@@ -969,11 +964,10 @@ Access</on_label>
<font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
</font>
</font>
- <background_color use_class="true">
- <color name="Background" red="220" green="225" blue="221">
+ <foreground_color use_class="true">
+ <color name="Text" red="25" green="25" blue="25">
</color>
- </background_color>
- <transparent use_class="true">true</transparent>
+ </foreground_color>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
</widget>
@@ -1217,11 +1211,10 @@ PAS</on_label>
<font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
</font>
</font>
- <background_color use_class="true">
- <color name="Background" red="220" green="225" blue="221">
+ <foreground_color use_class="true">
+ <color name="Text" red="25" green="25" blue="25">
</color>
- </background_color>
- <transparent use_class="true">true</transparent>
+ </foreground_color>
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
</widget>
@@ -1419,11 +1412,10 @@ PAS</on_label>
<font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
</font>
</font>
- <background_color use_class="true">
- <color name="Background" red="220" green="225" blue="221">
+ <foreground_color use_class="true">
+ <color name="Text" red="25" green="25" blue="25">
</color>
- </background_color>
- <transparent use_class="true">true</transparent>
+ </foreground_color>
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
</widget>
diff --git a/NON-APPROVED/pss1-pss/popups/permits/isrc_hvps.bob b/NON-APPROVED/pss1-pss/popups/permits/isrc_hvps.bob
index 147a75dc60b651317a6a9cfd17c644c2045805dd..339d52f4b89fdd2ed43c2a613ffe536a8d968b37 100644
--- a/NON-APPROVED/pss1-pss/popups/permits/isrc_hvps.bob
+++ b/NON-APPROVED/pss1-pss/popups/permits/isrc_hvps.bob
@@ -2,7 +2,7 @@
<display version="2.0.0">
<name>Ion source HV PS and grounding relay</name>
<width>690</width>
- <height>290</height>
+ <height>320</height>
<widget type="rectangle" version="2.0.0">
<name>Title Rectangle</name>
<class>TITLE-BAR</class>
@@ -41,7 +41,7 @@
<name>Grounding Relay</name>
<x>30</x>
<y>80</y>
- <height>180</height>
+ <height>220</height>
<style>3</style>
<background_color>
<color name="BACKGROUND" red="220" green="225" blue="221">
@@ -50,7 +50,7 @@
<widget type="rectangle" version="2.0.0">
<name>GR-titlebar</name>
<width>300</width>
- <height>180</height>
+ <height>220</height>
<line_width>2</line_width>
<line_color>
<color name="GROUP-BORDER" red="150" green="155" blue="151">
@@ -63,24 +63,6 @@
<corner_width>10</corner_width>
<corner_height>10</corner_height>
</widget>
- <widget type="rectangle" version="2.0.0">
- <name>GR-background</name>
- <x>10</x>
- <y>30</y>
- <width>280</width>
- <height>140</height>
- <line_width>2</line_width>
- <line_color>
- <color name="GROUP-BORDER" red="150" green="155" blue="151">
- </color>
- </line_color>
- <background_color>
- <color name="BACKGROUND" red="220" green="225" blue="221">
- </color>
- </background_color>
- <corner_width>5</corner_width>
- <corner_height>5</corner_height>
- </widget>
<widget type="label" version="2.0.0">
<name>GR-title</name>
<text>Grounding Relay</text>
@@ -99,9 +81,25 @@
<x>10</x>
<y>30</y>
<width>280</width>
- <height>140</height>
+ <height>180</height>
<style>3</style>
<transparent>true</transparent>
+ <widget type="rectangle" version="2.0.0">
+ <name>GR-background</name>
+ <width>280</width>
+ <height>180</height>
+ <line_width>2</line_width>
+ <line_color>
+ <color name="GROUP-BORDER" red="150" green="155" blue="151">
+ </color>
+ </line_color>
+ <background_color>
+ <color name="BACKGROUND" red="220" green="225" blue="221">
+ </color>
+ </background_color>
+ <corner_width>5</corner_width>
+ <corner_height>5</corner_height>
+ </widget>
<widget type="led" version="2.0.0">
<name>Grly_ConnectedToGround</name>
<pv_name>FEB-010Row:CnPw-U-007:Grly_ConnectedToGround</pv_name>
@@ -120,11 +118,33 @@
<width>230</width>
<vertical_alignment>1</vertical_alignment>
</widget>
+ <widget type="led" version="2.0.0">
+ <name>Grly_ConnectedToGround</name>
+ <pv_name>FEB-010Row:CnPw-U-007:Grly_ConnectedToGround</pv_name>
+ <x>20</x>
+ <y>60</y>
+ <off_color>
+ <color name="LED-RED-ON" red="255" green="60" blue="46">
+ </color>
+ </off_color>
+ <on_color>
+ <color name="Background" red="220" green="225" blue="221">
+ </color>
+ </on_color>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>LB_Grly_ConnectedToGround_1</name>
+ <text>Disconnected from ground</text>
+ <x>46</x>
+ <y>60</y>
+ <width>230</width>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
<widget type="led" version="2.0.0">
<name>Grly_fbkError</name>
<pv_name>AccPSS-Z0:PSS-GRly-1:Grly_fbkError</pv_name>
<x>20</x>
- <y>60</y>
+ <y>100</y>
<off_color>
<color name="LED-RED-ON" red="255" green="60" blue="46">
</color>
@@ -138,7 +158,7 @@
<name>LB_Grly_fbkError</name>
<text>Feedback error in grounding relay</text>
<x>46</x>
- <y>60</y>
+ <y>100</y>
<width>230</width>
<vertical_alignment>1</vertical_alignment>
</widget>
@@ -146,7 +166,7 @@
<name>Grly_fbkErrorGrCr</name>
<pv_name>FEB-010Row:CnPw-U-007:Grly_fbkErrorGrCr</pv_name>
<x>20</x>
- <y>100</y>
+ <y>140</y>
<off_color>
<color name="LED-RED-ON" red="255" green="60" blue="46">
</color>
@@ -160,7 +180,7 @@
<name>LB_Grly_fbkErrorGrCr</name>
<text>Feedback error in control relay</text>
<x>46</x>
- <y>100</y>
+ <y>140</y>
<width>230</width>
<vertical_alignment>1</vertical_alignment>
</widget>
@@ -170,7 +190,7 @@
<name>HV PS</name>
<x>360</x>
<y>80</y>
- <height>180</height>
+ <height>220</height>
<style>3</style>
<background_color>
<color name="BACKGROUND" red="220" green="225" blue="221">
@@ -179,7 +199,7 @@
<widget type="rectangle" version="2.0.0">
<name>HVPS-titlebar</name>
<width>300</width>
- <height>180</height>
+ <height>220</height>
<line_width>2</line_width>
<line_color>
<color name="GROUP-BORDER" red="150" green="155" blue="151">
@@ -192,24 +212,6 @@
<corner_width>10</corner_width>
<corner_height>10</corner_height>
</widget>
- <widget type="rectangle" version="2.0.0">
- <name>HVPS-background</name>
- <x>10</x>
- <y>30</y>
- <width>280</width>
- <height>140</height>
- <line_width>2</line_width>
- <line_color>
- <color name="GROUP-BORDER" red="150" green="155" blue="151">
- </color>
- </line_color>
- <background_color>
- <color name="BACKGROUND" red="220" green="225" blue="221">
- </color>
- </background_color>
- <corner_width>5</corner_width>
- <corner_height>5</corner_height>
- </widget>
<widget type="label" version="2.0.0">
<name>HVPS-title</name>
<text>High Voltage Power Supply</text>
@@ -228,9 +230,25 @@
<x>10</x>
<y>30</y>
<width>280</width>
- <height>140</height>
+ <height>180</height>
<style>3</style>
<transparent>true</transparent>
+ <widget type="rectangle" version="2.0.0">
+ <name>HVPS-background</name>
+ <width>280</width>
+ <height>180</height>
+ <line_width>2</line_width>
+ <line_color>
+ <color name="GROUP-BORDER" red="150" green="155" blue="151">
+ </color>
+ </line_color>
+ <background_color>
+ <color name="BACKGROUND" red="220" green="225" blue="221">
+ </color>
+ </background_color>
+ <corner_width>5</corner_width>
+ <corner_height>5</corner_height>
+ </widget>
<widget type="led" version="2.0.0">
<name>ISrcHVPS_ActuatorsEnergised</name>
<pv_name>FEB-010Row:CnPw-U-007:ISrcHVPS_ActuatorsEnergised</pv_name>
diff --git a/NON-APPROVED/pss1-pss/popups/permits/plc.bob b/NON-APPROVED/pss1-pss/popups/permits/plc.bob
new file mode 100644
index 0000000000000000000000000000000000000000..82ee9ad9d85af3228e75ecbf0bfe7b49ac7307d1
--- /dev/null
+++ b/NON-APPROVED/pss1-pss/popups/permits/plc.bob
@@ -0,0 +1,286 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<display version="2.0.0">
+ <name>Ion source HV PS and grounding relay</name>
+ <width>490</width>
+ <height>370</height>
+ <widget type="rectangle" version="2.0.0">
+ <name>Title Rectangle</name>
+ <class>TITLE-BAR</class>
+ <x use_class="true">0</x>
+ <y use_class="true">0</y>
+ <width>490</width>
+ <height use_class="true">50</height>
+ <line_width use_class="true">0</line_width>
+ <background_color use_class="true">
+ <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
+ </color>
+ </background_color>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>Title</name>
+ <class>TITLE</class>
+ <text>PLC Permits</text>
+ <x use_class="true">20</x>
+ <y use_class="true">0</y>
+ <width>426</width>
+ <height use_class="true">50</height>
+ <font use_class="true">
+ <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
+ </font>
+ </font>
+ <foreground_color use_class="true">
+ <color name="HEADER-TEXT" red="0" green="0" blue="0">
+ </color>
+ </foreground_color>
+ <transparent use_class="true">true</transparent>
+ <horizontal_alignment use_class="true">0</horizontal_alignment>
+ <vertical_alignment use_class="true">1</vertical_alignment>
+ <wrap_words use_class="true">false</wrap_words>
+ </widget>
+ <widget type="group" version="2.0.0">
+ <name>Grounding Relay</name>
+ <x>30</x>
+ <y>80</y>
+ <width>430</width>
+ <height>260</height>
+ <style>3</style>
+ <background_color>
+ <color name="BACKGROUND" red="220" green="225" blue="221">
+ </color>
+ </background_color>
+ <widget type="rectangle" version="2.0.0">
+ <name>GR-titlebar</name>
+ <width>430</width>
+ <height>260</height>
+ <line_width>2</line_width>
+ <line_color>
+ <color name="GROUP-BORDER" red="150" green="155" blue="151">
+ </color>
+ </line_color>
+ <background_color>
+ <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+ </color>
+ </background_color>
+ <corner_width>10</corner_width>
+ <corner_height>10</corner_height>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>GR-title</name>
+ <text>Permits to interfacing control system</text>
+ <x>10</x>
+ <width>406</width>
+ <height>30</height>
+ <font>
+ <font name="SUBSUB-GROUP-HEADER" family="Source Sans Pro" style="BOLD" size="16.0">
+ </font>
+ </font>
+ <horizontal_alignment>1</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="group" version="2.0.0">
+ <name>GR-content-group</name>
+ <x>10</x>
+ <y>30</y>
+ <width>410</width>
+ <height>220</height>
+ <style>3</style>
+ <transparent>true</transparent>
+ <widget type="rectangle" version="2.0.0">
+ <name>GR-background</name>
+ <width>410</width>
+ <height>220</height>
+ <line_width>2</line_width>
+ <line_color>
+ <color name="GROUP-BORDER" red="150" green="155" blue="151">
+ </color>
+ </line_color>
+ <background_color>
+ <color name="BACKGROUND" red="220" green="225" blue="221">
+ </color>
+ </background_color>
+ <corner_width>5</corner_width>
+ <corner_height>5</corner_height>
+ </widget>
+ <widget type="led" version="2.0.0">
+ <name>ToFBIS</name>
+ <pv_name>FEB-010Row:CnPw-U-002:ToFBIS</pv_name>
+ <x>20</x>
+ <y>20</y>
+ <off_color>
+ <color name="Background" red="220" green="225" blue="221">
+ </color>
+ </off_color>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>LB_ToFBIS</name>
+ <text>To FBIS</text>
+ <x>46</x>
+ <y>20</y>
+ <width>160</width>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="led" version="2.0.0">
+ <name>ToISrcInterlockPLC</name>
+ <pv_name>FEB-010Row:CnPw-U-001:ToISrcInterlockPLC</pv_name>
+ <x>20</x>
+ <y>60</y>
+ <off_color>
+ <color name="Background" red="220" green="225" blue="221">
+ </color>
+ </off_color>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>LB_ToISrcInterlockPLC</name>
+ <text>To ISrc Interlock PLC</text>
+ <x>46</x>
+ <y>60</y>
+ <width>160</width>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="led" version="2.0.0">
+ <name>ToRFQLPS</name>
+ <pv_name>FEB-010Row:CnPw-U-004:ToRFQLPS</pv_name>
+ <x>20</x>
+ <y>100</y>
+ <off_color>
+ <color name="Background" red="220" green="225" blue="221">
+ </color>
+ </off_color>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>LB_ToRFQLPS</name>
+ <text>To RFQ LPS</text>
+ <x>46</x>
+ <y>100</y>
+ <width>160</width>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="led" version="2.0.0">
+ <name>ToDTL1LPS</name>
+ <pv_name>FEB-010Row:CnPw-U-004:ToDTL1LPS</pv_name>
+ <x>20</x>
+ <y>140</y>
+ <off_color>
+ <color name="Background" red="220" green="225" blue="221">
+ </color>
+ </off_color>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>LB_ToDTL1LPS</name>
+ <text>To DTL1 LPS</text>
+ <x>46</x>
+ <y>140</y>
+ <width>160</width>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="led" version="2.0.0">
+ <name>ToDTL2LPS</name>
+ <pv_name>FEB-010Row:CnPw-U-004:ToDTL2LPS</pv_name>
+ <x>20</x>
+ <y>180</y>
+ <off_color>
+ <color name="Background" red="220" green="225" blue="221">
+ </color>
+ </off_color>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>LB_ToDTL2LPS</name>
+ <text>To DTL2 LPS</text>
+ <x>46</x>
+ <y>180</y>
+ <width>160</width>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="led" version="2.0.0">
+ <name>ToDTL3LPS</name>
+ <pv_name>FEB-010Row:CnPw-U-004:ToDTL3LPS</pv_name>
+ <x>220</x>
+ <y>20</y>
+ <off_color>
+ <color name="Background" red="220" green="225" blue="221">
+ </color>
+ </off_color>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>LB_ToDTL3LPS</name>
+ <text>To DTL3 LPS</text>
+ <x>246</x>
+ <y>20</y>
+ <width>160</width>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="led" version="2.0.0">
+ <name>ToDTL4LPS</name>
+ <pv_name>FEB-010Row:CnPw-U-004:ToDTL4LPS</pv_name>
+ <x>220</x>
+ <y>60</y>
+ <off_color>
+ <color name="Background" red="220" green="225" blue="221">
+ </color>
+ </off_color>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>LB_ToDTL4LPS</name>
+ <text>To DTL4 LPS</text>
+ <x>246</x>
+ <y>60</y>
+ <width>160</width>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="led" version="2.0.0">
+ <name>ToMEBT1LPS</name>
+ <pv_name>FEB-010Row:CnPw-U-004:ToMEBT1LPS</pv_name>
+ <x>220</x>
+ <y>100</y>
+ <off_color>
+ <color name="Background" red="220" green="225" blue="221">
+ </color>
+ </off_color>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>LB_ToMEBT1LPS</name>
+ <text>To MEBT 1 LPS</text>
+ <x>246</x>
+ <y>100</y>
+ <width>160</width>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="led" version="2.0.0">
+ <name>ToMEBT2LPS</name>
+ <pv_name>FEB-010Row:CnPw-U-004:ToMEBT2LPS</pv_name>
+ <x>220</x>
+ <y>140</y>
+ <off_color>
+ <color name="Background" red="220" green="225" blue="221">
+ </color>
+ </off_color>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>LB_ToMEBT2LPS</name>
+ <text>To MEBT 2 LPS</text>
+ <x>246</x>
+ <y>140</y>
+ <width>160</width>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="led" version="2.0.0">
+ <name>ToMEBT3LPS</name>
+ <pv_name>FEB-010Row:CnPw-U-004:ToMEBT3LPS</pv_name>
+ <x>220</x>
+ <y>180</y>
+ <off_color>
+ <color name="Background" red="220" green="225" blue="221">
+ </color>
+ </off_color>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>LB_ToMEBT3LPS</name>
+ <text>To MEBT 3 LPS</text>
+ <x>246</x>
+ <y>180</y>
+ <width>160</width>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ </widget>
+ </widget>
+</display>
diff --git a/NON-APPROVED/pss1-pss/scripts/wire.py b/NON-APPROVED/pss1-pss/scripts/wire.py
new file mode 100644
index 0000000000000000000000000000000000000000..95966513381dbc7895e7bb2789397b5c263b7526
--- /dev/null
+++ b/NON-APPROVED/pss1-pss/scripts/wire.py
@@ -0,0 +1,40 @@
+from org.csstudio.display.builder.runtime.script import PVUtil, ScriptUtil
+from org.csstudio.display.builder.model.persist import WidgetColorService
+
+line_style = 1 # dashed
+
+pvSevStr = "N/A"
+pvStatStr = "N/A"
+pvIntStr = "null"
+pvTime = ""
+
+try:
+ pvSev = PVUtil.getSeverity(pvs[0])
+ pvSevStr = PVUtil.getSeverityString(pvs[0])
+ pvStatStr = PVUtil.getStatus(pvs[0])
+
+ pvInt = PVUtil.getLong(pvs[0])
+ pvIntStr = PVUtil.getString(pvs[0])
+
+ pvTime = PVUtil.getTimeString(pvs[0])
+
+
+ if pvSev == 3: # INVALID
+ raise RuntimeError
+
+ if pvInt == True and pvSev == 0:
+ line_style = 0 # solid
+ line_color = WidgetColorService.getColor("GREEN-BORDER")
+ tooltip = "Healthy connection"
+ else:
+ line_color = WidgetColorService.getColor("ERROR")
+ tooltip = "NO connection"
+except:
+ line_color = WidgetColorService.getColor("DISCONNECTED")
+ tooltip = "Unknown connection status"
+
+widget.setPropertyValue('line_color', line_color)
+widget.setPropertyValue('line_style', line_style)
+widget.setPropertyValue('tooltip', tooltip + """
+{}
+{}, {} - {}, {}""".format(str(pvs[0]), pvIntStr, pvSevStr, pvStatStr, pvTime))
diff --git a/NON-APPROVED/rfq-010_vac/RFQ.bob b/NON-APPROVED/rfq-010_vac/RFQ.bob
index e866ff8dad48ffbb06693971656022d7900d61a5..f6deba1462808acff1937ef01dd3526fddd9cfc7 100644
--- a/NON-APPROVED/rfq-010_vac/RFQ.bob
+++ b/NON-APPROVED/rfq-010_vac/RFQ.bob
@@ -5,6 +5,7 @@
<DIS>Vac</DIS>
<ROOT>$(ESS_OPIS=/ess-opis)/NON-APPROVED</ROOT>
<SEC>RFQ</SEC>
+ <SERVICE_SECTION>$(SEC)</SERVICE_SECTION>
<SUBSEC>010</SUBSEC>
<WIDGET_ROOT>$(ROOT)/COMMON/DEVICES/vacuum</WIDGET_ROOT>
</macros>
@@ -28,13 +29,22 @@
</color>
</foreground_color>
<background_color>
- <color name="Primary Blue" red="0" green="148" blue="202">
+ <color name="PRIMARY" red="0" green="148" blue="202">
</color>
</background_color>
<transparent>false</transparent>
<vertical_alignment>1</vertical_alignment>
<wrap_words>false</wrap_words>
</widget>
+ <widget type="embedded" version="2.0.0">
+ <name>ServiceBar</name>
+ <file>$(WIDGET_ROOT)/COMMON/service_bar.bob</file>
+ <x>600</x>
+ <width>406</width>
+ <height>80</height>
+ <resize>2</resize>
+ <transparent>true</transparent>
+ </widget>
<widget type="action_button" version="3.0.0">
<name>Open VGC Trends Action</name>
<actions>
@@ -51,14 +61,9 @@ VGC Trends</text>
<width>150</width>
<height>60</height>
<font>
- <font name="GROUP-HEADER" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
+ <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
</font>
</font>
- <foreground_color>
- <color name="BLACK-TEXT" red="255" green="255" blue="255">
- </color>
- </foreground_color>
- <transparent>true</transparent>
<tooltip>$(actions)</tooltip>
</widget>
<widget type="action_button" version="3.0.0">
@@ -77,14 +82,9 @@ Diagnostics</text>
<width>150</width>
<height>60</height>
<font>
- <font name="GROUP-HEADER" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
+ <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
</font>
</font>
- <foreground_color>
- <color name="BLACK-TEXT" red="255" green="255" blue="255">
- </color>
- </foreground_color>
- <transparent>true</transparent>
<tooltip>$(actions)</tooltip>
</widget>
<widget type="action_button" version="3.0.0">
@@ -103,16 +103,21 @@ Legend</text>
<width>150</width>
<height>60</height>
<font>
- <font name="GROUP-HEADER" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
+ <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
</font>
</font>
- <foreground_color>
- <color name="BLACK-TEXT" red="255" green="255" blue="255">
- </color>
- </foreground_color>
- <transparent>true</transparent>
<tooltip>$(actions)</tooltip>
</widget>
+ <widget type="embedded" version="2.0.0">
+ <name>Open Service Action</name>
+ <file>$(WIDGET_ROOT)/COMMON/service_button.bob</file>
+ <x>1900</x>
+ <y>7</y>
+ <width>156</width>
+ <height>66</height>
+ <resize>2</resize>
+ <transparent>true</transparent>
+ </widget>
<widget type="polyline" version="2.0.0">
<name>Pipe Main</name>
<y>350</y>
diff --git a/NON-APPROVED/target-systems/RGTCS/.gitkeep b/NON-APPROVED/target-systems/RGTCS/.gitkeep
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391