Skip to content
Snippets Groups Projects
Commit a9a92417 authored by Benjamin Bertrand's avatar Benjamin Bertrand
Browse files

Merge branch 'ts2pss' into 'master' 

TS2 PSS Updates

See merge request ics-software/ess-opis!237
parents 2c5cf5e7 c03d2ef9
No related branches found
No related tags found
1 merge request!237TS2 PSS Updates
Pipeline #52612 failed
Stage: deploy
    Hide whitespace changes
    Inline Side-by-side
    NON-APPROVED/TS2/pss/PSS TS2 Layout.png
    + 0
    − 0
    View replaced file @ 2c5cf5e7 View file @ a9a92417
    NON-APPROVED/TS2/pss/PSS TS2 Layout.png

    9.88 KiB | W: | H:

    NON-APPROVED/TS2/pss/PSS TS2 Layout.png

    9.7 KiB | W: | H:

    NON-APPROVED/TS2/pss/PSS TS2 Layout.png
    NON-APPROVED/TS2/pss/PSS TS2 Layout.png
    NON-APPROVED/TS2/pss/PSS TS2 Layout.png
    NON-APPROVED/TS2/pss/PSS TS2 Layout.png
    • 2-up
    • Swipe
    • Onion skin
    NON-APPROVED/TS2/pss/TS2_PSS_Area.bob
    + 44
    − 27
    View file @ a9a92417
    ......@@ -79,7 +79,7 @@
    <height>84</height>
    <style>3</style>
    <widget type="led" version="2.0.0">
    <name>PermitIssued</name>
    <name>PermitLLRF</name>
    <pv_name>$(P):PermitLLRF</pv_name>
    <x>10</x>
    <y>29</y>
    ......@@ -152,6 +152,21 @@
    <width>970</width>
    <height>600</height>
    <style>3</style>
    <widget type="rectangle" version="2.0.0">
    <name>MAD</name>
    <x>833</x>
    <y>406</y>
    <width>50</width>
    <height>121</height>
    <line_color>
    <color name="GRAY-BORDER" red="121" green="121" blue="121">
    </color>
    </line_color>
    <background_color>
    <color name="GRAY" red="169" green="169" blue="169">
    </color>
    </background_color>
    </widget>
    <widget type="picture" version="2.0.0">
    <name>Area Layout</name>
    <file>PSS TS2 Layout.png</file>
    ......@@ -162,10 +177,10 @@
    </widget>
    <widget type="embedded" version="2.0.0">
    <name>O2iM-1</name>
    <file>embedded_displays/odh.bob</file>
    <macros>
    <IDX>1</IDX>
    </macros>
    <file>embedded_displays/odh.bob</file>
    <x>86</x>
    <y>11</y>
    <width>50</width>
    ......@@ -174,10 +189,10 @@
    </widget>
    <widget type="embedded" version="2.0.0">
    <name>O2iM-2</name>
    <file>embedded_displays/odh.bob</file>
    <macros>
    <IDX>2</IDX>
    </macros>
    <file>embedded_displays/odh.bob</file>
    <x>733</x>
    <y>11</y>
    <width>50</width>
    ......@@ -185,23 +200,25 @@
    <transparent>true</transparent>
    </widget>
    <widget type="embedded" version="2.0.0">
    <name>Radiation Monitor</name>
    <file>embedded_displays/rad.bob</file>
    <name>AGM-003</name>
    <macros>
    <AGM>003</AGM>
    <R_IDX>1</R_IDX>
    </macros>
    <x>34</x>
    <y>63</y>
    <file>embedded_displays/rad.bob</file>
    <x>833</x>
    <y>443</y>
    <width>50</width>
    <height>50</height>
    <transparent>true</transparent>
    </widget>
    <widget type="embedded" version="2.0.0">
    <name>Radiation Monitor</name>
    <file>embedded_displays/rad.bob</file>
    <name>AGM-002</name>
    <macros>
    <AGM>002</AGM>
    <R_IDX>2</R_IDX>
    </macros>
    <file>embedded_displays/rad.bob</file>
    <x>56</x>
    <y>276</y>
    <width>50</width>
    ......@@ -238,10 +255,10 @@
    </widget>
    <widget type="embedded" version="2.0.0">
    <name>PAD</name>
    <file>embedded_displays/door.bob</file>
    <macros>
    <DOOR_STAT>$(P):PADStat</DOOR_STAT>
    </macros>
    <file>embedded_displays/door.bob</file>
    <x>47</x>
    <y>467</y>
    <width>80</width>
    ......@@ -255,12 +272,12 @@
    <y>173</y>
    <width>52</width>
    <height>233</height>
    <off_label>Open</off_label>
    <off_label>MAD</off_label>
    <off_color>
    <color red="51" green="51" blue="51">
    </color>
    </off_color>
    <on_label>Closed</on_label>
    <on_label>MAD</on_label>
    <on_color>
    <color red="51" green="51" blue="51">
    </color>
    ......@@ -270,7 +287,7 @@
    </font>
    </font>
    <foreground_color>
    <color name="TEXT-LIGHT" red="230" green="230" blue="230">
    <color red="220" green="130" blue="10">
    </color>
    </foreground_color>
    <square>true</square>
    ......@@ -285,10 +302,10 @@
    </widget>
    <widget type="embedded" version="2.0.0">
    <name>ESOS$(ESOS_IDX)</name>
    <file>embedded_displays/esos.bob</file>
    <macros>
    <ESOS_IDX>1</ESOS_IDX>
    </macros>
    <file>embedded_displays/esos.bob</file>
    <x>783</x>
    <y>255</y>
    <width>50</width>
    ......@@ -298,10 +315,10 @@
    </widget>
    <widget type="embedded" version="2.0.0">
    <name>SEARCH$(SEARCH_IDX)</name>
    <file>embedded_displays/search.bob</file>
    <macros>
    <SEARCH_IDX>1</SEARCH_IDX>
    </macros>
    <file>embedded_displays/search.bob</file>
    <x>733</x>
    <y>255</y>
    <width>50</width>
    ......@@ -311,10 +328,10 @@
    </widget>
    <widget type="embedded" version="2.0.0">
    <name>ESOS$(ESOS_IDX)</name>
    <file>embedded_displays/esos.bob</file>
    <macros>
    <ESOS_IDX>2</ESOS_IDX>
    </macros>
    <file>embedded_displays/esos.bob</file>
    <x>521</x>
    <y>477</y>
    <width>50</width>
    ......@@ -324,10 +341,10 @@
    </widget>
    <widget type="embedded" version="2.0.0">
    <name>SEARCH$(SEARCH_IDX)</name>
    <file>embedded_displays/search.bob</file>
    <macros>
    <SEARCH_IDX>2</SEARCH_IDX>
    </macros>
    <file>embedded_displays/search.bob</file>
    <x>471</x>
    <y>477</y>
    <width>50</width>
    ......@@ -337,10 +354,10 @@
    </widget>
    <widget type="embedded" version="2.0.0">
    <name>ESOS$(ESOS_IDX)</name>
    <file>embedded_displays/esos.bob</file>
    <macros>
    <ESOS_IDX>3</ESOS_IDX>
    </macros>
    <file>embedded_displays/esos.bob</file>
    <x>348</x>
    <y>255</y>
    <width>50</width>
    ......@@ -350,10 +367,10 @@
    </widget>
    <widget type="embedded" version="2.0.0">
    <name>SEARCH$(SEARCH_IDX)</name>
    <file>embedded_displays/search.bob</file>
    <macros>
    <SEARCH_IDX>3</SEARCH_IDX>
    </macros>
    <file>embedded_displays/search.bob</file>
    <x>298</x>
    <y>255</y>
    <width>50</width>
    ......@@ -363,10 +380,10 @@
    </widget>
    <widget type="embedded" version="2.0.0">
    <name>ESOS$(ESOS_IDX)</name>
    <file>embedded_displays/esos.bob</file>
    <macros>
    <ESOS_IDX>4</ESOS_IDX>
    </macros>
    <file>embedded_displays/esos.bob</file>
    <x>186</x>
    <y>275</y>
    <width>50</width>
    ......@@ -376,10 +393,10 @@
    </widget>
    <widget type="embedded" version="2.0.0">
    <name>SEARCH$(SEARCH_IDX)</name>
    <file>embedded_displays/search.bob</file>
    <macros>
    <SEARCH_IDX>4</SEARCH_IDX>
    </macros>
    <file>embedded_displays/search.bob</file>
    <x>136</x>
    <y>275</y>
    <width>50</width>
    ......@@ -472,22 +489,22 @@
    <transparent>true</transparent>
    <widget type="embedded" version="2.0.0">
    <name>AccessMode</name>
    <file>embedded_displays/mode.bob</file>
    <macros>
    <MODE>Access Mode</MODE>
    <MODE_PV>AccessMode</MODE_PV>
    </macros>
    <file>embedded_displays/mode.bob</file>
    <width>160</width>
    <height>31</height>
    <transparent>true</transparent>
    </widget>
    <widget type="embedded" version="2.0.0">
    <name>SearchMode</name>
    <file>embedded_displays/mode.bob</file>
    <macros>
    <MODE>Search Mode</MODE>
    <MODE_PV>SearchMode</MODE_PV>
    </macros>
    <file>embedded_displays/mode.bob</file>
    <x>162</x>
    <width>160</width>
    <height>31</height>
    ......@@ -495,11 +512,11 @@
    </widget>
    <widget type="embedded" version="2.0.0">
    <name>TransitionMode</name>
    <file>embedded_displays/mode.bob</file>
    <macros>
    <MODE>Transition Mode</MODE>
    <MODE_PV>TransitionMode</MODE_PV>
    </macros>
    <file>embedded_displays/mode.bob</file>
    <x>324</x>
    <width>160</width>
    <height>31</height>
    ......@@ -507,11 +524,11 @@
    </widget>
    <widget type="embedded" version="2.0.0">
    <name>RFOnMode</name>
    <file>embedded_displays/mode.bob</file>
    <macros>
    <MODE>RF On Mode</MODE>
    <MODE_PV>RFOnMode</MODE_PV>
    </macros>
    <file>embedded_displays/mode.bob</file>
    <x>486</x>
    <width>160</width>
    <height>31</height>
    ......@@ -519,11 +536,11 @@
    </widget>
    <widget type="embedded" version="2.0.0">
    <name>RMITLckMode</name>
    <file>embedded_displays/alarm_mode.bob</file>
    <macros>
    <MODE>RM Interlock Mode</MODE>
    <MODE_PV>RMITLckMode</MODE_PV>
    </macros>
    <file>embedded_displays/alarm_mode.bob</file>
    <x>648</x>
    <width>160</width>
    <height>31</height>
    ......@@ -531,11 +548,11 @@
    </widget>
    <widget type="embedded" version="2.0.0">
    <name>Alarm Mode</name>
    <file>embedded_displays/alarm_mode.bob</file>
    <macros>
    <MODE>Alarm Mode</MODE>
    <MODE_PV>AlarmMode</MODE_PV>
    </macros>
    <file>embedded_displays/alarm_mode.bob</file>
    <x>810</x>
    <width>160</width>
    <height>31</height>
    ......
    NON-APPROVED/TS2/pss/embedded_displays/rad.bob
    + 23
    − 3
    View file @ a9a92417
    ......@@ -31,17 +31,37 @@
    </script>
    </scripts>
    </widget>
    <widget type="label" version="2.0.0">
    <name>Label shadow</name>
    <text>AGM-
    $(AGM)</text>
    <x>2</x>
    <y>2</y>
    <width>48</width>
    <height>48</height>
    <font>
    <font name="SMALL-SANS-BOLD" family="Source Sans Pro" style="BOLD" size="14.0">
    </font>
    </font>
    <foreground_color>
    <color name="TEXT-DARK" red="25" green="25" blue="25">
    </color>
    </foreground_color>
    <horizontal_alignment>1</horizontal_alignment>
    <vertical_alignment>1</vertical_alignment>
    </widget>
    <widget type="label" version="2.0.0">
    <name>Label</name>
    <text>RM$(R_IDX)</text>
    <text>AGM-
    $(AGM)</text>
    <width>50</width>
    <height>50</height>
    <font>
    <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
    <font name="SMALL-SANS-BOLD" family="Source Sans Pro" style="BOLD" size="14.0">
    </font>
    </font>
    <foreground_color>
    <color red="255" green="255" blue="255" alpha="200">
    <color red="245" green="245" blue="245">
    </color>
    </foreground_color>
    <horizontal_alignment>1</horizontal_alignment>
    ......
    NON-APPROVED/TS2/pss/symbols/PSS TS2 Layout.xcf
    + 0
    − 0
    View file @ a9a92417
    No preview for this file type
    0% or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment