Skip to content
Snippets Groups Projects
Commit 24296e67 authored by Benjamin Bolling's avatar Benjamin Bolling
Browse files

FC engineering screen layout rearranged

parent bbeadf9c
No related branches found
No related tags found
2 merge requests!5Major update on PBI OPIs,!4Merge of 6+ months of changes to upstream
Expand all Hide whitespace changes
Inline Side-by-side
10-Top/bcmioc/top.bob
+ 2
− 2
View file @ 24296e67
......@@ -53,7 +53,7 @@
<wrap_words use_class="true">false</wrap_words>
</widget>
<widget type="action_button" version="3.0.0">
<name>Operator</name>
<name>Operator_1</name>
<actions>
<action type="open_display">
<file>../../../../../30-Operator/10-ACC/99-PBI/10-Top/BCM.bob</file>
......@@ -68,7 +68,7 @@
<tooltip>$(actions)</tooltip>
</widget>
<widget type="action_button" version="3.0.0">
<name>MachineExpert</name>
<name>MachineExpert_1</name>
<actions>
<action type="open_display">
<file>../../../../../20-SystemExpert/10-ACC/99-PBI/10-Top/BCM.bob</file>
......
10-Top/fcioc/instance.bob
+ 94
− 141
View file @ 24296e67
<?xml version="1.0" encoding="UTF-8"?>
<display version="2.0.0">
<width>320</width>
<height>380</height>
<background_color>
<color red="240" green="240" blue="240">
<color name="Transparent" red="255" green="255" blue="255" alpha="0">
</color>
</background_color>
<actions>
</actions>
<widget type="action_button" version="3.0.0">
<name>Menu Button_3</name>
<actions>
<action type="open_display">
<file>../../99-Shared/adsis8300/system.opi</file>
<macros>
<P>$(CONTROL_GROUP):$(AMC_NAME):</P>
<R></R>
</macros>
<target>tab</target>
</action>
</actions>
<text>CG OPI</text>
<x>324</x>
<y>135</y>
<width>67</width>
<height>20</height>
<foreground_color>
<color name="IO TextButton" red="0" green="0" blue="0">
</color>
</foreground_color>
<widget type="rectangle" version="2.0.0">
<name>BGGrey03-titlebar_3</name>
<width>320</width>
<height>380</height>
<line_width>0</line_width>
<background_color>
<color name="IO Button" red="178" green="178" blue="178">
<color name="GROUP-BORDER" red="150" green="155" blue="151">
</color>
</background_color>
<tooltip>$(actions)</tooltip>
<corner_width>10</corner_width>
<corner_height>10</corner_height>
</widget>
<widget type="label" version="2.0.0">
<name>Label_1</name>
<text>$(CONTROL_GROUP)</text>
<x>25</x>
<y>133</y>
<width>133</width>
<height>23</height>
<font>
<font name="Header 3" family="Liberation Sans" style="BOLD" size="16.0">
</font>
</font>
<horizontal_alignment>1</horizontal_alignment>
<wrap_words>false</wrap_words>
<actions>
</actions>
<border_width>1</border_width>
<border_color>
<color name="IO Area Background" red="221" green="223" blue="229">
<widget type="rectangle" version="2.0.0">
<name>BGGrey03-background_9</name>
<x>20</x>
<y>50</y>
<width>280</width>
<height>70</height>
<line_width>0</line_width>
<background_color>
<color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
</color>
</border_color>
</background_color>
<corner_width>5</corner_width>
<corner_height>5</corner_height>
</widget>
<widget type="label" version="2.0.0">
<name>Label_2</name>
<text>$(AMC_NAME)</text>
<x>175</x>
<y>133</y>
<width>133</width>
<height>23</height>
<name>BGGrey02-title_18</name>
<text>$(CONTROL_GROUP)$(AMC_NAME)</text>
<width>320</width>
<height>50</height>
<font>
<font name="Header 3" family="Liberation Sans" style="BOLD" size="16.0">
<font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
</font>
</font>
<foreground_color>
<color name="WHITE" red="255" green="255" blue="255">
</color>
</foreground_color>
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
<wrap_words>false</wrap_words>
<actions>
</actions>
<border_width>1</border_width>
<border_color>
<color name="IO Area Background" red="221" green="223" blue="229">
</color>
</border_color>
</widget>
<widget type="action_button" version="3.0.0">
<name>Menu Button_1</name>
<name>Menu Button_3</name>
<actions>
<action type="open_display">
<file>../../99-Shared/adsis8300fc/fc.opi</file>
<file>../../99-Shared/adsis8300/system_top.bob</file>
<macros>
<CG>$(CONTROL_GROUP):$(AMC_NAME):</CG>
<P>$(SYSTEM1)</P>
<R></R>
<Name>FC</Name>
<P>$(CONTROL_GROUP):</P>
<R>$(AMC_NAME):</R>
</macros>
<target>tab</target>
</action>
</actions>
<text>$(SYSTEM1)</text>
<x>396</x>
<y>135</y>
<width>187</width>
<height>20</height>
<foreground_color>
<color name="IO TextButton" red="0" green="0" blue="0">
</color>
</foreground_color>
<text>CG OPI</text>
<x>40</x>
<y>70</y>
<width>240</width>
<tooltip>$(actions)</tooltip>
</widget>
<widget type="rectangle" version="2.0.0">
<name>BGGrey03-background_10</name>
<x>20</x>
<y>140</y>
<width>280</width>
<height>220</height>
<line_width>0</line_width>
<background_color>
<color name="IO Button" red="178" green="178" blue="178">
<color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
</color>
</background_color>
<tooltip>$(actions)</tooltip>
<corner_width>5</corner_width>
<corner_height>5</corner_height>
</widget>
<widget type="action_button" version="3.0.0">
<name>Menu Button_2</name>
<name>Menu Button_10</name>
<actions>
<action type="open_display">
<file>../../99-Shared/adsis8300fc/fc.opi</file>
<file>$(FCscreen)</file>
<macros>
<P>$(SYSTEM2)</P>
<R></R>
<AMC>$(AMC_NAME)</AMC>
<CG>$(CONTROL_GROUP)</CG>
<P>$(P1)</P>
<R>$(R1)</R>
</macros>
<target>tab</target>
</action>
</actions>
<text>$(SYSTEM2)</text>
<x>396</x>
<y>155</y>
<width>187</width>
<height>20</height>
<foreground_color>
<color name="IO TextButton" red="0" green="0" blue="0">
</color>
</foreground_color>
<background_color>
<color name="IO Button" red="178" green="178" blue="178">
</color>
</background_color>
<text>$(P1)$(R1)</text>
<x>40</x>
<y>160</y>
<width>240</width>
<tooltip>$(actions)</tooltip>
</widget>
<widget type="action_button" version="3.0.0">
<name>Menu Button_3</name>
<name>Menu Button_11</name>
<actions>
<action type="open_display">
<file>../../99-Shared/adsis8300fc/fc.opi</file>
<file>$(FCscreen)</file>
<macros>
<P>$(SYSTEM3)</P>
<R></R>
<AMC>$(AMC_NAME)</AMC>
<CG>$(CONTROL_GROUP)</CG>
<P>$(P2)</P>
<R>$(R2)</R>
</macros>
<target>tab</target>
</action>
</actions>
<text>$(SYSTEM3)</text>
<x>396</x>
<y>175</y>
<width>187</width>
<height>20</height>
<foreground_color>
<color name="IO TextButton" red="0" green="0" blue="0">
</color>
</foreground_color>
<background_color>
<color name="IO Button" red="178" green="178" blue="178">
</color>
</background_color>
<text>$(P2)$(R2)</text>
<x>40</x>
<y>210</y>
<width>240</width>
<tooltip>$(actions)</tooltip>
</widget>
<widget type="action_button" version="3.0.0">
<name>Menu Button_4</name>
<name>Menu Button_12</name>
<actions>
<action type="open_display">
<file>../../99-Shared/adsis8300fc/fc.opi</file>
<file>$(FCscreen)</file>
<macros>
<P>$(SYSTEM4)</P>
<R></R>
<AMC>$(AMC_NAME)</AMC>
<CG>$(CONTROL_GROUP)</CG>
<P>$(P3)</P>
<R>$(R3)</R>
</macros>
<target>tab</target>
</action>
</actions>
<text>$(SYSTEM4)</text>
<x>396</x>
<y>195</y>
<width>187</width>
<height>20</height>
<foreground_color>
<color name="IO TextButton" red="0" green="0" blue="0">
</color>
</foreground_color>
<background_color>
<color name="IO Button" red="178" green="178" blue="178">
</color>
</background_color>
<text>$(P3)$(R3)</text>
<x>40</x>
<y>260</y>
<width>240</width>
<tooltip>$(actions)</tooltip>
</widget>
<widget type="action_button" version="3.0.0">
<name>Menu Button_5</name>
<name>Menu Button_13</name>
<actions>
<action type="open_display">
<file>../../99-Shared/adsis8300fc/fc.opi</file>
<file>$(FCscreen)</file>
<macros>
<P>$(SYSTEM5)</P>
<R></R>
<AMC>$(AMC_NAME)</AMC>
<CG>$(CONTROL_GROUP)</CG>
<P>$(P4)</P>
<R>$(R4)</R>
</macros>
<target>tab</target>
</action>
</actions>
<text>$(SYSTEM5)</text>
<x>396</x>
<y>215</y>
<width>187</width>
<height>20</height>
<foreground_color>
<color name="IO TextButton" red="0" green="0" blue="0">
</color>
</foreground_color>
<background_color>
<color name="IO Button" red="178" green="178" blue="178">
</color>
</background_color>
<text>$(P4)$(R4)</text>
<x>40</x>
<y>310</y>
<width>240</width>
<tooltip>$(actions)</tooltip>
</widget>
</display>
10-Top/fcioc/top.bob
+ 82
− 97
View file @ 24296e67
......@@ -2,31 +2,31 @@
<display version="2.0.0">
<name>$(TITLE)</name>
<macros>
<FCscreen>../../99-Shared/adsis8300fc/channel.bob</FCscreen>
<TITLE>FC IOCs</TITLE>
</macros>
<width>600</width>
<background_color>
<color red="240" green="240" blue="240">
</color>
</background_color>
<height>470</height>
<actions>
</actions>
<widget type="embedded" version="2.0.0">
<name>Linking Container</name>
<file>instance.opi</file>
<macros>
<AMC_NAME>Ctrl-AMC-003</AMC_NAME>
<CONTROL_GROUP>LAB-FC05</CONTROL_GROUP>
<SYSTEM1>LAB-010:PBI-FC-001:</SYSTEM1>
<SYSTEM2>LAB-010:PBI-FC-002:</SYSTEM2>
<SYSTEM3>LAB-010:PBI-FC-003:</SYSTEM3>
<SYSTEM4>LAB-010:PBI-FC-004:</SYSTEM4>
<SYSTEM5>LAB-010:PBI-FC-005:</SYSTEM5>
<P1>LEBT-010:</P1>
<P2>MEBT-010:</P2>
<P3>DTL-020:</P3>
<P4>DTL-040:</P4>
<R1>PBI-FC-001:</R1>
<R2>PBI-FC-001:</R2>
<R3>PBI-FC-001:</R3>
<R4>PBI-FC-001:</R4>
</macros>
<x>18</x>
<y>114</y>
<width>560</width>
<height>104</height>
<file>instance.bob</file>
<x>240</x>
<y>70</y>
<width>320</width>
<height>380</height>
<resize>2</resize>
<actions>
</actions>
......@@ -35,89 +35,74 @@
</color>
</border_color>
</widget>
<widget type="label" version="2.0.0">
<name>Label_1</name>
<text>$(TITLE)</text>
<x>9</x>
<y>15</y>
<width>577</width>
<widget type="group" version="2.0.0">
<name>Titlebar_1</name>
<width>800</width>
<height>50</height>
<font>
<font name="Header 1" family="Liberation Sans" style="BOLD" size="22.0">
<style>3</style>
<transparent>true</transparent>
<widget type="rectangle" version="2.0.0">
<name>titleBar_1</name>
<class>TITLE-BAR</class>
<x use_class="true">0</x>
<y use_class="true">0</y>
<width>800</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_1</name>
<class>TITLE</class>
<text>FC : Engineering Screen (IOC)</text>
<x use_class="true">20</x>
<y use_class="true">0</y>
<width>770</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>
</font>
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
<wrap_words>false</wrap_words>
<actions>
</actions>
<border_width>3</border_width>
<border_color>
<color red="0" green="128" blue="255">
</color>
</border_color>
</widget>
<widget type="label" version="2.0.0">
<name>Label_3</name>
<text>CONTROL GROUP</text>
<x>19</x>
<y>79</y>
<width>133</width>
<height>23</height>
<font>
<font name="Header 3" family="Liberation Sans" style="BOLD" size="16.0">
</font>
</font>
<horizontal_alignment>1</horizontal_alignment>
<wrap_words>false</wrap_words>
<actions>
</actions>
<border_width>1</border_width>
<border_color>
<color name="IO Border" red="0" green="0" blue="0">
</color>
</border_color>
</widget>
<widget type="label" version="2.0.0">
<name>Label_4</name>
<text>AMC NAME</text>
<x>169</x>
<y>79</y>
<width>131</width>
<height>23</height>
<font>
<font name="Header 3" family="Liberation Sans" style="BOLD" size="16.0">
</font>
</font>
<horizontal_alignment>1</horizontal_alignment>
<wrap_words>false</wrap_words>
<actions>
</actions>
<border_width>1</border_width>
<border_color>
<color name="IO Border" red="0" green="0" blue="0">
</color>
</border_color>
</widget>
<widget type="label" version="2.0.0">
<name>Label_5</name>
<text>OPI</text>
<x>319</x>
<y>79</y>
<width>258</width>
<height>23</height>
<font>
<font name="Header 3" family="Liberation Sans" style="BOLD" size="16.0">
</font>
</font>
<horizontal_alignment>1</horizontal_alignment>
<wrap_words>false</wrap_words>
<actions>
</actions>
<border_width>1</border_width>
<border_color>
<color name="IO Border" red="0" green="0" blue="0">
</color>
</border_color>
<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="action_button" version="3.0.0">
<name>Operator_4</name>
<actions>
<action type="open_display">
<file>../../../../../30-Operator/10-ACC/99-PBI/10-Top/FC.bob</file>
<target>replace</target>
<description>Open Display</description>
</action>
</actions>
<text>Operator</text>
<x>530</x>
<y>10</y>
<width>120</width>
<tooltip>$(actions)</tooltip>
</widget>
<widget type="action_button" version="3.0.0">
<name>MachineExpert_2</name>
<actions>
<action type="open_display">
<file>../../../../../20-SystemExpert/10-ACC/99-PBI/10-Top/FC.bob</file>
<target>replace</target>
</action>
</actions>
<text>Machine Expert</text>
<x>660</x>
<y>10</y>
<width>120</width>
<tooltip>$(actions)</tooltip>
</widget>
</widget>
</display>
99-Shared/adsis8300/system_top.bob
+ 16
− 2
View file @ 24296e67
......@@ -2,7 +2,7 @@
<display version="2.0.0">
<name>$(P)$(R) System</name>
<width>1470</width>
<height>930</height>
<height>1130</height>
<actions>
</actions>
<widget type="rectangle" version="2.0.0">
......@@ -21,7 +21,7 @@
<widget type="label" version="2.0.0">
<name>title</name>
<class>TITLE</class>
<text>BCM IOC : $(P) System</text>
<text>$(Name) IOC : $(P) System</text>
<x use_class="true">20</x>
<y use_class="true">0</y>
<width>1430</width>
......@@ -48,4 +48,18 @@
<height>1040</height>
<resize>2</resize>
</widget>
<widget type="action_button" version="3.0.0">
<name>MachineExpert_3</name>
<actions>
<action type="open_display">
<file>../../10-Top/fcioc/top.bob</file>
<target>replace</target>
</action>
</actions>
<text>Overview</text>
<x>1330</x>
<y>10</y>
<width>120</width>
<tooltip>$(actions)</tooltip>
</widget>
</display>
99-Shared/adsis8300fc/channel.bob
+ 1069
− 1195
View file @ 24296e67
This diff is collapsed.
99-Shared/adsis8300fc/fc.bob deleted 100644 → 0
+ 0
− 765
View file @ bbeadf9c
This diff is collapsed.
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