diff --git a/10-Top/bcmioc/instance.bob b/10-Top/bcmioc/instance.bob
index 571c07c24c61dd305aadd74941b0fda10f108cad..ed83002bc466bea9a144ddb306704d7c4899254b 100644
--- a/10-Top/bcmioc/instance.bob
+++ b/10-Top/bcmioc/instance.bob
@@ -1,49 +1,73 @@
<?xml version="1.0" encoding="UTF-8"?>
<display version="2.0.0">
- <width>300</width>
- <height>261</height>
+ <width>320</width>
+ <height>640</height>
<background_color>
<color name="Transparent" red="255" green="255" blue="255" alpha="0">
</color>
</background_color>
<actions>
</actions>
+ <widget type="rectangle" version="2.0.0">
+ <name>BGGrey03-titlebar_3</name>
+ <width>320</width>
+ <height>640</height>
+ <line_width>0</line_width>
+ <background_color>
+ <color name="GROUP-BORDER" red="150" green="155" blue="151">
+ </color>
+ </background_color>
+ <corner_width>10</corner_width>
+ <corner_height>10</corner_height>
+ </widget>
+ <widget type="rectangle" version="2.0.0">
+ <name>BGGrey03-background_9</name>
+ <x>20</x>
+ <y>50</y>
+ <width>280</width>
+ <height>570</height>
+ <line_width>0</line_width>
+ <background_color>
+ <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+ </color>
+ </background_color>
+ <corner_width>5</corner_width>
+ <corner_height>5</corner_height>
+ </widget>
<widget type="label" version="2.0.0">
- <name>Label</name>
+ <name>BGGrey02-title_18</name>
<text>$(CONTROL_GROUP):$(AMC_NAME)</text>
- <width>300</width>
- <height>261</height>
+ <width>320</width>
+ <height>50</height>
<font>
- <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.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 red="0" green="128" blue="255">
- </color>
- </border_color>
</widget>
<widget type="action_button" version="3.0.0">
- <name>Menu Button_1</name>
+ <name>Menu Button_11</name>
<actions>
<action type="open_display">
- <file>../../99-Shared/adsis8300bcm/bcm.bob</file>
+ <file>../../99-Shared/adsis8300bcm/bcm_instance.opi</file>
<macros>
- <P>$(CONTROL_GROUP):$(AMC_NAME):</P>
+ <CG>$(CONTROL_GROUP):$(AMC_NAME):</CG>
+ <P>$(SYSTEM10):</P>
<R></R>
</macros>
<target>tab</target>
</action>
</actions>
- <text>$(CONTROL_GROUP):$(AMC_NAME)</text>
- <x>50</x>
- <y>30</y>
- <width>187</width>
- <height>20</height>
+ <text>$(SYSTEM10)</text>
+ <x>40</x>
+ <y>570</y>
+ <width>240</width>
<foreground_color>
<color name="IO TextButton" red="0" green="0" blue="0">
</color>
@@ -55,23 +79,22 @@
<tooltip>$(actions)</tooltip>
</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/adsis8300bcm/bcm_instance.opi</file>
<macros>
<CG>$(CONTROL_GROUP):$(AMC_NAME):</CG>
- <P>$(SYSTEM1):</P>
+ <P>$(SYSTEM9):</P>
<R></R>
</macros>
<target>tab</target>
</action>
</actions>
- <text>$(SYSTEM1)</text>
- <x>50</x>
- <y>54</y>
- <width>187</width>
- <height>20</height>
+ <text>$(SYSTEM9)</text>
+ <x>40</x>
+ <y>520</y>
+ <width>240</width>
<foreground_color>
<color name="IO TextButton" red="0" green="0" blue="0">
</color>
@@ -83,23 +106,22 @@
<tooltip>$(actions)</tooltip>
</widget>
<widget type="action_button" version="3.0.0">
- <name>Menu Button_3</name>
+ <name>Menu Button_9</name>
<actions>
<action type="open_display">
<file>../../99-Shared/adsis8300bcm/bcm_instance.opi</file>
<macros>
<CG>$(CONTROL_GROUP):$(AMC_NAME):</CG>
- <P>$(SYSTEM2):</P>
+ <P>$(SYSTEM8):</P>
<R></R>
</macros>
<target>tab</target>
</action>
</actions>
- <text>$(SYSTEM2)</text>
- <x>50</x>
- <y>74</y>
- <width>187</width>
- <height>20</height>
+ <text>$(SYSTEM8)</text>
+ <x>40</x>
+ <y>470</y>
+ <width>240</width>
<foreground_color>
<color name="IO TextButton" red="0" green="0" blue="0">
</color>
@@ -111,23 +133,22 @@
<tooltip>$(actions)</tooltip>
</widget>
<widget type="action_button" version="3.0.0">
- <name>Menu Button_4</name>
+ <name>Menu Button_8</name>
<actions>
<action type="open_display">
<file>../../99-Shared/adsis8300bcm/bcm_instance.opi</file>
<macros>
<CG>$(CONTROL_GROUP):$(AMC_NAME):</CG>
- <P>$(SYSTEM3):</P>
+ <P>$(SYSTEM7):</P>
<R></R>
</macros>
<target>tab</target>
</action>
</actions>
- <text>$(SYSTEM3)</text>
- <x>50</x>
- <y>93</y>
- <width>187</width>
- <height>20</height>
+ <text>$(SYSTEM7)</text>
+ <x>40</x>
+ <y>420</y>
+ <width>240</width>
<foreground_color>
<color name="IO TextButton" red="0" green="0" blue="0">
</color>
@@ -139,23 +160,22 @@
<tooltip>$(actions)</tooltip>
</widget>
<widget type="action_button" version="3.0.0">
- <name>Menu Button_5</name>
+ <name>Menu Button_7</name>
<actions>
<action type="open_display">
<file>../../99-Shared/adsis8300bcm/bcm_instance.opi</file>
<macros>
<CG>$(CONTROL_GROUP):$(AMC_NAME):</CG>
- <P>$(SYSTEM4):</P>
+ <P>$(SYSTEM6):</P>
<R></R>
</macros>
<target>tab</target>
</action>
</actions>
- <text>$(SYSTEM4)</text>
- <x>50</x>
- <y>112</y>
- <width>187</width>
- <height>20</height>
+ <text>$(SYSTEM6)</text>
+ <x>40</x>
+ <y>370</y>
+ <width>240</width>
<foreground_color>
<color name="IO TextButton" red="0" green="0" blue="0">
</color>
@@ -180,10 +200,9 @@
</action>
</actions>
<text>$(SYSTEM5)</text>
- <x>50</x>
- <y>131</y>
- <width>187</width>
- <height>20</height>
+ <x>40</x>
+ <y>320</y>
+ <width>240</width>
<foreground_color>
<color name="IO TextButton" red="0" green="0" blue="0">
</color>
@@ -195,23 +214,22 @@
<tooltip>$(actions)</tooltip>
</widget>
<widget type="action_button" version="3.0.0">
- <name>Menu Button_7</name>
+ <name>Menu Button_5</name>
<actions>
<action type="open_display">
<file>../../99-Shared/adsis8300bcm/bcm_instance.opi</file>
<macros>
<CG>$(CONTROL_GROUP):$(AMC_NAME):</CG>
- <P>$(SYSTEM6):</P>
+ <P>$(SYSTEM4):</P>
<R></R>
</macros>
<target>tab</target>
</action>
</actions>
- <text>$(SYSTEM6)</text>
- <x>50</x>
- <y>150</y>
- <width>187</width>
- <height>20</height>
+ <text>$(SYSTEM4)</text>
+ <x>40</x>
+ <y>270</y>
+ <width>240</width>
<foreground_color>
<color name="IO TextButton" red="0" green="0" blue="0">
</color>
@@ -223,23 +241,22 @@
<tooltip>$(actions)</tooltip>
</widget>
<widget type="action_button" version="3.0.0">
- <name>Menu Button_8</name>
+ <name>Menu Button_4</name>
<actions>
<action type="open_display">
<file>../../99-Shared/adsis8300bcm/bcm_instance.opi</file>
<macros>
<CG>$(CONTROL_GROUP):$(AMC_NAME):</CG>
- <P>$(SYSTEM7):</P>
+ <P>$(SYSTEM3):</P>
<R></R>
</macros>
<target>tab</target>
</action>
</actions>
- <text>$(SYSTEM7)</text>
- <x>50</x>
- <y>169</y>
- <width>187</width>
- <height>20</height>
+ <text>$(SYSTEM3)</text>
+ <x>40</x>
+ <y>220</y>
+ <width>240</width>
<foreground_color>
<color name="IO TextButton" red="0" green="0" blue="0">
</color>
@@ -251,23 +268,22 @@
<tooltip>$(actions)</tooltip>
</widget>
<widget type="action_button" version="3.0.0">
- <name>Menu Button_9</name>
+ <name>Menu Button_3</name>
<actions>
<action type="open_display">
<file>../../99-Shared/adsis8300bcm/bcm_instance.opi</file>
<macros>
<CG>$(CONTROL_GROUP):$(AMC_NAME):</CG>
- <P>$(SYSTEM8):</P>
+ <P>$(SYSTEM2):</P>
<R></R>
</macros>
<target>tab</target>
</action>
</actions>
- <text>$(SYSTEM8)</text>
- <x>50</x>
- <y>188</y>
- <width>187</width>
- <height>20</height>
+ <text>$(SYSTEM2)</text>
+ <x>40</x>
+ <y>170</y>
+ <width>240</width>
<foreground_color>
<color name="IO TextButton" red="0" green="0" blue="0">
</color>
@@ -279,23 +295,22 @@
<tooltip>$(actions)</tooltip>
</widget>
<widget type="action_button" version="3.0.0">
- <name>Menu Button_10</name>
+ <name>Menu Button_2</name>
<actions>
<action type="open_display">
<file>../../99-Shared/adsis8300bcm/bcm_instance.opi</file>
<macros>
<CG>$(CONTROL_GROUP):$(AMC_NAME):</CG>
- <P>$(SYSTEM9):</P>
+ <P>$(SYSTEM1):</P>
<R></R>
</macros>
<target>tab</target>
</action>
</actions>
- <text>$(SYSTEM9)</text>
- <x>50</x>
- <y>207</y>
- <width>187</width>
- <height>20</height>
+ <text>$(SYSTEM1)</text>
+ <x>40</x>
+ <y>120</y>
+ <width>240</width>
<foreground_color>
<color name="IO TextButton" red="0" green="0" blue="0">
</color>
@@ -307,23 +322,21 @@
<tooltip>$(actions)</tooltip>
</widget>
<widget type="action_button" version="3.0.0">
- <name>Menu Button_11</name>
+ <name>Menu Button_1</name>
<actions>
<action type="open_display">
- <file>../../99-Shared/adsis8300bcm/bcm_instance.opi</file>
+ <file>../../99-Shared/adsis8300bcm/bcm.bob</file>
<macros>
- <CG>$(CONTROL_GROUP):$(AMC_NAME):</CG>
- <P>$(SYSTEM10):</P>
+ <P>$(CONTROL_GROUP):$(AMC_NAME):</P>
<R></R>
</macros>
<target>tab</target>
</action>
</actions>
- <text>$(SYSTEM10)</text>
- <x>50</x>
- <y>226</y>
- <width>187</width>
- <height>20</height>
+ <text>$(CONTROL_GROUP):$(AMC_NAME)</text>
+ <x>40</x>
+ <y>70</y>
+ <width>240</width>
<foreground_color>
<color name="IO TextButton" red="0" green="0" blue="0">
</color>
diff --git a/10-Top/bcmioc/top.bob b/10-Top/bcmioc/top.bob
index 85b46f77998bfb86cd0793811f563b539fa4e0ca..837df441de2543a59439872db450a08b94dc0210 100644
--- a/10-Top/bcmioc/top.bob
+++ b/10-Top/bcmioc/top.bob
@@ -4,15 +4,87 @@
<macros>
<TITLE>BCM IOC</TITLE>
</macros>
- <width>900</width>
+ <width>1070</width>
+ <height>730</height>
<background_color>
- <color red="240" green="240" blue="240">
+ <color name="BACKGROUND" red="220" green="225" blue="221">
</color>
</background_color>
<actions>
</actions>
+ <widget type="group" version="2.0.0">
+ <name>Titlebar</name>
+ <width>1070</width>
+ <height>50</height>
+ <style>3</style>
+ <transparent>true</transparent>
+ <widget type="rectangle" version="2.0.0">
+ <name>titleBar</name>
+ <class>TITLE-BAR</class>
+ <x use_class="true">0</x>
+ <y use_class="true">0</y>
+ <width>1070</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>Beam Current Monitor : 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>
+ <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</name>
+ <actions>
+ <action type="open_display">
+ <file>../../../../../30-Operator/10-ACC/99-PBI/10-Top/BCM.bob</file>
+ <target>replace</target>
+ <description>Open Display</description>
+ </action>
+ </actions>
+ <text>Operator</text>
+ <x>800</x>
+ <y>10</y>
+ <width>120</width>
+ <tooltip>$(actions)</tooltip>
+ </widget>
+ <widget type="action_button" version="3.0.0">
+ <name>MachineExpert</name>
+ <actions>
+ <action type="open_display">
+ <file>../../../../../20-SystemExpert/10-ACC/99-PBI/10-Top/BCM.bob</file>
+ <target>replace</target>
+ </action>
+ </actions>
+ <text>Machine Expert</text>
+ <x>930</x>
+ <y>10</y>
+ <width>120</width>
+ <tooltip>$(actions)</tooltip>
+ </widget>
+ </widget>
<widget type="embedded" version="2.0.0">
<name>Linking Container</name>
+ <class></class>
<file>instance.opi</file>
<macros>
<AMC_NAME>Ctrl-AMC-005</AMC_NAME>
@@ -28,35 +100,12 @@
<SYSTEM8>LAB-008:PBI-BCM-008</SYSTEM8>
<SYSTEM9>LAB-008:PBI-BCM-009</SYSTEM9>
</macros>
- <x>12</x>
- <y>78</y>
- <width>300</width>
- <height>261</height>
- <resize>2</resize>
- <actions>
- </actions>
- <border_color>
- <color red="0" green="128" blue="255">
- </color>
- </border_color>
- </widget>
- <widget type="label" version="2.0.0">
- <name>Label_1</name>
- <text>$(TITLE)</text>
- <x>15</x>
- <y>15</y>
- <width>883</width>
- <height>50</height>
- <font>
- <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
- </font>
- </font>
- <horizontal_alignment>1</horizontal_alignment>
- <vertical_alignment>1</vertical_alignment>
- <wrap_words>false</wrap_words>
+ <x>20</x>
+ <y>70</y>
+ <width>320</width>
+ <height>640</height>
<actions>
</actions>
- <border_width>3</border_width>
<border_color>
<color red="0" green="128" blue="255">
</color>
@@ -64,6 +113,7 @@
</widget>
<widget type="embedded" version="2.0.0">
<name>Linking Container_1</name>
+ <class></class>
<file>instance.opi</file>
<macros>
<AMC_NAME>Ctrl-AMC-004</AMC_NAME>
@@ -79,11 +129,10 @@
<SYSTEM8>LAB-009:PBI-BCM-008</SYSTEM8>
<SYSTEM9>LAB-009:PBI-BCM-009</SYSTEM9>
</macros>
- <x>312</x>
- <y>78</y>
- <width>300</width>
- <height>261</height>
- <resize>2</resize>
+ <x>360</x>
+ <y>70</y>
+ <width>320</width>
+ <height>640</height>
<actions>
</actions>
<border_color>