From a8204084cade756eae0d1313cf7a1163ea0a2d58 Mon Sep 17 00:00:00 2001
From: rivers <rivers@dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b>
Date: Thu, 16 Aug 2012 05:01:30 +0000
Subject: [PATCH] Added PoolUsedBuffers

git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14967 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
---
 ADApp/op/adl/ADCollect.adl | 290 +++++++++++++++++++++----------------
 1 file changed, 165 insertions(+), 125 deletions(-)

diff --git a/ADApp/op/adl/ADCollect.adl b/ADApp/op/adl/ADCollect.adl
index 637158a..27800b3 100755
--- a/ADApp/op/adl/ADCollect.adl
+++ b/ADApp/op/adl/ADCollect.adl
@@ -8,7 +8,7 @@ display {
 		x=44
 		y=221
 		width=350
-		height=435
+		height=460
 	}
 	clr=14
 	bclr=4
@@ -578,7 +578,7 @@ rectangle {
 		x=0
 		y=0
 		width=350
-		height=435
+		height=460
 	}
 	"basic attribute" {
 		clr=14
@@ -664,58 +664,47 @@ composite {
 		}
 	}
 }
-composite {
+"text entry" {
+	object {
+		x=180
+		y=305
+		width=60
+		height=20
+	}
+	control {
+		chan="$(P)$(R)ArrayCounter"
+		clr=14
+		bclr=51
+	}
+	limits {
+	}
+}
+text {
 	object {
 		x=45
 		y=305
-		width=280
+		width=130
 		height=20
 	}
-	"composite name"=""
-	children {
-		"text entry" {
-			object {
-				x=180
-				y=305
-				width=60
-				height=20
-			}
-			control {
-				chan="$(P)$(R)ArrayCounter"
-				clr=14
-				bclr=51
-			}
-			limits {
-			}
-		}
-		text {
-			object {
-				x=45
-				y=305
-				width=130
-				height=20
-			}
-			"basic attribute" {
-				clr=14
-			}
-			textix="Image counter"
-			align="horiz. right"
-		}
-		"text update" {
-			object {
-				x=245
-				y=306
-				width=80
-				height=18
-			}
-			monitor {
-				chan="$(P)$(R)ArrayCounter_RBV"
-				clr=54
-				bclr=4
-			}
-			limits {
-			}
-		}
+	"basic attribute" {
+		clr=14
+	}
+	textix="Image counter"
+	align="horiz. right"
+}
+"text update" {
+	object {
+		x=245
+		y=306
+		width=80
+		height=18
+	}
+	monitor {
+		chan="$(P)$(R)ArrayCounter_RBV"
+		clr=54
+		bclr=4
+	}
+	limits {
 	}
 }
 composite {
@@ -811,87 +800,23 @@ composite {
 		}
 	}
 }
-"text update" {
-	object {
-		x=300
-		y=381
-		width=30
-		height=18
-	}
-	monitor {
-		chan="$(P)$(R)PoolFreeBuffers"
-		clr=54
-		bclr=4
-	}
-	align="horiz. right"
-	limits {
-	}
-}
-"text update" {
-	object {
-		x=265
-		y=381
-		width=30
-		height=18
-	}
-	monitor {
-		chan="$(P)$(R)PoolAllocBuffers"
-		clr=54
-		bclr=4
-	}
-	align="horiz. right"
-	limits {
-	}
-}
-"text update" {
-	object {
-		x=230
-		y=381
-		width=30
-		height=18
-	}
-	monitor {
-		chan="$(P)$(R)PoolMaxBuffers"
-		clr=54
-		bclr=4
-	}
-	align="horiz. right"
-	limits {
-	}
-}
 text {
 	object {
 		x=5
-		y=380
-		width=220
+		y=430
+		width=200
 		height=20
 	}
 	"basic attribute" {
 		clr=14
 	}
-	textix="Buffers max/alloc/free"
+	textix="Memory max/used (MB)"
 	align="horiz. right"
 }
-"text update" {
-	object {
-		x=275
-		y=406
-		width=60
-		height=18
-	}
-	monitor {
-		chan="$(P)$(R)PoolUsedMem"
-		clr=54
-		bclr=4
-	}
-	align="horiz. right"
-	limits {
-	}
-}
 "text update" {
 	object {
 		x=210
-		y=406
+		y=431
 		width=60
 		height=18
 	}
@@ -904,16 +829,131 @@ text {
 	limits {
 	}
 }
-text {
+"text update" {
 	object {
-		x=5
-		y=405
-		width=200
+		x=275
+		y=431
+		width=60
+		height=18
+	}
+	monitor {
+		chan="$(P)$(R)PoolUsedMem"
+		clr=54
+		bclr=4
+	}
+	align="horiz. right"
+	limits {
+	}
+}
+composite {
+	object {
+		x=45
+		y=380
+		width=270
 		height=20
 	}
-	"basic attribute" {
-		clr=14
+	"composite name"=""
+	children {
+		text {
+			object {
+				x=45
+				y=380
+				width=160
+				height=20
+			}
+			"basic attribute" {
+				clr=14
+			}
+			textix="Buffers max/used"
+			align="horiz. right"
+		}
+		"text update" {
+			object {
+				x=210
+				y=381
+				width=50
+				height=18
+			}
+			monitor {
+				chan="$(P)$(R)PoolMaxBuffers"
+				clr=54
+				bclr=4
+			}
+			align="horiz. right"
+			limits {
+			}
+		}
+		"text update" {
+			object {
+				x=265
+				y=381
+				width=50
+				height=18
+			}
+			monitor {
+				chan="$(P)$(R)PoolUsedBuffers"
+				clr=54
+				bclr=4
+			}
+			align="horiz. right"
+			limits {
+			}
+		}
+	}
+}
+composite {
+	object {
+		x=25
+		y=405
+		width=290
+		height=20
+	}
+	"composite name"=""
+	children {
+		text {
+			object {
+				x=25
+				y=405
+				width=180
+				height=20
+			}
+			"basic attribute" {
+				clr=14
+			}
+			textix="Buffers alloc/free"
+			align="horiz. right"
+		}
+		"text update" {
+			object {
+				x=210
+				y=406
+				width=50
+				height=18
+			}
+			monitor {
+				chan="$(P)$(R)PoolAllocBuffers"
+				clr=54
+				bclr=4
+			}
+			align="horiz. right"
+			limits {
+			}
+		}
+		"text update" {
+			object {
+				x=265
+				y=406
+				width=50
+				height=18
+			}
+			monitor {
+				chan="$(P)$(R)PoolFreeBuffers"
+				clr=54
+				bclr=4
+			}
+			align="horiz. right"
+			limits {
+			}
+		}
 	}
-	textix="Memory max/used (MB)"
-	align="horiz. right"
 }