Many changes, moved ROI N fields to NDROIN.adl

git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@7127 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b

ADApp/op/adl/NDROI.adl

@@ -5,10 +5,10 @@ file {
 }
 display {
 	object {
-		x=418
-		y=26
-		width=800
-		height=700
+		x=244
+		y=70
+		width=400
+		height=300
 	}
 	clr=14
 	bclr=4
@@ -87,539 +87,6 @@ display {
 		1a7309,
 	}
 }
-rectangle {
-	object {
-		x=14
-		y=9
-		width=360
-		height=26
-	}
-	"basic attribute" {
-		clr=2
-	}
-}
-text {
-	object {
-		x=86
-		y=10
-		width=216
-		height=25
-	}
-	"basic attribute" {
-		clr=54
-	}
-	textix="$(P)$(R)"
-	align="horiz. centered"
-}
-rectangle {
-	object {
-		x=153
-		y=287
-		width=107
-		height=21
-	}
-	"basic attribute" {
-		clr=2
-	}
-}
-text {
-	object {
-		x=127
-		y=288
-		width=159
-		height=20
-	}
-	"basic attribute" {
-		clr=54
-	}
-	textix="Definition"
-	align="horiz. centered"
-}
-text {
-	object {
-		x=198
-		y=315
-		width=10
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="X"
-	align="horiz. right"
-}
-text {
-	object {
-		x=291
-		y=315
-		width=10
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="Y"
-	align="horiz. right"
-}
-"text entry" {
-	object {
-		x=173
-		y=357
-		width=60
-		height=20
-	}
-	control {
-		chan="$(P)$(R)BinX"
-		clr=14
-		bclr=51
-	}
-	limits {
-	}
-}
-"text entry" {
-	object {
-		x=266
-		y=357
-		width=60
-		height=20
-	}
-	control {
-		chan="$(P)$(R)BinY"
-		clr=14
-		bclr=51
-	}
-	limits {
-	}
-}
-"text update" {
-	object {
-		x=173
-		y=337
-		width=61
-		height=18
-	}
-	monitor {
-		chan="$(P)$(R)BinX_RBV"
-		clr=54
-		bclr=4
-	}
-	align="horiz. centered"
-	limits {
-	}
-}
-"text update" {
-	object {
-		x=266
-		y=337
-		width=61
-		height=18
-	}
-	monitor {
-		chan="$(P)$(R)BinY_RBV"
-		clr=54
-		bclr=4
-	}
-	align="horiz. centered"
-	limits {
-	}
-}
-text {
-	object {
-		x=92
-		y=357
-		width=70
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="Binning"
-	align="horiz. right"
-}
-composite {
-	object {
-		x=173
-		y=382
-		width=154
-		height=40
-	}
-	"composite name"=""
-	children {
-		"text update" {
-			object {
-				x=173
-				y=382
-				width=61
-				height=18
-			}
-			monitor {
-				chan="$(P)$(R)MinX_RBV"
-				clr=54
-				bclr=4
-			}
-			align="horiz. centered"
-			limits {
-			}
-		}
-		"text entry" {
-			object {
-				x=173
-				y=402
-				width=60
-				height=20
-			}
-			control {
-				chan="$(P)$(R)MinX"
-				clr=14
-				bclr=51
-			}
-			limits {
-			}
-		}
-		"text entry" {
-			object {
-				x=266
-				y=402
-				width=60
-				height=20
-			}
-			control {
-				chan="$(P)$(R)MinY"
-				clr=14
-				bclr=51
-			}
-			limits {
-			}
-		}
-		"text update" {
-			object {
-				x=266
-				y=382
-				width=61
-				height=18
-			}
-			monitor {
-				chan="$(P)$(R)MinY_RBV"
-				clr=54
-				bclr=4
-			}
-			align="horiz. centered"
-			limits {
-			}
-		}
-	}
-}
-text {
-	object {
-		x=112
-		y=402
-		width=50
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="ROI start"
-	align="horiz. right"
-}
-text {
-	object {
-		x=122
-		y=447
-		width=40
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="ROI size"
-	align="horiz. right"
-}
-composite {
-	object {
-		x=173
-		y=427
-		width=154
-		height=40
-	}
-	"composite name"=""
-	children {
-		"text entry" {
-			object {
-				x=173
-				y=447
-				width=60
-				height=20
-			}
-			control {
-				chan="$(P)$(R)SizeX"
-				clr=14
-				bclr=51
-			}
-			limits {
-			}
-		}
-		"text entry" {
-			object {
-				x=266
-				y=447
-				width=60
-				height=20
-			}
-			control {
-				chan="$(P)$(R)SizeY"
-				clr=14
-				bclr=51
-			}
-			limits {
-			}
-		}
-		"text update" {
-			object {
-				x=173
-				y=427
-				width=61
-				height=18
-			}
-			monitor {
-				chan="$(P)$(R)SizeX_RBV"
-				clr=54
-				bclr=4
-			}
-			align="horiz. centered"
-			limits {
-			}
-		}
-		"text update" {
-			object {
-				x=266
-				y=427
-				width=61
-				height=18
-			}
-			monitor {
-				chan="$(P)$(R)SizeY_RBV"
-				clr=54
-				bclr=4
-			}
-			align="horiz. centered"
-			limits {
-			}
-		}
-	}
-}
-text {
-	object {
-		x=62
-		y=512
-		width=100
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="ROI Size"
-	align="horiz. right"
-}
-"text update" {
-	object {
-		x=173
-		y=513
-		width=61
-		height=18
-	}
-	monitor {
-		chan="$(P)$(R)ImageSizeX_RBV"
-		clr=54
-		bclr=4
-	}
-	align="horiz. centered"
-	limits {
-	}
-}
-"text update" {
-	object {
-		x=266
-		y=513
-		width=61
-		height=18
-	}
-	monitor {
-		chan="$(P)$(R)ImageSizeY_RBV"
-		clr=54
-		bclr=4
-	}
-	align="horiz. centered"
-	limits {
-	}
-}
-"text update" {
-	object {
-		x=173
-		y=472
-		width=61
-		height=18
-	}
-	monitor {
-		chan="$(P)$(R)ReverseX_RBV"
-		clr=54
-		bclr=4
-	}
-	align="horiz. centered"
-	limits {
-	}
-}
-"text update" {
-	object {
-		x=266
-		y=472
-		width=61
-		height=18
-	}
-	monitor {
-		chan="$(P)$(R)ReverseY_RBV"
-		clr=54
-		bclr=4
-	}
-	align="horiz. centered"
-	limits {
-	}
-}
-text {
-	object {
-		x=92
-		y=492
-		width=70
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="Reverse"
-	align="horiz. right"
-}
-menu {
-	object {
-		x=173
-		y=492
-		width=60
-		height=18
-	}
-	control {
-		chan="$(P)$(R)ReverseX"
-		clr=14
-		bclr=51
-	}
-}
-menu {
-	object {
-		x=266
-		y=492
-		width=60
-		height=18
-	}
-	control {
-		chan="$(P)$(R)ReverseY"
-		clr=14
-		bclr=51
-	}
-}
-rectangle {
-	object {
-		x=30
-		y=285
-		width=335
-		height=350
-	}
-	"basic attribute" {
-		clr=14
-		fill="outline"
-	}
-}
-menu {
-	object {
-		x=174
-		y=566
-		width=60
-		height=18
-	}
-	control {
-		chan="$(P)$(R)Use"
-		clr=14
-		bclr=51
-	}
-}
-text {
-	object {
-		x=93
-		y=566
-		width=70
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="Use"
-	align="horiz. right"
-}
-"text update" {
-	object {
-		x=174
-		y=546
-		width=61
-		height=18
-	}
-	monitor {
-		chan="$(P)$(R)Use_RBV"
-		clr=54
-		bclr=4
-	}
-	align="horiz. centered"
-	limits {
-	}
-}
-menu {
-	object {
-		x=172
-		y=611
-		width=60
-		height=18
-	}
-	control {
-		chan="$(P)$(R)ComputeStats"
-		clr=14
-		bclr=51
-	}
-}
-text {
-	object {
-		x=91
-		y=611
-		width=70
-		height=20
-	}
-	"basic attribute" {
-		clr=14
-	}
-	textix="Compute stats"
-	align="horiz. right"
-}
-"text update" {
-	object {
-		x=172
-		y=591
-		width=61
-		height=18
-	}
-	monitor {
-		chan="$(P)$(R)ComputeStats_RBV"
-		clr=54
-		bclr=4
-	}
-	align="horiz. centered"
-	limits {
-	}
-}
 text {
 	object {
 		x=62
@@ -663,44 +130,68 @@ text {
 	limits {
 	}
 }
-composite {
+text {
 	object {
 		x=136
 		y=235
-		width=129
+		width=50
 		height=20
 	}
-	"composite name"=""
-	children {
-		text {
-			object {
-				x=136
-				y=235
-				width=50
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix=" More"
-			align="horiz. right"
-		}
-		"related display" {
-			object {
-				x=195
-				y=235
-				width=70
-				height=20
-			}
-			display[0] {
-				label="asynRecord"
-				name="asynRecord.adl"
-				args="P=$(P),R=$(R)AsynIO"
-			}
-			clr=14
-			bclr=51
-		}
+	"basic attribute" {
+		clr=14
 	}
+	textix="ROIs 0-7"
+	align="horiz. right"
+}
+"related display" {
+	object {
+		x=195
+		y=235
+		width=70
+		height=20
+	}
+	display[0] {
+		label="ROI 0"
+		name="NDROIN.adl"
+		args="P=$(P), R=$(R)0:"
+	}
+	display[1] {
+		label="ROI 1"
+		name="NDROIN.adl"
+		args="P=$(P), R=$(R)1:"
+	}
+	display[2] {
+		label="ROI 2"
+		name="NDROIN.adl"
+		args="P=$(P), R=$(R)2:"
+	}
+	display[3] {
+		label="ROI 3"
+		name="NDROIN.adl"
+		args="P=$(P), R=$(R)3:"
+	}
+	display[4] {
+		label="ROI 4"
+		name="NDROIN.adl"
+		args="P=$(P), R=$(R)4:"
+	}
+	display[5] {
+		label="ROI 5"
+		name="NDROIN.adl"
+		args="P=$(P), R=$(R)5:"
+	}
+	display[6] {
+		label="ROI 6"
+		name="NDROIN.adl"
+		args="P=$(P), R=$(R)6:"
+	}
+	display[7] {
+		label="ROI 7"
+		name="NDROIN.adl"
+		args="P=$(P), R=$(R)7:"
+	}
+	clr=14
+	bclr=51
 }
 menu {
 	object {
@@ -791,7 +282,7 @@ rectangle {
 		x=9
 		y=41
 		width=380
-		height=220
+		height=250
 	}
 	"basic attribute" {
 		clr=14
@@ -838,7 +329,7 @@ text {
 	"basic attribute" {
 		clr=14
 	}
-	textix="File counter"
+	textix="Array counter"
 	align="horiz. right"
 }
 text {
@@ -851,7 +342,7 @@ text {
 	"basic attribute" {
 		clr=14
 	}
-	textix="File rate"
+	textix="Array rate"
 	align="horiz. right"
 }
 "text update" {
@@ -933,7 +424,7 @@ text {
 		height=20
 	}
 	control {
-		chan="$(P)$(R)MinWriteTime"
+		chan="$(P)$(R)MinTime"
 		clr=14
 		bclr=51
 	}
@@ -948,10 +439,84 @@ text {
 		height=18
 	}
 	monitor {
-		chan="$(P)$(R)MinWriteTime_RBV"
+		chan="$(P)$(R)MinTime_RBV"
 		clr=54
 		bclr=4
 	}
 	limits {
 	}
 }
+composite {
+	object {
+		x=136
+		y=261
+		width=129
+		height=20
+	}
+	"composite name"=""
+	children {
+		text {
+			object {
+				x=136
+				y=261
+				width=50
+				height=20
+			}
+			"basic attribute" {
+				clr=14
+			}
+			textix=" More"
+			align="horiz. right"
+		}
+		"related display" {
+			object {
+				x=195
+				y=261
+				width=70
+				height=20
+			}
+			display[0] {
+				label="asynRecord"
+				name="asynRecord.adl"
+				args="P=$(P),R=$(R)AsynIO"
+			}
+			clr=14
+			bclr=51
+		}
+	}
+}
+composite {
+	object {
+		x=20
+		y=9
+		width=360
+		height=26
+	}
+	"composite name"=""
+	children {
+		rectangle {
+			object {
+				x=20
+				y=9
+				width=360
+				height=26
+			}
+			"basic attribute" {
+				clr=2
+			}
+		}
+		text {
+			object {
+				x=92
+				y=10
+				width=216
+				height=25
+			}
+			"basic attribute" {
+				clr=54
+			}
+			textix="$(P)$(R)"
+			align="horiz. centered"
+		}
+	}
+}