From 2131e1e5e11910dddd22742ca42c11bdbb9f707f Mon Sep 17 00:00:00 2001 From: rivers Date: Sun, 8 Aug 2010 18:33:18 +0000 Subject: [PATCH] Added FalseColor git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@11286 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b --- ADApp/op/adl/NDColorConvert.adl | 150 +++++++++++++++++++------------- 1 file changed, 90 insertions(+), 60 deletions(-) diff --git a/ADApp/op/adl/NDColorConvert.adl b/ADApp/op/adl/NDColorConvert.adl index 61dbf09..0b50385 100644 --- a/ADApp/op/adl/NDColorConvert.adl +++ b/ADApp/op/adl/NDColorConvert.adl @@ -8,7 +8,7 @@ display { x=120 y=312 width=390 - height=570 + height=595 } clr=14 bclr=4 @@ -121,78 +121,108 @@ composite { "composite name"="" "composite file"="NDPluginBase.adl" } -composite { +rectangle { object { x=5 y=530 width=380 - height=35 + height=60 + } + "basic attribute" { + clr=14 + fill="outline" + } +} +composite { + object { + x=12 + y=538 + width=366 + height=20 } "composite name"="" children { - rectangle { - object { - x=5 - y=530 - width=380 - height=35 - } - "basic attribute" { - clr=14 - fill="outline" - } - } - composite { + text { object { x=12 y=538 - width=366 + width=150 height=20 } - "composite name"="" - children { - text { - object { - x=12 - y=538 - width=150 - height=20 - } - "basic attribute" { - clr=14 - } - textix="Color mode out" - align="horiz. right" - } - menu { - object { - x=172 - y=538 - width=100 - height=20 - } - control { - chan="$(P)$(R)ColorModeOut" - clr=14 - bclr=51 - } - } - "text update" { - object { - x=278 - y=539 - width=100 - height=18 - } - monitor { - chan="$(P)$(R)ColorModeOut_RBV" - clr=54 - bclr=4 - } - limits { - } - } + "basic attribute" { + clr=14 + } + textix="Color mode out" + align="horiz. right" + } + menu { + object { + x=172 + y=538 + width=100 + height=20 + } + control { + chan="$(P)$(R)ColorModeOut" + clr=14 + bclr=51 + } + } + "text update" { + object { + x=278 + y=539 + width=100 + height=18 + } + monitor { + chan="$(P)$(R)ColorModeOut_RBV" + clr=54 + bclr=4 + } + limits { } } } } +text { + object { + x=12 + y=563 + width=150 + height=20 + } + "basic attribute" { + clr=14 + } + textix="False color map" + align="horiz. right" +} +menu { + object { + x=172 + y=563 + width=100 + height=20 + } + control { + chan="$(P)$(R)FalseColor" + clr=14 + bclr=51 + } +} +"text update" { + object { + x=278 + y=564 + width=100 + height=18 + } + monitor { + chan="$(P)$(R)FalseColor_RBV" + clr=54 + bclr=4 + } + limits { + } +}