Changed ArrayAddress text entry field from string to decimal

areaDetector · Sep 21, 2018 · 5122f46 · 5122f46
1 parent 8bf6141
commit 5122f46
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/ADApp/op/adl/NDPluginBase.adl b/ADApp/op/adl/NDPluginBase.adl
@@ -1,6 +1,6 @@
 
 file {
-	name="/home/epics/devel/areaDetector/ADCore/ADApp/op/adl/NDPluginBase.adl"
+	name="/home/epics/devel/areaDetector-3-3-2/ADCore/ADApp/op/adl/NDPluginBase.adl"
 	version=030109
 }
 display {
@@ -227,7 +227,6 @@ text {
 		clr=14
 		bclr=51
 	}
-	format="string"
 	limits {
 	}
 }

diff --git a/ADApp/op/edl/autoconvert/NDPluginBase.edl b/ADApp/op/edl/autoconvert/NDPluginBase.edl
@@ -226,7 +226,7 @@ y 129
 w 100
 h 20
 controlPv "$(P)$(R)NDArrayAddress"
-format "string"
+format "decimal"
 font "helvetica-medium-r-12.0"
 fontAlign "left"
 fgColor rgb 0 0 0

diff --git a/ADApp/op/opi/autoconvert/NDPluginBase.opi b/ADApp/op/opi/autoconvert/NDPluginBase.opi
@@ -474,7 +474,7 @@ $(pv_value)</tooltip>
     <foreground_color>
       <color red="0" green="0" blue="0" />
     </foreground_color>
-    <format_type>4</format_type>
+    <format_type>1</format_type>
     <height>20</height>
     <horizontal_alignment>0</horizontal_alignment>
     <limits_from_pv>false</limits_from_pv>

diff --git a/ADApp/op/ui/autoconvert/NDPluginBase.ui b/ADApp/op/ui/autoconvert/NDPluginBase.ui
@@ -551,7 +551,7 @@ border-radius: 2px;
                 <enum>caLineEdit::Static</enum>
             </property>
             <property name="formatType">
-                <enum>string</enum>
+                <enum>decimal</enum>
             </property>
         </widget>
         <widget class="caLineEdit" name="caLineEdit_4">