diff --git a/ADApp/op/adl/NDColorConvert.adl b/ADApp/op/adl/NDColorConvert.adl index c4300c2..86921b1 100644 --- a/ADApp/op/adl/NDColorConvert.adl +++ b/ADApp/op/adl/NDColorConvert.adl @@ -5,10 +5,10 @@ file { } display { object { - x=607 - y=99 + x=445 + y=108 width=390 - height=450 + height=475 } clr=14 bclr=4 @@ -116,7 +116,7 @@ rectangle { x=5 y=35 width=380 - height=410 + height=435 } "basic attribute" { clr=14 @@ -126,7 +126,7 @@ rectangle { composite { object { x=136 - y=420 + y=445 width=129 height=20 } @@ -135,7 +135,7 @@ composite { text { object { x=136 - y=420 + y=445 width=50 height=20 } @@ -148,7 +148,7 @@ composite { "related display" { object { x=195 - y=420 + y=445 width=70 height=20 } @@ -162,568 +162,10 @@ composite { } } } -"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=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 - height=20 - } - "composite name"="" - children { - text { - object { - x=72 - y=290 - width=90 - height=20 - } - "basic attribute" { - clr=14 - } - textix="Data type" - align="horiz. right" - } - "text update" { - object { - x=172 - y=291 - width=79 - height=18 - } - monitor { - chan="$(P)$(R)DataType_RBV" - clr=54 - bclr=4 - } - align="horiz. centered" - format="string" - limits { - } - } - } -} -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 { - 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 { - } -} -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=390 + y=415 width=150 height=20 } @@ -736,7 +178,7 @@ text { menu { object { x=172 - y=390 + y=415 width=100 height=20 } @@ -749,7 +191,7 @@ menu { "text update" { object { x=278 - y=391 + y=416 width=100 height=18 } @@ -761,3 +203,613 @@ menu { limits { } } +composite { + object { + x=12 + y=40 + width=366 + height=370 + } + "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=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 + height=20 + } + "composite name"="" + children { + text { + object { + x=72 + y=290 + width=90 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Data type" + align="horiz. right" + } + "text update" { + object { + x=172 + y=291 + width=79 + height=18 + } + monitor { + chan="$(P)$(R)DataType_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 { + } + } + 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=72 + y=365 + width=90 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Unique ID" + align="horiz. right" + } + "text update" { + object { + x=172 + y=366 + 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=390 + width=90 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Time stamp" + align="horiz. right" + } + "text update" { + object { + x=172 + y=391 + width=150 + height=18 + } + monitor { + chan="$(P)$(R)TimeStamp_RBV" + clr=54 + bclr=4 + } + align="horiz. centered" + format="string" + limits { + } + } + composite { + object { + x=72 + y=315 + width=179 + height=20 + } + "composite name"="" + children { + 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=340 + width=90 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Bayer pattern" + align="horiz. right" + } + "text update" { + object { + x=172 + y=341 + width=79 + height=18 + } + monitor { + chan="$(P)$(R)BayerPattern_RBV" + clr=54 + bclr=4 + } + align="horiz. centered" + format="string" + limits { + } + } + } +} diff --git a/ADApp/op/adl/NDPluginFile.adl b/ADApp/op/adl/NDPluginFile.adl index e151957..b3fd374 100644 --- a/ADApp/op/adl/NDPluginFile.adl +++ b/ADApp/op/adl/NDPluginFile.adl @@ -5,8 +5,8 @@ file { } display { object { - x=123 - y=444 + x=176 + y=281 width=1080 height=430 } @@ -99,45 +99,6 @@ rectangle { fill="outline" } } -composite { - object { - x=139 - y=395 - width=129 - height=20 - } - "composite name"="" - children { - text { - object { - x=139 - y=395 - width=50 - height=20 - } - "basic attribute" { - clr=14 - } - textix=" More" - align="horiz. right" - } - "related display" { - object { - x=198 - 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=360 @@ -514,7 +475,7 @@ rectangle { x=396 y=40 width=675 - height=360 + height=385 } "basic attribute" { clr=14 @@ -874,260 +835,435 @@ composite { limits { } } +"text entry" { + object { + x=175 + y=70 + width=100 + height=20 + } + control { + chan="$(P)$(R)NDArrayAddress" + clr=14 + bclr=51 + } + limits { + } +} +"text update" { + object { + x=281 + y=71 + width=100 + height=18 + } + monitor { + chan="$(P)$(R)NDArrayAddress_RBV" + clr=54 + bclr=4 + } + limits { + } +} +text { + object { + x=35 + y=70 + width=130 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Array address" + align="horiz. right" +} +text { + object { + x=65 + y=45 + width=100 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Array port" + align="horiz. right" +} +"text entry" { + object { + x=175 + y=45 + width=100 + height=20 + } + control { + chan="$(P)$(R)NDArrayPort" + clr=14 + bclr=51 + } + limits { + } +} +"text update" { + object { + x=281 + y=46 + width=100 + height=18 + } + monitor { + chan="$(P)$(R)NDArrayPort_RBV" + clr=54 + bclr=4 + } + limits { + } +} +"text entry" { + object { + x=175 + y=170 + width=100 + height=20 + } + control { + chan="$(P)$(R)ArrayCounter" + clr=14 + bclr=51 + } + limits { + } +} +"text update" { + object { + x=281 + y=171 + width=100 + height=18 + } + monitor { + chan="$(P)$(R)ArrayCounter_RBV" + clr=54 + bclr=4 + } + limits { + } +} +text { + object { + x=35 + y=170 + width=130 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Array counter" + align="horiz. right" +} +text { + object { + x=65 + y=195 + width=100 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Array rate" + align="horiz. right" +} +"text update" { + object { + x=175 + y=196 + width=100 + height=18 + } + monitor { + chan="$(P)$(R)ArrayRate_RBV" + clr=54 + bclr=4 + } + limits { + } +} +"text entry" { + object { + x=175 + y=220 + width=100 + height=20 + } + control { + chan="$(P)$(R)DroppedArrays" + clr=14 + bclr=51 + } + limits { + } +} +"text update" { + object { + x=281 + y=221 + width=100 + height=18 + } + monitor { + chan="$(P)$(R)DroppedArrays_RBV" + clr=54 + bclr=4 + } + limits { + } +} +text { + object { + x=25 + y=220 + width=140 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Dropped arrays" + align="horiz. right" +} +text { + object { + x=55 + y=95 + width=110 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Enable" + align="horiz. right" +} +menu { + object { + x=175 + y=95 + width=100 + height=20 + } + control { + chan="$(P)$(R)EnableCallbacks" + clr=14 + bclr=51 + } +} +"text update" { + object { + x=281 + y=96 + width=100 + height=18 + } + monitor { + chan="$(P)$(R)EnableCallbacks_RBV" + clr=54 + bclr=4 + } + limits { + } +} +text { + object { + x=75 + y=120 + width=90 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Min. time" + align="horiz. right" +} +"text entry" { + object { + x=175 + y=120 + width=100 + height=20 + } + control { + chan="$(P)$(R)MinCallbackTime" + clr=14 + bclr=51 + } + limits { + } +} +"text update" { + object { + x=281 + y=121 + width=100 + height=18 + } + monitor { + chan="$(P)$(R)MinCallbackTime_RBV" + clr=54 + bclr=4 + } + limits { + } +} +text { + object { + x=65 + y=270 + width=100 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Array Size" + align="horiz. right" +} +"text update" { + object { + x=175 + y=271 + width=65 + height=18 + } + monitor { + chan="$(P)$(R)ArraySize0_RBV" + clr=54 + bclr=4 + } + align="horiz. centered" + limits { + } +} +"text update" { + object { + x=245 + y=271 + width=65 + height=18 + } + monitor { + chan="$(P)$(R)ArraySize1_RBV" + clr=54 + bclr=4 + } + align="horiz. centered" + limits { + } +} composite { object { - x=15 - y=44 - width=366 - height=345 + x=75 + y=295 + width=179 + height=20 } "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 + x=75 + y=295 + width=90 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" + textix="Data type" align="horiz. right" } "text update" { object { x=175 - y=195 - width=100 + y=296 + width=79 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" + chan="$(P)$(R)DataType_RBV" clr=54 bclr=4 } + align="horiz. centered" + format="string" limits { } } + } +} +text { + object { + x=75 + y=245 + width=90 + height=20 + } + "basic attribute" { + clr=14 + } + textix="# dimensions" + align="horiz. right" +} +"text update" { + object { + x=175 + y=246 + 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=271 + width=65 + height=18 + } + monitor { + chan="$(P)$(R)ArraySize2_RBV" + clr=54 + bclr=4 + } + align="horiz. centered" + limits { + } +} +composite { + object { + x=15 + y=145 + width=366 + height=20 + } + "composite name"="" + children { text { object { x=15 - y=144 + y=145 width=150 height=20 } @@ -1140,7 +1276,7 @@ composite { menu { object { x=175 - y=144 + y=145 width=100 height=20 } @@ -1153,7 +1289,7 @@ composite { "text update" { object { x=281 - y=145 + y=146 width=100 height=18 } @@ -1165,199 +1301,81 @@ composite { limits { } } + } +} +text { + object { + x=75 + y=370 + width=90 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Unique ID" + align="horiz. right" +} +"text update" { + object { + x=175 + y=371 + 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=395 + width=90 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Time stamp" + align="horiz. right" +} +"text update" { + object { + x=175 + y=396 + width=150 + height=18 + } + monitor { + chan="$(P)$(R)TimeStamp_RBV" + clr=54 + bclr=4 + } + align="horiz. centered" + format="string" + limits { + } +} +composite { + object { + x=75 + y=320 + width=179 + height=20 + } + "composite name"="" + children { 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 + y=320 width=90 height=20 } @@ -1370,7 +1388,7 @@ composite { "text update" { object { x=175 - y=320 + y=321 width=79 height=18 } @@ -1384,51 +1402,63 @@ composite { 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 { - } - } } } +text { + object { + x=75 + y=345 + width=90 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Bayer pattern" + align="horiz. right" +} +"text update" { + object { + x=175 + y=346 + width=79 + height=18 + } + monitor { + chan="$(P)$(R)BayerPattern_RBV" + clr=54 + bclr=4 + } + align="horiz. centered" + format="string" + limits { + } +} +text { + object { + x=502 + y=392 + width=50 + height=20 + } + "basic attribute" { + clr=14 + } + textix=" More" + align="horiz. right" +} +"related display" { + object { + x=562 + y=392 + width=70 + height=20 + } + display[0] { + label="asynRecord" + name="asynRecord.adl" + args="P=$(P),R=$(R)AsynIO" + } + clr=14 + bclr=51 +} diff --git a/ADApp/op/adl/NDROI.adl b/ADApp/op/adl/NDROI.adl index 7242800..be7dcd6 100644 --- a/ADApp/op/adl/NDROI.adl +++ b/ADApp/op/adl/NDROI.adl @@ -8,7 +8,7 @@ display { x=154 y=55 width=390 - height=525 + height=550 } clr=14 bclr=4 @@ -116,7 +116,7 @@ rectangle { x=5 y=35 width=380 - height=485 + height=510 } "basic attribute" { clr=14 @@ -126,7 +126,7 @@ rectangle { "related display" { object { x=172 - y=465 + y=490 width=130 height=20 } @@ -177,7 +177,7 @@ rectangle { text { object { x=22 - y=465 + y=490 width=140 height=20 } @@ -190,7 +190,7 @@ text { text { object { x=52 - y=415 + y=440 width=110 height=20 } @@ -203,7 +203,7 @@ text { "related display" { object { x=172 - y=415 + y=440 width=100 height=20 } @@ -218,7 +218,7 @@ text { text { object { x=12 - y=390 + y=415 width=150 height=20 } @@ -231,7 +231,7 @@ text { menu { object { x=172 - y=390 + y=415 width=100 height=20 } @@ -244,7 +244,7 @@ menu { "text update" { object { x=278 - y=391 + y=416 width=100 height=18 } @@ -259,7 +259,7 @@ menu { "related display" { object { x=172 - y=492 + y=517 width=130 height=20 } @@ -290,7 +290,7 @@ menu { text { object { x=138 - y=440 + y=465 width=150 height=20 } @@ -303,7 +303,7 @@ text { text { object { x=82 - y=493 + y=518 width=80 height=20 } @@ -315,7 +315,7 @@ text { } "text entry" { object { - x=172 + x=175 y=65 width=100 height=20 @@ -330,7 +330,7 @@ text { } "text update" { object { - x=278 + x=281 y=66 width=100 height=18 @@ -345,7 +345,7 @@ text { } text { object { - x=32 + x=35 y=65 width=130 height=20 @@ -358,7 +358,7 @@ text { } text { object { - x=62 + x=65 y=40 width=100 height=20 @@ -371,7 +371,7 @@ text { } "text entry" { object { - x=172 + x=175 y=40 width=100 height=20 @@ -386,7 +386,7 @@ text { } "text update" { object { - x=278 + x=281 y=41 width=100 height=18 @@ -401,7 +401,7 @@ text { } "text entry" { object { - x=172 + x=175 y=165 width=100 height=20 @@ -416,7 +416,7 @@ text { } "text update" { object { - x=278 + x=281 y=166 width=100 height=18 @@ -431,7 +431,7 @@ text { } text { object { - x=32 + x=35 y=165 width=130 height=20 @@ -444,7 +444,7 @@ text { } text { object { - x=62 + x=65 y=190 width=100 height=20 @@ -457,7 +457,7 @@ text { } "text update" { object { - x=172 + x=175 y=191 width=100 height=18 @@ -472,7 +472,7 @@ text { } "text entry" { object { - x=172 + x=175 y=215 width=100 height=20 @@ -487,7 +487,7 @@ text { } "text update" { object { - x=278 + x=281 y=216 width=100 height=18 @@ -502,7 +502,7 @@ text { } text { object { - x=22 + x=25 y=215 width=140 height=20 @@ -515,7 +515,7 @@ text { } text { object { - x=52 + x=55 y=90 width=110 height=20 @@ -528,7 +528,7 @@ text { } menu { object { - x=172 + x=175 y=90 width=100 height=20 @@ -541,7 +541,7 @@ menu { } "text update" { object { - x=278 + x=281 y=91 width=100 height=18 @@ -556,48 +556,7 @@ menu { } 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 + x=75 y=115 width=90 height=20 @@ -610,7 +569,7 @@ text { } "text entry" { object { - x=172 + x=175 y=115 width=100 height=20 @@ -625,7 +584,7 @@ text { } "text update" { object { - x=278 + x=281 y=116 width=100 height=18 @@ -640,7 +599,7 @@ text { } text { object { - x=62 + x=65 y=265 width=100 height=20 @@ -653,7 +612,7 @@ text { } "text update" { object { - x=172 + x=175 y=266 width=65 height=18 @@ -669,7 +628,7 @@ text { } "text update" { object { - x=242 + x=245 y=266 width=65 height=18 @@ -685,7 +644,7 @@ text { } composite { object { - x=72 + x=75 y=290 width=179 height=20 @@ -694,7 +653,7 @@ composite { children { text { object { - x=72 + x=75 y=290 width=90 height=20 @@ -707,7 +666,7 @@ composite { } "text update" { object { - x=172 + x=175 y=291 width=79 height=18 @@ -726,97 +685,7 @@ composite { } 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 { - 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 + x=75 y=240 width=90 height=20 @@ -829,7 +698,7 @@ text { } "text update" { object { - x=172 + x=175 y=241 width=79 height=18 @@ -846,7 +715,7 @@ text { } "text update" { object { - x=312 + x=315 y=266 width=65 height=18 @@ -860,3 +729,186 @@ text { limits { } } +composite { + object { + x=15 + y=140 + width=366 + height=20 + } + "composite name"="" + children { + text { + object { + x=15 + y=140 + width=150 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Callbacks block" + align="horiz. right" + } + menu { + object { + x=175 + y=140 + width=100 + height=20 + } + control { + chan="$(P)$(R)BlockingCallbacks" + clr=14 + bclr=51 + } + } + "text update" { + object { + x=281 + y=141 + width=100 + height=18 + } + monitor { + chan="$(P)$(R)BlockingCallbacks_RBV" + clr=54 + bclr=4 + } + limits { + } + } + } +} +text { + object { + x=75 + y=365 + width=90 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Unique ID" + align="horiz. right" +} +"text update" { + object { + x=175 + y=366 + 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=390 + width=90 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Time stamp" + align="horiz. right" +} +"text update" { + object { + x=175 + y=391 + width=150 + height=18 + } + monitor { + chan="$(P)$(R)TimeStamp_RBV" + clr=54 + bclr=4 + } + align="horiz. centered" + format="string" + limits { + } +} +composite { + object { + x=75 + y=315 + width=179 + height=20 + } + "composite name"="" + children { + text { + object { + x=75 + y=315 + width=90 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Color mode" + align="horiz. right" + } + "text update" { + object { + x=175 + 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=75 + y=340 + width=90 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Bayer pattern" + align="horiz. right" +} +"text update" { + object { + x=175 + y=341 + width=79 + height=18 + } + monitor { + chan="$(P)$(R)BayerPattern_RBV" + clr=54 + bclr=4 + } + align="horiz. centered" + format="string" + limits { + } +} diff --git a/ADApp/op/adl/NDStdArrays.adl b/ADApp/op/adl/NDStdArrays.adl index f34a73b..cd27a6e 100644 --- a/ADApp/op/adl/NDStdArrays.adl +++ b/ADApp/op/adl/NDStdArrays.adl @@ -5,10 +5,10 @@ file { } display { object { - x=607 - y=99 + x=264 + y=114 width=390 - height=425 + height=450 } clr=14 bclr=4 @@ -116,7 +116,7 @@ rectangle { x=5 y=35 width=380 - height=385 + height=410 } "basic attribute" { clr=14 @@ -126,7 +126,7 @@ rectangle { composite { object { x=136 - y=395 + y=420 width=129 height=20 } @@ -135,7 +135,7 @@ composite { text { object { x=136 - y=395 + y=420 width=50 height=20 } @@ -148,7 +148,7 @@ composite { "related display" { object { x=195 - y=395 + y=420 width=70 height=20 } @@ -167,7 +167,7 @@ composite { x=12 y=40 width=366 - height=345 + height=370 } "composite name"="" children { @@ -412,47 +412,6 @@ composite { 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 @@ -582,96 +541,6 @@ composite { } } } - 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 { - 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 @@ -718,5 +587,188 @@ composite { limits { } } + 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=72 + y=365 + width=90 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Unique ID" + align="horiz. right" + } + "text update" { + object { + x=172 + y=366 + 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=390 + width=90 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Time stamp" + align="horiz. right" + } + "text update" { + object { + x=172 + y=391 + width=150 + height=18 + } + monitor { + chan="$(P)$(R)TimeStamp_RBV" + clr=54 + bclr=4 + } + align="horiz. centered" + format="string" + limits { + } + } + composite { + object { + x=72 + y=315 + width=179 + height=20 + } + "composite name"="" + children { + 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=340 + width=90 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Bayer pattern" + align="horiz. right" + } + "text update" { + object { + x=172 + y=341 + width=79 + height=18 + } + monitor { + chan="$(P)$(R)BayerPattern_RBV" + clr=54 + bclr=4 + } + align="horiz. centered" + format="string" + limits { + } + } } }