Add ADEuresys

areaDetector · Mar 23, 2024 · 01b91d7 · 01b91d7
1 parent ba3de37
commit 01b91d7
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 24 deletions.
diff --git a/ADApp/op/bob/autoconvert/ADTop.bob b/ADApp/op/bob/autoconvert/ADTop.bob
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--Saved on 2023-10-05 14:26:00 by epics-->
+<!--Saved on 2024-02-28 16:49:05 by epics-->
 <display version="2.0.0">
   <name>ADTop</name>
-  <x>280</x>
-  <y>87</y>
+  <x>180</x>
+  <y>72</y>
   <width>225</width>
   <height>790</height>
   <background_color>
@@ -1496,6 +1496,16 @@
         <target>tab</target>
         <description>Mikrotron MC2066</description>
       </action>
+      <action type="open_display">
+        <file>ADBitFlow.opi</file>
+        <macros>
+          <C>Adimec_Q12A180CXP_1_1_5</C>
+          <P>13BF1:</P>
+          <R>cam1:</R>
+        </macros>
+        <target>tab</target>
+        <description>Adimec Q-12A180</description>
+      </action>
     </actions>
     <text></text>
     <x>143</x>

diff --git a/ADApp/op/edl/autoconvert/ADTop.edl b/ADApp/op/edl/autoconvert/ADTop.edl
@@ -3,8 +3,8 @@ beginScreenProperties
 major 4
 minor 0
 release 1
-x 280
-y 87
+x 180
+y 72
 w 225
 h 790
 font "helvetica-medium-r-18.0"
@@ -1735,19 +1735,23 @@ topShadowColor rgb 55808 55808 55808
 botShadowColor rgb 17920 17920 17920
 font "helvetica-medium-r-8.0"
 icon
-numPvs 2
-numDsps 1
+numPvs 4
+numDsps 2
 displayFileName {
   0 "ADBitFlow.edl"
+  1 "ADBitFlow.edl"
 }
 menuLabel {
   0 "Mikrotron MC2066"
+  1 "Adimec Q-12A180"
 }
 symbols {
   0 "P=13BF1:,R=cam1:,C=Mikrotron_CXP_MC206xS11"
+  1 "P=13BF1:,R=cam1:,C=Adimec_Q12A180CXP_1_1_5"
 }
 replaceSymbols {
   0 1
+  1 1
 }
 endObjectProperties
 
diff --git a/ADApp/op/opi/autoconvert/ADTop.opi b/ADApp/op/opi/autoconvert/ADTop.opi
@@ -28,8 +28,8 @@
   <snap_to_geometry>false</snap_to_geometry>
   <widget_type>Display</widget_type>
   <width>225</width>
-  <x>280</x>
-  <y>87</y>
+  <x>180</x>
+  <y>72</y>
   <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
     <actions hook="false" hook_all="false" />
     <auto_size>false</auto_size>
@@ -3290,7 +3290,7 @@ $(pv_value)</tooltip>
     <x>68</x>
     <y>209</y>
   </widget>
-  <widget typeId="org.csstudio.opibuilder.widgets.ActionButton" version="2.0.0">
+  <widget typeId="org.csstudio.opibuilder.widgets.MenuButton" version="1.0.0">
     <actions hook="false" hook_all="false">
       <action type="OPEN_DISPLAY">
         <path>ADBitFlow.opi</path>
@@ -3303,7 +3303,19 @@ $(pv_value)</tooltip>
         <mode>1</mode>
         <description>Mikrotron MC2066</description>
       </action>
+      <action type="OPEN_DISPLAY">
+        <path>ADBitFlow.opi</path>
+        <macros>
+          <include_parent_macros>true</include_parent_macros>
+          <P>13BF1:</P>
+          <R>cam1:</R>
+          <C>Adimec_Q12A180CXP_1_1_5</C>
+        </macros>
+        <mode>1</mode>
+        <description>Adimec Q-12A180</description>
+      </action>
     </actions>
+    <actions_from_pv>false</actions_from_pv>
     <alarm_pulsing>false</alarm_pulsing>
     <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
     <background_color>
@@ -3313,7 +3325,7 @@ $(pv_value)</tooltip>
     <border_color>
       <color red="0" green="128" blue="255" />
     </border_color>
-    <border_style>0</border_style>
+    <border_style>6</border_style>
     <border_width>1</border_width>
     <enabled>true</enabled>
     <font>
@@ -3324,9 +3336,8 @@ $(pv_value)</tooltip>
       <color red="0" green="0" blue="0" />
     </foreground_color>
     <height>20</height>
-    <image></image>
-    <name>Action Button</name>
-    <push_action_index>0</push_action_index>
+    <label></label>
+    <name>Menu Button</name>
     <pv_name></pv_name>
     <pv_value />
     <rules />
@@ -3336,13 +3347,12 @@ $(pv_value)</tooltip>
       <keep_wh_ratio>false</keep_wh_ratio>
     </scale_options>
     <scripts />
-    <style>0</style>
-    <text></text>
-    <toggle_button>false</toggle_button>
+    <show_down_arrow>false</show_down_arrow>
     <tooltip>$(pv_name)
 $(pv_value)</tooltip>
+    <transparent>false</transparent>
     <visible>true</visible>
-    <widget_type>Action Button</widget_type>
+    <widget_type>Menu Button</widget_type>
     <width>64</width>
     <x>143</x>
     <y>209</y>

diff --git a/ADApp/op/ui/autoconvert/ADTop.ui b/ADApp/op/ui/autoconvert/ADTop.ui
@@ -4,8 +4,8 @@
 <widget class="QMainWindow" name="MainWindow">
     <property name="geometry">
         <rect>
-            <x>280</x>
-            <y>87</y>
+            <x>180</x>
+            <y>72</y>
             <width>225</width>
             <height>790</height>
         </rect>
@@ -2315,16 +2315,16 @@ border-radius: 2px;
                 <enum>Menu</enum>
             </property>
             <property name="labels">
-                <string>Mikrotron MC2066</string>
+                <string>Mikrotron MC2066;Adimec Q-12A180</string>
             </property>
             <property name="files">
-                <string>ADBitFlow.ui </string>
+                <string>ADBitFlow.ui ;ADBitFlow.ui </string>
             </property>
             <property name="args">
-                <string>P=13BF1:, R=cam1:, C=Mikrotron_CXP_MC206xS11</string>
+                <string>P=13BF1:, R=cam1:, C=Mikrotron_CXP_MC206xS11;P=13BF1:,R=cam1:,C=Adimec_Q12A180CXP_1_1_5</string>
             </property>
             <property name="removeParent">
-                <string>false</string>
+                <string>false;false</string>
             </property>
         </widget>
         <zorder>caLabel_0</zorder>