diff --git a/ADApp/op/adl/NDROI8.adl b/ADApp/op/adl/NDROI8.adl index 665c807..8f756fd 100644 --- a/ADApp/op/adl/NDROI8.adl +++ b/ADApp/op/adl/NDROI8.adl @@ -5,8 +5,8 @@ file { } display { object { - x=516 - y=57 + x=328 + y=55 width=1000 height=290 } @@ -97,7 +97,7 @@ text { "basic attribute" { clr=14 } - textix="Pilatus $(P) $(ROI1)-$(ROI8)" + textix="$(P) $(ROI1)-$(ROI8)" align="horiz. centered" } composite { @@ -366,7 +366,7 @@ text { "basic attribute" { clr=14 } - textix="Plots" + textix="More" } composite { object { @@ -1687,147 +1687,136 @@ composite { } } } -composite { +text { + object { + x=225 + y=60 + width=50 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Name" +} +"text entry" { object { x=210 - y=60 + y=84 width=75 - height=219 + height=20 } - "composite name"="" - children { - text { - object { - x=225 - y=60 - width=50 - height=20 - } - "basic attribute" { - clr=14 - } - textix="Name" - } - "text entry" { - object { - x=210 - y=84 - width=75 - height=20 - } - control { - chan="$(P)$(ROI1)Name" - clr=14 - bclr=51 - } - limits { - } - } - "text entry" { - object { - x=210 - y=109 - width=75 - height=20 - } - control { - chan="$(P)$(ROI2)Name" - clr=14 - bclr=51 - } - limits { - } - } - "text entry" { - object { - x=210 - y=134 - width=75 - height=20 - } - control { - chan="$(P)$(ROI3)Name" - clr=14 - bclr=51 - } - limits { - } - } - "text entry" { - object { - x=210 - y=159 - width=75 - height=20 - } - control { - chan="$(P)$(ROI4)Name" - clr=14 - bclr=51 - } - limits { - } - } - "text entry" { - object { - x=210 - y=184 - width=75 - height=20 - } - control { - chan="$(P)$(ROI5)Name" - clr=14 - bclr=51 - } - limits { - } - } - "text entry" { - object { - x=210 - y=209 - width=75 - height=20 - } - control { - chan="$(P)$(ROI6)Name" - clr=14 - bclr=51 - } - limits { - } - } - "text entry" { - object { - x=210 - y=234 - width=75 - height=20 - } - control { - chan="$(P)$(ROI7)Name" - clr=14 - bclr=51 - } - limits { - } - } - "text entry" { - object { - x=210 - y=259 - width=75 - height=20 - } - control { - chan="$(P)$(ROI8)Name" - clr=14 - bclr=51 - } - limits { - } - } + control { + chan="$(P)$(ROI1)Name" + clr=14 + bclr=51 + } + limits { + } +} +"text entry" { + object { + x=210 + y=109 + width=75 + height=20 + } + control { + chan="$(P)$(ROI2)Name" + clr=14 + bclr=51 + } + limits { + } +} +"text entry" { + object { + x=210 + y=134 + width=75 + height=20 + } + control { + chan="$(P)$(ROI3)Name" + clr=14 + bclr=51 + } + limits { + } +} +"text entry" { + object { + x=210 + y=159 + width=75 + height=20 + } + control { + chan="$(P)$(ROI4)Name" + clr=14 + bclr=51 + } + limits { + } +} +"text entry" { + object { + x=210 + y=184 + width=75 + height=20 + } + control { + chan="$(P)$(ROI5)Name" + clr=14 + bclr=51 + } + limits { + } +} +"text entry" { + object { + x=210 + y=209 + width=75 + height=20 + } + control { + chan="$(P)$(ROI6)Name" + clr=14 + bclr=51 + } + limits { + } +} +"text entry" { + object { + x=210 + y=234 + width=75 + height=20 + } + control { + chan="$(P)$(ROI7)Name" + clr=14 + bclr=51 + } + limits { + } +} +"text entry" { + object { + x=210 + y=259 + width=75 + height=20 + } + control { + chan="$(P)$(ROI8)Name" + clr=14 + bclr=51 + } + limits { } } text { @@ -1975,15 +1964,20 @@ composite { height=20 } display[0] { - label="Total counts" + label="Total counts plot" name="mca.adl" args="P=$(P),M=$(ROI1)TotalArray" } display[1] { - label="Net counts" + label="Net counts plot" name="mca.adl" args="P=$(P),M=$(ROI1)NetArray" } + display[2] { + label="ROI full" + name="NDROIN.adl" + args="P=$(P),R=$(ROI1)" + } clr=53 bclr=4 } @@ -1995,15 +1989,20 @@ composite { height=20 } display[0] { - label="Total counts" + label="Total counts plot" name="mca.adl" args="P=$(P),M=$(ROI2)TotalArray" } display[1] { - label="Net counts" + label="Net counts plot" name="mca.adl" args="P=$(P),M=$(ROI2)NetArray" } + display[2] { + label="ROI full" + name="NDROIN.adl" + args="P=$(P),R=$(ROI2)" + } clr=53 bclr=4 } @@ -2015,15 +2014,20 @@ composite { height=20 } display[0] { - label="Total counts" + label="Total counts plot" name="mca.adl" args="P=$(P),M=$(ROI3)TotalArray" } display[1] { - label="Net counts" + label="Net counts plot" name="mca.adl" args="P=$(P),M=$(ROI3)NetArray" } + display[2] { + label="ROI full" + name="NDROIN.adl" + args="P=$(P),R=$(ROI3)" + } clr=53 bclr=4 } @@ -2035,15 +2039,20 @@ composite { height=20 } display[0] { - label="Total counts" + label="Total counts plot" name="mca.adl" args="P=$(P),M=$(ROI4)TotalArray" } display[1] { - label="Net counts" + label="Net counts plot" name="mca.adl" args="P=$(P),M=$(ROI4)NetArray" } + display[2] { + label="ROI full" + name="NDROIN.adl" + args="P=$(P),R=$(ROI4)" + } clr=53 bclr=4 } @@ -2055,15 +2064,20 @@ composite { height=20 } display[0] { - label="Total counts" + label="Total counts plot" name="mca.adl" args="P=$(P),M=$(ROI5)TotalArray" } display[1] { - label="Net counts" + label="Net counts plot" name="mca.adl" args="P=$(P),M=$(ROI5)NetArray" } + display[2] { + label="ROI full" + name="NDROIN.adl" + args="P=$(P),R=$(ROI4)" + } clr=53 bclr=4 } @@ -2075,15 +2089,20 @@ composite { height=20 } display[0] { - label="Total counts" + label="Total counts plot" name="mca.adl" args="P=$(P),M=$(ROI6)TotalArray" } display[1] { - label="Net counts" + label="Net counts plot" name="mca.adl" args="P=$(P),M=$(ROI6)NetArray" } + display[2] { + label="ROI full" + name="NDROIN.adl" + args="P=$(P),R=$(ROI6)" + } clr=53 bclr=4 } @@ -2095,15 +2114,20 @@ composite { height=20 } display[0] { - label="Total counts" + label="Total counts plot" name="mca.adl" args="P=$(P),M=$(ROI7)TotalArray" } display[1] { - label="Net counts" + label="Net counts plot" name="mca.adl" args="P=$(P),M=$(ROI7)NetArray" } + display[2] { + label="ROI full" + name="NDROIN.adl" + args="P=$(P),R=$(ROI7)" + } clr=53 bclr=4 } @@ -2115,15 +2139,20 @@ composite { height=20 } display[0] { - label="Total counts" + label="Total counts plot" name="mca.adl" args="P=$(P),M=$(ROI8)TotalArray" } display[1] { - label="Net counts" + label="Net counts plot" name="mca.adl" args="P=$(P),M=$(ROI8)NetArray" } + display[2] { + label="ROI full" + name="NDROIN.adl" + args="P=$(P),R=$(ROI8)" + } clr=53 bclr=4 }