diff --git a/ADApp/op/adl/NDStdArrays.adl b/ADApp/op/adl/NDStdArrays.adl index c482731..5d63852 100644 --- a/ADApp/op/adl/NDStdArrays.adl +++ b/ADApp/op/adl/NDStdArrays.adl @@ -1,14 +1,14 @@ file { - name="/home/epics/devel/areaDetector/1-1/ADApp/op/adl/NDStdArrays.adl" - version=030000 + name="/home/epics/devel/areaDetector/1-4/ADApp/op/adl/NDStdArrays.adl" + version=030102 } display { object { x=607 y=99 width=390 - height=375 + height=425 } clr=14 bclr=4 @@ -116,7 +116,7 @@ rectangle { x=5 y=35 width=380 - height=335 + height=385 } "basic attribute" { clr=14 @@ -280,51 +280,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 @@ -493,49 +448,55 @@ text { limits { } } -composite { +text { object { - x=136 - y=345 - width=129 + x=62 + y=265 + width=100 height=20 } - "composite name"="" - children { - text { - object { - x=136 - y=345 - width=50 - height=20 - } - "basic attribute" { - clr=14 - } - textix=" More" - align="horiz. right" - } - "related display" { - object { - x=195 - y=345 - width=70 - height=20 - } - display[0] { - label="asynRecord" - name="asynRecord.adl" - args="P=$(P),R=$(R)AsynIO" - } - clr=14 - bclr=51 - } + "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 } @@ -544,7 +505,7 @@ composite { text { object { x=72 - y=265 + y=290 width=90 height=20 } @@ -557,7 +518,7 @@ composite { "text update" { object { x=172 - y=266 + y=291 width=79 height=18 } @@ -573,34 +534,114 @@ composite { } } } -text { +composite { object { x=72 - y=290 - width=90 - height=20 + y=340 + width=250 + height=75 } - "basic attribute" { - clr=14 - } - textix="Unique ID" - align="horiz. right" -} -"text update" { - object { - x=172 - y=291 - width=79 - height=18 - } - monitor { - chan="$(P)$(R)UniqueId_RBV" - clr=54 - bclr=4 - } - align="horiz. centered" - format="string" - limits { + "composite name"="" + children { + composite { + object { + 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 + } + } + } + text { + object { + x=72 + y=340 + width=90 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Unique ID" + align="horiz. right" + } + "text update" { + object { + x=172 + y=341 + width=79 + height=18 + } + monitor { + chan="$(P)$(R)UniqueId_RBV" + clr=54 + bclr=4 + } + align="horiz. centered" + format="string" + 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 { @@ -613,18 +654,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 } @@ -633,3 +674,49 @@ text { 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 { + } +}