diff --git a/ADApp/op/adl/NDFile.adl b/ADApp/op/adl/NDFile.adl index dc2e023..2015fe5 100644 --- a/ADApp/op/adl/NDFile.adl +++ b/ADApp/op/adl/NDFile.adl @@ -714,7 +714,7 @@ composite { composite { object { x=371 - y=221 + y=173 width=300 height=20 } @@ -723,7 +723,7 @@ composite { text { object { x=371 - y=221 + y=173 width=110 height=20 } @@ -736,7 +736,7 @@ composite { "text update" { object { x=591 - y=222 + y=174 width=80 height=18 } @@ -751,7 +751,7 @@ composite { menu { object { x=486 - y=221 + y=173 width=100 height=20 } @@ -818,3 +818,15 @@ composite { } } } +text { + object { + x=345 + y=221 + width=230 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Example: %s%s_%3.3d.dat" +} diff --git a/ADApp/op/adl/NDFileJPEG.adl b/ADApp/op/adl/NDFileJPEG.adl index 5e995d7..f8b9ac0 100755 --- a/ADApp/op/adl/NDFileJPEG.adl +++ b/ADApp/op/adl/NDFileJPEG.adl @@ -410,58 +410,6 @@ rectangle { fill="outline" } } -composite { - object { - x=770 - y=221 - width=280 - height=20 - } - "composite name"="" - children { - text { - object { - x=770 - y=221 - width=110 - height=20 - } - "basic attribute" { - clr=14 - } - textix="File format" - align="horiz. right" - } - "text update" { - object { - x=970 - y=222 - width=80 - height=18 - } - monitor { - chan="$(P)$(R)FileFormat_RBV" - clr=54 - bclr=4 - } - limits { - } - } - menu { - object { - x=885 - y=221 - width=80 - height=20 - } - control { - chan="$(P)$(R)FileFormat" - clr=14 - bclr=51 - } - } - } -} text { object { x=813 @@ -766,7 +714,7 @@ composite { composite { object { x=770 - y=191 + y=173 width=274 height=22 } @@ -775,7 +723,7 @@ composite { text { object { x=770 - y=192 + y=174 width=120 height=20 } @@ -788,7 +736,7 @@ composite { "text entry" { object { x=899 - y=191 + y=173 width=60 height=22 } @@ -803,7 +751,7 @@ composite { "text update" { object { x=964 - y=193 + y=175 width=80 height=18 } @@ -886,3 +834,15 @@ composite { } } } +text { + object { + x=728 + y=221 + width=230 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Example: %s%s_%3.3d.jpg" +} diff --git a/ADApp/op/adl/NDFileMagick.adl b/ADApp/op/adl/NDFileMagick.adl index 1e2286b..3132fec 100755 --- a/ADApp/op/adl/NDFileMagick.adl +++ b/ADApp/op/adl/NDFileMagick.adl @@ -5,8 +5,8 @@ file { } display { object { - x=416 - y=86 + x=173 + y=257 width=1070 height=530 } @@ -798,10 +798,114 @@ composite { } } } +composite { + object { + x=789 + y=198 + width=260 + height=20 + } + "composite name"="" + children { + text { + object { + x=789 + y=198 + width=110 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Bit depth" + align="horiz. right" + } + menu { + object { + x=904 + y=198 + width=60 + height=20 + } + control { + chan="$(P)$(R)BitDepth" + clr=14 + bclr=51 + } + } + "text update" { + object { + x=969 + y=199 + width=80 + height=18 + } + monitor { + chan="$(P)$(R)BitDepth_RBV" + clr=54 + bclr=4 + } + limits { + } + } + } +} +composite { + object { + x=789 + y=146 + width=260 + height=20 + } + "composite name"="" + children { + text { + object { + x=789 + y=146 + width=110 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Compression" + align="horiz. right" + } + menu { + object { + x=904 + y=146 + width=60 + height=20 + } + control { + chan="$(P)$(R)CompressType" + clr=14 + bclr=51 + } + } + "text update" { + object { + x=969 + y=147 + width=80 + height=18 + } + monitor { + chan="$(P)$(R)CompressType_RBV" + clr=54 + bclr=4 + } + limits { + } + } + } +} composite { object { x=779 - y=190 + y=171 width=270 height=22 } @@ -810,7 +914,7 @@ composite { text { object { x=779 - y=191 + y=172 width=120 height=20 } @@ -823,7 +927,7 @@ composite { "text entry" { object { x=904 - y=190 + y=171 width=60 height=22 } @@ -838,7 +942,7 @@ composite { "text update" { object { x=969 - y=192 + y=173 width=80 height=18 } @@ -852,96 +956,15 @@ composite { } } } -composite { - object { - x=789 - y=217 - width=260 - height=20 - } - "composite name"="" - children { - text { - object { - x=789 - y=217 - width=110 - height=20 - } - "basic attribute" { - clr=14 - } - textix="Bit depth" - align="horiz. right" - } - menu { - object { - x=904 - y=217 - width=60 - height=20 - } - control { - chan="$(P)$(R)BitDepth" - clr=14 - bclr=51 - } - } - "text update" { - object { - x=969 - y=218 - width=80 - height=18 - } - monitor { - chan="$(P)$(R)BitDepth_RBV" - clr=54 - bclr=4 - } - limits { - } - } - } -} text { object { - x=789 - y=165 - width=110 + x=722 + y=221 + width=230 height=20 } "basic attribute" { clr=14 } - textix="Compression" - align="horiz. right" -} -menu { - object { - x=904 - y=165 - width=60 - height=20 - } - control { - chan="$(P)$(R)CompressType" - clr=14 - bclr=51 - } -} -"text update" { - object { - x=969 - y=166 - width=80 - height=18 - } - monitor { - chan="$(P)$(R)CompressType_RBV" - clr=54 - bclr=4 - } - limits { - } + textix="Example: %s%s_%3.3d.tif" } diff --git a/ADApp/op/adl/NDFileNetCDF.adl b/ADApp/op/adl/NDFileNetCDF.adl index 4c966b9..42fe40c 100755 --- a/ADApp/op/adl/NDFileNetCDF.adl +++ b/ADApp/op/adl/NDFileNetCDF.adl @@ -448,58 +448,6 @@ rectangle { fill="outline" } } -composite { - object { - x=764 - y=221 - width=280 - height=20 - } - "composite name"="" - children { - text { - object { - x=764 - y=221 - width=110 - height=20 - } - "basic attribute" { - clr=14 - } - textix="File format" - align="horiz. right" - } - "text update" { - object { - x=964 - y=222 - width=80 - height=18 - } - monitor { - chan="$(P)$(R)FileFormat_RBV" - clr=54 - bclr=4 - } - limits { - } - } - menu { - object { - x=879 - y=221 - width=80 - height=20 - } - control { - chan="$(P)$(R)FileFormat" - clr=14 - bclr=51 - } - } - } -} text { object { x=807 @@ -850,3 +798,15 @@ composite { } } } +text { + object { + x=722 + y=221 + width=230 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Example: %s%s_%3.3d.nc" +} diff --git a/ADApp/op/adl/NDFileNexus.adl b/ADApp/op/adl/NDFileNexus.adl index be7722d..c1bb763 100755 --- a/ADApp/op/adl/NDFileNexus.adl +++ b/ADApp/op/adl/NDFileNexus.adl @@ -419,7 +419,7 @@ rectangle { composite { object { x=764 - y=221 + y=173 width=280 height=20 } @@ -428,7 +428,7 @@ composite { text { object { x=764 - y=221 + y=173 width=110 height=20 } @@ -441,7 +441,7 @@ composite { "text update" { object { x=964 - y=222 + y=174 width=80 height=18 } @@ -456,7 +456,7 @@ composite { menu { object { x=879 - y=221 + y=173 width=80 height=20 } @@ -979,3 +979,15 @@ composite { limits { } } +text { + object { + x=722 + y=221 + width=230 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Example: %s%s_%3.3d.hdf" +} diff --git a/ADApp/op/adl/NDFileTIFF.adl b/ADApp/op/adl/NDFileTIFF.adl index aad29d6..623b669 100755 --- a/ADApp/op/adl/NDFileTIFF.adl +++ b/ADApp/op/adl/NDFileTIFF.adl @@ -448,58 +448,6 @@ rectangle { fill="outline" } } -composite { - object { - x=764 - y=221 - width=280 - height=20 - } - "composite name"="" - children { - text { - object { - x=764 - y=221 - width=110 - height=20 - } - "basic attribute" { - clr=14 - } - textix="File format" - align="horiz. right" - } - "text update" { - object { - x=964 - y=222 - width=80 - height=18 - } - monitor { - chan="$(P)$(R)FileFormat_RBV" - clr=54 - bclr=4 - } - limits { - } - } - menu { - object { - x=879 - y=221 - width=80 - height=20 - } - control { - chan="$(P)$(R)FileFormat" - clr=14 - bclr=51 - } - } - } -} text { object { x=807 @@ -850,3 +798,15 @@ composite { } } } +text { + object { + x=722 + y=221 + width=230 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Example: %s%s_%3.3d.tif" +}