New autoconvert file

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

Hide file tree

Showing 4 changed files with 10 additions and 56 deletions.
diff --git a/ADApp/op/bob/autoconvert/ADPlugins.bob b/ADApp/op/bob/autoconvert/ADPlugins.bob
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--Saved on 2024-03-25 15:22:21 by epics-->
+<!--Saved on 2024-11-18 15:11:00 by epics-->
 <display version="2.0.0">
   <name>ADPlugins</name>
   <x>141</x>
@@ -161,24 +161,6 @@
         <target>tab</target>
         <description>Null file #1</description>
       </action>
-      <action type="open_display">
-        <file>NDFileJRaw.opi</file>
-        <macros>
-          <EXT>jraw</EXT>
-          <R>JRaw1:</R>
-        </macros>
-        <target>tab</target>
-        <description>JRaw file #1</description>
-      </action>
-      <action type="open_display">
-        <file>NDFileJRaw.opi</file>
-        <macros>
-          <EXT>jraw</EXT>
-          <R>JRaw2:</R>
-        </macros>
-        <target>tab</target>
-        <description>JRaw file #2</description>
-      </action>
     </actions>
     <text></text>
     <x>135</x>
@@ -191,7 +173,7 @@
     </background_color>
   </widget>
   <widget type="action_button" version="3.0.0">
-    <name>related display #35</name>
+    <name>related display #33</name>
     <actions>
       <action type="open_display">
         <file>NDROI.opi</file>
@@ -248,7 +230,7 @@
     </background_color>
   </widget>
   <widget type="action_button" version="3.0.0">
-    <name>related display #42</name>
+    <name>related display #40</name>
     <actions>
       <action type="open_display">
         <file>commonPlugins.opi</file>
@@ -267,7 +249,7 @@
     </background_color>
   </widget>
   <widget type="label" version="2.0.0">
-    <name>text #45</name>
+    <name>text #43</name>
     <text>Stats</text>
     <x>10</x>
     <y>55</y>
@@ -279,7 +261,7 @@
     <auto_size>true</auto_size>
   </widget>
   <widget type="action_button" version="3.0.0">
-    <name>related display #48</name>
+    <name>related display #46</name>
     <actions>
       <action type="open_display">
         <file>NDStats.opi</file>
@@ -345,7 +327,7 @@
     </background_color>
   </widget>
   <widget type="action_button" version="3.0.0">
-    <name>related display #56</name>
+    <name>related display #54</name>
     <actions>
       <action type="open_display">
         <file>NDStdArrays.opi</file>
@@ -495,7 +477,7 @@
     </background_color>
   </widget>
   <widget type="action_button" version="3.0.0">
-    <name>related display #74</name>
+    <name>related display #72</name>
     <actions>
       <action type="open_display">
         <file>NDStdArrays.opi</file>

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-11-09 14:21:41 by epics-->
+<!--Saved on 2024-11-18 15:07:03 by epics-->
 <display version="2.0.0">
   <name>ADTop</name>
   <x>180</x>

diff --git a/ADApp/op/edl/autoconvert/ADPlugins.edl b/ADApp/op/edl/autoconvert/ADPlugins.edl
@@ -167,8 +167,8 @@ topShadowColor rgb 55808 55808 55808
 botShadowColor rgb 17920 17920 17920
 font "helvetica-medium-r-8.0"
 icon
-numPvs 18
-numDsps 9
+numPvs 14
+numDsps 7
 displayFileName {
   0 "NDFileNetCDF.edl"
   1 "NDFileTIFF.edl"
@@ -177,8 +177,6 @@ displayFileName {
   4 "NDFileMagick.edl"
   5 "NDFileHDF5.edl"
   6 "NDFileNull.edl"
-  7 "NDFileJRaw.edl"
-  8 "NDFileJRaw.edl"
 }
 menuLabel {
   0 "netCDF file #1"
@@ -188,8 +186,6 @@ menuLabel {
   4 "Magick file #1"
   5 "HDF5 file #1"
   6 "Null file #1"
-  7 "JRaw file #1"
-  8 "JRaw file #2"
 }
 symbols {
   0 "P=$(P),R=netCDF1:,EXT=nc"
@@ -199,8 +195,6 @@ symbols {
   4 "P=$(P),R=Magick1:,EXT=tif"
   5 "P=$(P),R=HDF1:,EXT=h5"
   6 "P=$(P),R=Null1:,EXT=null"
-  7 "P=$(P),R=JRaw1:,EXT=jraw"
-  8 "P=$(P),R=JRaw2:,EXT=jraw"
 }
 replaceSymbols {
   0 1
@@ -210,8 +204,6 @@ replaceSymbols {
   4 1
   5 1
   6 1
-  7 1
-  8 1
 }
 endObjectProperties
 

diff --git a/ADApp/op/opi/autoconvert/ADPlugins.opi b/ADApp/op/opi/autoconvert/ADPlugins.opi
@@ -376,26 +376,6 @@ $(pv_value)</tooltip>
         <mode>1</mode>
         <description>Null file #1</description>
       </action>
-      <action type="OPEN_DISPLAY">
-        <path>NDFileJRaw.opi</path>
-        <macros>
-          <include_parent_macros>true</include_parent_macros>
-          <R>JRaw1:</R>
-          <EXT>jraw</EXT>
-        </macros>
-        <mode>1</mode>
-        <description>JRaw file #1</description>
-      </action>
-      <action type="OPEN_DISPLAY">
-        <path>NDFileJRaw.opi</path>
-        <macros>
-          <include_parent_macros>true</include_parent_macros>
-          <R>JRaw2:</R>
-          <EXT>jraw</EXT>
-        </macros>
-        <mode>1</mode>
-        <description>JRaw file #2</description>
-      </action>
     </actions>
     <actions_from_pv>false</actions_from_pv>
     <alarm_pulsing>false</alarm_pulsing>