From 1d2551634fccb5ef73fd4542dcf111550125aed4 Mon Sep 17 00:00:00 2001
From: rivers <rivers@dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b>
Date: Tue, 18 Mar 2008 23:14:39 +0000
Subject: [PATCH] Added DataType; cleanup up some unused PVs

git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@6833 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
---
 ADApp/op/adl/ADAsyn.adl | 163 +++++++++++++++-------------------------
 1 file changed, 60 insertions(+), 103 deletions(-)

diff --git a/ADApp/op/adl/ADAsyn.adl b/ADApp/op/adl/ADAsyn.adl
index fb65eff..8048cf1 100644
--- a/ADApp/op/adl/ADAsyn.adl
+++ b/ADApp/op/adl/ADAsyn.adl
@@ -1,6 +1,6 @@
 
 file {
-	name="/home/epics/devel/ccd/1-10beta/ccdApp/op/adl/ccdAsyn.adl"
+	name="/home/epics/devel/areaDetector/1-1/ADApp/op/adl/ADAsyn.adl"
 	version=030000
 }
 display {
@@ -8,7 +8,7 @@ display {
 		x=62
 		y=35
 		width=1020
-		height=650
+		height=700
 	}
 	clr=14
 	bclr=4
@@ -109,23 +109,6 @@ composite {
 		}
 	}
 }
-text {
-	object {
-		x=169
-		y=135
-		width=110
-		height=20
-	}
-	"basic attribute" {
-		clr=20
-	}
-	"dynamic attribute" {
-		vis="if zero"
-		calc="A"
-		chan="$(P)$(D)SNLWatchdog"
-	}
-	textix="Not running"
-}
 rectangle {
 	object {
 		x=160
@@ -527,36 +510,6 @@ composite {
 		}
 	}
 }
-text {
-	object {
-		x=110
-		y=135
-		width=50
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="SNL Program"
-	align="horiz. right"
-}
-text {
-	object {
-		x=169
-		y=135
-		width=70
-		height=20
-	}
-	"basic attribute" {
-		clr=63
-	}
-	"dynamic attribute" {
-		vis="if not zero"
-		calc="A"
-		chan="$(P)$(D)SNLWatchdog"
-	}
-	textix="Running"
-}
 composite {
 	object {
 		x=70
@@ -845,7 +798,7 @@ text {
 }
 text {
 	object {
-		x=572
+		x=494
 		y=443
 		width=99
 		height=20
@@ -862,7 +815,7 @@ text {
 }
 text {
 	object {
-		x=572
+		x=494
 		y=443
 		width=99
 		height=20
@@ -1375,8 +1328,8 @@ menu {
 }
 "message button" {
 	object {
-		x=510
-		y=442
+		x=480
+		y=463
 		width=59
 		height=20
 	}
@@ -1390,9 +1343,9 @@ menu {
 }
 text {
 	object {
-		x=373
-		y=442
-		width=128
+		x=386
+		y=463
+		width=70
 		height=20
 	}
 	"basic attribute" {
@@ -1404,7 +1357,7 @@ text {
 text {
 	object {
 		x=373
-		y=467
+		y=492
 		width=128
 		height=20
 	}
@@ -1417,7 +1370,7 @@ text {
 "text update" {
 	object {
 		x=510
-		y=467
+		y=492
 		width=158
 		height=18
 	}
@@ -1430,23 +1383,10 @@ text {
 	limits {
 	}
 }
-text {
-	object {
-		x=412
-		y=542
-		width=89
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="Abort"
-	align="horiz. right"
-}
 "message button" {
 	object {
-		x=510
-		y=542
+		x=547
+		y=463
 		width=59
 		height=20
 	}
@@ -1455,39 +1395,13 @@ text {
 		clr=14
 		bclr=51
 	}
-	label="Abort"
+	label="Stop"
 	press_msg="0"
 }
-menu {
-	object {
-		x=510
-		y=517
-		width=99
-		height=20
-	}
-	control {
-		chan="$(P)$(D)StatusScan.SCAN"
-		clr=14
-		bclr=51
-	}
-}
-text {
-	object {
-		x=373
-		y=517
-		width=128
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="Polling rate"
-	align="horiz. right"
-}
 text {
 	object {
 		x=451
-		y=492
+		y=517
 		width=49
 		height=20
 	}
@@ -1500,7 +1414,7 @@ text {
 "text update" {
 	object {
 		x=510
-		y=493
+		y=518
 		width=67
 		height=18
 	}
@@ -1554,7 +1468,7 @@ rectangle {
 		x=2
 		y=365
 		width=335
-		height=280
+		height=320
 	}
 	"basic attribute" {
 		clr=14
@@ -2403,3 +2317,46 @@ text {
 	limits {
 	}
 }
+text {
+	object {
+		x=30
+		y=646
+		width=89
+		height=20
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="Data type"
+	align="horiz. right"
+}
+menu {
+	object {
+		x=128
+		y=646
+		width=100
+		height=20
+	}
+	control {
+		chan="$(P)$(D)DataType"
+		clr=14
+		bclr=51
+	}
+}
+"text update" {
+	object {
+		x=239
+		y=648
+		width=79
+		height=18
+	}
+	monitor {
+		chan="$(P)$(D)DataType_RBV"
+		clr=54
+		bclr=4
+	}
+	align="horiz. centered"
+	format="string"
+	limits {
+	}
+}