Merge branch 'ICSHWI-11887' into 'master'

nBLM: CAEN power supply OPI update

See merge request !38

10-Top/nblm/power.bob

@@ -39,10 +39,13 @@
         </children>
       </tab>
       <tab>
-        <name>Low Voltage</name>
+        <name>Low Voltage 1</name>
         <children>
           <widget type="embedded" version="2.0.0">
             <name>Linking Container</name>
+            <macros>
+              <Idx>101</Idx>
+            </macros>
             <file>../../99-Shared/caensyproxy/LV/LV_A2519_global.bob</file>
             <x>5</x>
             <y>5</y>
@@ -59,13 +62,62 @@
         </children>
       </tab>
       <tab>
-        <name>High Voltage</name>
+        <name>Low Voltage 2</name>
         <children>
           <widget type="embedded" version="2.0.0">
             <name>Linking Container_1</name>
+            <macros>
+              <Idx>102</Idx>
+            </macros>
+            <file>../../99-Shared/caensyproxy/LV/LV_A2519_global.bob</file>
+            <x>5</x>
+            <y>5</y>
+            <width>1800</width>
+            <height>1600</height>
+            <resize>2</resize>
+            <actions>
+            </actions>
+            <border_color>
+              <color red="0" green="128" blue="255">
+              </color>
+            </border_color>
+          </widget>
+        </children>
+      </tab>
+      <tab>
+        <name>High Voltage 1</name>
+        <children>
+          <widget type="embedded" version="2.0.0">
+            <name>Linking Container_2</name>
+            <macros>
+              <Idx>101</Idx>
+            </macros>
+            <file>../../99-Shared/caensyproxy/HV/HV_A7030_global.bob</file>
+            <x>5</x>
+            <y>5</y>
+            <width>2000</width>
+            <height>2000</height>
+            <resize>2</resize>
+            <actions>
+            </actions>
+            <border_color>
+              <color red="0" green="128" blue="255">
+              </color>
+            </border_color>
+          </widget>
+        </children>
+      </tab>
+      <tab>
+        <name>High Voltage 2</name>
+        <children>
+          <widget type="embedded" version="2.0.0">
+            <name>Linking Container_3</name>
+            <macros>
+              <Idx>102</Idx>
+            </macros>
             <file>../../99-Shared/caensyproxy/HV/HV_A7030_global.bob</file>
             <x>5</x>
-            <y>6</y>
+            <y>5</y>
             <width>2000</width>
             <height>2000</height>
             <resize>2</resize>
@@ -91,7 +143,6 @@
       <color name="BACKGROUND" red="220" green="225" blue="221">
       </color>
     </background_color>
-    <active_tab>2</active_tab>
     <tab_height>10</tab_height>
     <actions>
     </actions>
@@ -112,7 +163,7 @@
   <widget type="label" version="2.0.0">
     <name>Label</name>
     <class>TITLE</class>
-    <text>nBLM power</text>
+    <text>nBLM Power Supply</text>
     <x use_class="true">20</x>
     <y use_class="true">0</y>
     <width>600</width>

99-Shared/caensyproxy/HV/HV_A7030_global.bob

 <?xml version="1.0" encoding="UTF-8"?>
 <display version="2.0.0">
-  <macros>
-    <Idx>101</Idx>
-    <R>PwrC-HVM-${Idx}:</R>
-  </macros>
   <width>2000</width>
   <height>2000</height>
   <background_color>
@@ -75,7 +71,6 @@
       <color red="240" green="240" blue="240">
       </color>
     </background_color>
-    <active_tab>0</active_tab>
     <tab_height>10</tab_height>
     <actions>
     </actions>

99-Shared/caensyproxy/LV/LV_A2519_global.bob

 <?xml version="1.0" encoding="UTF-8"?>
 <display version="2.0.0">
-  <macros>
-    <Idx>101</Idx>
-    <R>PwrC-LVM-${Idx}:</R>
-  </macros>
   <width>1800</width>
   <height>1600</height>
   <background_color>