From 4e0c042d2c674e610c93196c5fb830a54f411c59 Mon Sep 17 00:00:00 2001
From: hammonds <hammonds@dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b>
Date: Fri, 13 Aug 2010 16:35:01 +0000
Subject: [PATCH] Add screens for extra parameters on Linear Ramp & Rings. For
 linear ramp indicate there are no extra parameters. For Rings indicate that
 it is not functioning.

git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@11326 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
---
 ADApp/op/adl/simDetectorLinearRampSetup.adl | 115 ++++++++++++++++++++
 ADApp/op/adl/simDetectorRingsSetup.adl      | 115 ++++++++++++++++++++
 ADApp/op/adl/simDetectorSetup.adl           |  40 ++++++-
 3 files changed, 265 insertions(+), 5 deletions(-)
 create mode 100644 ADApp/op/adl/simDetectorLinearRampSetup.adl
 create mode 100644 ADApp/op/adl/simDetectorRingsSetup.adl

diff --git a/ADApp/op/adl/simDetectorLinearRampSetup.adl b/ADApp/op/adl/simDetectorLinearRampSetup.adl
new file mode 100644
index 0000000..60b4fa1
--- /dev/null
+++ b/ADApp/op/adl/simDetectorLinearRampSetup.adl
@@ -0,0 +1,115 @@
+
+file {
+	name="C:\epics\synApps_SVN\support\areaDetector\ADApp\op\adl\simDetectorLinearRampSetup.adl"
+	version=030102
+}
+display {
+	object {
+		x=1163
+		y=455
+		width=245
+		height=345
+	}
+	clr=14
+	bclr=4
+	cmap=""
+	gridSpacing=5
+	gridOn=0
+	snapToGrid=0
+}
+"color map" {
+	ncolors=65
+	colors {
+		ffffff,
+		ececec,
+		dadada,
+		c8c8c8,
+		bbbbbb,
+		aeaeae,
+		9e9e9e,
+		919191,
+		858585,
+		787878,
+		696969,
+		5a5a5a,
+		464646,
+		2d2d2d,
+		000000,
+		00d800,
+		1ebb00,
+		339900,
+		2d7f00,
+		216c00,
+		fd0000,
+		de1309,
+		be190b,
+		a01207,
+		820400,
+		5893ff,
+		597ee1,
+		4b6ec7,
+		3a5eab,
+		27548d,
+		fbf34a,
+		f9da3c,
+		eeb62b,
+		e19015,
+		cd6100,
+		ffb0ff,
+		d67fe2,
+		ae4ebc,
+		8b1a96,
+		610a75,
+		a4aaff,
+		8793e2,
+		6a73c1,
+		4d52a4,
+		343386,
+		c7bb6d,
+		b79d5c,
+		a47e3c,
+		7d5627,
+		58340f,
+		99ffff,
+		73dfff,
+		4ea5f9,
+		2a63e4,
+		0a00b8,
+		ebf1b5,
+		d4db9d,
+		bbc187,
+		a6a462,
+		8b8239,
+		73ff6b,
+		52da3b,
+		3cb420,
+		289315,
+		1a7309,
+	}
+}
+text {
+	object {
+		x=17
+		y=31
+		width=215
+		height=40
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="No extra"
+	align="horiz. centered"
+}
+text {
+	object {
+		x=15
+		y=91
+		width=215
+		height=40
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="parameters"
+	align="horiz. centered"
+}
diff --git a/ADApp/op/adl/simDetectorRingsSetup.adl b/ADApp/op/adl/simDetectorRingsSetup.adl
new file mode 100644
index 0000000..95617a4
--- /dev/null
+++ b/ADApp/op/adl/simDetectorRingsSetup.adl
@@ -0,0 +1,115 @@
+
+file {
+	name="C:\epics\synApps_SVN\support\areaDetector\ADApp\op\adl\simDetectorRingsSetup.adl"
+	version=030102
+}
+display {
+	object {
+		x=1163
+		y=455
+		width=245
+		height=345
+	}
+	clr=14
+	bclr=4
+	cmap=""
+	gridSpacing=5
+	gridOn=0
+	snapToGrid=0
+}
+"color map" {
+	ncolors=65
+	colors {
+		ffffff,
+		ececec,
+		dadada,
+		c8c8c8,
+		bbbbbb,
+		aeaeae,
+		9e9e9e,
+		919191,
+		858585,
+		787878,
+		696969,
+		5a5a5a,
+		464646,
+		2d2d2d,
+		000000,
+		00d800,
+		1ebb00,
+		339900,
+		2d7f00,
+		216c00,
+		fd0000,
+		de1309,
+		be190b,
+		a01207,
+		820400,
+		5893ff,
+		597ee1,
+		4b6ec7,
+		3a5eab,
+		27548d,
+		fbf34a,
+		f9da3c,
+		eeb62b,
+		e19015,
+		cd6100,
+		ffb0ff,
+		d67fe2,
+		ae4ebc,
+		8b1a96,
+		610a75,
+		a4aaff,
+		8793e2,
+		6a73c1,
+		4d52a4,
+		343386,
+		c7bb6d,
+		b79d5c,
+		a47e3c,
+		7d5627,
+		58340f,
+		99ffff,
+		73dfff,
+		4ea5f9,
+		2a63e4,
+		0a00b8,
+		ebf1b5,
+		d4db9d,
+		bbc187,
+		a6a462,
+		8b8239,
+		73ff6b,
+		52da3b,
+		3cb420,
+		289315,
+		1a7309,
+	}
+}
+text {
+	object {
+		x=17
+		y=31
+		width=215
+		height=40
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="Not yet"
+	align="horiz. centered"
+}
+text {
+	object {
+		x=15
+		y=91
+		width=215
+		height=40
+	}
+	"basic attribute" {
+		clr=14
+	}
+	textix="working"
+	align="horiz. centered"
+}
diff --git a/ADApp/op/adl/simDetectorSetup.adl b/ADApp/op/adl/simDetectorSetup.adl
index 0b98933..8dbe5ca 100644
--- a/ADApp/op/adl/simDetectorSetup.adl
+++ b/ADApp/op/adl/simDetectorSetup.adl
@@ -87,6 +87,21 @@ display {
 		1a7309,
 	}
 }
+composite {
+	object {
+		x=250
+		y=118
+		width=228
+		height=269
+	}
+	"composite name"=""
+	"composite file"="simDetectorPeaksSetup.adl;P=$(P),R=$(R)"
+	"dynamic attribute" {
+		vis="calc"
+		calc="A=1"
+		chan="$(P)$(R)ImageType"
+	}
+}
 text {
 	object {
 		x=69
@@ -105,7 +120,7 @@ composite {
 		x=10
 		y=118
 		width=235
-		height=322
+		height=304
 	}
 	"composite name"=""
 	"composite file"="simDetectorMore.adl;P=$(P),R=$(R)"
@@ -153,14 +168,29 @@ composite {
 	object {
 		x=250
 		y=118
-		width=221
-		height=232
+		width=217
+		height=100
 	}
 	"composite name"=""
-	"composite file"="simDetectorPeaksSetup.adl;P=$(P),R=$(R)"
+	"composite file"="simDetectorRingsSetup.adl;P=$(P),R=$(R)"
 	"dynamic attribute" {
 		vis="calc"
-		calc="A=1"
+		calc="A=2"
+		chan="$(P)$(R)ImageType"
+	}
+}
+composite {
+	object {
+		x=255
+		y=115
+		width=217
+		height=100
+	}
+	"composite name"=""
+	"composite file"="simDetectorLinearRampSetup.adl;P=$(P),R=$(R)"
+	"dynamic attribute" {
+		vis="calc"
+		calc="A=0"
 		chan="$(P)$(R)ImageType"
 	}
 }