From 035f3922ea880d2668675be2ada9319ba7b327df Mon Sep 17 00:00:00 2001
From: rivers <rivers@dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b>
Date: Sun, 8 Aug 2010 19:58:55 +0000
Subject: [PATCH] Add new related display for ancillary information; rename
 ReadTiffTimeout record

git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@11295 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
---
 ADApp/op/adl/pilatusDetector.adl | 55 +++++++++++++++++++++++++++-----
 1 file changed, 47 insertions(+), 8 deletions(-)

diff --git a/ADApp/op/adl/pilatusDetector.adl b/ADApp/op/adl/pilatusDetector.adl
index 022b12c..ed968cf 100644
--- a/ADApp/op/adl/pilatusDetector.adl
+++ b/ADApp/op/adl/pilatusDetector.adl
@@ -281,7 +281,7 @@ composite {
 	children {
 		text {
 			object {
-				x=35
+				x=41
 				y=420
 				width=160
 				height=20
@@ -294,7 +294,7 @@ composite {
 		}
 		"text entry" {
 			object {
-				x=200
+				x=206
 				y=420
 				width=100
 				height=20
@@ -320,7 +320,7 @@ composite {
 	children {
 		text {
 			object {
-				x=15
+				x=21
 				y=445
 				width=180
 				height=20
@@ -333,7 +333,7 @@ composite {
 		}
 		menu {
 			object {
-				x=200
+				x=206
 				y=445
 				width=120
 				height=20
@@ -357,7 +357,7 @@ composite {
 	children {
 		text {
 			object {
-				x=15
+				x=21
 				y=470
 				width=180
 				height=20
@@ -365,18 +365,18 @@ composite {
 			"basic attribute" {
 				clr=14
 			}
-			textix="Read TIFF timeout:"
+			textix="Read CBF/TIFF tmot:"
 			align="horiz. right"
 		}
 		"text entry" {
 			object {
-				x=200
+				x=206
 				y=470
 				width=100
 				height=20
 			}
 			control {
-				chan="$(P)$(R)ReadTiffTimeout"
+				chan="$(P)$(R)ImageFileTmot"
 				clr=14
 				bclr=51
 			}
@@ -1982,3 +1982,42 @@ composite {
 		}
 	}
 }
+composite {
+	object {
+		x=350
+		y=949
+		width=289
+		height=20
+	}
+	"composite name"=""
+	children {
+		"related display" {
+			object {
+				x=569
+				y=949
+				width=70
+				height=20
+			}
+			display[0] {
+				label="Ancillary information"
+				name="pilatusAncillary.adl"
+				args="P=$(P),R=$(R)"
+			}
+			clr=14
+			bclr=51
+		}
+		text {
+			object {
+				x=350
+				y=949
+				width=210
+				height=20
+			}
+			"basic attribute" {
+				clr=14
+			}
+			textix="Ancillary information"
+			align="horiz. right"
+		}
+	}
+}