New autoconvert

areaDetector · Nov 18, 2024 · 69a9cf0 · 69a9cf0
1 parent 0569075
commit 69a9cf0
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 14 deletions.
diff --git a/ADApp/op/bob/autoconvert/ADTop.bob b/ADApp/op/bob/autoconvert/ADTop.bob
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--Saved on 2024-03-25 15:22:22 by epics-->
+<!--Saved on 2024-11-09 14:21:41 by epics-->
 <display version="2.0.0">
   <name>ADTop</name>
   <x>180</x>
@@ -1294,6 +1294,16 @@
         <target>tab</target>
         <description>GC1380H</description>
       </action>
+      <action type="open_display">
+        <file>ADVimba.opi</file>
+        <macros>
+          <C>AVT_GC1350C</C>
+          <P>13VMB1:</P>
+          <R>cam1:</R>
+        </macros>
+        <target>tab</target>
+        <description>GC1350C</description>
+      </action>
     </actions>
     <text></text>
     <x>145</x>
@@ -1306,7 +1316,7 @@
     </background_color>
   </widget>
   <widget type="action_button" version="3.0.0">
-    <name>related display #203</name>
+    <name>related display #204</name>
     <actions>
       <action type="open_display">
         <file>ADBase.opi</file>
@@ -1338,7 +1348,7 @@
     </background_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #207</name>
+    <name>text #208</name>
     <text>MarCCD</text>
     <x>80</x>
     <y>385</y>
@@ -1350,7 +1360,7 @@
     <horizontal_alignment>2</horizontal_alignment>
   </widget>
   <widget type="action_button" version="3.0.0">
-    <name>related display #210</name>
+    <name>related display #211</name>
     <actions>
       <action type="open_display">
         <file>ADBase.opi</file>
@@ -1382,7 +1392,7 @@
     </background_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #214</name>
+    <name>text #215</name>
     <text>MMPAD</text>
     <x>90</x>
     <y>410</y>
@@ -1394,7 +1404,7 @@
     <horizontal_alignment>2</horizontal_alignment>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #217</name>
+    <name>text #218</name>
     <text>Spinnaker</text>
     <x>50</x>
     <y>735</y>
@@ -1406,7 +1416,7 @@
     <horizontal_alignment>2</horizontal_alignment>
   </widget>
   <widget type="action_button" version="3.0.0">
-    <name>related display #220</name>
+    <name>related display #221</name>
     <actions>
       <action type="open_display">
         <file>ADSpinnaker.opi</file>
@@ -1490,15 +1500,15 @@
     </background_color>
   </widget>
   <widget type="group" version="2.0.0">
-    <name>composite #229</name>
+    <name>composite #230</name>
     <x>68</x>
     <y>209</y>
     <width>139</width>
     <height>20</height>
     <style>3</style>
     <transparent>true</transparent>
     <widget type="action_button" version="3.0.0">
-      <name>related display #232</name>
+      <name>related display #233</name>
       <actions>
         <action type="open_display">
           <file>ADBitFlow.opi</file>
@@ -1531,7 +1541,7 @@
       </background_color>
     </widget>
     <widget type="label" version="2.0.0">
-      <name>text #236</name>
+      <name>text #237</name>
       <text>BitFlow</text>
       <width>70</width>
       <font>
@@ -1542,7 +1552,7 @@
     </widget>
   </widget>
   <widget type="action_button" version="3.0.0">
-    <name>related display #239</name>
+    <name>related display #240</name>
     <actions>
       <action type="open_display">
         <file>ADEuresys.opi</file>
@@ -1586,7 +1596,7 @@
     </background_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #244</name>
+    <name>text #245</name>
     <text>Euresys</text>
     <x>68</x>
     <y>284</y>

diff --git a/ADApp/op/edl/autoconvert/ADTop.edl b/ADApp/op/edl/autoconvert/ADTop.edl
@@ -1609,31 +1609,35 @@ topShadowColor rgb 55808 55808 55808
 botShadowColor rgb 17920 17920 17920
 font "helvetica-medium-r-8.0"
 icon
-numPvs 8
-numDsps 4
+numPvs 10
+numDsps 5
 displayFileName {
   0 "ADVimba.edl"
   1 "ADVimba.edl"
   2 "ADVimba.edl"
   3 "ADVimba.edl"
+  4 "ADVimba.edl"
 }
 menuLabel {
   0 "Manta G507C"
   1 "GC1380CH"
   2 "Manta G146C"
   3 "GC1380H"
+  4 "GC1350C"
 }
 symbols {
   0 "P=13VMB1:,R=cam1:,C=AVT_Manta_G507C"
   1 "P=13VMB1:,R=cam1:,C=AVT_GC1380CH"
   2 "P=13VMB1:,R=cam1:,C=AVT_Manta_G146C"
   3 "P=13VMB1:,R=cam1:,C=AVT_GC1380H"
+  4 "P=13VMB1:,R=cam1:,C=AVT_GC1350C"
 }
 replaceSymbols {
   0 1
   1 1
   2 1
   3 1
+  4 1
 }
 endObjectProperties
 

diff --git a/ADApp/op/opi/autoconvert/ADTop.opi b/ADApp/op/opi/autoconvert/ADTop.opi
@@ -3002,6 +3002,17 @@ $(pv_value)</tooltip>
         <mode>1</mode>
         <description>GC1380H</description>
       </action>
+      <action type="OPEN_DISPLAY">
+        <path>ADVimba.opi</path>
+        <macros>
+          <include_parent_macros>true</include_parent_macros>
+          <P>13VMB1:</P>
+          <R>cam1:</R>
+          <C>AVT_GC1350C</C>
+        </macros>
+        <mode>1</mode>
+        <description>GC1350C</description>
+      </action>
     </actions>
     <actions_from_pv>false</actions_from_pv>
     <alarm_pulsing>false</alarm_pulsing>