From ccc3b92063ca2f3de663368eed2d1e00bc22b4e3 Mon Sep 17 00:00:00 2001
From: rivers <rivers@dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b>
Date: Mon, 27 Jul 2009 19:13:04 +0000
Subject: [PATCH] Added TIFF and JPEG file plugins to all drivers

git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@9137 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
---
 ADApp/op/adl/ADTop.adl | 98 ++++++++++++++++++++++++++++++++++++------
 1 file changed, 84 insertions(+), 14 deletions(-)

diff --git a/ADApp/op/adl/ADTop.adl b/ADApp/op/adl/ADTop.adl
index cfa12aa..ef545a0 100644
--- a/ADApp/op/adl/ADTop.adl
+++ b/ADApp/op/adl/ADTop.adl
@@ -1,6 +1,6 @@
 
 file {
-	name="C:\epics\devel\areaDetectorHEAD\ADApp\op\adl\ADTop.adl"
+	name="/home/epics/devel/areaDetector/1-5beta/ADApp/op/adl/ADTop.adl"
 	version=030102
 }
 display {
@@ -486,6 +486,21 @@ text {
 		args="P=13PIL1:, R=image1:"
 	}
 	display[1] {
+		label="File netCDF #1"
+		name="NDPluginFile.adl"
+		args="P=13PIL1:, R=netCDF1:"
+	}
+	display[2] {
+		label="File TIFF #1"
+		name="NDPluginFile.adl"
+		args="P=13PIL1:, R=TIFF1:"
+	}
+	display[3] {
+		label="File JPEG #1"
+		name="NDPluginFile.adl"
+		args="P=13PIL1:, R=JPEG1:"
+	}
+	display[4] {
 		label="ROI #1"
 		name="NDROI.adl"
 		args="P=13PIL1:, R=ROI1:"
@@ -526,11 +541,26 @@ text {
 		args="P=13ROPER1:, R=image1:"
 	}
 	display[1] {
-		label="ROI #1"
-		name="NDROI.adl"
-		args="P=13ROPER1:, R=ROI1:"
+		label="File netCDF #1"
+		name="NDPluginFile.adl"
+		args="P=13ROPER1:, R=netCDF1:"
 	}
 	display[2] {
+		label="File TIFF #1"
+		name="NDPluginFile.adl"
+		args="P=13ROPER1:, R=TIFF1:"
+	}
+	display[3] {
+		label="File JPEG #1"
+		name="NDPluginFile.adl"
+		args="P=13ROPER1:, R=JPEG1:"
+	}
+	display[4] {
+		label="ROI #1"
+		name="NDROI.adl"
+		args="P=13PS1:, R=ROI1:"
+	}
+	display[5] {
 		label="Scan 1"
 		name="scan_more.adl"
 		args="P=13ROPER1:, S=scan1, N=1"
@@ -581,26 +611,36 @@ text {
 		args="P=13FW1:, R=image1:"
 	}
 	display[1] {
+		label="File netCDF #1"
+		name="NDPluginFile.adl"
+		args="P=13FW1:, R=netCDF1:"
+	}
+	display[2] {
+		label="File TIFF #1"
+		name="NDPluginFile.adl"
+		args="P=13FW1:, R=TIFF1:"
+	}
+	display[3] {
+		label="File JPEG #1"
+		name="NDPluginFile.adl"
+		args="P=13FW1:, R=JPEG1:"
+	}
+	display[4] {
 		label="ROI #1"
 		name="NDROI.adl"
 		args="P=13FW1:, R=ROI1:"
 	}
-	display[2] {
-		label="File #1"
-		name="NDPluginFile.adl"
-		args="P=13FW1:, R=file1:"
-	}
-	display[3] {
+	display[5] {
 		label="Color Convert #1"
 		name="NDColorConvert.adl"
 		args="P=13FW1:,R=CC1:"
 	}
-	display[4] {
+	display[6] {
 		label="Scan 1"
 		name="scan_more.adl"
 		args="P=13FW1:, S=scan1, N=1"
 	}
-	display[5] {
+	display[7] {
 		label="Image #1"
 		name="NDStdArrays.adl"
 		args="P=13FW1:, R=image2:"
@@ -641,11 +681,26 @@ text {
 		args="P=13MARCCD1:, R=image1:"
 	}
 	display[1] {
+		label="File netCDF #1"
+		name="NDPluginFile.adl"
+		args="P=13MARCCD1:, R=netCDF1:"
+	}
+	display[2] {
+		label="File TIFF #1"
+		name="NDPluginFile.adl"
+		args="P=13MARCCD1:, R=TIFF1:"
+	}
+	display[3] {
+		label="File JPEG #1"
+		name="NDPluginFile.adl"
+		args="P=13MARCCD1:, R=JPEG1:"
+	}
+	display[4] {
 		label="ROI #1"
 		name="NDROI.adl"
 		args="P=13MARCCD1:, R=ROI1:"
 	}
-	display[2] {
+	display[5] {
 		label="Scan 1"
 		name="scan_more.adl"
 		args="P=13MARCCD1:, S=scan1, N=1"
@@ -686,11 +741,26 @@ text {
 		args="P=13MAR345_1:, R=image1:"
 	}
 	display[1] {
+		label="File netCDF #1"
+		name="NDPluginFile.adl"
+		args="P=13MAR345_1:, R=netCDF1:"
+	}
+	display[2] {
+		label="File TIFF #1"
+		name="NDPluginFile.adl"
+		args="P=13MAR345_1:, R=TIFF1:"
+	}
+	display[3] {
+		label="File JPEG #1"
+		name="NDPluginFile.adl"
+		args="P=13MAR345_1:, R=JPEG1:"
+	}
+	display[4] {
 		label="ROI #1"
 		name="NDROI.adl"
 		args="P=13MAR345_1:, R=ROI1:"
 	}
-	display[2] {
+	display[5] {
 		label="Scan 1"
 		name="scan_more.adl"
 		args="P=13MAR345_1:, S=scan1, N=1"