diff --git a/99-Shared/adsis8300bpm/aiChannel.bob b/99-Shared/adsis8300bpm/aiChannel.bob
index 8c65f80eac55d580a69977c95455f9da1ae741e3..e68d2a47cb9a5b0fe172ed946ffbc14109350740 100644
--- a/99-Shared/adsis8300bpm/aiChannel.bob
+++ b/99-Shared/adsis8300bpm/aiChannel.bob
@@ -4,15 +4,15 @@
<x>470</x>
<y>197</y>
<width>2040</width>
- <height>840</height>
+ <height>870</height>
<actions>
</actions>
<widget type="rectangle" version="2.0.0">
<name>BGGrey03-titlebar_6</name>
- <x>1080</x>
+ <x>1040</x>
<y>70</y>
- <width>940</width>
- <height>690</height>
+ <width>980</width>
+ <height>780</height>
<line_width>0</line_width>
<background_color>
<color name="GROUP-BORDER" red="150" green="155" blue="151">
@@ -23,10 +23,10 @@
</widget>
<widget type="rectangle" version="2.0.0">
<name>BGGrey03-background_22</name>
- <x>1100</x>
- <y>90</y>
- <width>900</width>
- <height>650</height>
+ <x>1060</x>
+ <y>120</y>
+ <width>940</width>
+ <height>710</height>
<line_width>0</line_width>
<background_color>
<color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
@@ -39,8 +39,8 @@
<name>BGGrey03-titlebar_5</name>
<x>550</x>
<y>70</y>
- <width>510</width>
- <height>690</height>
+ <width>470</width>
+ <height>780</height>
<line_width>0</line_width>
<background_color>
<color name="GROUP-BORDER" red="150" green="155" blue="151">
@@ -67,8 +67,8 @@
<name>BGGrey03-background_18</name>
<x>570</x>
<y>120</y>
- <width>470</width>
- <height>170</height>
+ <width>430</width>
+ <height>190</height>
<line_width>0</line_width>
<background_color>
<color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
@@ -80,9 +80,9 @@
<widget type="rectangle" version="2.0.0">
<name>BGGrey03-background_19</name>
<x>570</x>
- <y>350</y>
- <width>470</width>
- <height>60</height>
+ <y>370</y>
+ <width>430</width>
+ <height>70</height>
<line_width>0</line_width>
<background_color>
<color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
@@ -94,9 +94,9 @@
<widget type="rectangle" version="2.0.0">
<name>BGGrey03-background_20</name>
<x>570</x>
- <y>470</y>
- <width>470</width>
- <height>50</height>
+ <y>500</y>
+ <width>430</width>
+ <height>70</height>
<line_width>0</line_width>
<background_color>
<color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
@@ -108,9 +108,9 @@
<widget type="rectangle" version="2.0.0">
<name>BGGrey03-background_17</name>
<x>570</x>
- <y>580</y>
- <width>470</width>
- <height>50</height>
+ <y>630</y>
+ <width>430</width>
+ <height>70</height>
<line_width>0</line_width>
<background_color>
<color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
@@ -122,9 +122,9 @@
<widget type="rectangle" version="2.0.0">
<name>BGGrey03-background_16</name>
<x>40</x>
- <y>590</y>
+ <y>570</y>
<width>470</width>
- <height>210</height>
+ <height>230</height>
<line_width>0</line_width>
<background_color>
<color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
@@ -138,7 +138,7 @@
<x>40</x>
<y>120</y>
<width>470</width>
- <height>410</height>
+ <height>390</height>
<line_width>0</line_width>
<background_color>
<color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
@@ -149,10 +149,10 @@
</widget>
<widget type="xyplot" version="2.0.0">
<name>XY Graph</name>
- <x>1110</x>
- <y>100</y>
- <width>880</width>
- <height>630</height>
+ <x>1070</x>
+ <y>130</y>
+ <width>920</width>
+ <height>690</height>
<background_color>
<color name="Transparent" red="255" green="255" blue="255" alpha="0">
</color>
@@ -233,29 +233,12 @@
</trace>
</traces>
</widget>
- <widget type="label" version="2.0.0">
- <name>Label_1</name>
- <text>Time link or timepoint</text>
- <x>50</x>
- <y>250</y>
- <width>160</width>
- <height>30</height>
- <horizontal_alignment>2</horizontal_alignment>
- <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="textentry" version="3.0.0">
<name>Text Input</name>
<pv_name>$(P)$(R)$(CH)TR1-TimePerPointLink.DOL</pv_name>
- <x>220</x>
- <y>250</y>
- <width>120</width>
+ <x>350</x>
+ <y>260</y>
+ <width>140</width>
<height>30</height>
<format>6</format>
<show_units>false</show_units>
@@ -269,10 +252,10 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_2</name>
- <text>Time/point</text>
- <x>50</x>
- <y>290</y>
- <width>160</width>
+ <text>Time link/point:</text>
+ <x>60</x>
+ <y>260</y>
+ <width>140</width>
<height>30</height>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -287,9 +270,9 @@
<widget type="textupdate" version="2.0.0">
<name>Text Update</name>
<pv_name>$(P)$(R)$(CH)TR1-TimePerPoint</pv_name>
- <x>350</x>
- <y>290</y>
- <width>120</width>
+ <x>210</x>
+ <y>260</y>
+ <width>130</width>
<height>30</height>
<format>2</format>
<show_units>false</show_units>
@@ -305,8 +288,8 @@
<widget type="led" version="2.0.0">
<name>LED_1</name>
<pv_name>$(P)$(R)$(CH)DoneR</pv_name>
- <x>230</x>
- <y>175</y>
+ <x>220</x>
+ <y>185</y>
<off_color>
<color name="Major" red="250" green="12" blue="14">
</color>
@@ -320,10 +303,10 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_3</name>
- <text>Num bytes</text>
- <x>50</x>
- <y>330</y>
- <width>160</width>
+ <text>Num bytes:</text>
+ <x>60</x>
+ <y>300</y>
+ <width>140</width>
<height>30</height>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -338,9 +321,9 @@
<widget type="textupdate" version="2.0.0">
<name>Text Update_1</name>
<pv_name>$(P)$(R)$(CH)NumBytesR</pv_name>
- <x>350</x>
- <y>331</y>
- <width>120</width>
+ <x>210</x>
+ <y>301</y>
+ <width>130</width>
<height>30</height>
<precision>0</precision>
<show_units>false</show_units>
@@ -355,10 +338,10 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_4</name>
- <text>Done</text>
- <x>50</x>
- <y>170</y>
- <width>160</width>
+ <text>Done:</text>
+ <x>60</x>
+ <y>180</y>
+ <width>140</width>
<height>30</height>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -373,8 +356,8 @@
<widget type="led" version="2.0.0">
<name>LED_1</name>
<pv_name>$(P)$(R)$(CH)ActiveR</pv_name>
- <x>230</x>
- <y>215</y>
+ <x>220</x>
+ <y>225</y>
<off_color>
<color name="IO Normal Level Alarm" red="0" green="255" blue="0">
</color>
@@ -388,10 +371,10 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_5</name>
- <text>Active</text>
- <x>120</x>
- <y>210</y>
- <width>92</width>
+ <text>Active:</text>
+ <x>60</x>
+ <y>220</y>
+ <width>140</width>
<height>30</height>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -406,8 +389,8 @@
<widget type="led" version="2.0.0">
<name>LED_3</name>
<pv_name>$(P)$(R)$(CH)ControlR</pv_name>
- <x>230</x>
- <y>135</y>
+ <x>220</x>
+ <y>145</y>
<off_color>
<color name="Major" red="250" green="12" blue="14">
</color>
@@ -429,8 +412,8 @@
</actions>
<pv_name>$(P)$(R)$(CH)Control</pv_name>
<text>Enable</text>
- <x>270</x>
- <y>130</y>
+ <x>260</x>
+ <y>140</y>
<width>70</width>
</widget>
<widget type="action_button" version="3.0.0">
@@ -443,8 +426,8 @@
</actions>
<pv_name>$(P)$(R)$(CH)Control</pv_name>
<text>Disable</text>
- <x>350</x>
- <y>130</y>
+ <x>340</x>
+ <y>140</y>
<width>70</width>
</widget>
<widget type="action_button" version="3.0.0">
@@ -460,16 +443,16 @@
</action>
</actions>
<text>More..</text>
- <x>430</x>
- <y>600</y>
+ <x>420</x>
+ <y>590</y>
<width>70</width>
<tooltip>$(actions)</tooltip>
</widget>
<widget type="led" version="2.0.0">
<name>LED_4</name>
<pv_name>$(P)$(R)$(CH)TR1-EnableCallbacks_RBV</pv_name>
- <x>230</x>
- <y>605</y>
+ <x>220</x>
+ <y>595</y>
<off_color>
<color name="Major" red="250" green="12" blue="14">
</color>
@@ -491,8 +474,8 @@
</actions>
<pv_name>$(P)$(R)$(CH)TR1-EnableCallbacks</pv_name>
<text>Enable</text>
- <x>273</x>
- <y>600</y>
+ <x>263</x>
+ <y>590</y>
<width>70</width>
</widget>
<widget type="action_button" version="3.0.0">
@@ -505,16 +488,16 @@
</actions>
<pv_name>$(P)$(R)$(CH)TR1-EnableCallbacks</pv_name>
<text>Disable</text>
- <x>350</x>
- <y>600</y>
+ <x>340</x>
+ <y>590</y>
<width>70</width>
</widget>
<widget type="label" version="2.0.0">
<name>Label_13</name>
- <text>Array Size</text>
- <x>50</x>
- <y>720</y>
- <width>160</width>
+ <text>Array Size:</text>
+ <x>60</x>
+ <y>710</y>
+ <width>140</width>
<height>30</height>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -529,9 +512,9 @@
<widget type="textupdate" version="2.0.0">
<name>Text Update_6</name>
<pv_name>$(P)$(R)$(CH)TR1-ArraySize0_RBV</pv_name>
- <x>350</x>
- <y>721</y>
- <width>120</width>
+ <x>210</x>
+ <y>711</y>
+ <width>130</width>
<height>30</height>
<format>1</format>
<show_units>false</show_units>
@@ -547,10 +530,10 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_14</name>
- <text>Data type</text>
- <x>50</x>
- <y>760</y>
- <width>160</width>
+ <text>Data type:</text>
+ <x>60</x>
+ <y>750</y>
+ <width>140</width>
<height>30</height>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -565,9 +548,9 @@
<widget type="textupdate" version="2.0.0">
<name>Text Update_8</name>
<pv_name>$(P)$(R)$(CH)TR1-DataType_RBV</pv_name>
- <x>350</x>
- <y>761</y>
- <width>120</width>
+ <x>210</x>
+ <y>751</y>
+ <width>130</width>
<height>30</height>
<format>6</format>
<show_units>false</show_units>
@@ -583,9 +566,9 @@
<widget type="textupdate" version="2.0.0">
<name>Text Update_9</name>
<pv_name>$(P)$(R)$(CH)TR1-ArrayCounter_RBV</pv_name>
- <x>350</x>
- <y>641</y>
- <width>120</width>
+ <x>210</x>
+ <y>631</y>
+ <width>130</width>
<height>30</height>
<format>1</format>
<show_units>false</show_units>
@@ -600,10 +583,10 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_15</name>
- <text>Array counter</text>
- <x>50</x>
- <y>640</y>
- <width>160</width>
+ <text>Array counter:</text>
+ <x>60</x>
+ <y>630</y>
+ <width>140</width>
<height>30</height>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -617,10 +600,10 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_16</name>
- <text>Array rate</text>
- <x>50</x>
- <y>680</y>
- <width>160</width>
+ <text>Array rate:</text>
+ <x>60</x>
+ <y>670</y>
+ <width>140</width>
<height>30</height>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -635,9 +618,9 @@
<widget type="textupdate" version="2.0.0">
<name>Text Update_10</name>
<pv_name>$(P)$(R)$(CH)TR1-ArrayRate_RBV</pv_name>
- <x>350</x>
- <y>681</y>
- <width>120</width>
+ <x>210</x>
+ <y>671</y>
+ <width>130</width>
<height>30</height>
<format>1</format>
<show_units>false</show_units>
@@ -652,10 +635,10 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_17</name>
- <text>Control</text>
- <x>50</x>
- <y>600</y>
- <width>160</width>
+ <text>Control:</text>
+ <x>60</x>
+ <y>590</y>
+ <width>140</width>
<height>30</height>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -669,10 +652,9 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_20</name>
- <text>Value</text>
- <x>580</x>
- <y>590</y>
- <width>160</width>
+ <text>Value:</text>
+ <x>590</x>
+ <y>650</y>
<height>30</height>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -687,9 +669,9 @@
<widget type="textupdate" version="2.0.0">
<name>Text Update_11</name>
<pv_name>$(P)$(R)$(CH)AttnR</pv_name>
- <x>880</x>
- <y>590</y>
- <width>120</width>
+ <x>700</x>
+ <y>650</y>
+ <width>130</width>
<height>30</height>
<format>1</format>
<show_units>false</show_units>
@@ -705,9 +687,9 @@
<widget type="textentry" version="3.0.0">
<name>Text Input_3</name>
<pv_name>$(P)$(R)$(CH)Attn</pv_name>
- <x>750</x>
- <y>590</y>
- <width>120</width>
+ <x>840</x>
+ <y>650</y>
+ <width>140</width>
<height>30</height>
<show_units>false</show_units>
<actions>
@@ -721,8 +703,8 @@
<widget type="led" version="2.0.0">
<name>LED_9</name>
<pv_name>$(P)$(R)$(CH)SelfTrigControlR</pv_name>
- <x>760</x>
- <y>135</y>
+ <x>710</x>
+ <y>145</y>
<off_color>
<color name="Major" red="250" green="12" blue="14">
</color>
@@ -744,8 +726,8 @@
</actions>
<pv_name>$(P)$(R)$(CH)SelfTrigControl</pv_name>
<text>Enable</text>
- <x>803</x>
- <y>130</y>
+ <x>753</x>
+ <y>140</y>
<width>70</width>
</widget>
<widget type="action_button" version="3.0.0">
@@ -758,16 +740,15 @@
</actions>
<pv_name>$(P)$(R)$(CH)SelfTrigControl</pv_name>
<text>Disable</text>
- <x>880</x>
- <y>130</y>
+ <x>830</x>
+ <y>140</y>
<width>70</width>
</widget>
<widget type="label" version="2.0.0">
<name>Label_288</name>
- <text>Control</text>
- <x>580</x>
- <y>130</y>
- <width>160</width>
+ <text>Control:</text>
+ <x>590</x>
+ <y>140</y>
<height>30</height>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -781,10 +762,9 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_289</name>
- <text>Threshold</text>
- <x>580</x>
- <y>170</y>
- <width>160</width>
+ <text>Threshold:</text>
+ <x>590</x>
+ <y>180</y>
<height>30</height>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -799,9 +779,9 @@
<widget type="textupdate" version="2.0.0">
<name>Text Update_76</name>
<pv_name>$(P)$(R)$(CH)SelfTrigThresholdR</pv_name>
- <x>880</x>
- <y>171</y>
- <width>120</width>
+ <x>700</x>
+ <y>181</y>
+ <width>130</width>
<height>30</height>
<format>1</format>
<show_units>false</show_units>
@@ -817,9 +797,9 @@
<widget type="textentry" version="3.0.0">
<name>Text Input_4</name>
<pv_name>$(P)$(R)$(CH)SelfTrigThreshold</pv_name>
- <x>750</x>
- <y>170</y>
- <width>120</width>
+ <x>840</x>
+ <y>180</y>
+ <width>140</width>
<height>30</height>
<show_units>false</show_units>
<actions>
@@ -832,10 +812,9 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_290</name>
- <text>Window</text>
- <x>580</x>
- <y>210</y>
- <width>160</width>
+ <text>Window:</text>
+ <x>590</x>
+ <y>220</y>
<height>30</height>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -850,9 +829,9 @@
<widget type="textupdate" version="2.0.0">
<name>Text Update_77</name>
<pv_name>$(P)$(R)$(CH)SelfTrigWindowR</pv_name>
- <x>880</x>
- <y>211</y>
- <width>120</width>
+ <x>700</x>
+ <y>221</y>
+ <width>130</width>
<height>30</height>
<format>1</format>
<show_units>false</show_units>
@@ -868,9 +847,9 @@
<widget type="textentry" version="3.0.0">
<name>Text Input_5</name>
<pv_name>$(P)$(R)$(CH)SelfTrigWindow</pv_name>
- <x>750</x>
- <y>210</y>
- <width>120</width>
+ <x>840</x>
+ <y>220</y>
+ <width>140</width>
<height>30</height>
<show_units>false</show_units>
<actions>
@@ -884,8 +863,8 @@
<widget type="led" version="2.0.0">
<name>LED_10</name>
<pv_name>$(P)$(R)$(CH)SelfTrigTriggered</pv_name>
- <x>760</x>
- <y>255</y>
+ <x>710</x>
+ <y>265</y>
<off_color>
<color name="Major" red="250" green="12" blue="14">
</color>
@@ -899,10 +878,9 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_291</name>
- <text>Triggered</text>
- <x>580</x>
- <y>250</y>
- <width>160</width>
+ <text>Triggered:</text>
+ <x>590</x>
+ <y>260</y>
<height>30</height>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -916,10 +894,10 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_292</name>
- <text>Num samples</text>
- <x>50</x>
- <y>370</y>
- <width>160</width>
+ <text>Num samples:</text>
+ <x>60</x>
+ <y>340</y>
+ <width>140</width>
<height>30</height>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -934,9 +912,9 @@
<widget type="textupdate" version="2.0.0">
<name>Text Update_78</name>
<pv_name>$(P)$(R)$(CH)NumSamplesR</pv_name>
- <x>350</x>
- <y>371</y>
- <width>120</width>
+ <x>210</x>
+ <y>341</y>
+ <width>130</width>
<height>30</height>
<precision>0</precision>
<show_units>false</show_units>
@@ -962,16 +940,16 @@
</action>
</actions>
<text>More..</text>
- <x>960</x>
- <y>360</y>
+ <x>910</x>
+ <y>390</y>
<width>70</width>
<tooltip>$(actions)</tooltip>
</widget>
<widget type="led" version="2.0.0">
<name>LED_7</name>
<pv_name>$(P)$(R)$(CH)CB1-EnableCallbacks_RBV</pv_name>
- <x>760</x>
- <y>365</y>
+ <x>710</x>
+ <y>395</y>
<off_color>
<color name="Major" red="250" green="12" blue="14">
</color>
@@ -993,8 +971,8 @@
</actions>
<pv_name>$(P)$(R)$(CH)CB1-EnableCallbacks</pv_name>
<text>Enable</text>
- <x>800</x>
- <y>360</y>
+ <x>750</x>
+ <y>390</y>
<width>70</width>
</widget>
<widget type="action_button" version="3.0.0">
@@ -1007,16 +985,15 @@
</actions>
<pv_name>$(P)$(R)$(CH)CB1-EnableCallbacks</pv_name>
<text>Disable</text>
- <x>880</x>
- <y>360</y>
+ <x>830</x>
+ <y>390</y>
<width>70</width>
</widget>
<widget type="label" version="2.0.0">
<name>Label_35</name>
- <text>Control</text>
- <x>580</x>
- <y>361</y>
- <width>160</width>
+ <text>Control:</text>
+ <x>590</x>
+ <y>391</y>
<height>30</height>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -1041,16 +1018,16 @@
</action>
</actions>
<text>More..</text>
- <x>960</x>
- <y>480</y>
+ <x>910</x>
+ <y>520</y>
<width>70</width>
<tooltip>$(actions)</tooltip>
</widget>
<widget type="led" version="2.0.0">
<name>LED_8</name>
<pv_name>$(P)$(R)$(CH)TR2-EnableCallbacks_RBV</pv_name>
- <x>760</x>
- <y>485</y>
+ <x>710</x>
+ <y>525</y>
<off_color>
<color name="Major" red="250" green="12" blue="14">
</color>
@@ -1072,8 +1049,8 @@
</actions>
<pv_name>$(P)$(R)$(CH)TR2-EnableCallbacks</pv_name>
<text>Enable</text>
- <x>800</x>
- <y>480</y>
+ <x>750</x>
+ <y>520</y>
<width>70</width>
</widget>
<widget type="action_button" version="3.0.0">
@@ -1086,16 +1063,15 @@
</actions>
<pv_name>$(P)$(R)$(CH)TR2-EnableCallbacks</pv_name>
<text>Disable</text>
- <x>880</x>
- <y>480</y>
+ <x>830</x>
+ <y>520</y>
<width>70</width>
</widget>
<widget type="label" version="2.0.0">
<name>Label_37</name>
- <text>Control</text>
- <x>580</x>
- <y>480</y>
- <width>160</width>
+ <text>Control:</text>
+ <x>590</x>
+ <y>520</y>
<height>30</height>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -1109,10 +1085,10 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_297</name>
- <text>Memory addr.</text>
- <x>50</x>
- <y>490</y>
- <width>160</width>
+ <text>Memory addr.:</text>
+ <x>60</x>
+ <y>460</y>
+ <width>140</width>
<height>30</height>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -1127,9 +1103,9 @@
<widget type="textupdate" version="2.0.0">
<name>Text Update_79</name>
<pv_name>$(P)$(R)$(CH)MemoryAddressR</pv_name>
- <x>350</x>
- <y>490</y>
- <width>120</width>
+ <x>210</x>
+ <y>460</y>
+ <width>130</width>
<height>30</height>
<format>1</format>
<show_units>false</show_units>
@@ -1145,9 +1121,9 @@
<widget type="textentry" version="3.0.0">
<name>Text Input_6</name>
<pv_name>$(P)$(R)$(CH)MemoryAddress</pv_name>
- <x>220</x>
- <y>490</y>
- <width>120</width>
+ <x>350</x>
+ <y>460</y>
+ <width>140</width>
<height>30</height>
<show_units>false</show_units>
<actions>
@@ -1160,10 +1136,10 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_302</name>
- <text>PCIe start</text>
- <x>50</x>
- <y>410</y>
- <width>160</width>
+ <text>PCIe start:</text>
+ <x>60</x>
+ <y>380</y>
+ <width>140</width>
<height>30</height>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -1178,9 +1154,9 @@
<widget type="textupdate" version="2.0.0">
<name>Text Update_80</name>
<pv_name>$(P)$(R)$(CH)PcieStartTimeR</pv_name>
- <x>350</x>
- <y>411</y>
- <width>120</width>
+ <x>210</x>
+ <y>381</y>
+ <width>130</width>
<height>30</height>
<show_units>false</show_units>
<vertical_alignment>1</vertical_alignment>
@@ -1194,10 +1170,10 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_303</name>
- <text>PCIe time</text>
- <x>50</x>
- <y>450</y>
- <width>160</width>
+ <text>PCIe time:</text>
+ <x>60</x>
+ <y>420</y>
+ <width>140</width>
<height>30</height>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -1212,9 +1188,9 @@
<widget type="textupdate" version="2.0.0">
<name>Text Update_81</name>
<pv_name>$(P)$(R)$(CH)PcieTransferTimeR</pv_name>
- <x>350</x>
- <y>451</y>
- <width>120</width>
+ <x>210</x>
+ <y>421</y>
+ <width>130</width>
<height>30</height>
<show_units>false</show_units>
<vertical_alignment>1</vertical_alignment>
@@ -1230,11 +1206,11 @@
<name>BGGrey02-title_20</name>
<text>Trace</text>
<x>20</x>
- <y>540</y>
+ <y>520</y>
<width>510</width>
<height>50</height>
<font>
- <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
+ <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
</font>
</font>
<foreground_color>
@@ -1249,11 +1225,11 @@
<name>BGGrey02-title_22</name>
<text>Attenuation</text>
<x>550</x>
- <y>530</y>
- <width>510</width>
+ <y>580</y>
+ <width>470</width>
<height>50</height>
<font>
- <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
+ <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
</font>
</font>
<foreground_color>
@@ -1272,7 +1248,7 @@
<width>510</width>
<height>50</height>
<font>
- <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
+ <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
</font>
</font>
<foreground_color>
@@ -1285,10 +1261,10 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_19</name>
- <text>Control</text>
- <x>50</x>
- <y>130</y>
- <width>160</width>
+ <text>Control:</text>
+ <x>60</x>
+ <y>140</y>
+ <width>140</width>
<height>30</height>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -1305,10 +1281,10 @@
<text>Self-triggering</text>
<x>550</x>
<y>70</y>
- <width>510</width>
+ <width>470</width>
<height>50</height>
<font>
- <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
+ <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
</font>
</font>
<foreground_color>
@@ -1323,11 +1299,11 @@
<name>BGGrey02-title_25</name>
<text>Circular buffer trace</text>
<x>550</x>
- <y>420</y>
- <width>510</width>
+ <y>450</y>
+ <width>470</width>
<height>50</height>
<font>
- <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
+ <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
</font>
</font>
<foreground_color>
@@ -1342,11 +1318,11 @@
<name>BGGrey02-title_26</name>
<text>Circular buffer</text>
<x>550</x>
- <y>300</y>
- <width>510</width>
+ <y>320</y>
+ <width>470</width>
<height>50</height>
<font>
- <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
+ <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
</font>
</font>
<foreground_color>
@@ -1360,9 +1336,9 @@
<widget type="rectangle" version="2.0.0">
<name>BGGrey03-background_21</name>
<x>570</x>
- <y>690</y>
- <width>470</width>
- <height>50</height>
+ <y>760</y>
+ <width>430</width>
+ <height>70</height>
<line_width>0</line_width>
<background_color>
<color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
@@ -1375,11 +1351,11 @@
<name>BGGrey02-title_27</name>
<text>HDF5 file save</text>
<x>550</x>
- <y>640</y>
- <width>510</width>
+ <y>710</y>
+ <width>470</width>
<height>50</height>
<font>
- <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
+ <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
</font>
</font>
<foreground_color>
@@ -1392,10 +1368,9 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_299</name>
- <text>Control</text>
- <x>580</x>
- <y>700</y>
- <width>160</width>
+ <text>Control:</text>
+ <x>590</x>
+ <y>780</y>
<height>30</height>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -1417,8 +1392,8 @@
</actions>
<pv_name>$(P)$(R)$(CH)HDF1-EnableCallbacks</pv_name>
<text>Disable</text>
- <x>880</x>
- <y>700</y>
+ <x>830</x>
+ <y>780</y>
<width>70</width>
</widget>
<widget type="action_button" version="3.0.0">
@@ -1431,15 +1406,15 @@
</actions>
<pv_name>$(P)$(R)$(CH)HDF1-EnableCallbacks</pv_name>
<text>Enable</text>
- <x>800</x>
- <y>700</y>
+ <x>750</x>
+ <y>780</y>
<width>70</width>
</widget>
<widget type="led" version="2.0.0">
<name>LED_13</name>
<pv_name>$(P)$(R)$(CH)HDF1-EnableCallbacks_RBV</pv_name>
- <x>760</x>
- <y>705</y>
+ <x>710</x>
+ <y>785</y>
<off_color>
<color name="Major" red="250" green="12" blue="14">
</color>
@@ -1464,8 +1439,8 @@
</action>
</actions>
<text>More..</text>
- <x>959</x>
- <y>700</y>
+ <x>909</x>
+ <y>780</y>
<width>70</width>
<tooltip>$(actions)</tooltip>
</widget>
@@ -1511,4 +1486,23 @@
</rule>
</rules>
</widget>
+ <widget type="label" version="2.0.0">
+ <name>BGGrey02-title_28</name>
+ <text>ArrayData</text>
+ <x>1040</x>
+ <y>70</y>
+ <width>980</width>
+ <height>50</height>
+ <font>
+ <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
+ </font>
+ </font>
+ <foreground_color>
+ <color name="WHITE" red="255" green="255" blue="255">
+ </color>
+ </foreground_color>
+ <horizontal_alignment>1</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ <wrap_words>false</wrap_words>
+ </widget>
</display>
diff --git a/99-Shared/adsis8300bpm/aiChannelItem.bob b/99-Shared/adsis8300bpm/aiChannelItem.bob
index 01758ecf36e0fde8a71c61c49f9025002ed3b8c6..59209107515efc0bf95b23f900aba8168158cfd5 100644
--- a/99-Shared/adsis8300bpm/aiChannelItem.bob
+++ b/99-Shared/adsis8300bpm/aiChannelItem.bob
@@ -8,25 +8,6 @@
</background_color>
<actions>
</actions>
- <widget type="textupdate" version="2.0.0">
- <name>Text Update_75</name>
- <pv_name>$(P)$(R)$(CH)Name</pv_name>
- <width>230</width>
- <height>30</height>
- <background_color>
- <color red="255" green="255" blue="255">
- </color>
- </background_color>
- <transparent>true</transparent>
- <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="led" version="2.0.0">
<name>LED_1</name>
<pv_name>$(P)$(R)$(CH)ControlR</pv_name>
@@ -94,4 +75,19 @@
</background_color>
<tooltip>$(actions)</tooltip>
</widget>
+ <widget type="label" version="2.0.0">
+ <name>Label</name>
+ <width>230</width>
+ <height>30</height>
+ <horizontal_alignment>2</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ <rules>
+ <rule name="text" prop_id="text" out_exp="true">
+ <exp bool_exp="pv0">
+ <expression>pvStr0+":"</expression>
+ </exp>
+ <pv_name>$(P)$(R)$(CH)Name</pv_name>
+ </rule>
+ </rules>
+ </widget>
</display>
diff --git a/99-Shared/adsis8300bpm/bpm.bob b/99-Shared/adsis8300bpm/bpm.bob
index 82b472fd97f360eb6b9c8cabdca456a1e24258ca..103d430b206e3a4a6261eedfc0bd1a26912d5024 100644
--- a/99-Shared/adsis8300bpm/bpm.bob
+++ b/99-Shared/adsis8300bpm/bpm.bob
@@ -1,16 +1,30 @@
<?xml version="1.0" encoding="UTF-8"?>
<display version="2.0.0">
<name>$(TITLE) : Main</name>
- <width>2070</width>
+ <width>2130</width>
<height>910</height>
<actions>
</actions>
+ <widget type="rectangle" version="2.0.0">
+ <name>BGGrey03-titlebar_10</name>
+ <x>1670</x>
+ <y>70</y>
+ <width>440</width>
+ <height>760</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-titlebar_9</name>
<x>1210</x>
<y>70</y>
- <width>840</width>
- <height>820</height>
+ <width>440</width>
+ <height>800</height>
<line_width>0</line_width>
<background_color>
<color name="GROUP-BORDER" red="150" green="155" blue="151">
@@ -21,9 +35,9 @@
</widget>
<widget type="rectangle" version="2.0.0">
<name>BGGrey03-background_17</name>
- <x>1640</x>
- <y>360</y>
- <width>390</width>
+ <x>1690</x>
+ <y>330</y>
+ <width>400</width>
<height>190</height>
<line_width>0</line_width>
<background_color>
@@ -36,8 +50,8 @@
<widget type="rectangle" version="2.0.0">
<name>BGGrey03-background_19</name>
<x>1230</x>
- <y>160</y>
- <width>390</width>
+ <y>120</y>
+ <width>400</width>
<height>190</height>
<line_width>0</line_width>
<background_color>
@@ -49,9 +63,9 @@
</widget>
<widget type="rectangle" version="2.0.0">
<name>BGGrey03-background_18</name>
- <x>1640</x>
- <y>160</y>
- <width>390</width>
+ <x>1690</x>
+ <y>120</y>
+ <width>400</width>
<height>150</height>
<line_width>0</line_width>
<background_color>
@@ -63,9 +77,9 @@
</widget>
<widget type="rectangle" version="2.0.0">
<name>BGGrey03-background_16</name>
- <x>1640</x>
- <y>600</y>
- <width>390</width>
+ <x>1690</x>
+ <y>580</y>
+ <width>400</width>
<height>230</height>
<line_width>0</line_width>
<background_color>
@@ -78,8 +92,8 @@
<widget type="rectangle" version="2.0.0">
<name>BGGrey03-background_15</name>
<x>1230</x>
- <y>560</y>
- <width>390</width>
+ <y>540</y>
+ <width>400</width>
<height>310</height>
<line_width>0</line_width>
<background_color>
@@ -92,8 +106,8 @@
<widget type="rectangle" version="2.0.0">
<name>BGGrey03-background_14</name>
<x>1230</x>
- <y>400</y>
- <width>390</width>
+ <y>370</y>
+ <width>400</width>
<height>110</height>
<line_width>0</line_width>
<background_color>
@@ -103,25 +117,6 @@
<corner_width>5</corner_width>
<corner_height>5</corner_height>
</widget>
- <widget type="label" version="2.0.0">
- <name>BGGrey02-title_24</name>
- <text>Parameters</text>
- <x>1210</x>
- <y>70</y>
- <width>840</width>
- <height>50</height>
- <font>
- <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
- </font>
- </font>
- <foreground_color>
- <color name="WHITE" red="255" green="255" blue="255">
- </color>
- </foreground_color>
- <horizontal_alignment>1</horizontal_alignment>
- <vertical_alignment>1</vertical_alignment>
- <wrap_words>false</wrap_words>
- </widget>
<widget type="rectangle" version="2.0.0">
<name>BGGrey03-titlebar_8</name>
<x>940</x>
@@ -380,7 +375,7 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_157</name>
- <text>Rate</text>
+ <text>Rate:</text>
<x>470</x>
<y>180</y>
<width>160</width>
@@ -397,7 +392,7 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_158</name>
- <text>Status</text>
+ <text>Status:</text>
<x>470</x>
<y>140</y>
<width>160</width>
@@ -414,7 +409,7 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_163</name>
- <text>Pulse counter</text>
+ <text>Pulse counter:</text>
<x>470</x>
<y>260</y>
<width>160</width>
@@ -431,7 +426,7 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_166</name>
- <text>max. # raw samples</text>
+ <text>max. # raw samples:</text>
<x>470</x>
<y>220</y>
<width>160</width>
@@ -448,7 +443,7 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_271</name>
- <text>Control</text>
+ <text>Control:</text>
<x>470</x>
<y>420</y>
<width>160</width>
@@ -465,10 +460,10 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_124</name>
- <text>ROI start Trigger</text>
+ <text>ROI start Trigger:</text>
<x>1250</x>
- <y>620</y>
- <width>120</width>
+ <y>600</y>
+ <width>130</width>
<height>30</height>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -483,8 +478,8 @@
<widget type="textupdate" version="2.0.0">
<name>Text Update_70</name>
<pv_name>$(P)$(R)RoiStartTriggerR</pv_name>
- <x>1390</x>
- <y>620</y>
+ <x>1400</x>
+ <y>600</y>
<width>88</width>
<height>30</height>
<horizontal_alignment>1</horizontal_alignment>
@@ -500,8 +495,8 @@
<widget type="combo" version="2.0.0">
<name>Menu Button</name>
<pv_name>$(P)$(R)RoiStartTrigger</pv_name>
- <x>1500</x>
- <y>620</y>
+ <x>1510</x>
+ <y>600</y>
<background_color>
<color red="240" green="240" blue="240">
</color>
@@ -522,7 +517,7 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_280</name>
- <text>Pulse missed</text>
+ <text>Pulse missed:</text>
<x>470</x>
<y>300</y>
<width>160</width>
@@ -556,10 +551,10 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_125</name>
- <text>Near IQ M</text>
+ <text>Near IQ M:</text>
<x>1250</x>
- <y>420</y>
- <width>120</width>
+ <y>390</y>
+ <width>130</width>
<height>30</height>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -573,10 +568,10 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_60</name>
- <text>Near IQ N</text>
+ <text>Near IQ N:</text>
<x>1250</x>
- <y>460</y>
- <width>120</width>
+ <y>430</y>
+ <width>130</width>
<height>30</height>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -591,8 +586,8 @@
<widget type="spinner" version="2.0.0">
<name>Spinner_1</name>
<pv_name>$(P)$(R)NearIQM</pv_name>
- <x>1500</x>
- <y>420</y>
+ <x>1510</x>
+ <y>390</y>
<width>99</width>
<height>30</height>
<format>0</format>
@@ -605,8 +600,8 @@
<widget type="spinner" version="2.0.0">
<name>Spinner_2</name>
<pv_name>$(P)$(R)NearIQN</pv_name>
- <x>1500</x>
- <y>460</y>
+ <x>1510</x>
+ <y>430</y>
<width>99</width>
<height>30</height>
<format>0</format>
@@ -619,8 +614,8 @@
<widget type="textupdate" version="2.0.0">
<name>Text Update_72</name>
<pv_name>$(P)$(R)NearIQMR</pv_name>
- <x>1390</x>
- <y>420</y>
+ <x>1400</x>
+ <y>390</y>
<width>88</width>
<height>30</height>
<horizontal_alignment>1</horizontal_alignment>
@@ -636,8 +631,8 @@
<widget type="textupdate" version="2.0.0">
<name>Text Update_73</name>
<pv_name>$(P)$(R)NearIQNR</pv_name>
- <x>1390</x>
- <y>460</y>
+ <x>1400</x>
+ <y>430</y>
<width>88</width>
<height>30</height>
<horizontal_alignment>1</horizontal_alignment>
@@ -685,7 +680,7 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_1</name>
- <text>Sampling frequency</text>
+ <text>Sampling frequency:</text>
<x>50</x>
<y>450</y>
<width>160</width>
@@ -702,7 +697,7 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_2</name>
- <text>Time tick</text>
+ <text>Time tick:</text>
<x>50</x>
<y>490</y>
<width>160</width>
@@ -730,7 +725,7 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_273</name>
- <text>Driver message</text>
+ <text>Driver message:</text>
<x>50</x>
<y>770</y>
<width>160</width>
@@ -747,7 +742,7 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_315</name>
- <text>Trigger repeat</text>
+ <text>Trigger repeat:</text>
<x>470</x>
<y>380</y>
<width>160</width>
@@ -811,7 +806,7 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_316</name>
- <text>IQ time tick</text>
+ <text>IQ time tick:</text>
<x>50</x>
<y>530</y>
<width>160</width>
@@ -845,7 +840,7 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_319</name>
- <text>FW GIT hash</text>
+ <text>FW GIT hash:</text>
<x>50</x>
<y>370</y>
<width>160</width>
@@ -878,7 +873,7 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_320</name>
- <text>FW version</text>
+ <text>FW version:</text>
<x>50</x>
<y>410</y>
<width>160</width>
@@ -895,10 +890,10 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_321</name>
- <text>BPM Ready</text>
- <x>1660</x>
- <y>460</y>
- <width>120</width>
+ <text>BPM Ready:</text>
+ <x>1710</x>
+ <y>430</y>
+ <width>130</width>
<height>30</height>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -913,8 +908,8 @@
<widget type="textupdate" version="2.0.0">
<name>Text Update_110</name>
<pv_name>$(P)$(R)ReadyR</pv_name>
- <x>1802</x>
- <y>460</y>
+ <x>1862</x>
+ <y>430</y>
<width>90</width>
<height>30</height>
<horizontal_alignment>1</horizontal_alignment>
@@ -930,8 +925,8 @@
<widget type="combo" version="2.0.0">
<name>Menu Button_1</name>
<pv_name>$(P)$(R)Ready</pv_name>
- <x>1910</x>
- <y>460</y>
+ <x>1970</x>
+ <y>430</y>
<background_color>
<color red="240" green="240" blue="240">
</color>
@@ -940,10 +935,10 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_322</name>
- <text>RJ45 force</text>
- <x>1660</x>
- <y>620</y>
- <width>120</width>
+ <text>RJ45 force:</text>
+ <x>1710</x>
+ <y>600</y>
+ <width>130</width>
<height>30</height>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -958,8 +953,8 @@
<widget type="textupdate" version="2.0.0">
<name>Text Update_111</name>
<pv_name>$(P)$(R)RJ45ForceR</pv_name>
- <x>1802</x>
- <y>620</y>
+ <x>1862</x>
+ <y>600</y>
<width>88</width>
<height>30</height>
<horizontal_alignment>1</horizontal_alignment>
@@ -975,8 +970,8 @@
<widget type="combo" version="2.0.0">
<name>Menu Button_2</name>
<pv_name>$(P)$(R)RJ45Force</pv_name>
- <x>1912</x>
- <y>620</y>
+ <x>1972</x>
+ <y>600</y>
<background_color>
<color red="240" green="240" blue="240">
</color>
@@ -985,10 +980,10 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_323</name>
- <text>RJ45 line 1</text>
- <x>1660</x>
- <y>660</y>
- <width>120</width>
+ <text>RJ45 line 1:</text>
+ <x>1710</x>
+ <y>640</y>
+ <width>130</width>
<height>30</height>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -1003,8 +998,8 @@
<widget type="textupdate" version="2.0.0">
<name>Text Update_112</name>
<pv_name>$(P)$(R)RJ45Line1R</pv_name>
- <x>1802</x>
- <y>660</y>
+ <x>1862</x>
+ <y>640</y>
<width>88</width>
<height>30</height>
<horizontal_alignment>1</horizontal_alignment>
@@ -1019,10 +1014,10 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_327</name>
- <text>RJ45 line 2</text>
- <x>1660</x>
- <y>700</y>
- <width>120</width>
+ <text>RJ45 line 2:</text>
+ <x>1710</x>
+ <y>680</y>
+ <width>130</width>
<height>30</height>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -1037,8 +1032,8 @@
<widget type="textupdate" version="2.0.0">
<name>Text Update_113</name>
<pv_name>$(P)$(R)RJ45Line2R</pv_name>
- <x>1802</x>
- <y>700</y>
+ <x>1862</x>
+ <y>680</y>
<width>88</width>
<height>30</height>
<horizontal_alignment>1</horizontal_alignment>
@@ -1053,10 +1048,10 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_328</name>
- <text>RJ45 line 3</text>
- <x>1660</x>
- <y>740</y>
- <width>120</width>
+ <text>RJ45 line 3:</text>
+ <x>1710</x>
+ <y>720</y>
+ <width>130</width>
<height>30</height>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -1071,8 +1066,8 @@
<widget type="textupdate" version="2.0.0">
<name>Text Update_114</name>
<pv_name>$(P)$(R)RJ45Line3R</pv_name>
- <x>1802</x>
- <y>740</y>
+ <x>1862</x>
+ <y>720</y>
<width>88</width>
<height>30</height>
<horizontal_alignment>1</horizontal_alignment>
@@ -1087,10 +1082,10 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_329</name>
- <text>RJ45 line 4</text>
- <x>1660</x>
- <y>780</y>
- <width>120</width>
+ <text>RJ45 line 4:</text>
+ <x>1710</x>
+ <y>760</y>
+ <width>130</width>
<height>30</height>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -1105,8 +1100,8 @@
<widget type="textupdate" version="2.0.0">
<name>Text Update_115</name>
<pv_name>$(P)$(R)RJ45Line4R</pv_name>
- <x>1802</x>
- <y>780</y>
+ <x>1862</x>
+ <y>760</y>
<width>88</width>
<height>30</height>
<horizontal_alignment>1</horizontal_alignment>
@@ -1122,8 +1117,8 @@
<widget type="combo" version="2.0.0">
<name>Menu Button_3</name>
<pv_name>$(P)$(R)RJ45Line1</pv_name>
- <x>1912</x>
- <y>660</y>
+ <x>1972</x>
+ <y>640</y>
<background_color>
<color red="240" green="240" blue="240">
</color>
@@ -1133,8 +1128,8 @@
<widget type="combo" version="2.0.0">
<name>Menu Button_4</name>
<pv_name>$(P)$(R)RJ45Line2</pv_name>
- <x>1912</x>
- <y>700</y>
+ <x>1972</x>
+ <y>680</y>
<background_color>
<color red="240" green="240" blue="240">
</color>
@@ -1144,8 +1139,8 @@
<widget type="combo" version="2.0.0">
<name>Menu Button_5</name>
<pv_name>$(P)$(R)RJ45Line3</pv_name>
- <x>1912</x>
- <y>740</y>
+ <x>1972</x>
+ <y>720</y>
<background_color>
<color red="240" green="240" blue="240">
</color>
@@ -1155,8 +1150,8 @@
<widget type="combo" version="2.0.0">
<name>Menu Button_6</name>
<pv_name>$(P)$(R)RJ45Line4</pv_name>
- <x>1912</x>
- <y>780</y>
+ <x>1972</x>
+ <y>760</y>
<background_color>
<color red="240" green="240" blue="240">
</color>
@@ -1165,7 +1160,7 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_207</name>
- <text>Model</text>
+ <text>Model:</text>
<x>50</x>
<y>170</y>
<width>160</width>
@@ -1199,7 +1194,7 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_208</name>
- <text>Firmware version</text>
+ <text>Firmware version:</text>
<x>50</x>
<y>210</y>
<width>160</width>
@@ -1233,7 +1228,7 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_209</name>
- <text>Serial number</text>
+ <text>Serial number:</text>
<x>50</x>
<y>250</y>
<width>160</width>
@@ -1267,7 +1262,7 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_210</name>
- <text>Memory size</text>
+ <text>Memory size:</text>
<x>50</x>
<y>290</y>
<width>160</width>
@@ -1300,7 +1295,7 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_211</name>
- <text>Manufacturer</text>
+ <text>Manufacturer:</text>
<x>50</x>
<y>130</y>
<width>160</width>
@@ -1334,7 +1329,7 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_212</name>
- <text>Device path</text>
+ <text>Device path:</text>
<x>50</x>
<y>330</y>
<width>160</width>
@@ -1368,10 +1363,10 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_336</name>
- <text>ROI end Trigger</text>
+ <text>ROI end Trigger:</text>
<x>1250</x>
- <y>660</y>
- <width>120</width>
+ <y>640</y>
+ <width>130</width>
<height>30</height>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -1386,8 +1381,8 @@
<widget type="textupdate" version="2.0.0">
<name>Text Update_122</name>
<pv_name>$(P)$(R)RoiEndTriggerR</pv_name>
- <x>1390</x>
- <y>660</y>
+ <x>1400</x>
+ <y>640</y>
<width>88</width>
<height>30</height>
<horizontal_alignment>1</horizontal_alignment>
@@ -1403,8 +1398,8 @@
<widget type="combo" version="2.0.0">
<name>Menu Button_7</name>
<pv_name>$(P)$(R)RoiEndTrigger</pv_name>
- <x>1500</x>
- <y>660</y>
+ <x>1510</x>
+ <y>640</y>
<background_color>
<color red="240" green="240" blue="240">
</color>
@@ -1414,8 +1409,8 @@
<widget type="textupdate" version="2.0.0">
<name>Text Update_123</name>
<pv_name>$(P)$(R)AcquisitionSampleCountR</pv_name>
- <x>1390</x>
- <y>700</y>
+ <x>1400</x>
+ <y>680</y>
<width>88</width>
<height>30</height>
<horizontal_alignment>1</horizontal_alignment>
@@ -1430,10 +1425,10 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_337</name>
- <text>Acq. sample count</text>
+ <text>Acq. sample count:</text>
<x>1250</x>
- <y>700</y>
- <width>120</width>
+ <y>680</y>
+ <width>130</width>
<height>30</height>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -1448,8 +1443,8 @@
<widget type="textupdate" version="2.0.0">
<name>Text Update_124</name>
<pv_name>$(P)$(R)RoiSampleCountR</pv_name>
- <x>1390</x>
- <y>740</y>
+ <x>1400</x>
+ <y>720</y>
<width>88</width>
<height>30</height>
<horizontal_alignment>1</horizontal_alignment>
@@ -1464,10 +1459,10 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_338</name>
- <text>ROI sample count</text>
+ <text>ROI sample count:</text>
<x>1250</x>
- <y>740</y>
- <width>120</width>
+ <y>720</y>
+ <width>130</width>
<height>30</height>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -1494,10 +1489,10 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_339</name>
- <text>Control</text>
+ <text>Control:</text>
<x>1250</x>
- <y>180</y>
- <width>120</width>
+ <y>140</y>
+ <width>130</width>
<height>30</height>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -1512,8 +1507,8 @@
<widget type="led" version="2.0.0">
<name>LED_4</name>
<pv_name>$(P)$(R)EnergyInterlockControlR</pv_name>
- <x>1400</x>
- <y>185</y>
+ <x>1410</x>
+ <y>145</y>
<off_color>
<color name="IO Background" red="235" green="235" blue="235">
</color>
@@ -1535,8 +1530,8 @@
</actions>
<pv_name>$(P)$(R)EnergyInterlockControl</pv_name>
<text>Enable</text>
- <x>1448</x>
- <y>180</y>
+ <x>1458</x>
+ <y>140</y>
<width>60</width>
</widget>
<widget type="action_button" version="3.0.0">
@@ -1549,16 +1544,16 @@
</actions>
<pv_name>$(P)$(R)EnergyInterlockControl</pv_name>
<text>Disable</text>
- <x>1532</x>
- <y>180</y>
+ <x>1542</x>
+ <y>140</y>
<width>60</width>
</widget>
<widget type="label" version="2.0.0">
<name>Label_66</name>
- <text>Lower threshold</text>
+ <text>Lower threshold:</text>
<x>1250</x>
- <y>260</y>
- <width>120</width>
+ <y>220</y>
+ <width>130</width>
<height>30</height>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -1573,8 +1568,8 @@
<widget type="textentry" version="3.0.0">
<name>Text Input</name>
<pv_name>$(P)$(R)EnergyInterlockLowerThreshold</pv_name>
- <x>1500</x>
- <y>260</y>
+ <x>1510</x>
+ <y>220</y>
<height>30</height>
<actions>
</actions>
@@ -1587,8 +1582,8 @@
<widget type="textupdate" version="2.0.0">
<name>Text Update_76</name>
<pv_name>$(P)$(R)EnergyInterlockLowerThresholdR</pv_name>
- <x>1390</x>
- <y>260</y>
+ <x>1400</x>
+ <y>220</y>
<width>90</width>
<height>30</height>
<horizontal_alignment>1</horizontal_alignment>
@@ -1603,10 +1598,10 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_343</name>
- <text>Status</text>
+ <text>Status:</text>
<x>1250</x>
- <y>220</y>
- <width>120</width>
+ <y>180</y>
+ <width>130</width>
<height>30</height>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -1628,15 +1623,15 @@
</actions>
<pv_name>$(P)$(R)EnergyInterlockClear</pv_name>
<text>Clear</text>
- <x>1448</x>
- <y>220</y>
+ <x>1458</x>
+ <y>180</y>
<width>60</width>
</widget>
<widget type="led" version="2.0.0">
<name>LED_3</name>
<pv_name>$(P)$(R)EnergyInterlockStatusR</pv_name>
- <x>1400</x>
- <y>225</y>
+ <x>1410</x>
+ <y>185</y>
<off_color>
<color name="IO Background" red="235" green="235" blue="235">
</color>
@@ -1651,8 +1646,8 @@
<widget type="led" version="2.0.0">
<name>LED_6</name>
<pv_name>$(P)$(R)AngleDiffPhaseUnwrapControlR</pv_name>
- <x>1820</x>
- <y>385</y>
+ <x>1880</x>
+ <y>355</y>
<off_color>
<color name="IO Background" red="235" green="235" blue="235">
</color>
@@ -1674,8 +1669,8 @@
</actions>
<pv_name>$(P)$(R)AngleDiffPhaseUnwrapControl</pv_name>
<text>Enable</text>
- <x>1870</x>
- <y>380</y>
+ <x>1930</x>
+ <y>350</y>
<width>60</width>
</widget>
<widget type="action_button" version="3.0.0">
@@ -1688,16 +1683,16 @@
</actions>
<pv_name>$(P)$(R)AngleDiffPhaseUnwrapControl</pv_name>
<text>Disable</text>
- <x>1950</x>
- <y>380</y>
+ <x>2010</x>
+ <y>350</y>
<width>60</width>
</widget>
<widget type="label" version="2.0.0">
<name>Label_346</name>
- <text>Control</text>
- <x>1660</x>
- <y>380</y>
- <width>120</width>
+ <text>Control:</text>
+ <x>1710</x>
+ <y>350</y>
+ <width>130</width>
<height>30</height>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -1711,10 +1706,10 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_347</name>
- <text>Threshold</text>
- <x>1660</x>
- <y>420</y>
- <width>120</width>
+ <text>Threshold:</text>
+ <x>1710</x>
+ <y>390</y>
+ <width>130</width>
<height>30</height>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -1729,8 +1724,8 @@
<widget type="textentry" version="3.0.0">
<name>Text Input_6</name>
<pv_name>$(P)$(R)AngleDiffPhaseUnwrap</pv_name>
- <x>1910</x>
- <y>420</y>
+ <x>1970</x>
+ <y>390</y>
<height>30</height>
<actions>
</actions>
@@ -1743,8 +1738,8 @@
<widget type="textupdate" version="2.0.0">
<name>Text Update_126</name>
<pv_name>$(P)$(R)AngleDiffPhaseUnwrapR</pv_name>
- <x>1800</x>
- <y>420</y>
+ <x>1860</x>
+ <y>390</y>
<width>90</width>
<height>30</height>
<horizontal_alignment>1</horizontal_alignment>
@@ -1759,10 +1754,10 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_351</name>
- <text>Acquisition Trigger</text>
+ <text>Acquisition Trigger:</text>
<x>1250</x>
- <y>580</y>
- <width>120</width>
+ <y>560</y>
+ <width>130</width>
<height>30</height>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -1777,8 +1772,8 @@
<widget type="textupdate" version="2.0.0">
<name>Text Update_128</name>
<pv_name>$(P)$(R)AcquisitionTriggerR</pv_name>
- <x>1390</x>
- <y>580</y>
+ <x>1400</x>
+ <y>560</y>
<width>88</width>
<height>30</height>
<horizontal_alignment>1</horizontal_alignment>
@@ -1794,8 +1789,8 @@
<widget type="combo" version="2.0.0">
<name>Menu Button_8</name>
<pv_name>$(P)$(R)AcquisitionTrigger</pv_name>
- <x>1500</x>
- <y>580</y>
+ <x>1510</x>
+ <y>560</y>
<background_color>
<color red="240" green="240" blue="240">
</color>
@@ -1805,8 +1800,8 @@
<widget type="textupdate" version="2.0.0">
<name>Text Update_129</name>
<pv_name>$(P)$(R)RoiFirstSampleR</pv_name>
- <x>1390</x>
- <y>780</y>
+ <x>1400</x>
+ <y>760</y>
<width>88</width>
<height>30</height>
<horizontal_alignment>1</horizontal_alignment>
@@ -1821,10 +1816,10 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_352</name>
- <text>ROI first sample</text>
+ <text>ROI first sample:</text>
<x>1250</x>
- <y>780</y>
- <width>120</width>
+ <y>760</y>
+ <width>130</width>
<height>30</height>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -1839,8 +1834,8 @@
<widget type="textupdate" version="2.0.0">
<name>Text Update_130</name>
<pv_name>$(P)$(R)RoiLastSampleR</pv_name>
- <x>1390</x>
- <y>820</y>
+ <x>1400</x>
+ <y>800</y>
<width>88</width>
<height>30</height>
<horizontal_alignment>1</horizontal_alignment>
@@ -1855,10 +1850,10 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_353</name>
- <text>ROI last sample</text>
+ <text>ROI last sample:</text>
<x>1250</x>
- <y>820</y>
- <width>120</width>
+ <y>800</y>
+ <width>130</width>
<height>30</height>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -1889,7 +1884,7 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_354</name>
- <text>PCIe start</text>
+ <text>PCIe start:</text>
<x>50</x>
<y>650</y>
<width>160</width>
@@ -1906,10 +1901,10 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_355</name>
- <text>Self-trigger armed</text>
- <x>1660</x>
- <y>500</y>
- <width>120</width>
+ <text>Self-trigger armed:</text>
+ <x>1710</x>
+ <y>470</y>
+ <width>130</width>
<height>30</height>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -1924,8 +1919,8 @@
<widget type="textupdate" version="2.0.0">
<name>Text Update_132</name>
<pv_name>$(P)$(R)SelfTriggerArmedR</pv_name>
- <x>1802</x>
- <y>500</y>
+ <x>1862</x>
+ <y>470</y>
<width>90</width>
<height>30</height>
<horizontal_alignment>1</horizontal_alignment>
@@ -1940,10 +1935,10 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_356</name>
- <text>Upper threshold</text>
+ <text>Upper threshold:</text>
<x>1250</x>
- <y>300</y>
- <width>120</width>
+ <y>260</y>
+ <width>130</width>
<height>30</height>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -1958,8 +1953,8 @@
<widget type="textentry" version="3.0.0">
<name>Text Input_8</name>
<pv_name>$(P)$(R)EnergyInterlockUpperThreshold</pv_name>
- <x>1500</x>
- <y>300</y>
+ <x>1510</x>
+ <y>260</y>
<height>30</height>
<actions>
</actions>
@@ -1972,8 +1967,8 @@
<widget type="textupdate" version="2.0.0">
<name>Text Update_133</name>
<pv_name>$(P)$(R)EnergyInterlockUpperThresholdR</pv_name>
- <x>1390</x>
- <y>300</y>
+ <x>1400</x>
+ <y>260</y>
<width>90</width>
<height>30</height>
<horizontal_alignment>1</horizontal_alignment>
@@ -1988,10 +1983,10 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_357</name>
- <text>Clock alive</text>
- <x>1660</x>
- <y>180</y>
- <width>120</width>
+ <text>Clock alive:</text>
+ <x>1710</x>
+ <y>140</y>
+ <width>130</width>
<height>30</height>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -2006,8 +2001,8 @@
<widget type="led" version="2.0.0">
<name>LED_7</name>
<pv_name>$(P)$(R)HealthClockAliveR</pv_name>
- <x>1820</x>
- <y>185</y>
+ <x>1880</x>
+ <y>145</y>
<off_color>
<color name="IO Background" red="235" green="235" blue="235">
</color>
@@ -2021,10 +2016,10 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_359</name>
- <text>Clock interrupted</text>
- <x>1660</x>
- <y>220</y>
- <width>120</width>
+ <text>Clock interrupted:</text>
+ <x>1710</x>
+ <y>180</y>
+ <width>130</width>
<height>30</height>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -2039,8 +2034,8 @@
<widget type="led" version="2.0.0">
<name>LED_8</name>
<pv_name>$(P)$(R)HealthClockIntrR</pv_name>
- <x>1820</x>
- <y>225</y>
+ <x>1880</x>
+ <y>185</y>
<off_color>
<color name="IO Background" red="235" green="235" blue="235">
</color>
@@ -2062,16 +2057,16 @@
</actions>
<pv_name>$(P)$(R)HealthClockIntrClear</pv_name>
<text>Clear</text>
- <x>1860</x>
- <y>220</y>
+ <x>1920</x>
+ <y>180</y>
<width>60</width>
</widget>
<widget type="label" version="2.0.0">
<name>Label_360</name>
- <text>Clock frequency</text>
- <x>1660</x>
- <y>260</y>
- <width>120</width>
+ <text>Clock frequency:</text>
+ <x>1710</x>
+ <y>220</y>
+ <width>130</width>
<height>30</height>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -2086,8 +2081,8 @@
<widget type="textupdate" version="2.0.0">
<name>Text Update_134</name>
<pv_name>$(P)$(R)HealthClockFrequencyR</pv_name>
- <x>1800</x>
- <y>260</y>
+ <x>1860</x>
+ <y>220</y>
<width>88</width>
<height>30</height>
<horizontal_alignment>1</horizontal_alignment>
@@ -2131,7 +2126,7 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_362</name>
- <text>PCIe end</text>
+ <text>PCIe end:</text>
<x>50</x>
<y>690</y>
<width>160</width>
@@ -2165,7 +2160,7 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_363</name>
- <text>PCIe time</text>
+ <text>PCIe time:</text>
<x>50</x>
<y>730</y>
<width>160</width>
@@ -2199,7 +2194,7 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_364</name>
- <text>PCIe link speed</text>
+ <text>PCIe link speed:</text>
<x>50</x>
<y>570</y>
<width>160</width>
@@ -2233,7 +2228,7 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_365</name>
- <text>PCIe link width</text>
+ <text>PCIe link width:</text>
<x>50</x>
<y>610</y>
<width>160</width>
@@ -2267,7 +2262,7 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_281</name>
- <text>Pulse missed count</text>
+ <text>Pulse missed count:</text>
<x>470</x>
<y>340</y>
<width>160</width>
@@ -2402,12 +2397,12 @@
<widget type="label" version="2.0.0">
<name>BGGrey02-title_25</name>
<text>Trigger lines</text>
- <x>1230</x>
- <y>520</y>
- <width>390</width>
- <height>40</height>
+ <x>1210</x>
+ <y>490</y>
+ <width>440</width>
+ <height>50</height>
<font>
- <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
+ <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
</font>
</font>
<foreground_color>
@@ -2421,10 +2416,10 @@
<widget type="label" version="2.0.0">
<name>BGGrey02-title_26</name>
<text>RJ45 lines</text>
- <x>1640</x>
- <y>560</y>
- <width>390</width>
- <height>40</height>
+ <x>1670</x>
+ <y>530</y>
+ <width>440</width>
+ <height>50</height>
<font>
<font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
</font>
@@ -2440,10 +2435,10 @@
<widget type="label" version="2.0.0">
<name>BGGrey02-title_27</name>
<text>Phase unwrap for angle difference</text>
- <x>1640</x>
- <y>320</y>
- <width>390</width>
- <height>40</height>
+ <x>1670</x>
+ <y>280</y>
+ <width>440</width>
+ <height>50</height>
<font>
<font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
</font>
@@ -2459,12 +2454,12 @@
<widget type="label" version="2.0.0">
<name>BGGrey02-title_28</name>
<text>Near IQ</text>
- <x>1230</x>
- <y>360</y>
- <width>390</width>
- <height>40</height>
+ <x>1210</x>
+ <y>320</y>
+ <width>440</width>
+ <height>50</height>
<font>
- <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
+ <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
</font>
</font>
<foreground_color>
@@ -2478,10 +2473,10 @@
<widget type="label" version="2.0.0">
<name>BGGrey02-title_29</name>
<text>Health status</text>
- <x>1640</x>
- <y>120</y>
- <width>390</width>
- <height>40</height>
+ <x>1670</x>
+ <y>70</y>
+ <width>440</width>
+ <height>50</height>
<font>
<font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
</font>
@@ -2497,12 +2492,12 @@
<widget type="label" version="2.0.0">
<name>BGGrey02-title_30</name>
<text>Energy interlock</text>
- <x>1230</x>
- <y>120</y>
- <width>390</width>
- <height>40</height>
+ <x>1210</x>
+ <y>70</y>
+ <width>440</width>
+ <height>50</height>
<font>
- <font family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
+ <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
</font>
</font>
<foreground_color>
@@ -2518,7 +2513,7 @@
<class>TITLE-BAR</class>
<x use_class="true">0</x>
<y use_class="true">0</y>
- <width>2070</width>
+ <width>2130</width>
<height use_class="true">50</height>
<line_width use_class="true">0</line_width>
<background_color use_class="true">
@@ -2532,7 +2527,7 @@
<text>$(P)$(R)</text>
<x use_class="true">20</x>
<y use_class="true">0</y>
- <width>2030</width>
+ <width>2090</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">
diff --git a/99-Shared/adsis8300bpm/bpmAngleDifference.bob b/99-Shared/adsis8300bpm/bpmAngleDifference.bob
index d0767b3c8df70f402cc755d91fb4cbdc309efef9..3cec81e1cce45bb4e56e97a798af954c22790cb1 100644
--- a/99-Shared/adsis8300bpm/bpmAngleDifference.bob
+++ b/99-Shared/adsis8300bpm/bpmAngleDifference.bob
@@ -20,7 +20,7 @@
<widget type="label" version="2.0.0">
<name>title</name>
<class>TITLE</class>
- <text>Angle difference</text>
+ <text>Angle difference:</text>
<x use_class="true">20</x>
<y use_class="true">0</y>
<width>530</width>
diff --git a/99-Shared/adsis8300bpm/bpmChannel.bob b/99-Shared/adsis8300bpm/bpmChannel.bob
index 91cc36849213e3f17a5c4da7187ea5f16e50514a..672b1784de96ec6a5f0708229812fb8452fcc370 100644
--- a/99-Shared/adsis8300bpm/bpmChannel.bob
+++ b/99-Shared/adsis8300bpm/bpmChannel.bob
@@ -251,7 +251,7 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_10</name>
- <text>Control</text>
+ <text>Control:</text>
<x>60</x>
<y>140</y>
<width>120</width>
@@ -285,7 +285,7 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_303</name>
- <text>PCIe time</text>
+ <text>PCIe time:</text>
<x>60</x>
<y>420</y>
<width>120</width>
@@ -319,7 +319,7 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_302</name>
- <text>PCIe start</text>
+ <text>PCIe start:</text>
<x>60</x>
<y>380</y>
<width>120</width>
@@ -370,7 +370,7 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_297</name>
- <text>Memory addr.</text>
+ <text>Memory addr.:</text>
<x>60</x>
<y>460</y>
<width>120</width>
@@ -405,7 +405,7 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_33</name>
- <text>Num samples</text>
+ <text>Num samples:</text>
<x>60</x>
<y>340</y>
<width>120</width>
@@ -466,7 +466,7 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_5</name>
- <text>Active</text>
+ <text>Active:</text>
<x>60</x>
<y>220</y>
<width>120</width>
@@ -499,7 +499,7 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_4</name>
- <text>Done</text>
+ <text>Done:</text>
<x>60</x>
<y>180</y>
<width>120</width>
@@ -534,7 +534,7 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_3</name>
- <text>Num bytes</text>
+ <text>Num bytes:</text>
<x>60</x>
<y>300</y>
<width>120</width>
@@ -652,7 +652,7 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_7</name>
- <text>Scale</text>
+ <text>Scale:</text>
<x>60</x>
<y>620</y>
<width>120</width>
@@ -702,7 +702,7 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_8</name>
- <text>Offset</text>
+ <text>Offset:</text>
<x>60</x>
<y>660</y>
<width>120</width>
@@ -752,7 +752,7 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_30</name>
- <text>Decimation</text>
+ <text>Decimation:</text>
<x>60</x>
<y>700</y>
<width>120</width>
@@ -848,7 +848,7 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_32</name>
- <text>Control</text>
+ <text>Control:</text>
<x>60</x>
<y>580</y>
<width>120</width>
@@ -960,7 +960,7 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_13</name>
- <text>Array Size</text>
+ <text>Array Size:</text>
<x>550</x>
<y>260</y>
<width>120</width>
@@ -995,7 +995,7 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_14</name>
- <text>Data type</text>
+ <text>Data type:</text>
<x>550</x>
<y>300</y>
<width>120</width>
@@ -1048,7 +1048,7 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_15</name>
- <text>Array counter</text>
+ <text>Array counter:</text>
<x>550</x>
<y>180</y>
<width>120</width>
@@ -1065,7 +1065,7 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_16</name>
- <text>Array rate</text>
+ <text>Array rate:</text>
<x>550</x>
<y>220</y>
<width>120</width>
@@ -1100,7 +1100,7 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_17</name>
- <text>Control</text>
+ <text>Control:</text>
<x>550</x>
<y>140</y>
<width>120</width>
@@ -1194,7 +1194,7 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_9</name>
- <text>Control</text>
+ <text>Control:</text>
<x>60</x>
<y>820</y>
<width>120</width>
@@ -1372,7 +1372,7 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_35</name>
- <text>Control</text>
+ <text>Control:</text>
<x>550</x>
<y>420</y>
<width>120</width>
@@ -1451,7 +1451,7 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_37</name>
- <text>Control</text>
+ <text>Control:</text>
<x>550</x>
<y>540</y>
<width>120</width>
@@ -1530,7 +1530,7 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_299</name>
- <text>Control</text>
+ <text>Control:</text>
<x>550</x>
<y>660</y>
<width>120</width>
diff --git a/99-Shared/adsis8300bpm/bpmChannelAverage.bob b/99-Shared/adsis8300bpm/bpmChannelAverage.bob
index e7dd16057071336b9cd49ff6dd50c2881130c3f7..96d4905691c8671a869f499af02479e0f0a2fb0e 100644
--- a/99-Shared/adsis8300bpm/bpmChannelAverage.bob
+++ b/99-Shared/adsis8300bpm/bpmChannelAverage.bob
@@ -572,7 +572,7 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_3</name>
- <text>Num bytes</text>
+ <text>Num bytes:</text>
<x>60</x>
<y>300</y>
<width>120</width>
@@ -607,7 +607,7 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_4</name>
- <text>Done</text>
+ <text>Done:</text>
<x>60</x>
<y>180</y>
<width>120</width>
@@ -640,7 +640,7 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_5</name>
- <text>Active</text>
+ <text>Active:</text>
<x>60</x>
<y>220</y>
<width>120</width>
@@ -701,7 +701,7 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_7</name>
- <text>Scale</text>
+ <text>Scale:</text>
<x>60</x>
<y>620</y>
<width>120</width>
@@ -751,7 +751,7 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_8</name>
- <text>Offset</text>
+ <text>Offset:</text>
<x>60</x>
<y>660</y>
<width>120</width>
@@ -801,7 +801,7 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_9</name>
- <text>Control</text>
+ <text>Control:</text>
<x>560</x>
<y>620</y>
<height>30</height>
@@ -923,7 +923,7 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_13</name>
- <text>Array Size</text>
+ <text>Array Size:</text>
<x>560</x>
<y>460</y>
<height>30</height>
@@ -957,7 +957,7 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_14</name>
- <text>Data type</text>
+ <text>Data type:</text>
<x>560</x>
<y>500</y>
<height>30</height>
@@ -1009,7 +1009,7 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_15</name>
- <text>Array counter</text>
+ <text>Array counter:</text>
<x>560</x>
<y>380</y>
<height>30</height>
@@ -1025,7 +1025,7 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_16</name>
- <text>Array rate</text>
+ <text>Array rate:</text>
<x>560</x>
<y>420</y>
<height>30</height>
@@ -1059,7 +1059,7 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_17</name>
- <text>Control</text>
+ <text>Control:</text>
<x>560</x>
<y>340</y>
<height>30</height>
@@ -1075,7 +1075,7 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_20</name>
- <text>Start</text>
+ <text>Start:</text>
<x>60</x>
<y>860</y>
<width>120</width>
@@ -1126,7 +1126,7 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_21</name>
- <text>Count</text>
+ <text>Count:</text>
<x>60</x>
<y>900</y>
<width>120</width>
@@ -1177,7 +1177,7 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_22</name>
- <text>Value</text>
+ <text>Value:</text>
<x>60</x>
<y>980</y>
<width>120</width>
@@ -1211,7 +1211,7 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_30</name>
- <text>Decimation</text>
+ <text>Decimation:</text>
<x>60</x>
<y>700</y>
<width>120</width>
@@ -1307,7 +1307,7 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_32</name>
- <text>Control</text>
+ <text>Control:</text>
<x>60</x>
<y>580</y>
<width>120</width>
@@ -1324,7 +1324,7 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_33</name>
- <text>Num samples</text>
+ <text>Num samples:</text>
<x>60</x>
<y>340</y>
<width>120</width>
@@ -1421,7 +1421,7 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_35</name>
- <text>Control</text>
+ <text>Control:</text>
<x>560</x>
<y>740</y>
<height>30</height>
@@ -1499,7 +1499,7 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_37</name>
- <text>Control</text>
+ <text>Control:</text>
<x>560</x>
<y>860</y>
<height>30</height>
@@ -1515,7 +1515,7 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_38</name>
- <text>Num. averaged</text>
+ <text>Num. averaged:</text>
<x>60</x>
<y>940</y>
<width>120</width>
@@ -1565,7 +1565,7 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_39</name>
- <text>Busy</text>
+ <text>Busy:</text>
<x>60</x>
<y>820</y>
<width>120</width>
@@ -1628,7 +1628,7 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_297</name>
- <text>Memory addr.</text>
+ <text>Memory addr.:</text>
<x>60</x>
<y>461</y>
<width>120</width>
@@ -1741,7 +1741,7 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_299</name>
- <text>Control</text>
+ <text>Control:</text>
<x>560</x>
<y>980</y>
<height>30</height>
@@ -1757,7 +1757,7 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_302</name>
- <text>PCIe start</text>
+ <text>PCIe start:</text>
<x>60</x>
<y>380</y>
<width>120</width>
@@ -1791,7 +1791,7 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_303</name>
- <text>PCIe time</text>
+ <text>PCIe time:</text>
<x>60</x>
<y>420</y>
<width>120</width>
@@ -1825,7 +1825,7 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_10</name>
- <text>Control</text>
+ <text>Control:</text>
<x>60</x>
<y>140</y>
<width>120</width>
@@ -1894,7 +1894,7 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_353</name>
- <text>Last sample</text>
+ <text>Last sample:</text>
<x>560</x>
<y>220</y>
<height>30</height>
@@ -1910,7 +1910,7 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_352</name>
- <text>First sample</text>
+ <text>First sample:</text>
<x>560</x>
<y>180</y>
<height>30</height>
@@ -1926,7 +1926,7 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_338</name>
- <text>Sample count</text>
+ <text>Sample count:</text>
<x>560</x>
<y>140</y>
<height>30</height>
diff --git a/99-Shared/adsis8300bpm/bpmChannelAverageItem.bob b/99-Shared/adsis8300bpm/bpmChannelAverageItem.bob
index 9c5ce225a478165806736bc1414efda5214146f4..8adcebee7178cbf72c0098edb9c6d823b18e319a 100644
--- a/99-Shared/adsis8300bpm/bpmChannelAverageItem.bob
+++ b/99-Shared/adsis8300bpm/bpmChannelAverageItem.bob
@@ -8,25 +8,6 @@
</background_color>
<actions>
</actions>
- <widget type="textupdate" version="2.0.0">
- <name>Text Update_75</name>
- <pv_name>$(P)$(R)$(CH)Name</pv_name>
- <width>230</width>
- <height>30</height>
- <background_color>
- <color red="255" green="255" blue="255">
- </color>
- </background_color>
- <transparent>true</transparent>
- <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="led" version="2.0.0">
<name>LED_1</name>
<pv_name>$(P)$(R)$(CH)Status</pv_name>
@@ -82,4 +63,19 @@
<width>60</width>
<tooltip>$(actions)</tooltip>
</widget>
+ <widget type="label" version="2.0.0">
+ <name>Label</name>
+ <width>230</width>
+ <height>30</height>
+ <horizontal_alignment>2</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ <rules>
+ <rule name="text" prop_id="text" out_exp="true">
+ <exp bool_exp="pv0">
+ <expression>pvStr0+":"</expression>
+ </exp>
+ <pv_name>$(P)$(R)$(CH)Name</pv_name>
+ </rule>
+ </rules>
+ </widget>
</display>
diff --git a/99-Shared/adsis8300bpm/bpmChannelItem.bob b/99-Shared/adsis8300bpm/bpmChannelItem.bob
index 9ad7749d6f9a14334b83537bb3fb5df92cca4592..fed9b92b0a23e669c3e92c10b7855d40a67dcd8f 100644
--- a/99-Shared/adsis8300bpm/bpmChannelItem.bob
+++ b/99-Shared/adsis8300bpm/bpmChannelItem.bob
@@ -8,25 +8,6 @@
</background_color>
<actions>
</actions>
- <widget type="textupdate" version="2.0.0">
- <name>Text Update_75</name>
- <pv_name>$(P)$(R)$(CH)Name</pv_name>
- <width>230</width>
- <height>30</height>
- <background_color>
- <color red="255" green="255" blue="255">
- </color>
- </background_color>
- <transparent>true</transparent>
- <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="led" version="2.0.0">
<name>LED_1</name>
<pv_name>$(P)$(R)$(CH)Status</pv_name>
@@ -94,4 +75,19 @@
</background_color>
<tooltip>$(actions)</tooltip>
</widget>
+ <widget type="label" version="2.0.0">
+ <name>Label</name>
+ <width>230</width>
+ <height>30</height>
+ <horizontal_alignment>2</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ <rules>
+ <rule name="text" prop_id="text" out_exp="true">
+ <exp bool_exp="pv0">
+ <expression>pvStr0+":"</expression>
+ </exp>
+ <pv_name>$(P)$(R)$(CH)Name</pv_name>
+ </rule>
+ </rules>
+ </widget>
</display>
diff --git a/99-Shared/adsis8300bpm/bpmFilter.bob b/99-Shared/adsis8300bpm/bpmFilter.bob
index 842e22696298cff24d8369612a53345fbfef13e1..49eec551dedbb1e88be02477bc8df150b8f9b4af 100644
--- a/99-Shared/adsis8300bpm/bpmFilter.bob
+++ b/99-Shared/adsis8300bpm/bpmFilter.bob
@@ -64,7 +64,7 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_65</name>
- <text>Filter Control</text>
+ <text>Filter Control:</text>
<x>40</x>
<y>60</y>
<width>110</width>
@@ -81,7 +81,7 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_66</name>
- <text>Filter Coeff 0</text>
+ <text>Filter Coeff 0:</text>
<x>40</x>
<y>180</y>
<width>110</width>
@@ -98,7 +98,7 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_67</name>
- <text>Filter Coeff 1</text>
+ <text>Filter Coeff 1:</text>
<x>40</x>
<y>220</y>
<width>110</width>
@@ -115,7 +115,7 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_68</name>
- <text>Filter Coeff 2</text>
+ <text>Filter Coeff 2:</text>
<x>40</x>
<y>260</y>
<width>110</width>
@@ -132,7 +132,7 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_69</name>
- <text>Filter Coeff 3</text>
+ <text>Filter Coeff 3:</text>
<x>40</x>
<y>300</y>
<width>110</width>
@@ -149,7 +149,7 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_70</name>
- <text>Filter Coeff 4</text>
+ <text>Filter Coeff 4:</text>
<x>40</x>
<y>340</y>
<width>110</width>
@@ -166,7 +166,7 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_71</name>
- <text>Filter Coeff 5</text>
+ <text>Filter Coeff 5:</text>
<x>40</x>
<y>380</y>
<width>110</width>
@@ -183,7 +183,7 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_72</name>
- <text>Filter Gain</text>
+ <text>Filter Gain:</text>
<x>40</x>
<y>420</y>
<width>110</width>
diff --git a/99-Shared/adsis8300bpm/bpmInstance.bob b/99-Shared/adsis8300bpm/bpmInstance.bob
index 4fc6019e0dc499ae554b5f6b771c444407f89e33..0e6b59a1709e3c38aa644b5dd861ea396f19401b 100644
--- a/99-Shared/adsis8300bpm/bpmInstance.bob
+++ b/99-Shared/adsis8300bpm/bpmInstance.bob
@@ -5,12 +5,68 @@
<height>940</height>
<actions>
</actions>
+ <widget type="rectangle" version="2.0.0">
+ <name>BGGrey03-titlebar_5</name>
+ <x>570</x>
+ <y>70</y>
+ <width>450</width>
+ <height>940</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_18</name>
+ <x>590</x>
+ <y>840</y>
+ <width>410</width>
+ <height>150</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="rectangle" version="2.0.0">
+ <name>BGGrey03-background_17</name>
+ <x>590</x>
+ <y>670</y>
+ <width>410</width>
+ <height>110</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="rectangle" version="2.0.0">
+ <name>BGGrey03-background_16</name>
+ <x>590</x>
+ <y>460</y>
+ <width>410</width>
+ <height>150</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="rectangle" version="2.0.0">
<name>BGGrey03-titlebar_4</name>
<x>20</x>
<y>70</y>
- <width>960</width>
- <height>850</height>
+ <width>530</width>
+ <height>1000</height>
<line_width>0</line_width>
<background_color>
<color name="GROUP-BORDER" red="150" green="155" blue="151">
@@ -21,10 +77,10 @@
</widget>
<widget type="rectangle" version="2.0.0">
<name>BGGrey03-background_11</name>
- <x>550</x>
- <y>110</y>
+ <x>590</x>
+ <y>120</y>
<width>410</width>
- <height>410</height>
+ <height>280</height>
<line_width>0</line_width>
<background_color>
<color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
@@ -35,10 +91,10 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_66</name>
- <text>X Low</text>
- <x>570</x>
- <y>220</y>
- <width>120</width>
+ <text>X Low:</text>
+ <x>610</x>
+ <y>230</y>
+ <width>110</width>
<height>30</height>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -53,8 +109,8 @@
<widget type="textentry" version="3.0.0">
<name>Text Input</name>
<pv_name>$(P)$(R)ThrXPosLow</pv_name>
- <x>700</x>
- <y>220</y>
+ <x>870</x>
+ <y>230</y>
<width>120</width>
<height>30</height>
<actions>
@@ -68,9 +124,9 @@
<widget type="textupdate" version="2.0.0">
<name>Text Update_76</name>
<pv_name>$(P)$(R)ThrXPosLowR</pv_name>
- <x>830</x>
- <y>220</y>
- <width>120</width>
+ <x>730</x>
+ <y>230</y>
+ <width>130</width>
<height>30</height>
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -84,10 +140,10 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_278</name>
- <text>X High</text>
- <x>570</x>
- <y>260</y>
- <width>120</width>
+ <text>X High:</text>
+ <x>610</x>
+ <y>270</y>
+ <width>110</width>
<height>30</height>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -102,8 +158,8 @@
<widget type="textentry" version="3.0.0">
<name>Text Input_1</name>
<pv_name>$(P)$(R)ThrXPosHigh</pv_name>
- <x>700</x>
- <y>260</y>
+ <x>870</x>
+ <y>270</y>
<width>120</width>
<height>30</height>
<actions>
@@ -117,9 +173,9 @@
<widget type="textupdate" version="2.0.0">
<name>Text Update_1</name>
<pv_name>$(P)$(R)ThrXPosHighR</pv_name>
- <x>830</x>
- <y>260</y>
- <width>120</width>
+ <x>730</x>
+ <y>270</y>
+ <width>130</width>
<height>30</height>
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -133,10 +189,10 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_279</name>
- <text>Y Low</text>
- <x>570</x>
- <y>300</y>
- <width>120</width>
+ <text>Y Low:</text>
+ <x>610</x>
+ <y>310</y>
+ <width>110</width>
<height>30</height>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -151,8 +207,8 @@
<widget type="textentry" version="3.0.0">
<name>Text Input_2</name>
<pv_name>$(P)$(R)ThrYPosLow</pv_name>
- <x>700</x>
- <y>300</y>
+ <x>870</x>
+ <y>310</y>
<width>120</width>
<height>30</height>
<actions>
@@ -166,9 +222,9 @@
<widget type="textupdate" version="2.0.0">
<name>Text Update_2</name>
<pv_name>$(P)$(R)ThrYPosLowR</pv_name>
- <x>830</x>
- <y>300</y>
- <width>120</width>
+ <x>730</x>
+ <y>310</y>
+ <width>130</width>
<height>30</height>
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -182,10 +238,10 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_280</name>
- <text>Y High</text>
- <x>570</x>
- <y>340</y>
- <width>120</width>
+ <text>Y High:</text>
+ <x>610</x>
+ <y>350</y>
+ <width>110</width>
<height>30</height>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -200,8 +256,8 @@
<widget type="textentry" version="3.0.0">
<name>Text Input_3</name>
<pv_name>$(P)$(R)ThrYPosHigh</pv_name>
- <x>700</x>
- <y>340</y>
+ <x>870</x>
+ <y>350</y>
<width>120</width>
<height>30</height>
<actions>
@@ -215,9 +271,9 @@
<widget type="textupdate" version="2.0.0">
<name>Text Update_3</name>
<pv_name>$(P)$(R)ThrYPosHighR</pv_name>
- <x>830</x>
- <y>340</y>
- <width>120</width>
+ <x>730</x>
+ <y>350</y>
+ <width>130</width>
<height>30</height>
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -231,10 +287,10 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_281</name>
- <text>Magnitude</text>
- <x>570</x>
- <y>480</y>
- <width>120</width>
+ <text>Magnitude:</text>
+ <x>610</x>
+ <y>560</y>
+ <width>110</width>
<height>30</height>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -249,8 +305,8 @@
<widget type="textentry" version="3.0.0">
<name>Text Input_4</name>
<pv_name>$(P)$(R)ThrMagnitude</pv_name>
- <x>700</x>
- <y>480</y>
+ <x>870</x>
+ <y>560</y>
<width>120</width>
<height>30</height>
<actions>
@@ -264,9 +320,9 @@
<widget type="textupdate" version="2.0.0">
<name>Text Update_4</name>
<pv_name>$(P)$(R)ThrMagnitudeR</pv_name>
- <x>830</x>
- <y>480</y>
- <width>120</width>
+ <x>730</x>
+ <y>560</y>
+ <width>130</width>
<height>30</height>
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -278,32 +334,12 @@
</color>
</border_color>
</widget>
- <widget type="label" version="2.0.0">
- <name>Label_11</name>
- <text>Magnitude</text>
- <x>560</x>
- <y>380</y>
- <width>120</width>
- <height>30</height>
- <font>
- <font name="Default Bold" family="Source Sans Pro" 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_322</name>
- <text>Control</text>
- <x>570</x>
- <y>140</y>
- <width>120</width>
+ <text>Control:</text>
+ <x>610</x>
+ <y>150</y>
+ <width>110</width>
<height>30</height>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -318,8 +354,8 @@
<widget type="led" version="2.0.0">
<name>LED_4</name>
<pv_name>$(P)$(R)IlkPositionControlR</pv_name>
- <x>696</x>
- <y>142</y>
+ <x>740</x>
+ <y>155</y>
<off_color>
<color name="IO Background" red="235" green="235" blue="235">
</color>
@@ -341,8 +377,8 @@
</actions>
<pv_name>$(P)$(R)IlkPositionControl</pv_name>
<text>Enable</text>
- <x>747</x>
- <y>140</y>
+ <x>780</x>
+ <y>150</y>
<width>80</width>
</widget>
<widget type="action_button" version="3.0.0">
@@ -355,16 +391,16 @@
</actions>
<pv_name>$(P)$(R)IlkPositionControl</pv_name>
<text>Disable</text>
- <x>831</x>
- <y>140</y>
+ <x>870</x>
+ <y>150</y>
<width>80</width>
</widget>
<widget type="label" version="2.0.0">
<name>Label_323</name>
- <text>Status</text>
- <x>570</x>
- <y>180</y>
- <width>120</width>
+ <text>Status:</text>
+ <x>610</x>
+ <y>190</y>
+ <width>110</width>
<height>30</height>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -386,35 +422,15 @@
</actions>
<pv_name>$(P)$(R)IlkPositionClear</pv_name>
<text>Clear</text>
- <x>747</x>
- <y>180</y>
+ <x>780</x>
+ <y>190</y>
<width>80</width>
</widget>
- <widget type="label" version="2.0.0">
- <name>Label_325</name>
- <text>Position</text>
- <x>560</x>
- <y>120</y>
- <width>120</width>
- <height>30</height>
- <font>
- <font name="Default Bold" family="Source Sans Pro" 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="led" version="2.0.0">
<name>LED_3</name>
<pv_name>$(P)$(R)IlkPositionStatusR</pv_name>
- <x>696</x>
- <y>182</y>
+ <x>740</x>
+ <y>195</y>
<off_color>
<color name="IO Background" red="235" green="235" blue="235">
</color>
@@ -428,10 +444,10 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_344</name>
- <text>Control</text>
- <x>570</x>
- <y>399</y>
- <width>120</width>
+ <text>Control:</text>
+ <x>610</x>
+ <y>480</y>
+ <width>110</width>
<height>30</height>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -446,8 +462,8 @@
<widget type="led" version="2.0.0">
<name>LED_5</name>
<pv_name>$(P)$(R)IlkMagnitudeControlR</pv_name>
- <x>696</x>
- <y>401</y>
+ <x>740</x>
+ <y>486</y>
<off_color>
<color name="IO Background" red="235" green="235" blue="235">
</color>
@@ -469,8 +485,8 @@
</actions>
<pv_name>$(P)$(R)IlkMagnitudeControl</pv_name>
<text>Enable</text>
- <x>747</x>
- <y>399</y>
+ <x>780</x>
+ <y>480</y>
<width>80</width>
</widget>
<widget type="action_button" version="3.0.0">
@@ -483,16 +499,16 @@
</actions>
<pv_name>$(P)$(R)IlkMagnitudeControl</pv_name>
<text>Disable</text>
- <x>831</x>
- <y>399</y>
+ <x>870</x>
+ <y>480</y>
<width>80</width>
</widget>
<widget type="label" version="2.0.0">
<name>Label_345</name>
- <text>Status</text>
- <x>570</x>
- <y>440</y>
- <width>120</width>
+ <text>Status:</text>
+ <x>610</x>
+ <y>520</y>
+ <width>110</width>
<height>30</height>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -514,15 +530,15 @@
</actions>
<pv_name>$(P)$(R)IlkMagnitudeClear</pv_name>
<text>Clear</text>
- <x>747</x>
- <y>440</y>
+ <x>780</x>
+ <y>520</y>
<width>80</width>
</widget>
<widget type="led" version="2.0.0">
<name>LED_6</name>
<pv_name>$(P)$(R)IlkMagnitudeStatusR</pv_name>
- <x>696</x>
- <y>442</y>
+ <x>740</x>
+ <y>526</y>
<off_color>
<color name="IO Background" red="235" green="235" blue="235">
</color>
@@ -537,7 +553,7 @@
<widget type="rectangle" version="2.0.0">
<name>BGGrey03-background_12</name>
<x>40</x>
- <y>110</y>
+ <y>120</y>
<width>490</width>
<height>490</height>
<line_width>0</line_width>
@@ -551,7 +567,7 @@
<widget type="rectangle" version="2.0.0">
<name>BGGrey03-background_13</name>
<x>40</x>
- <y>650</y>
+ <y>670</y>
<width>490</width>
<height>170</height>
<line_width>0</line_width>
@@ -564,10 +580,10 @@
</widget>
<widget type="rectangle" version="2.0.0">
<name>BGGrey03-background_14</name>
- <x>550</x>
- <y>570</y>
- <width>410</width>
- <height>330</height>
+ <x>40</x>
+ <y>980</y>
+ <width>490</width>
+ <height>70</height>
<line_width>0</line_width>
<background_color>
<color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
@@ -579,10 +595,10 @@
<widget type="label" version="2.0.0">
<name>BGGrey02-title_20</name>
<text>Channels (IQ)</text>
- <x>40</x>
+ <x>20</x>
<y>70</y>
- <width>490</width>
- <height>40</height>
+ <width>530</width>
+ <height>50</height>
<font>
<font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
</font>
@@ -597,11 +613,11 @@
</widget>
<widget type="label" version="2.0.0">
<name>BGGrey02-title_21</name>
- <text>Interlock</text>
- <x>550</x>
+ <text>Position Interlock</text>
+ <x>570</x>
<y>70</y>
- <width>410</width>
- <height>40</height>
+ <width>450</width>
+ <height>50</height>
<font>
<font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
</font>
@@ -617,10 +633,10 @@
<widget type="label" version="2.0.0">
<name>BGGrey02-title_22</name>
<text>Channels (raw)</text>
- <x>40</x>
- <y>610</y>
- <width>490</width>
- <height>40</height>
+ <x>20</x>
+ <y>620</y>
+ <width>530</width>
+ <height>50</height>
<font>
<font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
</font>
@@ -635,11 +651,11 @@
</widget>
<widget type="label" version="2.0.0">
<name>BGGrey02-title_23</name>
- <text>Various</text>
- <x>550</x>
- <y>530</y>
- <width>410</width>
- <height>40</height>
+ <text>Reference line</text>
+ <x>20</x>
+ <y>930</y>
+ <width>530</width>
+ <height>50</height>
<font>
<font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
</font>
@@ -659,7 +675,7 @@
<CH>SA-</CH>
</macros>
<x>50</x>
- <y>560</y>
+ <y>570</y>
<width>470</width>
<height>30</height>
<resize>2</resize>
@@ -677,7 +693,7 @@
<CH>SM-</CH>
</macros>
<x>50</x>
- <y>360</y>
+ <y>370</y>
<width>470</width>
<height>30</height>
<resize>2</resize>
@@ -695,7 +711,7 @@
<CH>YP-</CH>
</macros>
<x>50</x>
- <y>160</y>
+ <y>170</y>
<width>470</width>
<height>30</height>
<resize>2</resize>
@@ -713,7 +729,7 @@
<CH>XP-</CH>
</macros>
<x>50</x>
- <y>120</y>
+ <y>130</y>
<width>470</width>
<height>30</height>
<resize>2</resize>
@@ -731,7 +747,7 @@
<CH>DA-</CH>
</macros>
<x>50</x>
- <y>520</y>
+ <y>530</y>
<width>470</width>
<height>30</height>
<resize>2</resize>
@@ -749,7 +765,7 @@
<CH>CA-</CH>
</macros>
<x>50</x>
- <y>480</y>
+ <y>490</y>
<width>470</width>
<height>30</height>
<resize>2</resize>
@@ -767,7 +783,7 @@
<CH>BA-</CH>
</macros>
<x>50</x>
- <y>440</y>
+ <y>450</y>
<width>470</width>
<height>30</height>
<resize>2</resize>
@@ -785,7 +801,7 @@
<CH>AA-</CH>
</macros>
<x>50</x>
- <y>400</y>
+ <y>410</y>
<width>470</width>
<height>30</height>
<resize>2</resize>
@@ -803,7 +819,7 @@
<CH>DM-</CH>
</macros>
<x>50</x>
- <y>320</y>
+ <y>330</y>
<width>470</width>
<height>30</height>
<resize>2</resize>
@@ -821,7 +837,7 @@
<CH>CM-</CH>
</macros>
<x>50</x>
- <y>280</y>
+ <y>290</y>
<width>470</width>
<height>30</height>
<resize>2</resize>
@@ -839,7 +855,7 @@
<CH>BM-</CH>
</macros>
<x>50</x>
- <y>240</y>
+ <y>250</y>
<width>470</width>
<height>30</height>
<resize>2</resize>
@@ -857,7 +873,7 @@
<CH>AM-</CH>
</macros>
<x>50</x>
- <y>200</y>
+ <y>210</y>
<width>470</width>
<height>30</height>
<resize>2</resize>
@@ -871,7 +887,7 @@
<widget type="rectangle" version="2.0.0">
<name>BGGrey03-background_15</name>
<x>40</x>
- <y>840</y>
+ <y>860</y>
<width>490</width>
<height>60</height>
<line_width>0</line_width>
@@ -889,7 +905,7 @@
<CH>D-</CH>
</macros>
<x>50</x>
- <y>780</y>
+ <y>800</y>
<width>470</width>
<height>30</height>
<resize>2</resize>
@@ -907,7 +923,7 @@
<CH>C-</CH>
</macros>
<x>50</x>
- <y>740</y>
+ <y>760</y>
<width>470</width>
<height>30</height>
<resize>2</resize>
@@ -925,7 +941,7 @@
<CH>B-</CH>
</macros>
<x>50</x>
- <y>700</y>
+ <y>720</y>
<width>470</width>
<height>30</height>
<resize>2</resize>
@@ -943,7 +959,7 @@
<CH>A-</CH>
</macros>
<x>50</x>
- <y>660</y>
+ <y>680</y>
<width>470</width>
<height>30</height>
<resize>2</resize>
@@ -964,56 +980,16 @@
</actions>
<text>Overview</text>
<x>365</x>
- <y>854</y>
+ <y>874</y>
<width>150</width>
<tooltip>$(actions)</tooltip>
</widget>
- <widget type="label" version="2.0.0">
- <name>Label_343</name>
- <text>FBIS region of interest</text>
- <x>560</x>
- <y>750</y>
- <width>160</width>
- <height>30</height>
- <font>
- <font name="Default Bold" family="Source Sans Pro" 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_342</name>
- <text>Phase unwrap</text>
- <x>560</x>
- <y>640</y>
- <width>160</width>
- <height>30</height>
- <font>
- <font name="Default Bold" family="Source Sans Pro" 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="textupdate" version="2.0.0">
<name>Text Update_115</name>
<pv_name>$(P)$(R)FbisRoiCountR</pv_name>
- <x>830</x>
- <y>860</y>
- <width>120</width>
+ <x>730</x>
+ <y>940</y>
+ <width>130</width>
<height>30</height>
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -1027,10 +1003,10 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_341</name>
- <text>Num samples</text>
- <x>570</x>
- <y>860</y>
- <width>120</width>
+ <text>Num samples:</text>
+ <x>610</x>
+ <y>940</y>
+ <width>110</width>
<height>30</height>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -1045,9 +1021,9 @@
<widget type="textupdate" version="2.0.0">
<name>Text Update_114</name>
<pv_name>$(P)$(R)FbisRoiCountR</pv_name>
- <x>830</x>
- <y>820</y>
- <width>120</width>
+ <x>730</x>
+ <y>900</y>
+ <width>130</width>
<height>30</height>
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -1062,8 +1038,8 @@
<widget type="textentry" version="3.0.0">
<name>Text Input_8</name>
<pv_name>$(P)$(R)FbisRoiCount</pv_name>
- <x>700</x>
- <y>820</y>
+ <x>870</x>
+ <y>900</y>
<width>120</width>
<height>30</height>
<actions>
@@ -1076,10 +1052,10 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_340</name>
- <text>Count</text>
- <x>570</x>
- <y>820</y>
- <width>120</width>
+ <text>Count:</text>
+ <x>610</x>
+ <y>900</y>
+ <width>110</width>
<height>30</height>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -1094,9 +1070,9 @@
<widget type="textupdate" version="2.0.0">
<name>Text Update_113</name>
<pv_name>$(P)$(R)FbisRoiStartR</pv_name>
- <x>830</x>
- <y>780</y>
- <width>120</width>
+ <x>730</x>
+ <y>860</y>
+ <width>130</width>
<height>30</height>
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -1111,8 +1087,8 @@
<widget type="textentry" version="3.0.0">
<name>Text Input_7</name>
<pv_name>$(P)$(R)FbisRoiStart</pv_name>
- <x>700</x>
- <y>780</y>
+ <x>870</x>
+ <y>860</y>
<width>120</width>
<height>30</height>
<actions>
@@ -1125,10 +1101,10 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_339</name>
- <text>Start</text>
- <x>570</x>
- <y>780</y>
- <width>120</width>
+ <text>Start:</text>
+ <x>610</x>
+ <y>860</y>
+ <width>110</width>
<height>30</height>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -1143,9 +1119,9 @@
<widget type="textupdate" version="2.0.0">
<name>Text Update_112</name>
<pv_name>$(P)$(R)PhaseUnwrapR</pv_name>
- <x>830</x>
- <y>710</y>
- <width>120</width>
+ <x>730</x>
+ <y>730</y>
+ <width>130</width>
<height>30</height>
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -1160,8 +1136,8 @@
<widget type="textentry" version="3.0.0">
<name>Text Input_6</name>
<pv_name>$(P)$(R)PhaseUnwrap</pv_name>
- <x>700</x>
- <y>710</y>
+ <x>870</x>
+ <y>730</y>
<width>120</width>
<height>30</height>
<actions>
@@ -1174,10 +1150,10 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_338</name>
- <text>Threshold</text>
- <x>570</x>
- <y>710</y>
- <width>120</width>
+ <text>Threshold:</text>
+ <x>610</x>
+ <y>730</y>
+ <width>110</width>
<height>30</height>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -1191,10 +1167,10 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_337</name>
- <text>Control</text>
- <x>570</x>
- <y>670</y>
- <width>120</width>
+ <text>Control:</text>
+ <x>610</x>
+ <y>690</y>
+ <width>110</width>
<height>30</height>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -1216,8 +1192,8 @@
</actions>
<pv_name>$(P)$(R)PhaseUnwrapControl</pv_name>
<text>Disable</text>
- <x>830</x>
- <y>670</y>
+ <x>870</x>
+ <y>690</y>
<width>80</width>
</widget>
<widget type="action_button" version="3.0.0">
@@ -1230,15 +1206,15 @@
</actions>
<pv_name>$(P)$(R)PhaseUnwrapControl</pv_name>
<text>Enable</text>
- <x>740</x>
- <y>670</y>
+ <x>780</x>
+ <y>690</y>
<width>80</width>
</widget>
<widget type="led" version="2.0.0">
<name>LED_4</name>
<pv_name>$(P)$(R)PhaseUnwrapControlR</pv_name>
- <x>706</x>
- <y>675</y>
+ <x>740</x>
+ <y>695</y>
<off_color>
<color name="IO Background" red="235" green="235" blue="235">
</color>
@@ -1253,9 +1229,9 @@
<widget type="combo" version="2.0.0">
<name>Menu Button_3</name>
<pv_name>$(P)$(R)ReferenceLine</pv_name>
- <x>700</x>
- <y>590</y>
- <width>120</width>
+ <x>370</x>
+ <y>1000</y>
+ <width>140</width>
<background_color>
<color red="240" green="240" blue="240">
</color>
@@ -1265,9 +1241,9 @@
<widget type="textupdate" version="2.0.0">
<name>Text Update_111</name>
<pv_name>$(P)$(R)ReferenceLineR</pv_name>
- <x>830</x>
- <y>590</y>
- <width>120</width>
+ <x>210</x>
+ <y>1000</y>
+ <width>140</width>
<height>30</height>
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -1281,10 +1257,10 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_1</name>
- <text>Reference line</text>
- <x>570</x>
- <y>590</y>
- <width>120</width>
+ <text>Reference line:</text>
+ <x>60</x>
+ <y>1000</y>
+ <width>140</width>
<height>30</height>
<horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -1298,11 +1274,12 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label_346</name>
- <text>Channel Overview</text>
+ <text>Channel Overview:</text>
<x>55</x>
- <y>854</y>
+ <y>874</y>
<width>260</width>
<height>30</height>
+ <horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
<wrap_words>false</wrap_words>
<actions>
@@ -1346,4 +1323,61 @@
<vertical_alignment use_class="true">1</vertical_alignment>
<wrap_words use_class="true">false</wrap_words>
</widget>
+ <widget type="label" version="2.0.0">
+ <name>BGGrey02-title_24</name>
+ <text>Magnitude Interlock</text>
+ <x>570</x>
+ <y>410</y>
+ <width>450</width>
+ <height>50</height>
+ <font>
+ <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
+ </font>
+ </font>
+ <foreground_color>
+ <color name="WHITE" red="255" green="255" blue="255">
+ </color>
+ </foreground_color>
+ <horizontal_alignment>1</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ <wrap_words>false</wrap_words>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>BGGrey02-title_25</name>
+ <text>Phase unwrap:</text>
+ <x>570</x>
+ <y>620</y>
+ <width>450</width>
+ <height>50</height>
+ <font>
+ <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
+ </font>
+ </font>
+ <foreground_color>
+ <color name="WHITE" red="255" green="255" blue="255">
+ </color>
+ </foreground_color>
+ <horizontal_alignment>1</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ <wrap_words>false</wrap_words>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>BGGrey02-title_26</name>
+ <text>FBIS region of interest:</text>
+ <x>570</x>
+ <y>790</y>
+ <width>450</width>
+ <height>50</height>
+ <font>
+ <font family="Source Sans Pro" style="BOLD_ITALIC" size="26.0">
+ </font>
+ </font>
+ <foreground_color>
+ <color name="WHITE" red="255" green="255" blue="255">
+ </color>
+ </foreground_color>
+ <horizontal_alignment>1</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ <wrap_words>false</wrap_words>
+ </widget>
</display>
diff --git a/99-Shared/adsis8300bpm/bpmReference.bob b/99-Shared/adsis8300bpm/bpmReference.bob
index 886e8125e3cd4d8672f682b5cf2ff8c6da13c279..19dbcb4f1ffe534a594d0b3d58e1d216fe694168 100644
--- a/99-Shared/adsis8300bpm/bpmReference.bob
+++ b/99-Shared/adsis8300bpm/bpmReference.bob
@@ -47,7 +47,7 @@
</widget>
<widget type="label" version="2.0.0">
<name>BGGrey02-title_19</name>
- <text>Reference line $(I)</text>
+ <text>Reference line $(I):</text>
<x>20</x>
<width>530</width>
<height>50</height>