From 4b237492ea35c81083a0c2ef2a63b2c38add0230 Mon Sep 17 00:00:00 2001
From: Mark Rivers <rivers@cars.uchicago.edu>
Date: Mon, 26 Jun 2023 08:22:21 -0500
Subject: [PATCH] Fix position of PICAM-specific related display widget

---
 PICamApp/op/bob/autoconvert/PICAMBase.bob |   5 +-
 PICamApp/op/edl/autoconvert/PICAMBase.edl | 113 ++++++----------------
 PICamApp/op/opi/autoconvert/PICAMBase.opi |   4 +-
 PICamApp/op/ui/autoconvert/PICAMBase.ui   |   6 +-
 4 files changed, 36 insertions(+), 92 deletions(-)

diff --git a/PICamApp/op/bob/autoconvert/PICAMBase.bob b/PICamApp/op/bob/autoconvert/PICAMBase.bob
index b76d092..3d70498 100644
--- a/PICamApp/op/bob/autoconvert/PICAMBase.bob
+++ b/PICamApp/op/bob/autoconvert/PICAMBase.bob
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--Saved on 2023-06-26 08:22:11 by epics-->
 <display version="2.0.0">
   <name>PICAMBase</name>
   <x>409</x>
@@ -588,7 +589,7 @@
     <x>715</x>
     <y>379</y>
     <width>350</width>
-    <height>135</height>
+    <height>160</height>
   </widget>
   <widget type="action_button" version="3.0.0">
     <name>related display #132</name>
@@ -651,7 +652,7 @@
     </actions>
     <text>PICAM Specific Parameters</text>
     <x>744</x>
-    <y>519</y>
+    <y>544</y>
     <width>300</width>
     <height>27</height>
     <background_color>
diff --git a/PICamApp/op/edl/autoconvert/PICAMBase.edl b/PICamApp/op/edl/autoconvert/PICAMBase.edl
index e523f79..ab30d2c 100644
--- a/PICamApp/op/edl/autoconvert/PICAMBase.edl
+++ b/PICamApp/op/edl/autoconvert/PICAMBase.edl
@@ -100,24 +100,11 @@ newPos
 objType "controls"
 endObjectProperties
 
-# (Group)
-object activeGroupClass
-beginObjectProperties
-major 4
-minor 0
-release 0
-x 5
-y 53
-w 350
-h 340
-
-beginGroup
-
 # (Embedded Window)
 object activePipClass
 beginObjectProperties
 major 4
-minor 1
+minor 0
 release 0
 x 5
 y 53
