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

Updated the BPM engineering level screens.

parent 0719d72e
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
Showing
with 4458 additions and 5573 deletions
10-Top/bpmioc/instance.bob
+ 64
− 53
View file @ faa8b6cd
<?xml version="1.0" encoding="UTF-8"?>
<display version="2.0.0">
<width>300</width>
<height>100</height>
<width>340</width>
<height>260</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="label" version="2.0.0">
<name>Label_1</name>
<text>$(CONTROL_GROUP):$(AMC_NAME)</text>
<widget type="rectangle" version="2.0.0">
<name>BGGrey03-titlebar_4</name>
<width>340</width>
<height>260</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_16</name>
<x>20</x>
<y>130</y>
<width>300</width>
<height>100</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">
<height>110</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="rectangle" version="2.0.0">
<name>BGGrey03-background_15</name>
<x>20</x>
<y>50</y>
<width>300</width>
<height>70</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="action_button" version="3.0.0">
<name>Menu Button_3</name>
......@@ -40,18 +61,9 @@
</action>
</actions>
<text>$(CONTROL_GROUP):$(AMC_NAME)</text>
<x>60</x>
<y>30</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>
<x>40</x>
<y>70</y>
<width>260</width>
<tooltip>$(actions)</tooltip>
</widget>
<widget type="action_button" version="3.0.0">
......@@ -68,18 +80,9 @@
</action>
</actions>
<text>$(SYSTEM1)</text>
<x>60</x>
<y>55</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>
<x>40</x>
<y>150</y>
<width>260</width>
<tooltip>$(actions)</tooltip>
</widget>
<widget type="action_button" version="3.0.0">
......@@ -95,18 +98,26 @@
</action>
</actions>
<text>$(SYSTEM2)</text>
<x>60</x>
<y>75</y>
<width>187</width>
<height>20</height>
<x>40</x>
<y>190</y>
<width>260</width>
<tooltip>$(actions)</tooltip>
</widget>
<widget type="label" version="2.0.0">
<name>BGGrey02-title_19</name>
<text>$(CONTROL_GROUP):$(AMC_NAME)</text>
<width>340</width>
<height>50</height>
<font>
<font family="Source Sans Pro" style="BOLD_ITALIC" size="28.0">
</font>
</font>
<foreground_color>
<color name="IO TextButton" red="0" green="0" blue="0">
<color name="WHITE" red="255" green="255" blue="255">
</color>
</foreground_color>
<background_color>
<color name="IO Button" red="178" green="178" blue="178">
</color>
</background_color>
<tooltip>$(actions)</tooltip>
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
<wrap_words>false</wrap_words>
</widget>
</display>
10-Top/bpmioc/top.bob
+ 129
− 29
View file @ faa8b6cd
......@@ -4,27 +4,78 @@
<macros>
<TITLE>BPM IOCs</TITLE>
</macros>
<width>595</width>
<height>183</height>
<background_color>
<color red="240" green="240" blue="240">
</color>
</background_color>
<width>1460</width>
<height>350</height>
<actions>
</actions>
<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>1460</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="embedded" version="2.0.0">
<name>Linking Container</name>
<name>Linking Container_1</name>
<file>instance.opi</file>
<macros>
<AMC_NAME>Ctrl-AMC-003</AMC_NAME>
<CONTROL_GROUP>LAB-BPM19</CONTROL_GROUP>
<SYSTEM1>LAB-019:PBI-BPM-001:</SYSTEM1>
<SYSTEM2>LAB-019:PBI-BPM-002:</SYSTEM2>
</macros>
<x>20</x>
<y>70</y>
<width>340</width>
<height>260</height>
<resize>2</resize>
<actions>
</actions>
<border_color>
<color red="0" green="128" blue="255">
</color>
</border_color>
</widget>
<widget type="embedded" version="2.0.0">
<name>Linking Container_2</name>
<file>instance.opi</file>
<macros>
<AMC_NAME>Ctrl-AMC-004</AMC_NAME>
<CONTROL_GROUP>LAB-BPM04</CONTROL_GROUP>
<SYSTEM1>LAB-004:PBI-BPM-001:</SYSTEM1>
<SYSTEM2>LAB-004:PBI-BPM-002:</SYSTEM2>
<CONTROL_GROUP>LAB-BPM19</CONTROL_GROUP>
<SYSTEM1>LAB-019:PBI-BPM-003:</SYSTEM1>
<SYSTEM2>LAB-019:PBI-BPM-004:</SYSTEM2>
</macros>
<x>380</x>
<y>70</y>
<width>340</width>
<height>260</height>
<resize>2</resize>
<actions>
</actions>
<border_color>
<color red="0" green="128" blue="255">
</color>
</border_color>
</widget>
<widget type="embedded" version="2.0.0">
<name>Linking Container_3</name>
<file>instance.opi</file>
<x>9</x>
<y>80</y>
<width>350</width>
<height>88</height>
<macros>
<AMC_NAME>Ctrl-AMC-005</AMC_NAME>
<CONTROL_GROUP>LAB-BPM19</CONTROL_GROUP>
<SYSTEM1>LAB-019:PBI-BPM-005:</SYSTEM1>
<SYSTEM2>LAB-019:PBI-BPM-006:</SYSTEM2>
</macros>
<x>740</x>
<y>70</y>
<width>340</width>
<height>260</height>
<resize>2</resize>
<actions>
</actions>
......@@ -33,26 +84,75 @@
</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>
<height>50</height>
<font>
<font name="Header 1" family="Liberation Sans" style="BOLD" size="22.0">
</font>
</font>
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
<wrap_words>false</wrap_words>
<widget type="embedded" version="2.0.0">
<name>Linking Container_4</name>
<file>instance.opi</file>
<macros>
<AMC_NAME>Ctrl-AMC-006</AMC_NAME>
<CONTROL_GROUP>LAB-BPM19</CONTROL_GROUP>
<SYSTEM1>LAB-019:PBI-BPM-007:</SYSTEM1>
<SYSTEM2>LAB-019:PBI-BPM-008:</SYSTEM2>
</macros>
<x>1100</x>
<y>70</y>
<width>340</width>
<height>260</height>
<resize>2</resize>
<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>title</name>
<class>TITLE</class>
<text>Beam Position and Phase Monitor : Engineering Screen (IOC)</text>
<x use_class="true">20</x>
<y use_class="true">0</y>
<width>1150</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/BPM.bob</file>
<target>replace</target>
<description>Open Display</description>
</action>
</actions>
<text>Operator</text>
<x>1190</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/BPM.bob</file>
<target>replace</target>
</action>
</actions>
<text>Machine Expert</text>
<x>1320</x>
<y>10</y>
<width>120</width>
<tooltip>$(actions)</tooltip>
</widget>
</display>
99-Shared/adsis8300bpm/aiChannel.bob
+ 609
− 951
View file @ faa8b6cd
This diff is collapsed.
99-Shared/adsis8300bpm/aiChannelItem.bob
+ 11
− 39
View file @ faa8b6cd
<?xml version="1.0" encoding="UTF-8"?>
<display version="2.0.0">
<width>420</width>
<height>20</height>
<width>470</width>
<height>30</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>
......@@ -12,10 +12,7 @@
<name>Text Update_75</name>
<pv_name>$(P)$(R)$(CH)Name</pv_name>
<width>230</width>
<font>
<font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
</font>
</font>
<height>30</height>
<background_color>
<color red="255" green="255" blue="255">
</color>
......@@ -34,9 +31,7 @@
<name>LED_1</name>
<pv_name>$(P)$(R)$(CH)ControlR</pv_name>
<x>240</x>
<y>2</y>
<width>16</width>
<height>16</height>
<y>5</y>
<off_color>
<color name="IO Background" red="235" green="235" blue="235">
</color>
......@@ -45,14 +40,6 @@
<color name="IO Normal Level Alarm" red="0" green="255" blue="0">
</color>
</on_color>
<foreground_color>
<color red="192" green="192" blue="192">
</color>
</foreground_color>
<line_color>
<color red="150" green="150" blue="150">
</color>
</line_color>
<actions>
</actions>
</widget>
......@@ -66,13 +53,8 @@
</actions>
<pv_name>$(P)$(R)$(CH)Control</pv_name>
<text>Enable</text>
<x>257</x>
<width>50</width>
<height>20</height>
<font>
<font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
</font>
</font>
<x>270</x>
<width>60</width>
<background_color>
<color red="240" green="240" blue="240">
</color>
......@@ -88,13 +70,8 @@
</actions>
<pv_name>$(P)$(R)$(CH)Control</pv_name>
<text>Disable</text>
<x>310</x>
<width>50</width>
<height>20</height>
<font>
<font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
</font>
</font>
<x>340</x>
<width>60</width>
<background_color>
<color red="240" green="240" blue="240">
</color>
......@@ -109,13 +86,8 @@
</action>
</actions>
<text>More..</text>
<x>370</x>
<width>50</width>
<height>20</height>
<font>
<font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
</font>
</font>
<x>410</x>
<width>60</width>
<background_color>
<color red="240" green="240" blue="240">
</color>
......
99-Shared/adsis8300bpm/bpm.bob
+ 929
− 1011
View file @ faa8b6cd
This diff is collapsed.
99-Shared/adsis8300bpm/bpmAngleDifference.bob
+ 60
− 26
View file @ faa8b6cd
<?xml version="1.0" encoding="UTF-8"?>
<display version="2.0.0">
<width>448</width>
<height>69</height>
<background_color>
<color red="240" green="240" blue="240">
</color>
</background_color>
<width>570</width>
<height>180</height>
<actions>
</actions>
<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>570</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>Label_276</name>
<name>title</name>
<class>TITLE</class>
<text>Angle difference</text>
<width>448</width>
<height>69</height>
<font>
<font name="Header 1" family="Liberation Sans" style="BOLD" size="22.0">
<x use_class="true">20</x>
<y use_class="true">0</y>
<width>530</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="rectangle" version="2.0.0">
<name>BGGrey03-titlebar_4</name>
<x>20</x>
<y>70</y>
<width>530</width>
<height>90</height>
<line_width>0</line_width>
<background_color>
<color name="IO Area Background" red="221" green="223" blue="229">
<color name="GROUP-BORDER" red="150" green="155" blue="151">
</color>
</background_color>
<transparent>false</transparent>
<horizontal_alignment>1</horizontal_alignment>
<wrap_words>false</wrap_words>
<actions>
</actions>
<border_width>2</border_width>
<border_color>
<color name="IO Border" red="0" green="0" blue="0">
<corner_width>10</corner_width>
<corner_height>10</corner_height>
</widget>
<widget type="rectangle" version="2.0.0">
<name>BGGrey03-background_10</name>
<x>40</x>
<y>90</y>
<width>490</width>
<height>50</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="embedded" version="2.0.0">
<name>Linking Container_18</name>
<file>bpmChannelAverageItem.opi</file>
<macros>
<CH>DIFF-A-</CH>
</macros>
<file>bpmChannelAverageItem.opi</file>
<x>18</x>
<y>42</y>
<width>420</width>
<height>20</height>
<x>50</x>
<y>100</y>
<width>470</width>
<height>30</height>
<resize>2</resize>
<actions>
</actions>
......
99-Shared/adsis8300bpm/bpmChannel.bob
+ 730
− 1093
View file @ faa8b6cd
This diff is collapsed.
99-Shared/adsis8300bpm/bpmChannelAverage.bob
+ 796
− 1166
View file @ faa8b6cd
This diff is collapsed.
99-Shared/adsis8300bpm/bpmChannelAverageItem.bob
+ 11
− 51
View file @ faa8b6cd
<?xml version="1.0" encoding="UTF-8"?>
<display version="2.0.0">
<width>420</width>
<height>20</height>
<width>470</width>
<height>30</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>
......@@ -12,10 +12,7 @@
<name>Text Update_75</name>
<pv_name>$(P)$(R)$(CH)Name</pv_name>
<width>230</width>
<font>
<font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
</font>
</font>
<height>30</height>
<background_color>
<color red="255" green="255" blue="255">
</color>
......@@ -34,9 +31,7 @@
<name>LED_1</name>
<pv_name>$(P)$(R)$(CH)Status</pv_name>
<x>240</x>
<y>2</y>
<width>16</width>
<height>16</height>
<y>5</y>
<off_color>
<color name="IO Background" red="235" green="235" blue="235">
</color>
......@@ -45,14 +40,6 @@
<color name="IO Normal Level Alarm" red="0" green="255" blue="0">
</color>
</on_color>
<foreground_color>
<color red="192" green="192" blue="192">
</color>
</foreground_color>
<line_color>
<color red="150" green="150" blue="150">
</color>
</line_color>
<actions>
</actions>
</widget>
......@@ -66,17 +53,8 @@
</actions>
<pv_name>$(P)$(R)$(CH)Control</pv_name>
<text>Enable</text>
<x>257</x>
<width>50</width>
<height>20</height>
<font>
<font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
</font>
</font>
<background_color>
<color red="240" green="240" blue="240">
</color>
</background_color>
<x>270</x>
<width>60</width>
</widget>
<widget type="action_button" version="3.0.0">
<name>Action Button_8</name>
......@@ -88,17 +66,8 @@
</actions>
<pv_name>$(P)$(R)$(CH)Control</pv_name>
<text>Disable</text>
<x>310</x>
<width>50</width>
<height>20</height>
<font>
<font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
</font>
</font>
<background_color>
<color red="240" green="240" blue="240">
</color>
</background_color>
<x>340</x>
<width>60</width>
</widget>
<widget type="action_button" version="3.0.0">
<name>Action Button_9</name>
......@@ -109,17 +78,8 @@
</action>
</actions>
<text>More..</text>
<x>370</x>
<width>50</width>
<height>20</height>
<font>
<font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
</font>
</font>
<background_color>
<color red="240" green="240" blue="240">
</color>
</background_color>
<x>410</x>
<width>60</width>
<tooltip>$(actions)</tooltip>
</widget>
</display>
99-Shared/adsis8300bpm/bpmChannelItem.bob
+ 11
− 39
View file @ faa8b6cd
This diff is collapsed.
99-Shared/adsis8300bpm/bpmFilter.bob
+ 169
− 138
View file @ faa8b6cd
This diff is collapsed.
99-Shared/adsis8300bpm/bpmInstance.bob
+ 697
− 821
View file @ faa8b6cd
This diff is collapsed.
99-Shared/adsis8300bpm/bpmInstanceOverview.bob
+ 131
− 42
View file @ faa8b6cd
This diff is collapsed.
99-Shared/adsis8300bpm/bpmReference.bob
+ 64
− 40
View file @ faa8b6cd
This diff is collapsed.
99-Shared/adsis8300bpm/instance.bob
+ 47
− 74
View file @ faa8b6cd
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