From 7d157f28e80e6bb5b32e70e146b9bb8f0841df68 Mon Sep 17 00:00:00 2001 From: rivers Date: Tue, 26 Aug 2008 19:28:40 +0000 Subject: [PATCH] Removed waveform callback time git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@7549 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b --- ADApp/op/adl/pilatusDetector.adl | 212 +++++++++++++------------------ 1 file changed, 91 insertions(+), 121 deletions(-) diff --git a/ADApp/op/adl/pilatusDetector.adl b/ADApp/op/adl/pilatusDetector.adl index 6e0cc3b..191f15c 100644 --- a/ADApp/op/adl/pilatusDetector.adl +++ b/ADApp/op/adl/pilatusDetector.adl @@ -5,8 +5,8 @@ file { } display { object { - x=398 - y=66 + x=311 + y=73 width=585 height=875 } @@ -507,58 +507,6 @@ text { textix="ROIs/Images" align="horiz. centered" } -text { - object { - x=292 - y=625 - width=180 - height=20 - } - "basic attribute" { - clr=14 - } - textix="Highlight ROIs:" - align="horiz. right" -} -menu { - object { - x=475 - y=625 - width=90 - height=20 - } - control { - chan="$(P)$(ROI)Highlight" - clr=14 - bclr=51 - } -} -menu { - object { - x=178 - y=650 - width=90 - height=20 - } - control { - chan="$(P)image1:EnableCallbacks" - clr=14 - bclr=51 - } -} -text { - object { - x=5 - y=650 - width=170 - height=20 - } - "basic attribute" { - clr=14 - } - textix="Post images:" - align="horiz. right" -} text { object { x=293 @@ -631,73 +579,6 @@ text { bclr=51 label="ROIs" } -text { - object { - x=5 - y=625 - width=170 - height=20 - } - "basic attribute" { - clr=14 - } - textix="Clear ROIs:" - align="horiz. right" -} -"message button" { - object { - x=178 - y=625 - width=90 - height=20 - } - control { - chan="$(P)$(R)ClearROIs" - clr=14 - bclr=51 - } - label="Clear ROIs" - press_msg="1" -} -composite { - object { - x=292 - y=600 - width=283 - height=20 - } - "composite name"="" - children { - text { - object { - x=292 - y=600 - width=180 - height=20 - } - "basic attribute" { - clr=14 - } - textix="Min. array update:" - align="horiz. right" - } - "text entry" { - object { - x=475 - y=600 - width=100 - height=20 - } - control { - chan="$(P)$(R)MinWFUpdateTime" - clr=14 - bclr=51 - } - limits { - } - } - } -} text { object { x=240 @@ -1331,3 +1212,92 @@ text { bclr=51 label="Scan" } +composite { + object { + x=292 + y=625 + width=273 + height=20 + } + "composite name"="" + children { + text { + object { + x=292 + y=625 + width=180 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Highlight ROIs:" + align="horiz. right" + } + menu { + object { + x=475 + y=625 + width=90 + height=20 + } + control { + chan="$(P)$(ROI)Highlight" + clr=14 + bclr=51 + } + } + } +} +text { + object { + x=25 + y=625 + width=150 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Enable ROIs:" + align="horiz. right" +} +menu { + object { + x=178 + y=625 + width=90 + height=20 + } + control { + chan="$(P)$(ROI)EnableCallbacks" + clr=14 + bclr=51 + } +} +text { + object { + x=5 + y=650 + width=170 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Post images:" + align="horiz. right" +} +menu { + object { + x=178 + y=650 + width=90 + height=20 + } + control { + chan="$(P)image1:EnableCallbacks" + clr=14 + bclr=51 + } +}