@@ -137,30 +124,11 @@ displayFileName {
 noScroll
 endObjectProperties
 
-endGroup
-
-visMin "A"
-visMax "1"
-endObjectProperties
-
-# (Group)
-object activeGroupClass
-beginObjectProperties
-major 4
-minor 0
-release 0
-x 5
-y 398
-w 350
-h 80
-
-beginGroup
-
 # (Embedded Window)
 object activePipClass
 beginObjectProperties
 major 4
-minor 1
+minor 0
 release 0
 x 5
 y 398
@@ -180,30 +148,11 @@ displayFileName {
 noScroll
 endObjectProperties
 
-endGroup
-
-visMin "A"
-visMax "1"
-endObjectProperties
-
-# (Group)
-object activeGroupClass
-beginObjectProperties
-major 4
-minor 0
-release 0
-x 360
-y 53
-w 350
-h 250
-
-beginGroup
-
 # (Embedded Window)
 object activePipClass
 beginObjectProperties
 major 4
-minor 1
+minor 0
 release 0
 x 360
 y 53
@@ -223,12 +172,6 @@ displayFileName {
 noScroll
 endObjectProperties
 
-endGroup
-
-visMin "A"
-visMax "1"
-endObjectProperties
-
 # (Rectangle)
 object activeRectangleClass
 beginObjectProperties
@@ -839,7 +782,7 @@ release 0
 x 715
 y 379
 w 350
-h 135
+h 160
 
 beginGroup
 
@@ -852,7 +795,7 @@ release 0
 x 715
 y 379
 w 350
-h 135
+h 160
 fgColor rgb 0 0 0
 bgColor rgb 65280 65280 65280
 topShadowColor rgb 65280 65280 65280
@@ -1170,7 +1113,7 @@ major 4
 minor 0
 release 0
 x 744
-y 519
+y 544
 w 300
 h 27
 fgColor rgb 0 0 0
@@ -1183,30 +1126,30 @@ buttonLabel "PICAM Specific Parameters"
 numPvs 22
 numDsps 11
 displayFileName {
-  0 PICAM_ParameterRelevance.edl
-  1 PICam_AcquisitionParams.edl
-  2 PICam_SensorInformation.edl
-  3 PICam_SensorLayout.edl
-  4 PICam_SensorCleaning.edl
-  5 PICam_SensorTemperature.edl
-  6 PICam_HardwareIO.edl
-  7 PICAM_ShutterParams.edl
-  8 PICAM_ReadoutParams.edl
-  9 PICAM_AdcParams.edl
-  10 PICAM.edl
+  0 "PICAM_ParameterRelevance.edl"
+  1 "PICam_AcquisitionParams.edl"
+  2 "PICam_SensorInformation.edl"
+  3 "PICam_SensorLayout.edl"
+  4 "PICam_SensorCleaning.edl"
+  5 "PICam_SensorTemperature.edl"
+  6 "PICam_HardwareIO.edl"
+  7 "PICAM_ShutterParams.edl"
+  8 "PICAM_ReadoutParams.edl"
+  9 "PICAM_AdcParams.edl"
+  10 "PICAM.edl"
 }
 menuLabel {
-  0 ParameterRelevance
-  1 Data Acquisition
-  2 Sensor Information
-  3 Sensor Layout
-  4 Sensor Cleaning
-  5 Sensor Temperature
-  6 Hardware I/O
-  7 Shutter
-  8 Readout Parameters
-  9 ADC Parameters
-  10 Available Detectors
+  0 "ParameterRelevance"
+  1 "Data Acquisition"
+  2 "Sensor Information"
+  3 "Sensor Layout"
+  4 "Sensor Cleaning"
+  5 "Sensor Temperature"
+  6 "Hardware I/O"
+  7 "Shutter"
+  8 "Readout Parameters"
+  9 "ADC Parameters"
+  10 "Available Detectors"
 }
 symbols {
   0 "P=$(P),R=$(R)"
diff --git a/PICamApp/op/opi/autoconvert/PICAMBase.opi b/PICamApp/op/opi/autoconvert/PICAMBase.opi
index db3dc77..e569690 100644
--- a/PICamApp/op/opi/autoconvert/PICAMBase.opi
+++ b/PICamApp/op/opi/autoconvert/PICAMBase.opi
@@ -1409,7 +1409,7 @@ $(pv_value)</tooltip>
       <color red="0" green="0" blue="0" />
     </foreground_color>
     <group_name></group_name>
-    <height>135</height>
+    <height>160</height>
     <macros>
       <include_parent_macros>true</include_parent_macros>
     </macros>
@@ -2011,6 +2011,6 @@ $(pv_value)</tooltip>
     <widget_type>Menu Button</widget_type>
     <width>300</width>
     <x>744</x>
-    <y>519</y>
+    <y>544</y>
   </widget>
 </display>
diff --git a/PICamApp/op/ui/autoconvert/PICAMBase.ui b/PICamApp/op/ui/autoconvert/PICAMBase.ui
index 76e2953..8793251 100644
--- a/PICamApp/op/ui/autoconvert/PICAMBase.ui
+++ b/PICamApp/op/ui/autoconvert/PICAMBase.ui
@@ -1404,7 +1404,7 @@ border-radius: 2px;
                     <x>715</x>
                     <y>379</y>
                     <width>354</width>
-                    <height>139</height>
+                    <height>164</height>
                 </rect>
             </property>
             <property name="geometry">
@@ -1412,7 +1412,7 @@ border-radius: 2px;
                     <x>715</x>
                     <y>379</y>
                     <width>352</width>
-                    <height>137</height>
+                    <height>162</height>
                 </rect>
             </property>
             <property name="filename">
@@ -1426,7 +1426,7 @@ border-radius: 2px;
             <property name="geometry">
                 <rect>
                     <x>744</x>
-                    <y>519</y>
+                    <y>544</y>
                     <width>300</width>
                     <height>27</height>
                 </rect>