Merge branch 'ref1' into 'master'

Fixes to OPI panels

See merge request beam-diagnostics/opis-pbi/opis-pbi-engineer!3

99-Shared/adsis8300bpm/bpmAngleDifference.bob

 <?xml version="1.0" encoding="UTF-8"?>
 <display version="2.0.0">
+  <name>$(P)$(R) AngleDiff</name>
   <width>570</width>
   <height>180</height>
   <actions>
@@ -7,12 +8,10 @@
   <widget type="rectangle" version="2.0.0">
     <name>titleBar</name>
     <class>TITLE-BAR</class>
-    <x use_class="true">0</x>
-    <y use_class="true">0</y>
     <width>570</width>
-    <height use_class="true">50</height>
-    <line_width use_class="true">0</line_width>
-    <background_color use_class="true">
+    <height>50</height>
+    <line_width>0</line_width>
+    <background_color>
       <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
       </color>
     </background_color>
@@ -21,22 +20,21 @@
     <name>title</name>
     <class>TITLE</class>
     <text>Angle difference:</text>
-    <x use_class="true">20</x>
+    <x use_class="true">0</x>
     <y use_class="true">0</y>
     <width>530</width>
-    <height use_class="true">50</height>
+    <height>50</height>
     <font use_class="true">
-      <font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
+      <font name="Header 1" family="Liberation Sans" style="BOLD" size="22.0">
       </font>
     </font>
     <foreground_color use_class="true">
-      <color name="HEADER-TEXT" red="0" green="0" blue="0">
+      <color name="Text" red="0" green="0" blue="0">
       </color>
     </foreground_color>
     <transparent use_class="true">true</transparent>
-    <horizontal_alignment use_class="true">0</horizontal_alignment>
-    <vertical_alignment use_class="true">1</vertical_alignment>
-    <wrap_words use_class="true">false</wrap_words>
+    <vertical_alignment>1</vertical_alignment>
+    <wrap_words>false</wrap_words>
   </widget>
   <widget type="rectangle" version="2.0.0">
     <name>BGGrey03-titlebar_4</name>
@@ -68,10 +66,10 @@
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>Linking Container_18</name>
-    <file>bpmChannelAverageItem.opi</file>
     <macros>
       <CH>DIFF-A-</CH>
     </macros>
+    <file>bpmChannelAverageItem.opi</file>
     <x>50</x>
     <y>100</y>
     <width>470</width>

99-Shared/adsis8300bpm/bpmReference.bob

 <?xml version="1.0" encoding="UTF-8"?>
 <display version="2.0.0">
+  <name>$(P)$(R) RefLine</name>
   <width>570</width>
   <height>260</height>
   <actions>
@@ -7,12 +8,10 @@
   <widget type="rectangle" version="2.0.0">
     <name>titleBar</name>
     <class>TITLE-BAR</class>
-    <x use_class="true">0</x>
-    <y use_class="true">0</y>
     <width>570</width>
-    <height use_class="true">50</height>
-    <line_width use_class="true">0</line_width>
-    <background_color use_class="true">
+    <height>50</height>
+    <line_width>0</line_width>
+    <background_color>
       <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
       </color>
     </background_color>
@@ -60,10 +59,10 @@
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>Linking Container_8</name>
-    <file>aiChannelItem.opi</file>
     <macros>
       <CH>RL$(I)-</CH>
     </macros>
+    <file>aiChannelItem.opi</file>
     <x>50</x>
     <y>100</y>
     <width>470</width>
@@ -78,10 +77,10 @@
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>Linking Container_17</name>
-    <file>bpmChannelItem.opi</file>
     <macros>
       <CH>RL$(I)-M-</CH>
     </macros>
+    <file>bpmChannelItem.opi</file>
     <x>50</x>
     <y>140</y>
     <width>470</width>
@@ -96,10 +95,10 @@
   </widget>
   <widget type="embedded" version="2.0.0">
     <name>Linking Container_18</name>
-    <file>bpmChannelItem.opi</file>
     <macros>
       <CH>RL$(I)-A-</CH>
     </macros>
+    <file>bpmChannelItem.opi</file>
     <x>50</x>
     <y>180</y>
     <width>470</width>