diff --git a/10-Top/bpmioc/instance.bob b/10-Top/bpmioc/instance.bob
index 81038a2d74ef26452265c708d649b43ed020b082..89fd4f6f5cdfea426b8512f6586b9953d9e2be17 100644
--- a/10-Top/bpmioc/instance.bob
+++ b/10-Top/bpmioc/instance.bob
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<display version="2.0.0">
+ <width>350</width>
+ <height>88</height>
<background_color>
<color red="240" green="240" blue="240">
</color>
@@ -18,10 +20,10 @@
<target>tab</target>
</action>
</actions>
- <text>CG OPI</text>
- <x>324</x>
- <y>135</y>
- <width>67</width>
+ <text>$(CONTROL_GROUP):$(AMC_NAME)</text>
+ <x>40</x>
+ <y>23</y>
+ <width>270</width>
<height>20</height>
<foreground_color>
<color name="IO TextButton" red="0" green="0" blue="0">
@@ -35,31 +37,8 @@
</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">
- </color>
- </border_color>
- </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>
+ <text>$(CONTROL_GROUP):$(AMC_NAME)</text>
+ <width>350</width>
<height>23</height>
<font>
<font name="Header 3" family="Liberation Sans" style="BOLD" size="16.0">
@@ -89,9 +68,9 @@
</action>
</actions>
<text>$(SYSTEM1)</text>
- <x>396</x>
- <y>135</y>
- <width>187</width>
+ <x>40</x>
+ <y>48</y>
+ <width>270</width>
<height>20</height>
<foreground_color>
<color name="IO TextButton" red="0" green="0" blue="0">
@@ -116,9 +95,9 @@
</action>
</actions>
<text>$(SYSTEM2)</text>
- <x>396</x>
- <y>155</y>
- <width>187</width>
+ <x>40</x>
+ <y>68</y>
+ <width>270</width>
<height>20</height>
<foreground_color>
<color name="IO TextButton" red="0" green="0" blue="0">
diff --git a/10-Top/bpmioc/top.bob b/10-Top/bpmioc/top.bob
index ab18719fb9086141f62180cdf923713df4487b8f..d60b6f5eababd1ae493fea7fcba12522b406259b 100644
--- a/10-Top/bpmioc/top.bob
+++ b/10-Top/bpmioc/top.bob
@@ -13,17 +13,17 @@
</actions>
<widget type="embedded" version="2.0.0">
<name>Linking Container</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>
</macros>
- <x>18</x>
- <y>114</y>
- <width>560</width>
- <height>44</height>
+ <file>instance.opi</file>
+ <x>9</x>
+ <y>80</y>
+ <width>350</width>
+ <height>88</height>
<resize>2</resize>
<actions>
</actions>
@@ -54,67 +54,4 @@
</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>
- </widget>
</display>
diff --git a/99-Shared/adsis8300/sis8300-evr.bob b/99-Shared/adsis8300/sis8300-evr.bob
index f5c212053f1e7125d88c9966cd3ba8f8ec0a4e11..db09844bc6ba24d3cdb0152d3f83b5bfef441b34 100644
--- a/99-Shared/adsis8300/sis8300-evr.bob
+++ b/99-Shared/adsis8300/sis8300-evr.bob
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<display version="2.0.0">
<name>$(P)$(R) System</name>
- <width>400</width>
- <height>200</height>
+ <width>699</width>
+ <height>171</height>
<background_color>
<color red="240" green="240" blue="240">
</color>
@@ -50,7 +50,7 @@
<pv_name>$(P)$(R)EvrTimestampIn.TSEL</pv_name>
<x>336</x>
<y>30</y>
- <width>259</width>
+ <width>354</width>
<background_color>
<color red="255" green="255" blue="255">
</color>
@@ -104,7 +104,7 @@
<pv_name>$(P)$(R)BeamModeEvr.DOL</pv_name>
<x>336</x>
<y>49</y>
- <width>259</width>
+ <width>354</width>
<background_color>
<color red="255" green="255" blue="255">
</color>
@@ -158,7 +158,7 @@
<pv_name>$(P)$(R)BeamDestEvr.DOL</pv_name>
<x>336</x>
<y>68</y>
- <width>259</width>
+ <width>354</width>
<background_color>
<color red="255" green="255" blue="255">
</color>
@@ -212,7 +212,7 @@
<pv_name>$(P)$(R)EvrBeamStateIn.INP</pv_name>
<x>336</x>
<y>87</y>
- <width>259</width>
+ <width>354</width>
<background_color>
<color red="255" green="255" blue="255">
</color>
@@ -266,7 +266,7 @@
<pv_name>$(P)$(R)EvrLinkIn.INP</pv_name>
<x>336</x>
<y>106</y>
- <width>259</width>
+ <width>354</width>
<background_color>
<color red="255" green="255" blue="255">
</color>
@@ -320,7 +320,7 @@
<pv_name>$(P)$(R)EvrLinkStatIn.INP</pv_name>
<x>336</x>
<y>125</y>
- <width>259</width>
+ <width>354</width>
<background_color>
<color red="255" green="255" blue="255">
</color>
@@ -374,7 +374,7 @@
<pv_name>$(P)$(R)EvrLinkSevrIn.INP</pv_name>
<x>336</x>
<y>144</y>
- <width>259</width>
+ <width>354</width>
<background_color>
<color red="255" green="255" blue="255">
</color>
diff --git a/99-Shared/adsis8300bpm/aiChannel.bob b/99-Shared/adsis8300bpm/aiChannel.bob
index dd654306d638c8c64282ecbd50b81fa9198aad15..746608d6968e720f23d8fe31c52be7528718b3c9 100644
--- a/99-Shared/adsis8300bpm/aiChannel.bob
+++ b/99-Shared/adsis8300bpm/aiChannel.bob
@@ -70,19 +70,13 @@ $(pv_value)</tooltip>
<actions>
</actions>
<rules>
- <rule name="buffer_size" prop_id="trace_0_buffer_size" out_exp="true">
- <exp bool_exp="true">
- <expression>pv0</expression>
- </exp>
- <pv_name>$(P)$(R)$(CH)TR1-ArraySize0_RBV</pv_name>
- </rule>
- <rule name="data_y_max" prop_id="axis_1_maximum" out_exp="true">
+ <rule name="data_y_max" prop_id="y_axes[0].maximum" out_exp="true">
<exp bool_exp="true">
<expression>pv0</expression>
</exp>
<pv_name>$(P)$(R)$(CH)TR1-ArraySize1_RBV</pv_name>
</rule>
- <rule name="data_x0_max" prop_id="axis_0_maximum" out_exp="true">
+ <rule name="data_x0_max" prop_id="x_axis.maximum" out_exp="true">
<exp bool_exp="true">
<expression>pv0</expression>
</exp>
diff --git a/99-Shared/adsis8300bpm/aiChannelItem.bob b/99-Shared/adsis8300bpm/aiChannelItem.bob
index b5b87292d7cdaf29bbbcd15d439e7df317461956..bbe66e3347b6a52169c2590ff35e26fdc92e7599 100644
--- a/99-Shared/adsis8300bpm/aiChannelItem.bob
+++ b/99-Shared/adsis8300bpm/aiChannelItem.bob
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<display version="2.0.0">
+ <width>420</width>
+ <height>20</height>
<background_color>
<color red="240" green="240" blue="240">
</color>
@@ -9,9 +11,7 @@
<widget type="textupdate" version="2.0.0">
<name>Text Update_75</name>
<pv_name>$(P)$(R)$(CH)Name</pv_name>
- <x>174</x>
- <y>72</y>
- <width>145</width>
+ <width>230</width>
<font>
<font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
</font>
@@ -33,8 +33,8 @@
<widget type="led" version="2.0.0">
<name>LED_1</name>
<pv_name>$(P)$(R)$(CH)ControlR</pv_name>
- <x>320</x>
- <y>74</y>
+ <x>240</x>
+ <y>2</y>
<width>16</width>
<height>16</height>
<off_color>
@@ -66,9 +66,8 @@
</actions>
<pv_name>$(P)$(R)$(CH)Control</pv_name>
<text>Enable</text>
- <x>337</x>
- <y>72</y>
- <width>43</width>
+ <x>257</x>
+ <width>50</width>
<height>20</height>
<font>
<font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
@@ -89,9 +88,8 @@
</actions>
<pv_name>$(P)$(R)$(CH)Control</pv_name>
<text>Disable</text>
- <x>379</x>
- <y>72</y>
- <width>43</width>
+ <x>310</x>
+ <width>50</width>
<height>20</height>
<font>
<font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
@@ -111,9 +109,8 @@
</action>
</actions>
<text>More..</text>
- <x>432</x>
- <y>72</y>
- <width>49</width>
+ <x>370</x>
+ <width>50</width>
<height>20</height>
<font>
<font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
diff --git a/99-Shared/adsis8300bpm/bpm.bob b/99-Shared/adsis8300bpm/bpm.bob
index 00d647cc832abd059dfb31704b57b9169de43bb2..4834a57146a39894fa6aa8bceb27b94ca3b97bc0 100644
--- a/99-Shared/adsis8300bpm/bpm.bob
+++ b/99-Shared/adsis8300bpm/bpm.bob
@@ -241,32 +241,6 @@
</color>
</border_color>
</widget>
- <widget type="polyline" version="2.0.0">
- <name>Polyline</name>
- <height>100</height>
- <line_width>1</line_width>
- <line_color>
- <color red="30" green="144" blue="255">
- </color>
- </line_color>
- <actions>
- </actions>
- <tooltip>$(pv_name)
-$(pv_value)</tooltip>
- </widget>
- <widget type="polyline" version="2.0.0">
- <name>Polyline_1</name>
- <height>100</height>
- <line_width>1</line_width>
- <line_color>
- <color red="30" green="144" blue="255">
- </color>
- </line_color>
- <actions>
- </actions>
- <tooltip>$(pv_name)
-$(pv_value)</tooltip>
- </widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update_60</name>
<pv_name>$(P)$(R)ArrayRate_RBV</pv_name>
@@ -2357,8 +2331,8 @@ $(pv_value)</tooltip>
<file>../adsis8300/sis8300-evr.opi</file>
<x>448</x>
<y>433</y>
- <width>589</width>
- <height>162</height>
+ <width>699</width>
+ <height>171</height>
<resize>2</resize>
<actions>
</actions>
diff --git a/99-Shared/adsis8300bpm/bpmAngleDifference.bob b/99-Shared/adsis8300bpm/bpmAngleDifference.bob
index 00506f1890d9cafa508e97374d745dea23dfb8b2..919445239c77f92f5be667644f392c292a6453c1 100644
--- a/99-Shared/adsis8300bpm/bpmAngleDifference.bob
+++ b/99-Shared/adsis8300bpm/bpmAngleDifference.bob
@@ -1,45 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<display version="2.0.0">
- <width>1200</width>
- <height>1000</height>
+ <width>448</width>
+ <height>69</height>
<background_color>
<color red="240" green="240" blue="240">
</color>
</background_color>
<actions>
</actions>
- <widget type="polyline" version="2.0.0">
- <name>Polyline</name>
- <height>100</height>
- <line_width>1</line_width>
- <line_color>
- <color red="30" green="144" blue="255">
- </color>
- </line_color>
- <actions>
- </actions>
- <tooltip>$(pv_name)
-$(pv_value)</tooltip>
- </widget>
- <widget type="polyline" version="2.0.0">
- <name>Polyline_1</name>
- <height>100</height>
- <line_width>1</line_width>
- <line_color>
- <color red="30" green="144" blue="255">
- </color>
- </line_color>
- <actions>
- </actions>
- <tooltip>$(pv_name)
-$(pv_value)</tooltip>
- </widget>
<widget type="label" version="2.0.0">
<name>Label_276</name>
<text>Angle difference</text>
- <x>2</x>
- <y>2</y>
- <width>381</width>
+ <width>448</width>
<height>69</height>
<font>
<font name="Header 1" family="Liberation Sans" style="BOLD" size="22.0">
@@ -62,14 +34,14 @@ $(pv_value)</tooltip>
</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>310</width>
- <height>23</height>
+ <width>420</width>
+ <height>20</height>
<resize>2</resize>
<actions>
</actions>
diff --git a/99-Shared/adsis8300bpm/bpmChannel.bob b/99-Shared/adsis8300bpm/bpmChannel.bob
index fd8dbf9344f6bada055e17d65c45a1a3bb736f53..56a1dfc91c0dcde16a0585e9345ae2c369d3fd60 100644
--- a/99-Shared/adsis8300bpm/bpmChannel.bob
+++ b/99-Shared/adsis8300bpm/bpmChannel.bob
@@ -70,19 +70,13 @@ $(pv_value)</tooltip>
<actions>
</actions>
<rules>
- <rule name="buffer_size" prop_id="trace_0_buffer_size" out_exp="true">
- <exp bool_exp="true">
- <expression>pv0</expression>
- </exp>
- <pv_name>$(P)$(R)$(CH)TR1-ArraySize0_RBV</pv_name>
- </rule>
- <rule name="data_y_max" prop_id="axis_1_maximum" out_exp="true">
+ <rule name="data_y_max" prop_id="y_axes[0].maximum" out_exp="true">
<exp bool_exp="true">
<expression>pv0</expression>
</exp>
<pv_name>$(P)$(R)$(CH)TR1-ArraySize1_RBV</pv_name>
</rule>
- <rule name="data_x0_max" prop_id="axis_0_maximum" out_exp="true">
+ <rule name="data_x0_max" prop_id="x_axis.maximum" out_exp="true">
<exp bool_exp="true">
<expression>pv0</expression>
</exp>
diff --git a/99-Shared/adsis8300bpm/bpmChannelAverage.bob b/99-Shared/adsis8300bpm/bpmChannelAverage.bob
index c74237850bdb26f4643ea4e55ecb6673d6861773..47b185e728ae32c9455f4d5780ac1091d63c7d8d 100644
--- a/99-Shared/adsis8300bpm/bpmChannelAverage.bob
+++ b/99-Shared/adsis8300bpm/bpmChannelAverage.bob
@@ -63,26 +63,20 @@ $(pv_value)</tooltip>
</color>
</background_color>
<title_font>
- <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+ <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
</font>
</title_font>
<show_toolbar>true</show_toolbar>
<actions>
</actions>
<rules>
- <rule name="buffer_size" prop_id="trace_0_buffer_size" out_exp="true">
- <exp bool_exp="true">
- <expression>pv0</expression>
- </exp>
- <pv_name>$(P)$(R)$(CH)TR1-ArraySize0_RBV</pv_name>
- </rule>
- <rule name="data_y_max" prop_id="axis_1_maximum" out_exp="true">
+ <rule name="data_y_max" prop_id="y_axes[0].maximum" out_exp="true">
<exp bool_exp="true">
<expression>pv0</expression>
</exp>
<pv_name>$(P)$(R)$(CH)TR1-ArraySize1_RBV</pv_name>
</rule>
- <rule name="data_x0_max" prop_id="axis_0_maximum" out_exp="true">
+ <rule name="data_x0_max" prop_id="x_axis.maximum" out_exp="true">
<exp bool_exp="true">
<expression>pv0</expression>
</exp>
@@ -90,18 +84,18 @@ $(pv_value)</tooltip>
</rule>
</rules>
<x_axis>
- <title>Samples</title>
+ <title>Time</title>
<autoscale>true</autoscale>
<log_scale>false</log_scale>
<minimum>0.0</minimum>
<maximum>100.0</maximum>
<show_grid>true</show_grid>
<title_font>
- <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+ <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
</font>
</title_font>
<scale_font>
- <font name="Default" family="Liberation Sans" style="REGULAR" size="14.0">
+ <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
</font>
</scale_font>
<visible>true</visible>
@@ -115,11 +109,11 @@ $(pv_value)</tooltip>
<maximum>100.0</maximum>
<show_grid>true</show_grid>
<title_font>
- <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+ <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
</font>
</title_font>
<scale_font>
- <font name="Default" family="Liberation Sans" style="REGULAR" size="14.0">
+ <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
</font>
</scale_font>
<visible>true</visible>
@@ -128,7 +122,7 @@ $(pv_value)</tooltip>
<traces>
<trace>
<name>$(traces[0].y_pv)</name>
- <x_pv>$(P)$(R)$(CH)TR1-ArrayTime</x_pv>
+ <x_pv></x_pv>
<y_pv>$(P)$(R)$(CH)TR1-ArrayData</y_pv>
<err_pv></err_pv>
<axis>0</axis>
@@ -144,6 +138,24 @@ $(pv_value)</tooltip>
<visible>true</visible>
</trace>
</traces>
+ <marker>
+ <marker>
+ <color>
+ <color name="ActiveText" red="254" green="194" blue="81">
+ </color>
+ </color>
+ <pv_name>$(P)$(R)$(CH)RoiFirstSampleR</pv_name>
+ <interactive>false</interactive>
+ </marker>
+ <marker>
+ <color>
+ <color name="ATTENTION" red="252" green="242" blue="17">
+ </color>
+ </color>
+ <pv_name>$(P)$(R)$(CH)RoiLastSampleR</pv_name>
+ <interactive>false</interactive>
+ </marker>
+ </marker>
</widget>
<widget type="label" version="2.0.0">
<name>Label_1</name>
@@ -421,7 +433,7 @@ time/point</text>
<width>43</width>
<height>20</height>
<font>
- <font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
+ <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
</font>
</font>
<background_color>
@@ -444,7 +456,7 @@ time/point</text>
<width>43</width>
<height>20</height>
<font>
- <font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
+ <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
</font>
</font>
<background_color>
@@ -459,7 +471,7 @@ time/point</text>
<y>265</y>
<width>80</width>
<font>
- <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+ <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
</font>
</font>
<horizontal_alignment>1</horizontal_alignment>
@@ -642,7 +654,7 @@ time/point</text>
<width>336</width>
<height>31</height>
<font>
- <font name="Header 2" family="Liberation Sans" style="BOLD" size="18.0">
+ <font name="Header 2" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
</font>
</font>
<background_color>
@@ -700,7 +712,7 @@ time/point</text>
<width>43</width>
<height>20</height>
<font>
- <font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
+ <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
</font>
</font>
<background_color>
@@ -723,7 +735,7 @@ time/point</text>
<width>43</width>
<height>20</height>
<font>
- <font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
+ <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
</font>
</font>
<background_color>
@@ -738,7 +750,7 @@ time/point</text>
<y>45</y>
<width>70</width>
<font>
- <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+ <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
</font>
</font>
<vertical_alignment>1</vertical_alignment>
@@ -768,7 +780,7 @@ time/point</text>
<width>49</width>
<height>20</height>
<font>
- <font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
+ <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
</font>
</font>
<background_color>
@@ -818,7 +830,7 @@ time/point</text>
<width>43</width>
<height>20</height>
<font>
- <font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
+ <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
</font>
</font>
<background_color>
@@ -841,7 +853,7 @@ time/point</text>
<width>43</width>
<height>20</height>
<font>
- <font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
+ <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
</font>
</font>
<background_color>
@@ -855,7 +867,7 @@ time/point</text>
<x>16</x>
<y>551</y>
<font>
- <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+ <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
</font>
</font>
<vertical_alignment>1</vertical_alignment>
@@ -1089,7 +1101,7 @@ time/point</text>
<y>15</y>
<width>188</width>
<font>
- <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+ <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
</font>
</font>
<vertical_alignment>1</vertical_alignment>
@@ -1108,7 +1120,7 @@ time/point</text>
<y>426</y>
<width>80</width>
<font>
- <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+ <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
</font>
</font>
<horizontal_alignment>1</horizontal_alignment>
@@ -1427,7 +1439,7 @@ time/point</text>
<width>43</width>
<height>20</height>
<font>
- <font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
+ <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
</font>
</font>
<background_color>
@@ -1450,7 +1462,7 @@ time/point</text>
<width>43</width>
<height>20</height>
<font>
- <font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
+ <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
</font>
</font>
<background_color>
@@ -1465,7 +1477,7 @@ time/point</text>
<y>320</y>
<width>80</width>
<font>
- <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+ <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
</font>
</font>
<horizontal_alignment>1</horizontal_alignment>
@@ -1564,7 +1576,7 @@ time/point</text>
<width>49</width>
<height>20</height>
<font>
- <font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
+ <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
</font>
</font>
<background_color>
@@ -1614,7 +1626,7 @@ time/point</text>
<width>43</width>
<height>20</height>
<font>
- <font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
+ <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
</font>
</font>
<background_color>
@@ -1637,7 +1649,7 @@ time/point</text>
<width>43</width>
<height>20</height>
<font>
- <font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
+ <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
</font>
</font>
<background_color>
@@ -1651,7 +1663,7 @@ time/point</text>
<x>9</x>
<y>695</y>
<font>
- <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+ <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
</font>
</font>
<vertical_alignment>1</vertical_alignment>
@@ -1700,7 +1712,7 @@ time/point</text>
<width>49</width>
<height>20</height>
<font>
- <font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
+ <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
</font>
</font>
<background_color>
@@ -1750,7 +1762,7 @@ time/point</text>
<width>43</width>
<height>20</height>
<font>
- <font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
+ <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
</font>
</font>
<background_color>
@@ -1773,7 +1785,7 @@ time/point</text>
<width>43</width>
<height>20</height>
<font>
- <font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
+ <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
</font>
</font>
<background_color>
@@ -1893,7 +1905,7 @@ time/point</text>
</color>
</border_color>
</widget>
- <widget type="xyplot" version="2.0.0">
+ <widget type="stripchart" version="2.0.0">
<name>XY Graph_2</name>
<x>400</x>
<y>481</y>
@@ -1904,64 +1916,36 @@ time/point</text>
</color>
</background_color>
<title_font>
- <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+ <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
</font>
</title_font>
- <show_toolbar>true</show_toolbar>
+ <show_legend>true</show_legend>
<actions>
</actions>
- <x_axis>
- <title>Primary X Axis (0)</title>
- <autoscale>true</autoscale>
- <log_scale>false</log_scale>
- <minimum>0.0</minimum>
- <maximum>100.0</maximum>
- <show_grid>true</show_grid>
- <title_font>
- <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
- </font>
- </title_font>
- <scale_font>
- <font name="Default" family="Liberation Sans" style="REGULAR" size="14.0">
- </font>
- </scale_font>
- <visible>true</visible>
- </x_axis>
<y_axes>
<y_axis>
- <title>Primary Y Axis (1)</title>
+ <title>Average value</title>
<autoscale>true</autoscale>
<log_scale>false</log_scale>
<minimum>0.0</minimum>
<maximum>100.0</maximum>
- <show_grid>true</show_grid>
- <title_font>
- <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
- </font>
- </title_font>
- <scale_font>
- <font name="Default" family="Liberation Sans" style="REGULAR" size="14.0">
- </font>
- </scale_font>
+ <show_grid>false</show_grid>
<visible>true</visible>
</y_axis>
</y_axes>
<traces>
<trace>
<name>$(traces[0].y_pv)</name>
- <x_pv></x_pv>
- <y_pv>$(P)$(CH)AvgValue</y_pv>
- <err_pv></err_pv>
+ <y_pv>$(P)$(R)$(CH)AvgValue</y_pv>
<axis>0</axis>
- <trace_type>1</trace_type>
+ <trace_type>2</trace_type>
<color>
- <color red="21" green="21" blue="196">
+ <color red="0" green="0" blue="255">
</color>
</color>
- <line_width>1</line_width>
- <line_style>0</line_style>
+ <line_width>2</line_width>
<point_type>0</point_type>
- <point_size>4</point_size>
+ <point_size>10</point_size>
<visible>true</visible>
</trace>
</traces>
@@ -1973,7 +1957,7 @@ time/point</text>
<y>746</y>
<width>142</width>
<font>
- <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+ <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
</font>
</font>
<vertical_alignment>1</vertical_alignment>
@@ -2075,7 +2059,7 @@ time/point</text>
<width>49</width>
<height>20</height>
<font>
- <font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
+ <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
</font>
</font>
<background_color>
@@ -2125,7 +2109,7 @@ time/point</text>
<width>43</width>
<height>20</height>
<font>
- <font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
+ <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
</font>
</font>
<background_color>
@@ -2148,7 +2132,7 @@ time/point</text>
<width>43</width>
<height>20</height>
<font>
- <font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
+ <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
</font>
</font>
<background_color>
@@ -2163,7 +2147,7 @@ time/point</text>
<y>756</y>
<width>142</width>
<font>
- <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+ <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
</font>
</font>
<vertical_alignment>1</vertical_alignment>
diff --git a/99-Shared/adsis8300bpm/bpmChannelAverageItem.bob b/99-Shared/adsis8300bpm/bpmChannelAverageItem.bob
index aa398403c7b4408ae03ab19993820a3801c629aa..64b6f5d222e26db82c61d412840f80e418850319 100644
--- a/99-Shared/adsis8300bpm/bpmChannelAverageItem.bob
+++ b/99-Shared/adsis8300bpm/bpmChannelAverageItem.bob
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<display version="2.0.0">
+ <width>420</width>
+ <height>20</height>
<background_color>
<color red="240" green="240" blue="240">
</color>
@@ -9,9 +11,7 @@
<widget type="textupdate" version="2.0.0">
<name>Text Update_75</name>
<pv_name>$(P)$(R)$(CH)Name</pv_name>
- <x>240</x>
- <y>75</y>
- <width>145</width>
+ <width>230</width>
<font>
<font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
</font>
@@ -33,8 +33,8 @@
<widget type="led" version="2.0.0">
<name>LED_1</name>
<pv_name>$(P)$(R)$(CH)Status</pv_name>
- <x>386</x>
- <y>77</y>
+ <x>240</x>
+ <y>2</y>
<width>16</width>
<height>16</height>
<off_color>
@@ -66,9 +66,8 @@
</actions>
<pv_name>$(P)$(R)$(CH)Control</pv_name>
<text>Enable</text>
- <x>403</x>
- <y>75</y>
- <width>43</width>
+ <x>257</x>
+ <width>50</width>
<height>20</height>
<font>
<font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
@@ -89,9 +88,8 @@
</actions>
<pv_name>$(P)$(R)$(CH)Control</pv_name>
<text>Disable</text>
- <x>445</x>
- <y>75</y>
- <width>43</width>
+ <x>310</x>
+ <width>50</width>
<height>20</height>
<font>
<font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
@@ -111,9 +109,8 @@
</action>
</actions>
<text>More..</text>
- <x>498</x>
- <y>75</y>
- <width>49</width>
+ <x>370</x>
+ <width>50</width>
<height>20</height>
<font>
<font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
diff --git a/99-Shared/adsis8300bpm/bpmChannelItem.bob b/99-Shared/adsis8300bpm/bpmChannelItem.bob
index 3f1868903200b79b1d461aa74cce61ab4894592b..bbea349bd0457a0d8fe73531ba7a82cb7b21311a 100644
--- a/99-Shared/adsis8300bpm/bpmChannelItem.bob
+++ b/99-Shared/adsis8300bpm/bpmChannelItem.bob
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<display version="2.0.0">
+ <width>420</width>
+ <height>20</height>
<background_color>
<color red="240" green="240" blue="240">
</color>
@@ -9,9 +11,7 @@
<widget type="textupdate" version="2.0.0">
<name>Text Update_75</name>
<pv_name>$(P)$(R)$(CH)Name</pv_name>
- <x>240</x>
- <y>75</y>
- <width>145</width>
+ <width>230</width>
<font>
<font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
</font>
@@ -33,8 +33,8 @@
<widget type="led" version="2.0.0">
<name>LED_1</name>
<pv_name>$(P)$(R)$(CH)Status</pv_name>
- <x>386</x>
- <y>77</y>
+ <x>240</x>
+ <y>2</y>
<width>16</width>
<height>16</height>
<off_color>
@@ -66,9 +66,8 @@
</actions>
<pv_name>$(P)$(R)$(CH)Control</pv_name>
<text>Enable</text>
- <x>403</x>
- <y>75</y>
- <width>43</width>
+ <x>257</x>
+ <width>50</width>
<height>20</height>
<font>
<font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
@@ -89,9 +88,8 @@
</actions>
<pv_name>$(P)$(R)$(CH)Control</pv_name>
<text>Disable</text>
- <x>445</x>
- <y>75</y>
- <width>43</width>
+ <x>310</x>
+ <width>50</width>
<height>20</height>
<font>
<font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
@@ -111,9 +109,8 @@
</action>
</actions>
<text>More..</text>
- <x>498</x>
- <y>75</y>
- <width>49</width>
+ <x>370</x>
+ <width>50</width>
<height>20</height>
<font>
<font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
diff --git a/99-Shared/adsis8300bpm/bpmFilter.bob b/99-Shared/adsis8300bpm/bpmFilter.bob
index aab8854d601e22275a1ac029fb6dc2d70a52c181..80e46f9b337351d8362f00ffc0a230063dabb042 100644
--- a/99-Shared/adsis8300bpm/bpmFilter.bob
+++ b/99-Shared/adsis8300bpm/bpmFilter.bob
@@ -1,45 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<display version="2.0.0">
<name>$(TITLE) : Main</name>
- <width>1200</width>
- <height>800</height>
+ <width>356</width>
+ <height>153</height>
<background_color>
<color red="240" green="240" blue="240">
</color>
</background_color>
<actions>
</actions>
- <widget type="polyline" version="2.0.0">
- <name>Polyline</name>
- <height>100</height>
- <line_width>1</line_width>
- <line_color>
- <color red="30" green="144" blue="255">
- </color>
- </line_color>
- <actions>
- </actions>
- <tooltip>$(pv_name)
-$(pv_value)</tooltip>
- </widget>
- <widget type="polyline" version="2.0.0">
- <name>Polyline_1</name>
- <height>100</height>
- <line_width>1</line_width>
- <line_color>
- <color red="30" green="144" blue="255">
- </color>
- </line_color>
- <actions>
- </actions>
- <tooltip>$(pv_name)
-$(pv_value)</tooltip>
- </widget>
<widget type="label" version="2.0.0">
<name>Label_65</name>
<text>Filter Control</text>
- <x>431</x>
- <y>233</y>
<width>108</width>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -54,8 +26,7 @@ $(pv_value)</tooltip>
<widget type="label" version="2.0.0">
<name>Label_66</name>
<text>Filter Coeff 0</text>
- <x>431</x>
- <y>253</y>
+ <y>20</y>
<width>108</width>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -70,8 +41,7 @@ $(pv_value)</tooltip>
<widget type="label" version="2.0.0">
<name>Label_67</name>
<text>Filter Coeff 1</text>
- <x>431</x>
- <y>272</y>
+ <y>39</y>
<width>108</width>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -86,8 +56,7 @@ $(pv_value)</tooltip>
<widget type="label" version="2.0.0">
<name>Label_68</name>
<text>Filter Coeff 2</text>
- <x>431</x>
- <y>291</y>
+ <y>58</y>
<width>108</width>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -102,8 +71,7 @@ $(pv_value)</tooltip>
<widget type="label" version="2.0.0">
<name>Label_69</name>
<text>Filter Coeff 3</text>
- <x>431</x>
- <y>310</y>
+ <y>77</y>
<width>108</width>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -118,8 +86,7 @@ $(pv_value)</tooltip>
<widget type="label" version="2.0.0">
<name>Label_70</name>
<text>Filter Coeff 4</text>
- <x>431</x>
- <y>329</y>
+ <y>96</y>
<width>108</width>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -134,8 +101,7 @@ $(pv_value)</tooltip>
<widget type="label" version="2.0.0">
<name>Label_71</name>
<text>Filter Coeff 5</text>
- <x>431</x>
- <y>347</y>
+ <y>114</y>
<width>108</width>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -150,8 +116,7 @@ $(pv_value)</tooltip>
<widget type="label" version="2.0.0">
<name>Label_72</name>
<text>Filter Gain</text>
- <x>431</x>
- <y>366</y>
+ <y>133</y>
<width>108</width>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -173,8 +138,7 @@ $(pv_value)</tooltip>
</actions>
<pv_name>$(P)$(R)FilterControl</pv_name>
<text>Enable</text>
- <x>579</x>
- <y>233</y>
+ <x>148</x>
<width>79</width>
<height>20</height>
<background_color>
@@ -192,8 +156,7 @@ $(pv_value)</tooltip>
</actions>
<pv_name>$(P)$(R)FilterControl</pv_name>
<text>Disable</text>
- <x>675</x>
- <y>233</y>
+ <x>244</x>
<width>79</width>
<height>20</height>
<background_color>
@@ -204,8 +167,8 @@ $(pv_value)</tooltip>
<widget type="led" version="2.0.0">
<name>LED_10</name>
<pv_name>$(P)$(R)FilterControlR</pv_name>
- <x>558</x>
- <y>235</y>
+ <x>127</x>
+ <y>2</y>
<width>16</width>
<height>16</height>
<off_color>
@@ -230,8 +193,8 @@ $(pv_value)</tooltip>
<widget type="textentry" version="3.0.0">
<name>Text Input</name>
<pv_name>$(P)$(R)FilterCoeff4</pv_name>
- <x>558</x>
- <y>253</y>
+ <x>127</x>
+ <y>20</y>
<width>109</width>
<background_color>
<color red="255" green="255" blue="255">
@@ -248,8 +211,8 @@ $(pv_value)</tooltip>
<widget type="textupdate" version="2.0.0">
<name>Text Update_76</name>
<pv_name>$(P)$(R)FilterCoeff4R</pv_name>
- <x>675</x>
- <y>253</y>
+ <x>244</x>
+ <y>20</y>
<width>112</width>
<background_color>
<color red="255" green="255" blue="255">
@@ -268,8 +231,8 @@ $(pv_value)</tooltip>
<widget type="textentry" version="3.0.0">
<name>Text Input_1</name>
<pv_name>$(P)$(R)FilterCoeff5</pv_name>
- <x>558</x>
- <y>272</y>
+ <x>127</x>
+ <y>39</y>
<width>109</width>
<background_color>
<color red="255" green="255" blue="255">
@@ -286,8 +249,8 @@ $(pv_value)</tooltip>
<widget type="textupdate" version="2.0.0">
<name>Text Update_77</name>
<pv_name>$(P)$(R)FilterCoeff5R</pv_name>
- <x>675</x>
- <y>272</y>
+ <x>244</x>
+ <y>39</y>
<width>112</width>
<background_color>
<color red="255" green="255" blue="255">
@@ -306,8 +269,8 @@ $(pv_value)</tooltip>
<widget type="textentry" version="3.0.0">
<name>Text Input_2</name>
<pv_name>$(P)$(R)FilterCoeff2</pv_name>
- <x>558</x>
- <y>291</y>
+ <x>127</x>
+ <y>58</y>
<width>109</width>
<background_color>
<color red="255" green="255" blue="255">
@@ -324,8 +287,8 @@ $(pv_value)</tooltip>
<widget type="textupdate" version="2.0.0">
<name>Text Update_78</name>
<pv_name>$(P)$(R)FilterCoeff2R</pv_name>
- <x>675</x>
- <y>291</y>
+ <x>244</x>
+ <y>58</y>
<width>112</width>
<background_color>
<color red="255" green="255" blue="255">
@@ -344,8 +307,8 @@ $(pv_value)</tooltip>
<widget type="textentry" version="3.0.0">
<name>Text Input_3</name>
<pv_name>$(P)$(R)FilterCoeff3</pv_name>
- <x>558</x>
- <y>310</y>
+ <x>127</x>
+ <y>77</y>
<width>109</width>
<background_color>
<color red="255" green="255" blue="255">
@@ -362,8 +325,8 @@ $(pv_value)</tooltip>
<widget type="textupdate" version="2.0.0">
<name>Text Update_79</name>
<pv_name>$(P)$(R)FilterCoeff3R</pv_name>
- <x>675</x>
- <y>310</y>
+ <x>244</x>
+ <y>77</y>
<width>112</width>
<background_color>
<color red="255" green="255" blue="255">
@@ -382,8 +345,8 @@ $(pv_value)</tooltip>
<widget type="textentry" version="3.0.0">
<name>Text Input_4</name>
<pv_name>$(P)$(R)FilterCoeff0</pv_name>
- <x>558</x>
- <y>329</y>
+ <x>127</x>
+ <y>96</y>
<width>109</width>
<background_color>
<color red="255" green="255" blue="255">
@@ -400,8 +363,8 @@ $(pv_value)</tooltip>
<widget type="textupdate" version="2.0.0">
<name>Text Update_80</name>
<pv_name>$(P)$(R)FilterCoeff0R</pv_name>
- <x>675</x>
- <y>329</y>
+ <x>244</x>
+ <y>96</y>
<width>112</width>
<background_color>
<color red="255" green="255" blue="255">
@@ -420,8 +383,8 @@ $(pv_value)</tooltip>
<widget type="textentry" version="3.0.0">
<name>Text Input_5</name>
<pv_name>$(P)$(R)FilterCoeff1</pv_name>
- <x>558</x>
- <y>347</y>
+ <x>127</x>
+ <y>114</y>
<width>109</width>
<background_color>
<color red="255" green="255" blue="255">
@@ -438,8 +401,8 @@ $(pv_value)</tooltip>
<widget type="textupdate" version="2.0.0">
<name>Text Update_81</name>
<pv_name>$(P)$(R)FilterCoeff1R</pv_name>
- <x>675</x>
- <y>347</y>
+ <x>244</x>
+ <y>114</y>
<width>112</width>
<background_color>
<color red="255" green="255" blue="255">
@@ -458,8 +421,8 @@ $(pv_value)</tooltip>
<widget type="textupdate" version="2.0.0">
<name>Text Update_82</name>
<pv_name>$(P)$(R)FilterGainR</pv_name>
- <x>675</x>
- <y>366</y>
+ <x>244</x>
+ <y>133</y>
<width>112</width>
<background_color>
<color red="255" green="255" blue="255">
diff --git a/99-Shared/adsis8300bpm/bpmInstance.bob b/99-Shared/adsis8300bpm/bpmInstance.bob
index 68a215de4323a429856f4b91891b51109936b1f6..583fdb0058780d9562c26360943f167a01a52e1d 100644
--- a/99-Shared/adsis8300bpm/bpmInstance.bob
+++ b/99-Shared/adsis8300bpm/bpmInstance.bob
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<display version="2.0.0">
+ <name>$(P)$(R) instance</name>
<width>1200</width>
<height>1100</height>
<background_color>
@@ -9,12 +10,12 @@
<actions>
</actions>
<widget type="label" version="2.0.0">
- <name>Label_276</name>
- <text> $(P)$(R)</text>
+ <name>Label_330</name>
+ <text>CHANNEL OVERVIEW</text>
<x>14</x>
- <y>8</y>
- <width>381</width>
- <height>32</height>
+ <y>533</y>
+ <width>448</width>
+ <height>73</height>
<font>
<font name="Header 1" family="Liberation Sans" style="BOLD" size="22.0">
</font>
@@ -24,6 +25,7 @@
</color>
</background_color>
<transparent>false</transparent>
+ <horizontal_alignment>1</horizontal_alignment>
<wrap_words>false</wrap_words>
<actions>
</actions>
@@ -33,31 +35,31 @@
</color>
</border_color>
</widget>
- <widget type="polyline" version="2.0.0">
- <name>Polyline</name>
- <height>100</height>
- <line_width>1</line_width>
- <line_color>
- <color red="30" green="144" blue="255">
+ <widget type="label" version="2.0.0">
+ <name>Label_276</name>
+ <text> $(P)$(R)</text>
+ <x>14</x>
+ <y>8</y>
+ <width>914</width>
+ <height>32</height>
+ <font>
+ <font name="Header 1" family="Liberation Sans" style="BOLD" size="22.0">
+ </font>
+ </font>
+ <background_color>
+ <color name="IO Area Background" red="221" green="223" blue="229">
</color>
- </line_color>
+ </background_color>
+ <transparent>false</transparent>
+ <horizontal_alignment>1</horizontal_alignment>
+ <wrap_words>false</wrap_words>
<actions>
</actions>
- <tooltip>$(pv_name)
-$(pv_value)</tooltip>
- </widget>
- <widget type="polyline" version="2.0.0">
- <name>Polyline_1</name>
- <height>100</height>
- <line_width>1</line_width>
- <line_color>
- <color red="30" green="144" blue="255">
+ <border_width>2</border_width>
+ <border_color>
+ <color name="IO Border" red="0" green="0" blue="0">
</color>
- </line_color>
- <actions>
- </actions>
- <tooltip>$(pv_name)
-$(pv_value)</tooltip>
+ </border_color>
</widget>
<widget type="action_button" version="3.0.0">
<name>Action Button_25</name>
@@ -68,8 +70,8 @@ $(pv_value)</tooltip>
</action>
</actions>
<text>Overview</text>
- <x>302</x>
- <y>11</y>
+ <x>24</x>
+ <y>572</y>
<width>80</width>
<height>25</height>
<background_color>
@@ -78,38 +80,12 @@ $(pv_value)</tooltip>
</background_color>
<tooltip>$(actions)</tooltip>
</widget>
- <widget type="polyline" version="2.0.0">
- <name>Polyline_2</name>
- <height>100</height>
- <line_width>1</line_width>
- <line_color>
- <color red="30" green="144" blue="255">
- </color>
- </line_color>
- <actions>
- </actions>
- <tooltip>$(pv_name)
-$(pv_value)</tooltip>
- </widget>
- <widget type="polyline" version="2.0.0">
- <name>Polyline_3</name>
- <height>100</height>
- <line_width>1</line_width>
- <line_color>
- <color red="30" green="144" blue="255">
- </color>
- </line_color>
- <actions>
- </actions>
- <tooltip>$(pv_name)
-$(pv_value)</tooltip>
- </widget>
<widget type="label" version="2.0.0">
<name>Label_274</name>
<text>INTERLOCK</text>
- <x>14</x>
- <y>507</y>
- <width>381</width>
+ <x>480</x>
+ <y>60</y>
+ <width>448</width>
<height>285</height>
<font>
<font name="Header 1" family="Liberation Sans" style="BOLD" size="22.0">
@@ -133,8 +109,8 @@ $(pv_value)</tooltip>
<widget type="label" version="2.0.0">
<name>Label_66</name>
<text>X Low</text>
- <x>24</x>
- <y>603</y>
+ <x>490</x>
+ <y>156</y>
<width>108</width>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -149,8 +125,8 @@ $(pv_value)</tooltip>
<widget type="textentry" version="3.0.0">
<name>Text Input</name>
<pv_name>$(P)$(R)ThrXPosLow</pv_name>
- <x>150</x>
- <y>603</y>
+ <x>616</x>
+ <y>156</y>
<width>109</width>
<background_color>
<color red="255" green="255" blue="255">
@@ -167,8 +143,8 @@ $(pv_value)</tooltip>
<widget type="textupdate" version="2.0.0">
<name>Text Update_76</name>
<pv_name>$(P)$(R)ThrXPosLowR</pv_name>
- <x>276</x>
- <y>603</y>
+ <x>742</x>
+ <y>156</y>
<width>112</width>
<background_color>
<color red="255" green="255" blue="255">
@@ -187,8 +163,8 @@ $(pv_value)</tooltip>
<widget type="label" version="2.0.0">
<name>Label_278</name>
<text>X High</text>
- <x>24</x>
- <y>622</y>
+ <x>490</x>
+ <y>175</y>
<width>108</width>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -203,8 +179,8 @@ $(pv_value)</tooltip>
<widget type="textentry" version="3.0.0">
<name>Text Input_1</name>
<pv_name>$(P)$(R)ThrXPosHigh</pv_name>
- <x>150</x>
- <y>622</y>
+ <x>616</x>
+ <y>175</y>
<width>109</width>
<background_color>
<color red="255" green="255" blue="255">
@@ -221,8 +197,8 @@ $(pv_value)</tooltip>
<widget type="textupdate" version="2.0.0">
<name>Text Update_1</name>
<pv_name>$(P)$(R)ThrXPosHighR</pv_name>
- <x>276</x>
- <y>622</y>
+ <x>742</x>
+ <y>175</y>
<width>112</width>
<background_color>
<color red="255" green="255" blue="255">
@@ -241,8 +217,8 @@ $(pv_value)</tooltip>
<widget type="label" version="2.0.0">
<name>Label_279</name>
<text>Y Low</text>
- <x>24</x>
- <y>640</y>
+ <x>490</x>
+ <y>193</y>
<width>108</width>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -257,8 +233,8 @@ $(pv_value)</tooltip>
<widget type="textentry" version="3.0.0">
<name>Text Input_2</name>
<pv_name>$(P)$(R)ThrYPosLow</pv_name>
- <x>150</x>
- <y>640</y>
+ <x>616</x>
+ <y>193</y>
<width>109</width>
<background_color>
<color red="255" green="255" blue="255">
@@ -275,8 +251,8 @@ $(pv_value)</tooltip>
<widget type="textupdate" version="2.0.0">
<name>Text Update_2</name>
<pv_name>$(P)$(R)ThrYPosLowR</pv_name>
- <x>276</x>
- <y>640</y>
+ <x>742</x>
+ <y>193</y>
<width>112</width>
<background_color>
<color red="255" green="255" blue="255">
@@ -295,8 +271,8 @@ $(pv_value)</tooltip>
<widget type="label" version="2.0.0">
<name>Label_280</name>
<text>Y High</text>
- <x>24</x>
- <y>659</y>
+ <x>490</x>
+ <y>212</y>
<width>108</width>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -311,8 +287,8 @@ $(pv_value)</tooltip>
<widget type="textentry" version="3.0.0">
<name>Text Input_3</name>
<pv_name>$(P)$(R)ThrYPosHigh</pv_name>
- <x>150</x>
- <y>659</y>
+ <x>616</x>
+ <y>212</y>
<width>109</width>
<background_color>
<color red="255" green="255" blue="255">
@@ -329,8 +305,8 @@ $(pv_value)</tooltip>
<widget type="textupdate" version="2.0.0">
<name>Text Update_3</name>
<pv_name>$(P)$(R)ThrYPosHighR</pv_name>
- <x>276</x>
- <y>659</y>
+ <x>742</x>
+ <y>212</y>
<width>112</width>
<background_color>
<color red="255" green="255" blue="255">
@@ -349,8 +325,8 @@ $(pv_value)</tooltip>
<widget type="label" version="2.0.0">
<name>Label_281</name>
<text>Magnitude</text>
- <x>24</x>
- <y>753</y>
+ <x>490</x>
+ <y>306</y>
<width>108</width>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -365,8 +341,8 @@ $(pv_value)</tooltip>
<widget type="textentry" version="3.0.0">
<name>Text Input_4</name>
<pv_name>$(P)$(R)ThrMagnitude</pv_name>
- <x>150</x>
- <y>753</y>
+ <x>616</x>
+ <y>306</y>
<width>109</width>
<background_color>
<color red="255" green="255" blue="255">
@@ -383,8 +359,8 @@ $(pv_value)</tooltip>
<widget type="textupdate" version="2.0.0">
<name>Text Update_4</name>
<pv_name>$(P)$(R)ThrMagnitudeR</pv_name>
- <x>276</x>
- <y>753</y>
+ <x>742</x>
+ <y>306</y>
<width>112</width>
<background_color>
<color red="255" green="255" blue="255">
@@ -403,8 +379,8 @@ $(pv_value)</tooltip>
<widget type="label" version="2.0.0">
<name>Label_11</name>
<text>Magnitude</text>
- <x>17</x>
- <y>696</y>
+ <x>483</x>
+ <y>249</y>
<font>
<font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
</font>
@@ -421,8 +397,8 @@ $(pv_value)</tooltip>
<widget type="label" version="2.0.0">
<name>Label_322</name>
<text>Control</text>
- <x>20</x>
- <y>565</y>
+ <x>486</x>
+ <y>118</y>
<width>112</width>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -437,8 +413,8 @@ $(pv_value)</tooltip>
<widget type="led" version="2.0.0">
<name>LED_4</name>
<pv_name>$(P)$(R)IlkPositionControlR</pv_name>
- <x>153</x>
- <y>567</y>
+ <x>619</x>
+ <y>120</y>
<width>16</width>
<height>16</height>
<off_color>
@@ -470,8 +446,8 @@ $(pv_value)</tooltip>
</actions>
<pv_name>$(P)$(R)IlkPositionControl</pv_name>
<text>Enable</text>
- <x>204</x>
- <y>565</y>
+ <x>670</x>
+ <y>118</y>
<width>43</width>
<height>20</height>
<font>
@@ -493,8 +469,8 @@ $(pv_value)</tooltip>
</actions>
<pv_name>$(P)$(R)IlkPositionControl</pv_name>
<text>Disable</text>
- <x>288</x>
- <y>565</y>
+ <x>754</x>
+ <y>118</y>
<width>43</width>
<height>20</height>
<font>
@@ -509,8 +485,8 @@ $(pv_value)</tooltip>
<widget type="label" version="2.0.0">
<name>Label_323</name>
<text>Status</text>
- <x>20</x>
- <y>584</y>
+ <x>486</x>
+ <y>137</y>
<width>112</width>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -532,8 +508,8 @@ $(pv_value)</tooltip>
</actions>
<pv_name>$(P)$(R)IlkPositionClear</pv_name>
<text>Clear</text>
- <x>204</x>
- <y>584</y>
+ <x>670</x>
+ <y>137</y>
<width>43</width>
<height>20</height>
<font>
@@ -548,8 +524,8 @@ $(pv_value)</tooltip>
<widget type="label" version="2.0.0">
<name>Label_325</name>
<text>Position</text>
- <x>17</x>
- <y>551</y>
+ <x>483</x>
+ <y>104</y>
<font>
<font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
</font>
@@ -563,38 +539,12 @@ $(pv_value)</tooltip>
</color>
</border_color>
</widget>
- <widget type="polyline" version="2.0.0">
- <name>Polyline_4</name>
- <height>100</height>
- <line_width>1</line_width>
- <line_color>
- <color red="30" green="144" blue="255">
- </color>
- </line_color>
- <actions>
- </actions>
- <tooltip>$(pv_name)
-$(pv_value)</tooltip>
- </widget>
- <widget type="polyline" version="2.0.0">
- <name>Polyline_5</name>
- <height>100</height>
- <line_width>1</line_width>
- <line_color>
- <color red="30" green="144" blue="255">
- </color>
- </line_color>
- <actions>
- </actions>
- <tooltip>$(pv_name)
-$(pv_value)</tooltip>
- </widget>
<widget type="label" version="2.0.0">
<name>Label_329</name>
<text>CHANNELS</text>
<x>14</x>
- <y>45</y>
- <width>381</width>
+ <y>60</y>
+ <width>448</width>
<height>453</height>
<font>
<font name="Header 1" family="Liberation Sans" style="BOLD" size="22.0">
@@ -617,14 +567,14 @@ $(pv_value)</tooltip>
</widget>
<widget type="embedded" version="2.0.0">
<name>Linking Container</name>
- <file>aiChannelItem.opi</file>
<macros>
<CH>A-</CH>
</macros>
- <x>50</x>
- <y>403</y>
- <width>310</width>
- <height>23</height>
+ <file>aiChannelItem.opi</file>
+ <x>24</x>
+ <y>414</y>
+ <width>420</width>
+ <height>20</height>
<resize>2</resize>
<actions>
</actions>
@@ -635,14 +585,14 @@ $(pv_value)</tooltip>
</widget>
<widget type="embedded" version="2.0.0">
<name>Linking Container_1</name>
- <file>aiChannelItem.opi</file>
<macros>
<CH>B-</CH>
</macros>
- <x>50</x>
- <y>425</y>
- <width>310</width>
- <height>23</height>
+ <file>aiChannelItem.opi</file>
+ <x>24</x>
+ <y>436</y>
+ <width>420</width>
+ <height>20</height>
<resize>2</resize>
<actions>
</actions>
@@ -653,14 +603,14 @@ $(pv_value)</tooltip>
</widget>
<widget type="embedded" version="2.0.0">
<name>Linking Container_2</name>
- <file>aiChannelItem.opi</file>
<macros>
<CH>C-</CH>
</macros>
- <x>50</x>
- <y>447</y>
- <width>310</width>
- <height>23</height>
+ <file>aiChannelItem.opi</file>
+ <x>24</x>
+ <y>458</y>
+ <width>420</width>
+ <height>20</height>
<resize>2</resize>
<actions>
</actions>
@@ -671,14 +621,14 @@ $(pv_value)</tooltip>
</widget>
<widget type="embedded" version="2.0.0">
<name>Linking Container_3</name>
- <file>aiChannelItem.opi</file>
<macros>
<CH>D-</CH>
</macros>
- <x>50</x>
- <y>469</y>
- <width>310</width>
- <height>23</height>
+ <file>aiChannelItem.opi</file>
+ <x>24</x>
+ <y>480</y>
+ <width>420</width>
+ <height>20</height>
<resize>2</resize>
<actions>
</actions>
@@ -689,14 +639,14 @@ $(pv_value)</tooltip>
</widget>
<widget type="embedded" version="2.0.0">
<name>Linking Container_9</name>
- <file>bpmChannelItem.opi</file>
<macros>
<CH>AM-</CH>
</macros>
- <x>50</x>
- <y>147</y>
- <width>310</width>
- <height>23</height>
+ <file>bpmChannelItem.opi</file>
+ <x>24</x>
+ <y>157</y>
+ <width>420</width>
+ <height>20</height>
<resize>2</resize>
<actions>
</actions>
@@ -707,14 +657,14 @@ $(pv_value)</tooltip>
</widget>
<widget type="embedded" version="2.0.0">
<name>Linking Container_10</name>
- <file>bpmChannelItem.opi</file>
<macros>
<CH>BM-</CH>
</macros>
- <x>50</x>
- <y>169</y>
- <width>310</width>
- <height>23</height>
+ <file>bpmChannelItem.opi</file>
+ <x>24</x>
+ <y>179</y>
+ <width>420</width>
+ <height>20</height>
<resize>2</resize>
<actions>
</actions>
@@ -725,14 +675,14 @@ $(pv_value)</tooltip>
</widget>
<widget type="embedded" version="2.0.0">
<name>Linking Container_11</name>
- <file>bpmChannelItem.opi</file>
<macros>
<CH>CM-</CH>
</macros>
- <x>50</x>
- <y>191</y>
- <width>310</width>
- <height>23</height>
+ <file>bpmChannelItem.opi</file>
+ <x>24</x>
+ <y>201</y>
+ <width>420</width>
+ <height>20</height>
<resize>2</resize>
<actions>
</actions>
@@ -743,14 +693,14 @@ $(pv_value)</tooltip>
</widget>
<widget type="embedded" version="2.0.0">
<name>Linking Container_12</name>
- <file>bpmChannelItem.opi</file>
<macros>
<CH>DM-</CH>
</macros>
- <x>50</x>
- <y>213</y>
- <width>310</width>
- <height>23</height>
+ <file>bpmChannelItem.opi</file>
+ <x>24</x>
+ <y>223</y>
+ <width>420</width>
+ <height>20</height>
<resize>2</resize>
<actions>
</actions>
@@ -761,14 +711,14 @@ $(pv_value)</tooltip>
</widget>
<widget type="embedded" version="2.0.0">
<name>Linking Container_13</name>
- <file>bpmChannelItem.opi</file>
<macros>
<CH>AA-</CH>
</macros>
- <x>50</x>
- <y>273</y>
- <width>310</width>
- <height>23</height>
+ <file>bpmChannelItem.opi</file>
+ <x>24</x>
+ <y>265</y>
+ <width>420</width>
+ <height>20</height>
<resize>2</resize>
<actions>
</actions>
@@ -779,14 +729,14 @@ $(pv_value)</tooltip>
</widget>
<widget type="embedded" version="2.0.0">
<name>Linking Container_14</name>
- <file>bpmChannelItem.opi</file>
<macros>
<CH>BA-</CH>
</macros>
- <x>50</x>
- <y>295</y>
- <width>310</width>
- <height>23</height>
+ <file>bpmChannelItem.opi</file>
+ <x>24</x>
+ <y>287</y>
+ <width>420</width>
+ <height>20</height>
<resize>2</resize>
<actions>
</actions>
@@ -797,14 +747,14 @@ $(pv_value)</tooltip>
</widget>
<widget type="embedded" version="2.0.0">
<name>Linking Container_15</name>
- <file>bpmChannelItem.opi</file>
<macros>
<CH>CA-</CH>
</macros>
- <x>50</x>
- <y>317</y>
- <width>310</width>
- <height>23</height>
+ <file>bpmChannelItem.opi</file>
+ <x>24</x>
+ <y>309</y>
+ <width>420</width>
+ <height>20</height>
<resize>2</resize>
<actions>
</actions>
@@ -815,14 +765,14 @@ $(pv_value)</tooltip>
</widget>
<widget type="embedded" version="2.0.0">
<name>Linking Container_16</name>
- <file>bpmChannelItem.opi</file>
<macros>
<CH>DA-</CH>
</macros>
- <x>50</x>
- <y>339</y>
- <width>310</width>
- <height>23</height>
+ <file>bpmChannelItem.opi</file>
+ <x>24</x>
+ <y>331</y>
+ <width>420</width>
+ <height>20</height>
<resize>2</resize>
<actions>
</actions>
@@ -833,14 +783,14 @@ $(pv_value)</tooltip>
</widget>
<widget type="embedded" version="2.0.0">
<name>Linking Container_27</name>
- <file>bpmChannelAverageItem.opi</file>
<macros>
<CH>XP-</CH>
</macros>
- <x>50</x>
- <y>87</y>
- <width>310</width>
- <height>23</height>
+ <file>bpmChannelAverageItem.opi</file>
+ <x>24</x>
+ <y>115</y>
+ <width>420</width>
+ <height>20</height>
<resize>2</resize>
<actions>
</actions>
@@ -851,14 +801,14 @@ $(pv_value)</tooltip>
</widget>
<widget type="embedded" version="2.0.0">
<name>Linking Container_28</name>
- <file>bpmChannelAverageItem.opi</file>
<macros>
<CH>YP-</CH>
</macros>
- <x>50</x>
- <y>109</y>
- <width>310</width>
- <height>23</height>
+ <file>bpmChannelAverageItem.opi</file>
+ <x>24</x>
+ <y>137</y>
+ <width>420</width>
+ <height>20</height>
<resize>2</resize>
<actions>
</actions>
@@ -869,14 +819,14 @@ $(pv_value)</tooltip>
</widget>
<widget type="embedded" version="2.0.0">
<name>Linking Container_31</name>
- <file>bpmChannelAverageItem.opi</file>
<macros>
<CH>SM-</CH>
</macros>
- <x>50</x>
- <y>235</y>
- <width>310</width>
- <height>23</height>
+ <file>bpmChannelAverageItem.opi</file>
+ <x>24</x>
+ <y>245</y>
+ <width>420</width>
+ <height>20</height>
<resize>2</resize>
<actions>
</actions>
@@ -887,75 +837,15 @@ $(pv_value)</tooltip>
</widget>
<widget type="embedded" version="2.0.0">
<name>Linking Container_32</name>
- <file>bpmChannelAverageItem.opi</file>
<macros>
<CH>SA-</CH>
</macros>
- <x>50</x>
- <y>361</y>
- <width>310</width>
- <height>23</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</name>
- <text>Raw</text>
- <x>24</x>
- <y>384</y>
- <width>80</width>
- <height>15</height>
- <font>
- <font name="Header 3" family="Liberation Sans" style="BOLD" size="16.0">
- </font>
- </font>
- <vertical_alignment>1</vertical_alignment>
- <wrap_words>false</wrap_words>
- <actions>
- </actions>
- <border_color>
- <color red="0" green="128" blue="255">
- </color>
- </border_color>
- </widget>
- <widget type="label" version="2.0.0">
- <name>Label_2</name>
- <text>Angles</text>
- <x>24</x>
- <y>259</y>
- <width>80</width>
- <height>15</height>
- <font>
- <font name="Header 3" family="Liberation Sans" style="BOLD" size="16.0">
- </font>
- </font>
- <vertical_alignment>1</vertical_alignment>
- <wrap_words>false</wrap_words>
- <actions>
- </actions>
- <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>Magnitudes</text>
+ <file>bpmChannelAverageItem.opi</file>
<x>24</x>
- <y>133</y>
- <width>80</width>
- <height>15</height>
- <font>
- <font name="Header 3" family="Liberation Sans" style="BOLD" size="16.0">
- </font>
- </font>
- <vertical_alignment>1</vertical_alignment>
- <wrap_words>false</wrap_words>
+ <y>353</y>
+ <width>420</width>
+ <height>20</height>
+ <resize>2</resize>
<actions>
</actions>
<border_color>
@@ -965,9 +855,9 @@ $(pv_value)</tooltip>
</widget>
<widget type="label" version="2.0.0">
<name>Label_4</name>
- <text>Positions</text>
+ <text>IQ</text>
<x>24</x>
- <y>73</y>
+ <y>85</y>
<width>80</width>
<height>15</height>
<font>
@@ -986,9 +876,9 @@ $(pv_value)</tooltip>
<widget type="label" version="2.0.0">
<name>Label_334</name>
<text>VARIOUS</text>
- <x>14</x>
- <y>801</y>
- <width>381</width>
+ <x>480</x>
+ <y>354</y>
+ <width>448</width>
<height>249</height>
<font>
<font name="Header 1" family="Liberation Sans" style="BOLD" size="22.0">
@@ -1012,8 +902,8 @@ $(pv_value)</tooltip>
<widget type="label" version="2.0.0">
<name>Label_1</name>
<text>Reference line</text>
- <x>24</x>
- <y>841</y>
+ <x>490</x>
+ <y>394</y>
<width>108</width>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -1028,8 +918,8 @@ $(pv_value)</tooltip>
<widget type="textupdate" version="2.0.0">
<name>Text Update_111</name>
<pv_name>$(P)$(R)ReferenceLineR</pv_name>
- <x>276</x>
- <y>841</y>
+ <x>742</x>
+ <y>394</y>
<width>111</width>
<background_color>
<color red="255" green="255" blue="255">
@@ -1048,8 +938,8 @@ $(pv_value)</tooltip>
<widget type="combo" version="2.0.0">
<name>Menu Button_3</name>
<pv_name>$(P)$(R)ReferenceLine</pv_name>
- <x>150</x>
- <y>841</y>
+ <x>616</x>
+ <y>394</y>
<width>110</width>
<height>20</height>
<background_color>
@@ -1061,8 +951,8 @@ $(pv_value)</tooltip>
<widget type="led" version="2.0.0">
<name>LED_3</name>
<pv_name>$(P)$(R)IlkPositionStatusR</pv_name>
- <x>153</x>
- <y>586</y>
+ <x>619</x>
+ <y>139</y>
<width>16</width>
<height>16</height>
<off_color>
@@ -1087,8 +977,8 @@ $(pv_value)</tooltip>
<widget type="led" version="2.0.0">
<name>LED_4</name>
<pv_name>$(P)$(R)PhaseUnwrapControlR</pv_name>
- <x>153</x>
- <y>885</y>
+ <x>619</x>
+ <y>438</y>
<width>16</width>
<height>16</height>
<off_color>
@@ -1120,8 +1010,8 @@ $(pv_value)</tooltip>
</actions>
<pv_name>$(P)$(R)PhaseUnwrapControl</pv_name>
<text>Enable</text>
- <x>204</x>
- <y>883</y>
+ <x>670</x>
+ <y>436</y>
<width>43</width>
<height>20</height>
<font>
@@ -1143,8 +1033,8 @@ $(pv_value)</tooltip>
</actions>
<pv_name>$(P)$(R)PhaseUnwrapControl</pv_name>
<text>Disable</text>
- <x>288</x>
- <y>883</y>
+ <x>754</x>
+ <y>436</y>
<width>43</width>
<height>20</height>
<font>
@@ -1159,8 +1049,8 @@ $(pv_value)</tooltip>
<widget type="label" version="2.0.0">
<name>Label_337</name>
<text>Control</text>
- <x>17</x>
- <y>883</y>
+ <x>483</x>
+ <y>436</y>
<width>114</width>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -1175,8 +1065,8 @@ $(pv_value)</tooltip>
<widget type="label" version="2.0.0">
<name>Label_338</name>
<text>Threshold</text>
- <x>17</x>
- <y>904</y>
+ <x>483</x>
+ <y>457</y>
<width>114</width>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -1191,8 +1081,8 @@ $(pv_value)</tooltip>
<widget type="textentry" version="3.0.0">
<name>Text Input_6</name>
<pv_name>$(P)$(R)PhaseUnwrap</pv_name>
- <x>150</x>
- <y>904</y>
+ <x>616</x>
+ <y>457</y>
<width>109</width>
<background_color>
<color red="255" green="255" blue="255">
@@ -1209,8 +1099,8 @@ $(pv_value)</tooltip>
<widget type="textupdate" version="2.0.0">
<name>Text Update_112</name>
<pv_name>$(P)$(R)PhaseUnwrapR</pv_name>
- <x>276</x>
- <y>904</y>
+ <x>742</x>
+ <y>457</y>
<width>112</width>
<background_color>
<color red="255" green="255" blue="255">
@@ -1229,8 +1119,8 @@ $(pv_value)</tooltip>
<widget type="label" version="2.0.0">
<name>Label_339</name>
<text>Start</text>
- <x>17</x>
- <y>961</y>
+ <x>483</x>
+ <y>514</y>
<width>114</width>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -1245,8 +1135,8 @@ $(pv_value)</tooltip>
<widget type="textentry" version="3.0.0">
<name>Text Input_7</name>
<pv_name>$(P)$(R)FbisRoiStart</pv_name>
- <x>150</x>
- <y>961</y>
+ <x>616</x>
+ <y>514</y>
<width>109</width>
<background_color>
<color red="255" green="255" blue="255">
@@ -1263,8 +1153,8 @@ $(pv_value)</tooltip>
<widget type="textupdate" version="2.0.0">
<name>Text Update_113</name>
<pv_name>$(P)$(R)FbisRoiStartR</pv_name>
- <x>276</x>
- <y>961</y>
+ <x>742</x>
+ <y>514</y>
<width>112</width>
<background_color>
<color red="255" green="255" blue="255">
@@ -1283,8 +1173,8 @@ $(pv_value)</tooltip>
<widget type="label" version="2.0.0">
<name>Label_340</name>
<text>Count</text>
- <x>17</x>
- <y>980</y>
+ <x>483</x>
+ <y>533</y>
<width>114</width>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -1299,8 +1189,8 @@ $(pv_value)</tooltip>
<widget type="textentry" version="3.0.0">
<name>Text Input_8</name>
<pv_name>$(P)$(R)FbisRoiCount</pv_name>
- <x>150</x>
- <y>980</y>
+ <x>616</x>
+ <y>533</y>
<width>109</width>
<background_color>
<color red="255" green="255" blue="255">
@@ -1317,8 +1207,8 @@ $(pv_value)</tooltip>
<widget type="textupdate" version="2.0.0">
<name>Text Update_114</name>
<pv_name>$(P)$(R)FbisRoiCountR</pv_name>
- <x>276</x>
- <y>980</y>
+ <x>742</x>
+ <y>533</y>
<width>112</width>
<background_color>
<color red="255" green="255" blue="255">
@@ -1337,8 +1227,8 @@ $(pv_value)</tooltip>
<widget type="label" version="2.0.0">
<name>Label_341</name>
<text>Num samples</text>
- <x>17</x>
- <y>999</y>
+ <x>483</x>
+ <y>552</y>
<width>114</width>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -1353,8 +1243,8 @@ $(pv_value)</tooltip>
<widget type="textupdate" version="2.0.0">
<name>Text Update_115</name>
<pv_name>$(P)$(R)FbisRoiCountR</pv_name>
- <x>276</x>
- <y>999</y>
+ <x>742</x>
+ <y>552</y>
<width>112</width>
<background_color>
<color red="255" green="255" blue="255">
@@ -1373,8 +1263,8 @@ $(pv_value)</tooltip>
<widget type="label" version="2.0.0">
<name>Label_342</name>
<text>Phase unwrap</text>
- <x>17</x>
- <y>864</y>
+ <x>483</x>
+ <y>417</y>
<font>
<font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
</font>
@@ -1391,8 +1281,8 @@ $(pv_value)</tooltip>
<widget type="label" version="2.0.0">
<name>Label_343</name>
<text>FBIS region of interest</text>
- <x>17</x>
- <y>942</y>
+ <x>483</x>
+ <y>495</y>
<width>154</width>
<font>
<font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
@@ -1410,8 +1300,8 @@ $(pv_value)</tooltip>
<widget type="label" version="2.0.0">
<name>Label_344</name>
<text>Control</text>
- <x>20</x>
- <y>715</y>
+ <x>486</x>
+ <y>268</y>
<width>112</width>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -1426,8 +1316,8 @@ $(pv_value)</tooltip>
<widget type="led" version="2.0.0">
<name>LED_5</name>
<pv_name>$(P)$(R)IlkMagnitudeControlR</pv_name>
- <x>153</x>
- <y>717</y>
+ <x>619</x>
+ <y>270</y>
<width>16</width>
<height>16</height>
<off_color>
@@ -1459,8 +1349,8 @@ $(pv_value)</tooltip>
</actions>
<pv_name>$(P)$(R)IlkMagnitudeControl</pv_name>
<text>Enable</text>
- <x>204</x>
- <y>715</y>
+ <x>670</x>
+ <y>268</y>
<width>43</width>
<height>20</height>
<font>
@@ -1482,8 +1372,8 @@ $(pv_value)</tooltip>
</actions>
<pv_name>$(P)$(R)IlkMagnitudeControl</pv_name>
<text>Disable</text>
- <x>288</x>
- <y>715</y>
+ <x>754</x>
+ <y>268</y>
<width>43</width>
<height>20</height>
<font>
@@ -1498,8 +1388,8 @@ $(pv_value)</tooltip>
<widget type="label" version="2.0.0">
<name>Label_345</name>
<text>Status</text>
- <x>20</x>
- <y>734</y>
+ <x>486</x>
+ <y>287</y>
<width>112</width>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -1521,8 +1411,8 @@ $(pv_value)</tooltip>
</actions>
<pv_name>$(P)$(R)IlkMagnitudeClear</pv_name>
<text>Clear</text>
- <x>204</x>
- <y>734</y>
+ <x>670</x>
+ <y>287</y>
<width>43</width>
<height>20</height>
<font>
@@ -1537,8 +1427,8 @@ $(pv_value)</tooltip>
<widget type="led" version="2.0.0">
<name>LED_6</name>
<pv_name>$(P)$(R)IlkMagnitudeStatusR</pv_name>
- <x>153</x>
- <y>736</y>
+ <x>619</x>
+ <y>289</y>
<width>16</width>
<height>16</height>
<off_color>
@@ -1560,4 +1450,24 @@ $(pv_value)</tooltip>
<actions>
</actions>
</widget>
+ <widget type="label" version="2.0.0">
+ <name>Label_5</name>
+ <text>RAW</text>
+ <x>24</x>
+ <y>385</y>
+ <width>80</width>
+ <height>15</height>
+ <font>
+ <font name="Header 3" family="Liberation Sans" style="BOLD" size="16.0">
+ </font>
+ </font>
+ <vertical_alignment>1</vertical_alignment>
+ <wrap_words>false</wrap_words>
+ <actions>
+ </actions>
+ <border_color>
+ <color red="0" green="128" blue="255">
+ </color>
+ </border_color>
+ </widget>
</display>
diff --git a/99-Shared/adsis8300bpm/bpmInstanceOverview.bob b/99-Shared/adsis8300bpm/bpmInstanceOverview.bob
index 538ba2051d5a7939da213b891007935bef29bca1..d458ad188bf06f9591373d89f16f1abd7e656341 100644
--- a/99-Shared/adsis8300bpm/bpmInstanceOverview.bob
+++ b/99-Shared/adsis8300bpm/bpmInstanceOverview.bob
@@ -17,7 +17,7 @@
<width>1187</width>
<height>29</height>
<font>
- <font name="Header 1" family="Liberation Sans" style="BOLD" size="22.0">
+ <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
</font>
</font>
<background_color>
@@ -47,58 +47,22 @@
</color>
</background_color>
<title_font>
- <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+ <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
</font>
</title_font>
<show_toolbar>true</show_toolbar>
<actions>
</actions>
<rules>
- <rule name="A_size" prop_id="trace_0_buffer_size" out_exp="true">
+ <rule name="RL1_visible" prop_id="traces[4].visible" out_exp="true">
<exp bool_exp="true">
- <expression>pv0</expression>
- </exp>
- <pv_name>$(P)$(R)A-TR1-ArraySize0_RBV</pv_name>
- </rule>
- <rule name="B_size" prop_id="trace_1_buffer_size" out_exp="true">
- <exp bool_exp="true">
- <expression>pv0</expression>
- </exp>
- <pv_name>$(P)$(R)B-TR1-ArraySize0_RBV</pv_name>
- </rule>
- <rule name="C_size" prop_id="trace_2_buffer_size" out_exp="true">
- <exp bool_exp="true">
- <expression>pv0</expression>
- </exp>
- <pv_name>$(P)$(R)C-TR1-ArraySize0_RBV</pv_name>
- </rule>
- <rule name="D_size" prop_id="trace_3_buffer_size" out_exp="true">
- <exp bool_exp="true">
- <expression>pv0</expression>
- </exp>
- <pv_name>$(P)$(R)D-TR1-ArraySize0_RBV</pv_name>
- </rule>
- <rule name="RL1_size" prop_id="trace_4_buffer_size" out_exp="true">
- <exp bool_exp="true">
- <expression>pv0</expression>
- </exp>
- <pv_name>$(CG)RL1-TR1-ArraySize0_RBV</pv_name>
- </rule>
- <rule name="RL2_size" prop_id="trace_5_buffer_size" out_exp="true">
- <exp bool_exp="true">
- <expression>pv0</expression>
- </exp>
- <pv_name>$(CG)RL2-TR1-ArraySize0_RBV</pv_name>
- </rule>
- <rule name="RL1_visible" prop_id="trace_4_visible" out_exp="true">
- <exp bool_exp="true">
- <expression>pv0</expression>
+ <expression>pvInt0</expression>
</exp>
<pv_name>loc://ref1_visible</pv_name>
</rule>
- <rule name="RL2_visible" prop_id="trace_5_visible" out_exp="true">
+ <rule name="RL2_visible" prop_id="traces[5].visible" out_exp="true">
<exp bool_exp="true">
- <expression>pv0</expression>
+ <expression>pvInt0</expression>
</exp>
<pv_name>loc://ref2_visible</pv_name>
</rule>
@@ -111,11 +75,11 @@
<maximum>100.0</maximum>
<show_grid>true</show_grid>
<title_font>
- <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+ <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
</font>
</title_font>
<scale_font>
- <font name="Default" family="Liberation Sans" style="REGULAR" size="14.0">
+ <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
</font>
</scale_font>
<visible>true</visible>
@@ -129,11 +93,11 @@
<maximum>100.0</maximum>
<show_grid>true</show_grid>
<title_font>
- <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+ <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
</font>
</title_font>
<scale_font>
- <font name="Default" family="Liberation Sans" style="REGULAR" size="14.0">
+ <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
</font>
</scale_font>
<visible>true</visible>
@@ -255,26 +219,12 @@
</color>
</background_color>
<title_font>
- <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+ <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
</font>
</title_font>
<show_toolbar>true</show_toolbar>
<actions>
</actions>
- <rules>
- <rule name="X_size" prop_id="trace_0_buffer_size" out_exp="true">
- <exp bool_exp="true">
- <expression>pv0</expression>
- </exp>
- <pv_name>$(P)$(R)XP-TR1-ArraySize0_RBV</pv_name>
- </rule>
- <rule name="Y_size" prop_id="trace_1_buffer_size" out_exp="true">
- <exp bool_exp="true">
- <expression>pv0</expression>
- </exp>
- <pv_name>$(P)$(R)YP-TR1-ArraySize0_RBV</pv_name>
- </rule>
- </rules>
<x_axis>
<title>Points</title>
<autoscale>true</autoscale>
@@ -283,11 +233,11 @@
<maximum>100.0</maximum>
<show_grid>true</show_grid>
<title_font>
- <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+ <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
</font>
</title_font>
<scale_font>
- <font name="Default" family="Liberation Sans" style="REGULAR" size="14.0">
+ <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
</font>
</scale_font>
<visible>true</visible>
@@ -301,11 +251,11 @@
<maximum>100.0</maximum>
<show_grid>true</show_grid>
<title_font>
- <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+ <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
</font>
</title_font>
<scale_font>
- <font name="Default" family="Liberation Sans" style="REGULAR" size="14.0">
+ <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
</font>
</scale_font>
<visible>true</visible>
@@ -359,64 +309,22 @@
</color>
</background_color>
<title_font>
- <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+ <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
</font>
</title_font>
<show_toolbar>true</show_toolbar>
<actions>
</actions>
<rules>
- <rule name="AM_size" prop_id="trace_0_buffer_size" out_exp="true">
- <exp bool_exp="true">
- <expression>pv0</expression>
- </exp>
- <pv_name>$(P)$(R)AM-TR1-ArraySize0_RBV</pv_name>
- </rule>
- <rule name="BM_size" prop_id="trace_1_buffer_size" out_exp="true">
- <exp bool_exp="true">
- <expression>pv0</expression>
- </exp>
- <pv_name>$(P)$(R)BM-TR1-ArraySize0_RBV</pv_name>
- </rule>
- <rule name="CM_size" prop_id="trace_2_buffer_size" out_exp="true">
- <exp bool_exp="true">
- <expression>pv0</expression>
- </exp>
- <pv_name>$(P)$(R)CM-TR1-ArraySize0_RBV</pv_name>
- </rule>
- <rule name="DM_size" prop_id="trace_3_buffer_size" out_exp="true">
+ <rule name="RL1_visible" prop_id="traces[5].visible" out_exp="true">
<exp bool_exp="true">
- <expression>pv0</expression>
- </exp>
- <pv_name>$(P)$(R)DM-TR1-ArraySize0_RBV</pv_name>
- </rule>
- <rule name="SUM_size" prop_id="trace_4_buffer_size" out_exp="true">
- <exp bool_exp="true">
- <expression>pv0</expression>
- </exp>
- <pv_name>$(P)$(R)SM-TR1-ArraySize0_RBV</pv_name>
- </rule>
- <rule name="RL1_size" prop_id="trace_5_buffer_size" out_exp="true">
- <exp bool_exp="true">
- <expression>pv0</expression>
- </exp>
- <pv_name>$(CG)RL1-M-TR1-ArraySize0_RBV</pv_name>
- </rule>
- <rule name="RL2_size" prop_id="trace_6_buffer_size" out_exp="true">
- <exp bool_exp="true">
- <expression>pv0</expression>
- </exp>
- <pv_name>$(CG)RL2-M-TR1-ArraySize0_RBV</pv_name>
- </rule>
- <rule name="RL1_visible" prop_id="trace_5_visible" out_exp="true">
- <exp bool_exp="true">
- <expression>pv0</expression>
+ <expression>pvInt0</expression>
</exp>
<pv_name>loc://ref1_visible</pv_name>
</rule>
- <rule name="RL2_visible" prop_id="trace_6_visible" out_exp="true">
+ <rule name="RL2_visible" prop_id="traces[6].visible" out_exp="true">
<exp bool_exp="true">
- <expression>pv0</expression>
+ <expression>pvInt0</expression>
</exp>
<pv_name>loc://ref2_visible</pv_name>
</rule>
@@ -429,11 +337,11 @@
<maximum>100.0</maximum>
<show_grid>true</show_grid>
<title_font>
- <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+ <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
</font>
</title_font>
<scale_font>
- <font name="Default" family="Liberation Sans" style="REGULAR" size="14.0">
+ <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
</font>
</scale_font>
<visible>true</visible>
@@ -447,11 +355,11 @@
<maximum>100.0</maximum>
<show_grid>true</show_grid>
<title_font>
- <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+ <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
</font>
</title_font>
<scale_font>
- <font name="Default" family="Liberation Sans" style="REGULAR" size="14.0">
+ <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
</font>
</scale_font>
<visible>true</visible>
@@ -590,64 +498,22 @@
</color>
</background_color>
<title_font>
- <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+ <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
</font>
</title_font>
<show_toolbar>true</show_toolbar>
<actions>
</actions>
<rules>
- <rule name="AA_size" prop_id="trace_0_buffer_size" out_exp="true">
- <exp bool_exp="true">
- <expression>pv0</expression>
- </exp>
- <pv_name>$(P)$(R)AA-TR1-ArraySize0_RBV</pv_name>
- </rule>
- <rule name="BA_size" prop_id="trace_1_buffer_size" out_exp="true">
- <exp bool_exp="true">
- <expression>pv0</expression>
- </exp>
- <pv_name>$(P)$(R)BA-TR1-ArraySize0_RBV</pv_name>
- </rule>
- <rule name="CA_size" prop_id="trace_2_buffer_size" out_exp="true">
- <exp bool_exp="true">
- <expression>pv0</expression>
- </exp>
- <pv_name>$(P)$(R)CA-TR1-ArraySize0_RBV</pv_name>
- </rule>
- <rule name="DA_size" prop_id="trace_3_buffer_size" out_exp="true">
- <exp bool_exp="true">
- <expression>pv0</expression>
- </exp>
- <pv_name>$(P)$(R)DA-TR1-ArraySize0_RBV</pv_name>
- </rule>
- <rule name="SUM_size" prop_id="trace_4_buffer_size" out_exp="true">
- <exp bool_exp="true">
- <expression>pv0</expression>
- </exp>
- <pv_name>$(P)$(R)SA-TR1-ArraySize0_RBV</pv_name>
- </rule>
- <rule name="RL1_size" prop_id="trace_5_buffer_size" out_exp="true">
- <exp bool_exp="true">
- <expression>pv0</expression>
- </exp>
- <pv_name>$(CG)RL1-A-TR1-ArraySize0_RBV</pv_name>
- </rule>
- <rule name="RL2_size" prop_id="trace_6_buffer_size" out_exp="true">
- <exp bool_exp="true">
- <expression>pv0</expression>
- </exp>
- <pv_name>$(CG)RL2-A-TR1-ArraySize0_RBV</pv_name>
- </rule>
- <rule name="RL1_visible" prop_id="trace_5_visible" out_exp="true">
+ <rule name="RL1_visible" prop_id="traces[5].visible" out_exp="true">
<exp bool_exp="true">
- <expression>pv0</expression>
+ <expression>pvInt0</expression>
</exp>
<pv_name>loc://ref1_visible</pv_name>
</rule>
- <rule name="RL2_visible" prop_id="trace_6_visible" out_exp="true">
+ <rule name="RL2_visible" prop_id="traces[6].visible" out_exp="true">
<exp bool_exp="true">
- <expression>pv0</expression>
+ <expression>pvInt0</expression>
</exp>
<pv_name>loc://ref2_visible</pv_name>
</rule>
@@ -660,11 +526,11 @@
<maximum>100.0</maximum>
<show_grid>true</show_grid>
<title_font>
- <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+ <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
</font>
</title_font>
<scale_font>
- <font name="Default" family="Liberation Sans" style="REGULAR" size="14.0">
+ <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
</font>
</scale_font>
<visible>true</visible>
@@ -678,11 +544,11 @@
<maximum>100.0</maximum>
<show_grid>true</show_grid>
<title_font>
- <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+ <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
</font>
</title_font>
<scale_font>
- <font name="Default" family="Liberation Sans" style="REGULAR" size="14.0">
+ <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
</font>
</scale_font>
<visible>true</visible>
diff --git a/99-Shared/adsis8300bpm/bpmInstances.bob b/99-Shared/adsis8300bpm/bpmInstances.bob
deleted file mode 100644
index 7a2c1b1c9e86db236be270c2ab6538fe0aca52df..0000000000000000000000000000000000000000
--- a/99-Shared/adsis8300bpm/bpmInstances.bob
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<display version="2.0.0">
- <name>$(TITLE) : Instances</name>
- <width>1200</width>
- <height>1000</height>
- <background_color>
- <color red="240" green="240" blue="240">
- </color>
- </background_color>
- <actions>
- </actions>
- <widget type="label" version="2.0.0">
- <name>Label_23</name>
- <text>$(TITLE) // $(SYSTEM)</text>
- <x>13</x>
- <y>7</y>
- <width>1181</width>
- <height>29</height>
- <font>
- <font name="Header 1" family="Liberation Sans" style="BOLD" size="22.0">
- </font>
- </font>
- <background_color>
- <color name="IO Focus Entry" red="198" green="217" blue="241">
- </color>
- </background_color>
- <transparent>false</transparent>
- <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 Border" red="0" green="0" blue="0">
- </color>
- </border_color>
- </widget>
- <widget type="polyline" version="2.0.0">
- <name>Polyline</name>
- <height>100</height>
- <line_width>1</line_width>
- <line_color>
- <color red="30" green="144" blue="255">
- </color>
- </line_color>
- <actions>
- </actions>
- <tooltip>$(pv_name)
-$(pv_value)</tooltip>
- </widget>
- <widget type="polyline" version="2.0.0">
- <name>Polyline_1</name>
- <height>100</height>
- <line_width>1</line_width>
- <line_color>
- <color red="30" green="144" blue="255">
- </color>
- </line_color>
- <actions>
- </actions>
- <tooltip>$(pv_name)
-$(pv_value)</tooltip>
- </widget>
- <widget type="embedded" version="2.0.0">
- <name>Linking Container</name>
- <file>bpmInstance.opi</file>
- <macros>
- <I>1</I>
- </macros>
- <x>408</x>
- <y>45</y>
- <height>1055</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_39</name>
- <file>bpmInstance.opi</file>
- <macros>
- <I>2</I>
- </macros>
- <x>807</x>
- <y>45</y>
- <height>1055</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_40</name>
- <file>bpmReference.opi</file>
- <macros>
- <I>1</I>
- </macros>
- <x>12</x>
- <y>45</y>
- <width>388</width>
- <height>130</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_41</name>
- <file>bpmReference.opi</file>
- <macros>
- <I>2</I>
- </macros>
- <x>12</x>
- <y>180</y>
- <width>388</width>
- <height>130</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_42</name>
- <file>bpmAngleDifference.opi</file>
- <x>12</x>
- <y>318</y>
- <width>388</width>
- <height>103</height>
- <resize>2</resize>
- <actions>
- </actions>
- <border_color>
- <color red="0" green="128" blue="255">
- </color>
- </border_color>
- </widget>
-</display>
diff --git a/99-Shared/adsis8300bpm/bpmReference.bob b/99-Shared/adsis8300bpm/bpmReference.bob
index 5af1edbc300be70327f7b399e9e6db02f86f8b0b..11182a32e2733f0c64ca959cb9426128e681f427 100644
--- a/99-Shared/adsis8300bpm/bpmReference.bob
+++ b/99-Shared/adsis8300bpm/bpmReference.bob
@@ -1,45 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<display version="2.0.0">
- <width>1200</width>
- <height>1000</height>
+ <width>450</width>
+ <height>125</height>
<background_color>
<color red="240" green="240" blue="240">
</color>
</background_color>
<actions>
</actions>
- <widget type="polyline" version="2.0.0">
- <name>Polyline</name>
- <height>100</height>
- <line_width>1</line_width>
- <line_color>
- <color red="30" green="144" blue="255">
- </color>
- </line_color>
- <actions>
- </actions>
- <tooltip>$(pv_name)
-$(pv_value)</tooltip>
- </widget>
- <widget type="polyline" version="2.0.0">
- <name>Polyline_1</name>
- <height>100</height>
- <line_width>1</line_width>
- <line_color>
- <color red="30" green="144" blue="255">
- </color>
- </line_color>
- <actions>
- </actions>
- <tooltip>$(pv_name)
-$(pv_value)</tooltip>
- </widget>
<widget type="label" version="2.0.0">
<name>Label_276</name>
<text>Reference line $(I)</text>
<x>2</x>
<y>2</y>
- <width>381</width>
+ <width>448</width>
<height>123</height>
<font>
<font name="Header 1" family="Liberation Sans" style="BOLD" size="22.0">
@@ -62,14 +36,14 @@ $(pv_value)</tooltip>
</widget>
<widget type="embedded" version="2.0.0">
<name>Linking Container_8</name>
- <file>aiChannelItem.opi</file>
<macros>
<CH>RL$(I)-</CH>
</macros>
+ <file>aiChannelItem.opi</file>
<x>18</x>
<y>42</y>
- <width>310</width>
- <height>23</height>
+ <width>420</width>
+ <height>20</height>
<resize>2</resize>
<actions>
</actions>
@@ -80,14 +54,14 @@ $(pv_value)</tooltip>
</widget>
<widget type="embedded" version="2.0.0">
<name>Linking Container_17</name>
- <file>bpmChannelItem.opi</file>
<macros>
<CH>RL$(I)-M-</CH>
</macros>
+ <file>bpmChannelItem.opi</file>
<x>18</x>
<y>64</y>
- <width>310</width>
- <height>23</height>
+ <width>420</width>
+ <height>20</height>
<resize>2</resize>
<actions>
</actions>
@@ -98,14 +72,14 @@ $(pv_value)</tooltip>
</widget>
<widget type="embedded" version="2.0.0">
<name>Linking Container_18</name>
- <file>bpmChannelItem.opi</file>
<macros>
<CH>RL$(I)-A-</CH>
</macros>
+ <file>bpmChannelItem.opi</file>
<x>18</x>
<y>86</y>
- <width>310</width>
- <height>23</height>
+ <width>420</width>
+ <height>20</height>
<resize>2</resize>
<actions>
</actions>