diff --git a/ADApp/op/adl/NDROI.adl b/ADApp/op/adl/NDROI.adl index 72d5063..bc9292d 100644 --- a/ADApp/op/adl/NDROI.adl +++ b/ADApp/op/adl/NDROI.adl @@ -5,10 +5,10 @@ file { } display { object { - x=359 - y=169 + x=116 + y=168 width=390 - height=425 + height=475 } clr=14 bclr=4 @@ -541,178 +541,104 @@ text { limits { } } -composite { +"related display" { object { - x=136 - y=366 - width=129 - height=45 + x=172 + y=415 + width=130 + height=20 } - "composite name"="" - children { - "related display" { - object { - x=195 - y=391 - width=70 - height=20 - } - display[0] { - label="ROI 0" - name="NDROIN.adl" - args="P=$(P), R=$(R)0:" - } - display[1] { - label="ROI 1" - name="NDROIN.adl" - args="P=$(P), R=$(R)1:" - } - display[2] { - label="ROI 2" - name="NDROIN.adl" - args="P=$(P), R=$(R)2:" - } - display[3] { - label="ROI 3" - name="NDROIN.adl" - args="P=$(P), R=$(R)3:" - } - display[4] { - label="ROI 4" - name="NDROIN.adl" - args="P=$(P), R=$(R)4:" - } - display[5] { - label="ROI 5" - name="NDROIN.adl" - args="P=$(P), R=$(R)5:" - } - display[6] { - label="ROI 6" - name="NDROIN.adl" - args="P=$(P), R=$(R)6:" - } - display[7] { - label="ROI 7" - name="NDROIN.adl" - args="P=$(P), R=$(R)7:" - } - clr=14 - bclr=51 - } - text { - object { - x=136 - y=391 - width=50 - height=20 - } - "basic attribute" { - clr=14 - } - textix="ROIs 0-7" - align="horiz. right" - } - text { - object { - x=136 - y=366 - width=50 - height=20 - } - "basic attribute" { - clr=14 - } - textix=" More" - align="horiz. right" - } - "related display" { - object { - x=195 - y=366 - width=70 - height=20 - } - display[0] { - label="asynRecord" - name="asynRecord.adl" - args="P=$(P),R=$(R)AsynIO" - } - clr=14 - bclr=51 - } + display[0] { + label="ROI 0" + name="NDROIN.adl" + args="P=$(P), R=$(R)0:" } + display[1] { + label="ROI 1" + name="NDROIN.adl" + args="P=$(P), R=$(R)1:" + } + display[2] { + label="ROI 2" + name="NDROIN.adl" + args="P=$(P), R=$(R)2:" + } + display[3] { + label="ROI 3" + name="NDROIN.adl" + args="P=$(P), R=$(R)3:" + } + display[4] { + label="ROI 4" + name="NDROIN.adl" + args="P=$(P), R=$(R)4:" + } + display[5] { + label="ROI 5" + name="NDROIN.adl" + args="P=$(P), R=$(R)5:" + } + display[6] { + label="ROI 6" + name="NDROIN.adl" + args="P=$(P), R=$(R)6:" + } + display[7] { + label="ROI 7" + name="NDROIN.adl" + args="P=$(P), R=$(R)7:" + } + clr=14 + bclr=51 + label="Individual ROIs" } -composite { +text { object { - x=5 - y=35 - width=380 - height=385 + x=22 + y=415 + width=140 + height=20 } - "composite name"="" - children { - text { - object { - x=12 - y=140 - width=150 - height=20 - } - "basic attribute" { - clr=14 - } - textix="Callbacks block" - align="horiz. right" - } - menu { - object { - x=172 - y=140 - width=100 - height=20 - } - control { - chan="$(P)$(R)BlockingCallbacks" - clr=14 - bclr=51 - } - } - rectangle { - object { - x=5 - y=35 - width=380 - height=385 - } - "basic attribute" { - clr=14 - fill="outline" - } - } - "text update" { - object { - x=278 - y=141 - width=100 - height=18 - } - monitor { - chan="$(P)$(R)BlockingCallbacks_RBV" - clr=54 - bclr=4 - } - limits { - } - } + "basic attribute" { + clr=14 } + textix="Individual 0-7" + align="horiz. right" +} +text { + object { + x=52 + y=365 + width=110 + height=20 + } + "basic attribute" { + clr=14 + } + textix="asyn record" + align="horiz. right" +} +"related display" { + object { + x=172 + y=365 + width=100 + height=20 + } + display[0] { + label="asynRecord" + name="asynRecord.adl" + args="P=$(P),R=$(R)AsynIO" + } + clr=14 + bclr=51 } rectangle { object { x=5 y=35 width=380 - height=385 + height=435 } "basic attribute" { clr=14 @@ -812,3 +738,60 @@ menu { limits { } } +"related display" { + object { + x=172 + y=442 + width=130 + height=20 + } + display[0] { + label="ROIS 1-8" + name="NDROI8.adl" + args="P=$(P),ROI1=$(R)0:,ROI2=$(R)1:,ROI3=$(R)2:,ROI4=$(R)3:,ROI5=$(R)4:,ROI6=$(R)5:,ROI7=$(R)6:,ROI8=$(R)7:," + } + display[1] { + label="ROIS 9-16" + name="NDROI8.adl" + args="P=$(P),ROI1=$(R)8:,ROI2=$(R)9:,ROI3=$(R)10:,ROI4=$(R)11:,ROI5=$(R)12:,ROI6=$(R)13:,ROI7=$(R)14:,ROI8=$(R)15:," + } + display[2] { + label="ROIS 17-24" + name="NDROI8.adl" + args="P=$(P),ROI1=$(R)16:,ROI2=$(R)17:,ROI3=$(R)18:,ROI4=$(R)19:,ROI5=$(R)20:,ROI6=$(R)21:,ROI7=$(R)22:,ROI8=$(R)23:," + } + display[3] { + label="ROIS 25-32" + name="NDROI8.adl" + args="P=$(P),ROI1=$(R)24:,ROI2=$(R)25:,ROI3=$(R)26:,ROI4=$(R)27:,ROI5=$(R)28:,ROI6=$(R)29:,ROI7=$(R)30:,ROI8=$(R)31:," + } + clr=14 + bclr=51 + label="Combined ROIs" +} +text { + object { + x=138 + y=390 + width=150 + height=20 + } + "basic attribute" { + clr=14 + } + textix="ROI definitions" + align="horiz. right" +} +text { + object { + x=82 + y=443 + width=80 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Combined" + align="horiz. right" +}