diff --git a/ADApp/op/adl/NDPluginFile.adl b/ADApp/op/adl/NDPluginFile.adl index 774eb65..e151957 100644 --- a/ADApp/op/adl/NDPluginFile.adl +++ b/ADApp/op/adl/NDPluginFile.adl @@ -1,14 +1,14 @@ file { - name="/home/epics/devel/areaDetector/1-3beta/ADApp/op/adl/NDFile.adl" + name="/home/epics/devel/areaDetector/1-4/ADApp/op/adl/NDPluginFile.adl" version=030102 } display { object { - x=126 - y=517 + x=123 + y=444 width=1080 - height=405 + height=430 } clr=14 bclr=4 @@ -92,387 +92,17 @@ rectangle { x=8 y=40 width=380 - height=360 + height=385 } "basic attribute" { clr=14 fill="outline" } } -"text entry" { - object { - x=175 - y=71 - width=100 - height=20 - } - control { - chan="$(P)$(R)NDArrayAddress" - clr=14 - bclr=51 - } - limits { - } -} -"text update" { - object { - x=281 - y=72 - width=100 - height=18 - } - monitor { - chan="$(P)$(R)NDArrayAddress_RBV" - clr=54 - bclr=4 - } - limits { - } -} -text { - object { - x=35 - y=71 - width=130 - height=20 - } - "basic attribute" { - clr=14 - } - textix="Array address" - align="horiz. right" -} -text { - object { - x=65 - y=46 - width=100 - height=20 - } - "basic attribute" { - clr=14 - } - textix="Array port" - align="horiz. right" -} -"text entry" { - object { - x=175 - y=46 - width=100 - height=20 - } - control { - chan="$(P)$(R)NDArrayPort" - clr=14 - bclr=51 - } - limits { - } -} -"text update" { - object { - x=281 - y=47 - width=100 - height=18 - } - monitor { - chan="$(P)$(R)NDArrayPort_RBV" - clr=54 - bclr=4 - } - limits { - } -} -"text entry" { - object { - x=175 - y=171 - width=100 - height=20 - } - control { - chan="$(P)$(R)ArrayCounter" - clr=14 - bclr=51 - } - limits { - } -} -"text update" { - object { - x=281 - y=172 - width=100 - height=18 - } - monitor { - chan="$(P)$(R)ArrayCounter_RBV" - clr=54 - bclr=4 - } - limits { - } -} -text { - object { - x=35 - y=171 - width=130 - height=20 - } - "basic attribute" { - clr=14 - } - textix="Array counter" - align="horiz. right" -} -text { - object { - x=65 - y=196 - width=100 - height=20 - } - "basic attribute" { - clr=14 - } - textix="Array rate" - align="horiz. right" -} -"text update" { - object { - x=175 - y=197 - width=100 - height=18 - } - monitor { - chan="$(P)$(R)ArrayRate_RBV" - clr=54 - bclr=4 - } - limits { - } -} -text { - object { - x=65 - y=246 - width=100 - height=20 - } - "basic attribute" { - clr=14 - } - textix="Array Size" - align="horiz. right" -} -"text update" { - object { - x=175 - y=247 - width=61 - height=18 - } - monitor { - chan="$(P)$(R)ArraySize0_RBV" - clr=54 - bclr=4 - } - align="horiz. centered" - limits { - } -} -"text update" { - object { - x=274 - y=247 - width=61 - height=18 - } - monitor { - chan="$(P)$(R)ArraySize1_RBV" - clr=54 - bclr=4 - } - align="horiz. centered" - limits { - } -} -"text entry" { - object { - x=175 - y=221 - width=100 - height=20 - } - control { - chan="$(P)$(R)DroppedArrays" - clr=14 - bclr=51 - } - limits { - } -} -"text update" { - object { - x=281 - y=222 - width=100 - height=18 - } - monitor { - chan="$(P)$(R)DroppedArrays_RBV" - clr=54 - bclr=4 - } - limits { - } -} -text { - object { - x=25 - y=221 - width=140 - height=20 - } - "basic attribute" { - clr=14 - } - textix="Dropped arrays" - align="horiz. right" -} -text { - object { - x=55 - y=96 - width=110 - height=20 - } - "basic attribute" { - clr=14 - } - textix="Enable" - align="horiz. right" -} -menu { - object { - x=175 - y=96 - width=100 - height=20 - } - control { - chan="$(P)$(R)EnableCallbacks" - clr=14 - bclr=51 - } -} -"text update" { - object { - x=281 - y=97 - width=100 - height=18 - } - monitor { - chan="$(P)$(R)EnableCallbacks_RBV" - clr=54 - bclr=4 - } - limits { - } -} -text { - object { - x=15 - y=146 - width=150 - height=20 - } - "basic attribute" { - clr=14 - } - textix="Callbacks block" - align="horiz. right" -} -menu { - object { - x=175 - y=146 - width=100 - height=20 - } - control { - chan="$(P)$(R)BlockingCallbacks" - clr=14 - bclr=51 - } -} -"text update" { - object { - x=281 - y=147 - width=100 - height=18 - } - monitor { - chan="$(P)$(R)BlockingCallbacks_RBV" - clr=54 - bclr=4 - } - limits { - } -} -text { - object { - x=75 - y=121 - width=90 - height=20 - } - "basic attribute" { - clr=14 - } - textix="Min. time" - align="horiz. right" -} -"text entry" { - object { - x=175 - y=121 - width=100 - height=20 - } - control { - chan="$(P)$(R)MinCallbackTime" - clr=14 - bclr=51 - } - limits { - } -} -"text update" { - object { - x=281 - y=122 - width=100 - height=18 - } - monitor { - chan="$(P)$(R)MinCallbackTime_RBV" - clr=54 - bclr=4 - } - limits { - } -} composite { object { x=139 - y=351 + y=395 width=129 height=20 } @@ -481,7 +111,7 @@ composite { text { object { x=139 - y=351 + y=395 width=50 height=20 } @@ -494,7 +124,7 @@ composite { "related display" { object { x=198 - y=351 + y=395 width=70 height=20 } @@ -508,107 +138,6 @@ composite { } } } -composite { - object { - x=75 - y=271 - width=179 - height=20 - } - "composite name"="" - children { - text { - object { - x=75 - y=271 - width=90 - height=20 - } - "basic attribute" { - clr=14 - } - textix="Data type" - align="horiz. right" - } - "text update" { - object { - x=175 - y=272 - width=79 - height=18 - } - monitor { - chan="$(P)$(R)DataType_RBV" - clr=54 - bclr=4 - } - align="horiz. centered" - format="string" - limits { - } - } - } -} -text { - object { - x=75 - y=296 - width=90 - height=20 - } - "basic attribute" { - clr=14 - } - textix="Unique ID" - align="horiz. right" -} -"text update" { - object { - x=175 - y=297 - width=79 - height=18 - } - monitor { - chan="$(P)$(R)UniqueId_RBV" - clr=54 - bclr=4 - } - align="horiz. centered" - format="string" - limits { - } -} -text { - object { - x=75 - y=321 - width=90 - height=20 - } - "basic attribute" { - clr=14 - } - textix="Time stamp" - align="horiz. right" -} -"text update" { - object { - x=175 - y=322 - width=150 - height=18 - } - monitor { - chan="$(P)$(R)TimeStamp_RBV" - clr=54 - bclr=4 - } - align="horiz. centered" - format="string" - limits { - } -} composite { object { x=360 @@ -1345,3 +874,561 @@ composite { limits { } } +composite { + object { + x=15 + y=44 + width=366 + height=345 + } + "composite name"="" + children { + "text entry" { + object { + x=175 + y=69 + width=100 + height=20 + } + control { + chan="$(P)$(R)NDArrayAddress" + clr=14 + bclr=51 + } + limits { + } + } + "text update" { + object { + x=281 + y=70 + width=100 + height=18 + } + monitor { + chan="$(P)$(R)NDArrayAddress_RBV" + clr=54 + bclr=4 + } + limits { + } + } + text { + object { + x=35 + y=69 + width=130 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Array address" + align="horiz. right" + } + text { + object { + x=65 + y=44 + width=100 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Array port" + align="horiz. right" + } + "text entry" { + object { + x=175 + y=44 + width=100 + height=20 + } + control { + chan="$(P)$(R)NDArrayPort" + clr=14 + bclr=51 + } + limits { + } + } + "text update" { + object { + x=281 + y=45 + width=100 + height=18 + } + monitor { + chan="$(P)$(R)NDArrayPort_RBV" + clr=54 + bclr=4 + } + limits { + } + } + "text entry" { + object { + x=175 + y=169 + width=100 + height=20 + } + control { + chan="$(P)$(R)ArrayCounter" + clr=14 + bclr=51 + } + limits { + } + } + "text update" { + object { + x=281 + y=170 + width=100 + height=18 + } + monitor { + chan="$(P)$(R)ArrayCounter_RBV" + clr=54 + bclr=4 + } + limits { + } + } + text { + object { + x=35 + y=169 + width=130 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Array counter" + align="horiz. right" + } + text { + object { + x=65 + y=194 + width=100 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Array rate" + align="horiz. right" + } + "text update" { + object { + x=175 + y=195 + width=100 + height=18 + } + monitor { + chan="$(P)$(R)ArrayRate_RBV" + clr=54 + bclr=4 + } + limits { + } + } + "text entry" { + object { + x=175 + y=219 + width=100 + height=20 + } + control { + chan="$(P)$(R)DroppedArrays" + clr=14 + bclr=51 + } + limits { + } + } + "text update" { + object { + x=281 + y=220 + width=100 + height=18 + } + monitor { + chan="$(P)$(R)DroppedArrays_RBV" + clr=54 + bclr=4 + } + limits { + } + } + text { + object { + x=25 + y=219 + width=140 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Dropped arrays" + align="horiz. right" + } + text { + object { + x=55 + y=94 + width=110 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Enable" + align="horiz. right" + } + menu { + object { + x=175 + y=94 + width=100 + height=20 + } + control { + chan="$(P)$(R)EnableCallbacks" + clr=14 + bclr=51 + } + } + "text update" { + object { + x=281 + y=95 + width=100 + height=18 + } + monitor { + chan="$(P)$(R)EnableCallbacks_RBV" + clr=54 + bclr=4 + } + limits { + } + } + text { + object { + x=15 + y=144 + width=150 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Callbacks block" + align="horiz. right" + } + menu { + object { + x=175 + y=144 + width=100 + height=20 + } + control { + chan="$(P)$(R)BlockingCallbacks" + clr=14 + bclr=51 + } + } + "text update" { + object { + x=281 + y=145 + width=100 + height=18 + } + monitor { + chan="$(P)$(R)BlockingCallbacks_RBV" + clr=54 + bclr=4 + } + limits { + } + } + text { + object { + x=75 + y=119 + width=90 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Min. time" + align="horiz. right" + } + "text entry" { + object { + x=175 + y=119 + width=100 + height=20 + } + control { + chan="$(P)$(R)MinCallbackTime" + clr=14 + bclr=51 + } + limits { + } + } + "text update" { + object { + x=281 + y=120 + width=100 + height=18 + } + monitor { + chan="$(P)$(R)MinCallbackTime_RBV" + clr=54 + bclr=4 + } + limits { + } + } + text { + object { + x=65 + y=269 + width=100 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Array Size" + align="horiz. right" + } + "text update" { + object { + x=175 + y=270 + width=65 + height=18 + } + monitor { + chan="$(P)$(R)ArraySize0_RBV" + clr=54 + bclr=4 + } + align="horiz. centered" + limits { + } + } + "text update" { + object { + x=245 + y=270 + width=65 + height=18 + } + monitor { + chan="$(P)$(R)ArraySize1_RBV" + clr=54 + bclr=4 + } + align="horiz. centered" + limits { + } + } + composite { + object { + x=75 + y=294 + width=179 + height=20 + } + "composite name"="" + children { + text { + object { + x=75 + y=294 + width=90 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Data type" + align="horiz. right" + } + "text update" { + object { + x=175 + y=295 + width=79 + height=18 + } + monitor { + chan="$(P)$(R)DataType_RBV" + clr=54 + bclr=4 + } + align="horiz. centered" + format="string" + limits { + } + } + } + } + text { + object { + x=75 + y=344 + width=90 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Unique ID" + align="horiz. right" + } + "text update" { + object { + x=175 + y=345 + width=79 + height=18 + } + monitor { + chan="$(P)$(R)UniqueId_RBV" + clr=54 + bclr=4 + } + align="horiz. centered" + format="string" + limits { + } + } + text { + object { + x=75 + y=369 + width=90 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Time stamp" + align="horiz. right" + } + "text update" { + object { + x=175 + y=370 + width=150 + height=18 + } + monitor { + chan="$(P)$(R)TimeStamp_RBV" + clr=54 + bclr=4 + } + align="horiz. centered" + format="string" + limits { + } + } + text { + object { + x=75 + y=319 + width=90 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Color mode" + align="horiz. right" + } + "text update" { + object { + x=175 + y=320 + width=79 + height=18 + } + monitor { + chan="$(P)$(R)ColorMode_RBV" + clr=54 + bclr=4 + } + align="horiz. centered" + format="string" + limits { + } + } + text { + object { + x=75 + y=244 + width=90 + height=20 + } + "basic attribute" { + clr=14 + } + textix="# dimensions" + align="horiz. right" + } + "text update" { + object { + x=175 + y=245 + width=79 + height=18 + } + monitor { + chan="$(P)$(R)NDimensions_RBV" + clr=54 + bclr=4 + } + align="horiz. centered" + format="string" + limits { + } + } + "text update" { + object { + x=315 + y=270 + width=65 + height=18 + } + monitor { + chan="$(P)$(R)ArraySize2_RBV" + clr=54 + bclr=4 + } + align="horiz. centered" + limits { + } + } + } +} diff --git a/ADApp/op/adl/NDROI.adl b/ADApp/op/adl/NDROI.adl index bc9292d..7242800 100644 --- a/ADApp/op/adl/NDROI.adl +++ b/ADApp/op/adl/NDROI.adl @@ -1,14 +1,14 @@ file { - name="/home/epics/devel/areaDetector/1-2/ADApp/op/adl/NDROI.adl" - version=030000 + name="/home/epics/devel/areaDetector/1-4/ADApp/op/adl/NDROI.adl" + version=030102 } display { object { - x=116 - y=168 + x=154 + y=55 width=390 - height=475 + height=525 } clr=14 bclr=4 @@ -111,6 +111,208 @@ text { textix="$(P)$(R)" align="horiz. centered" } +rectangle { + object { + x=5 + y=35 + width=380 + height=485 + } + "basic attribute" { + clr=14 + fill="outline" + } +} +"related display" { + object { + x=172 + y=465 + width=130 + 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 + label="Individual ROIs" +} +text { + object { + x=22 + y=465 + width=140 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Individual 0-7" + align="horiz. right" +} +text { + object { + x=52 + y=415 + width=110 + height=20 + } + "basic attribute" { + clr=14 + } + textix="asyn record" + align="horiz. right" +} +"related display" { + object { + x=172 + y=415 + width=100 + height=20 + } + display[0] { + label="asynRecord" + name="asynRecord.adl" + args="P=$(P),R=$(R)AsynIO" + } + clr=14 + bclr=51 +} +text { + object { + x=12 + y=390 + width=150 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Highlight ROIs" + align="horiz. right" +} +menu { + object { + x=172 + y=390 + width=100 + height=20 + } + control { + chan="$(P)$(R)Highlight" + clr=14 + bclr=51 + } +} +"text update" { + object { + x=278 + y=391 + width=100 + height=18 + } + monitor { + chan="$(P)$(R)Highlight_RBV" + clr=54 + bclr=4 + } + limits { + } +} +"related display" { + object { + x=172 + y=492 + 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=440 + width=150 + height=20 + } + "basic attribute" { + clr=14 + } + textix="ROI definitions" + align="horiz. right" +} +text { + object { + x=82 + y=493 + width=80 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Combined" + align="horiz. right" +} "text entry" { object { x=172 @@ -268,51 +470,6 @@ text { limits { } } -text { - object { - x=62 - y=240 - width=100 - height=20 - } - "basic attribute" { - clr=14 - } - textix="Array Size" - align="horiz. right" -} -"text update" { - object { - x=172 - y=241 - width=61 - height=18 - } - monitor { - chan="$(P)$(R)ArraySize0_RBV" - clr=54 - bclr=4 - } - align="horiz. centered" - limits { - } -} -"text update" { - object { - x=271 - y=241 - width=61 - height=18 - } - monitor { - chan="$(P)$(R)ArraySize1_RBV" - clr=54 - bclr=4 - } - align="horiz. centered" - limits { - } -} "text entry" { object { x=172 @@ -397,6 +554,47 @@ menu { limits { } } +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 + } +} +"text update" { + object { + x=278 + y=141 + width=100 + height=18 + } + monitor { + chan="$(P)$(R)BlockingCallbacks_RBV" + clr=54 + bclr=4 + } + limits { + } +} text { object { x=72 @@ -440,10 +638,55 @@ text { limits { } } +text { + object { + x=62 + y=265 + width=100 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Array Size" + align="horiz. right" +} +"text update" { + object { + x=172 + y=266 + width=65 + height=18 + } + monitor { + chan="$(P)$(R)ArraySize0_RBV" + clr=54 + bclr=4 + } + align="horiz. centered" + limits { + } +} +"text update" { + object { + x=242 + y=266 + width=65 + height=18 + } + monitor { + chan="$(P)$(R)ArraySize1_RBV" + clr=54 + bclr=4 + } + align="horiz. centered" + limits { + } +} composite { object { x=72 - y=265 + y=290 width=179 height=20 } @@ -452,7 +695,7 @@ composite { text { object { x=72 - y=265 + y=290 width=90 height=20 } @@ -465,7 +708,7 @@ composite { "text update" { object { x=172 - y=266 + y=291 width=79 height=18 } @@ -484,7 +727,7 @@ composite { text { object { x=72 - y=290 + y=340 width=90 height=20 } @@ -497,7 +740,7 @@ text { "text update" { object { x=172 - y=291 + y=341 width=79 height=18 } @@ -511,6 +754,36 @@ text { limits { } } +text { + object { + x=72 + y=365 + width=90 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Time stamp" + align="horiz. right" +} +"text update" { + object { + x=172 + y=366 + width=150 + height=18 + } + monitor { + chan="$(P)$(R)TimeStamp_RBV" + clr=54 + bclr=4 + } + align="horiz. centered" + format="string" + limits { + } +} text { object { x=72 @@ -521,18 +794,18 @@ text { "basic attribute" { clr=14 } - textix="Time stamp" + textix="Color mode" align="horiz. right" } "text update" { object { x=172 y=316 - width=150 + width=79 height=18 } monitor { - chan="$(P)$(R)TimeStamp_RBV" + chan="$(P)$(R)ColorMode_RBV" clr=54 bclr=4 } @@ -541,257 +814,49 @@ text { limits { } } -"related display" { - object { - x=172 - y=415 - width=130 - 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 - label="Individual ROIs" -} text { object { - x=22 - y=415 - width=140 + x=72 + y=240 + width=90 height=20 } "basic attribute" { clr=14 } - textix="Individual 0-7" + textix="# dimensions" 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" { +"text update" { object { x=172 - y=365 - width=100 - height=20 + y=241 + width=79 + height=18 } - display[0] { - label="asynRecord" - name="asynRecord.adl" - args="P=$(P),R=$(R)AsynIO" + monitor { + chan="$(P)$(R)NDimensions_RBV" + clr=54 + bclr=4 } - clr=14 - bclr=51 -} -rectangle { - object { - x=5 - y=35 - width=380 - height=435 - } - "basic attribute" { - clr=14 - fill="outline" - } -} -composite { - object { - x=12 - y=140 - width=366 - 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 - } - } - "text update" { - object { - x=278 - y=141 - width=100 - height=18 - } - monitor { - chan="$(P)$(R)BlockingCallbacks_RBV" - clr=54 - bclr=4 - } - limits { - } - } - } -} -text { - object { - x=12 - y=340 - width=150 - height=20 - } - "basic attribute" { - clr=14 - } - textix="Highlight ROIs" - align="horiz. right" -} -menu { - object { - x=172 - y=340 - width=100 - height=20 - } - control { - chan="$(P)$(R)Highlight" - clr=14 - bclr=51 + align="horiz. centered" + format="string" + limits { } } "text update" { object { - x=278 - y=341 - width=100 + x=312 + y=266 + width=65 height=18 } monitor { - chan="$(P)$(R)Highlight_RBV" + chan="$(P)$(R)ArraySize2_RBV" clr=54 bclr=4 } + align="horiz. centered" 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" -} diff --git a/ADApp/op/adl/NDStdArrays.adl b/ADApp/op/adl/NDStdArrays.adl index 5d63852..f34a73b 100644 --- a/ADApp/op/adl/NDStdArrays.adl +++ b/ADApp/op/adl/NDStdArrays.adl @@ -123,462 +123,462 @@ rectangle { fill="outline" } } -"text entry" { - object { - x=172 - y=65 - width=100 - height=20 - } - control { - chan="$(P)$(R)NDArrayAddress" - clr=14 - bclr=51 - } - limits { - } -} -"text update" { - object { - x=278 - y=66 - width=100 - height=18 - } - monitor { - chan="$(P)$(R)NDArrayAddress_RBV" - clr=54 - bclr=4 - } - limits { - } -} -text { - object { - x=32 - y=65 - width=130 - height=20 - } - "basic attribute" { - clr=14 - } - textix="Array address" - align="horiz. right" -} -text { - object { - x=62 - y=40 - width=100 - height=20 - } - "basic attribute" { - clr=14 - } - textix="Array port" - align="horiz. right" -} -"text entry" { - object { - x=172 - y=40 - width=100 - height=20 - } - control { - chan="$(P)$(R)NDArrayPort" - clr=14 - bclr=51 - } - limits { - } -} -"text update" { - object { - x=278 - y=41 - width=100 - height=18 - } - monitor { - chan="$(P)$(R)NDArrayPort_RBV" - clr=54 - bclr=4 - } - limits { - } -} -"text entry" { - object { - x=172 - y=165 - width=100 - height=20 - } - control { - chan="$(P)$(R)ArrayCounter" - clr=14 - bclr=51 - } - limits { - } -} -"text update" { - object { - x=278 - y=166 - width=100 - height=18 - } - monitor { - chan="$(P)$(R)ArrayCounter_RBV" - clr=54 - bclr=4 - } - limits { - } -} -text { - object { - x=32 - y=165 - width=130 - height=20 - } - "basic attribute" { - clr=14 - } - textix="Array counter" - align="horiz. right" -} -text { - object { - x=62 - y=190 - width=100 - height=20 - } - "basic attribute" { - clr=14 - } - textix="Array rate" - align="horiz. right" -} -"text update" { - object { - x=172 - y=191 - width=100 - height=18 - } - monitor { - chan="$(P)$(R)ArrayRate_RBV" - clr=54 - bclr=4 - } - limits { - } -} -"text entry" { - object { - x=172 - y=215 - width=100 - height=20 - } - control { - chan="$(P)$(R)DroppedArrays" - clr=14 - bclr=51 - } - limits { - } -} -"text update" { - object { - x=278 - y=216 - width=100 - height=18 - } - monitor { - chan="$(P)$(R)DroppedArrays_RBV" - clr=54 - bclr=4 - } - limits { - } -} -text { - object { - x=22 - y=215 - width=140 - height=20 - } - "basic attribute" { - clr=14 - } - textix="Dropped arrays" - align="horiz. right" -} -text { - object { - x=52 - y=90 - width=110 - height=20 - } - "basic attribute" { - clr=14 - } - textix="Enable" - align="horiz. right" -} -menu { - object { - x=172 - y=90 - width=100 - height=20 - } - control { - chan="$(P)$(R)EnableCallbacks" - clr=14 - bclr=51 - } -} -"text update" { - object { - x=278 - y=91 - width=100 - height=18 - } - monitor { - chan="$(P)$(R)EnableCallbacks_RBV" - clr=54 - bclr=4 - } - limits { - } -} -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 - } -} -"text update" { - object { - x=278 - y=141 - width=100 - height=18 - } - monitor { - chan="$(P)$(R)BlockingCallbacks_RBV" - clr=54 - bclr=4 - } - limits { - } -} -text { - object { - x=72 - y=115 - width=90 - height=20 - } - "basic attribute" { - clr=14 - } - textix="Min. time" - align="horiz. right" -} -"text entry" { - object { - x=172 - y=115 - width=100 - height=20 - } - control { - chan="$(P)$(R)MinCallbackTime" - clr=14 - bclr=51 - } - limits { - } -} -"text update" { - object { - x=278 - y=116 - width=100 - height=18 - } - monitor { - chan="$(P)$(R)MinCallbackTime_RBV" - clr=54 - bclr=4 - } - limits { - } -} -text { - object { - x=62 - y=265 - width=100 - height=20 - } - "basic attribute" { - clr=14 - } - textix="Array Size" - align="horiz. right" -} -"text update" { - object { - x=172 - y=266 - width=65 - height=18 - } - monitor { - chan="$(P)$(R)ArraySize0_RBV" - clr=54 - bclr=4 - } - align="horiz. centered" - limits { - } -} -"text update" { - object { - x=242 - y=266 - width=65 - height=18 - } - monitor { - chan="$(P)$(R)ArraySize1_RBV" - clr=54 - bclr=4 - } - align="horiz. centered" - limits { - } -} composite { object { - x=72 - y=290 - width=179 + x=136 + y=395 + width=129 height=20 } "composite name"="" children { + text { + object { + x=136 + y=395 + width=50 + height=20 + } + "basic attribute" { + clr=14 + } + textix=" More" + align="horiz. right" + } + "related display" { + object { + x=195 + y=395 + width=70 + height=20 + } + display[0] { + label="asynRecord" + name="asynRecord.adl" + args="P=$(P),R=$(R)AsynIO" + } + clr=14 + bclr=51 + } + } +} +composite { + object { + x=12 + y=40 + width=366 + height=345 + } + "composite name"="" + children { + "text entry" { + object { + x=172 + y=65 + width=100 + height=20 + } + control { + chan="$(P)$(R)NDArrayAddress" + clr=14 + bclr=51 + } + limits { + } + } + "text update" { + object { + x=278 + y=66 + width=100 + height=18 + } + monitor { + chan="$(P)$(R)NDArrayAddress_RBV" + clr=54 + bclr=4 + } + limits { + } + } + text { + object { + x=32 + y=65 + width=130 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Array address" + align="horiz. right" + } + text { + object { + x=62 + y=40 + width=100 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Array port" + align="horiz. right" + } + "text entry" { + object { + x=172 + y=40 + width=100 + height=20 + } + control { + chan="$(P)$(R)NDArrayPort" + clr=14 + bclr=51 + } + limits { + } + } + "text update" { + object { + x=278 + y=41 + width=100 + height=18 + } + monitor { + chan="$(P)$(R)NDArrayPort_RBV" + clr=54 + bclr=4 + } + limits { + } + } + "text entry" { + object { + x=172 + y=165 + width=100 + height=20 + } + control { + chan="$(P)$(R)ArrayCounter" + clr=14 + bclr=51 + } + limits { + } + } + "text update" { + object { + x=278 + y=166 + width=100 + height=18 + } + monitor { + chan="$(P)$(R)ArrayCounter_RBV" + clr=54 + bclr=4 + } + limits { + } + } + text { + object { + x=32 + y=165 + width=130 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Array counter" + align="horiz. right" + } + text { + object { + x=62 + y=190 + width=100 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Array rate" + align="horiz. right" + } + "text update" { + object { + x=172 + y=191 + width=100 + height=18 + } + monitor { + chan="$(P)$(R)ArrayRate_RBV" + clr=54 + bclr=4 + } + limits { + } + } + "text entry" { + object { + x=172 + y=215 + width=100 + height=20 + } + control { + chan="$(P)$(R)DroppedArrays" + clr=14 + bclr=51 + } + limits { + } + } + "text update" { + object { + x=278 + y=216 + width=100 + height=18 + } + monitor { + chan="$(P)$(R)DroppedArrays_RBV" + clr=54 + bclr=4 + } + limits { + } + } + text { + object { + x=22 + y=215 + width=140 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Dropped arrays" + align="horiz. right" + } + text { + object { + x=52 + y=90 + width=110 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Enable" + align="horiz. right" + } + menu { + object { + x=172 + y=90 + width=100 + height=20 + } + control { + chan="$(P)$(R)EnableCallbacks" + clr=14 + bclr=51 + } + } + "text update" { + object { + x=278 + y=91 + width=100 + height=18 + } + monitor { + chan="$(P)$(R)EnableCallbacks_RBV" + clr=54 + bclr=4 + } + limits { + } + } + 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 + } + } + "text update" { + object { + x=278 + y=141 + width=100 + height=18 + } + monitor { + chan="$(P)$(R)BlockingCallbacks_RBV" + clr=54 + bclr=4 + } + limits { + } + } text { object { x=72 - y=290 + y=115 width=90 height=20 } "basic attribute" { clr=14 } - textix="Data type" + textix="Min. time" + align="horiz. right" + } + "text entry" { + object { + x=172 + y=115 + width=100 + height=20 + } + control { + chan="$(P)$(R)MinCallbackTime" + clr=14 + bclr=51 + } + limits { + } + } + "text update" { + object { + x=278 + y=116 + width=100 + height=18 + } + monitor { + chan="$(P)$(R)MinCallbackTime_RBV" + clr=54 + bclr=4 + } + limits { + } + } + text { + object { + x=62 + y=265 + width=100 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Array Size" align="horiz. right" } "text update" { object { x=172 - y=291 - width=79 + y=266 + width=65 height=18 } monitor { - chan="$(P)$(R)DataType_RBV" + chan="$(P)$(R)ArraySize0_RBV" + clr=54 + bclr=4 + } + align="horiz. centered" + limits { + } + } + "text update" { + object { + x=242 + y=266 + width=65 + height=18 + } + monitor { + chan="$(P)$(R)ArraySize1_RBV" clr=54 bclr=4 } align="horiz. centered" - format="string" limits { } } - } -} -composite { - object { - x=72 - y=340 - width=250 - height=75 - } - "composite name"="" - children { composite { object { - x=136 - y=395 - width=129 + x=72 + y=290 + width=179 height=20 } "composite name"="" children { text { object { - x=136 - y=395 - width=50 + x=72 + y=290 + width=90 height=20 } "basic attribute" { clr=14 } - textix=" More" + textix="Data type" align="horiz. right" } - "related display" { + "text update" { object { - x=195 - y=395 - width=70 - height=20 + x=172 + y=291 + width=79 + height=18 } - display[0] { - label="asynRecord" - name="asynRecord.adl" - args="P=$(P),R=$(R)AsynIO" + monitor { + chan="$(P)$(R)DataType_RBV" + clr=54 + bclr=4 + } + align="horiz. centered" + format="string" + limits { } - clr=14 - bclr=51 } } } @@ -642,81 +642,81 @@ composite { limits { } } - } -} -text { - object { - x=72 - y=315 - width=90 - height=20 - } - "basic attribute" { - clr=14 - } - textix="Color mode" - align="horiz. right" -} -"text update" { - object { - x=172 - y=316 - width=79 - height=18 - } - monitor { - chan="$(P)$(R)ColorMode_RBV" - clr=54 - bclr=4 - } - align="horiz. centered" - format="string" - limits { - } -} -text { - object { - x=72 - y=240 - width=90 - height=20 - } - "basic attribute" { - clr=14 - } - textix="# dimensions" - align="horiz. right" -} -"text update" { - object { - x=172 - y=241 - width=79 - height=18 - } - monitor { - chan="$(P)$(R)NDimensions_RBV" - clr=54 - bclr=4 - } - align="horiz. centered" - format="string" - limits { - } -} -"text update" { - object { - x=312 - y=266 - width=65 - height=18 - } - monitor { - chan="$(P)$(R)ArraySize2_RBV" - clr=54 - bclr=4 - } - align="horiz. centered" - limits { + text { + object { + x=72 + y=315 + width=90 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Color mode" + align="horiz. right" + } + "text update" { + object { + x=172 + y=316 + width=79 + height=18 + } + monitor { + chan="$(P)$(R)ColorMode_RBV" + clr=54 + bclr=4 + } + align="horiz. centered" + format="string" + limits { + } + } + text { + object { + x=72 + y=240 + width=90 + height=20 + } + "basic attribute" { + clr=14 + } + textix="# dimensions" + align="horiz. right" + } + "text update" { + object { + x=172 + y=241 + width=79 + height=18 + } + monitor { + chan="$(P)$(R)NDimensions_RBV" + clr=54 + bclr=4 + } + align="horiz. centered" + format="string" + limits { + } + } + "text update" { + object { + x=312 + y=266 + width=65 + height=18 + } + monitor { + chan="$(P)$(R)ArraySize2_RBV" + clr=54 + bclr=4 + } + align="horiz. centered" + limits { + } + } } }