From 2fdae22d9997e39488f2054856bd6f5c9de63ec1 Mon Sep 17 00:00:00 2001 From: rivers Date: Fri, 2 Dec 2011 00:31:42 +0000 Subject: [PATCH] Added WriteStatus and WriteMessage PVs to display error messages on write or open errors git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14206 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b --- ADApp/op/adl/NDFile.adl | 76 +- ADApp/op/adl/NDFileHDF5.adl | 1637 +++++++++++++++++---------------- ADApp/op/adl/NDFileJPEG.adl | 186 ++-- ADApp/op/adl/NDFileMagick.adl | 74 +- ADApp/op/adl/NDFileNetCDF.adl | 74 +- ADApp/op/adl/NDFileNexus.adl | 347 ++++--- ADApp/op/adl/NDFileNull.adl | 72 +- ADApp/op/adl/NDFileTIFF.adl | 80 +- 8 files changed, 1564 insertions(+), 982 deletions(-) diff --git a/ADApp/op/adl/NDFile.adl b/ADApp/op/adl/NDFile.adl index 61dfc2b..3ab4ad3 100644 --- a/ADApp/op/adl/NDFile.adl +++ b/ADApp/op/adl/NDFile.adl @@ -1,14 +1,14 @@ file { name="/home/epics/devel/areaDetector/ADApp/op/adl/NDFile.adl" - version=030102 + version=030105 } display { object { x=35 y=109 width=685 - height=410 + height=455 } clr=14 bclr=4 @@ -403,7 +403,7 @@ rectangle { x=5 y=40 width=675 - height=360 + height=405 } "basic attribute" { clr=14 @@ -882,3 +882,73 @@ composite { } } } +composite { + object { + x=21 + y=393 + width=654 + height=45 + } + "composite name"="" + children { + text { + object { + x=21 + y=393 + width=140 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Write status" + align="horiz. right" + } + "text update" { + object { + x=170 + y=393 + width=120 + height=20 + } + monitor { + chan="$(P)$(R)WriteStatus" + clr=63 + bclr=4 + } + clrmod="alarm" + format="string" + limits { + } + } + text { + object { + x=21 + y=418 + width=140 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Write message" + align="horiz. right" + } + "text update" { + object { + x=170 + y=421 + width=505 + height=14 + } + monitor { + chan="$(P)$(R)WriteMessage" + clr=20 + bclr=2 + } + format="string" + limits { + } + } + } +} diff --git a/ADApp/op/adl/NDFileHDF5.adl b/ADApp/op/adl/NDFileHDF5.adl index 855a48b..8dab76e 100755 --- a/ADApp/op/adl/NDFileHDF5.adl +++ b/ADApp/op/adl/NDFileHDF5.adl @@ -1,14 +1,14 @@ file { name="/home/epics/devel/areaDetector/ADApp/op/adl/NDFileHDF5.adl" - version=030102 + version=030105 } display { object { - x=642 - y=96 + x=186 + y=88 width=1070 - height=650 + height=695 } clr=14 bclr=4 @@ -441,7 +441,7 @@ rectangle { x=390 y=40 width=675 - height=355 + height=400 } "basic attribute" { clr=14 @@ -810,779 +810,6 @@ text { } textix="Example: %s%s_%3.3d.h5" } -composite { - object { - x=400 - y=483 - width=310 - height=22 - } - "composite name"="" - children { - text { - object { - x=400 - y=484 - width=160 - height=20 - } - "basic attribute" { - clr=14 - } - textix="Data bits offset" - align="horiz. right" - } - "text entry" { - object { - x=564 - y=483 - width=60 - height=22 - } - control { - chan="$(P)$(R)DataBitsOffset" - clr=14 - bclr=51 - } - limits { - } - } - "text update" { - object { - x=630 - y=485 - width=80 - height=18 - } - monitor { - chan="$(P)$(R)DataBitsOffset_RBV" - clr=54 - bclr=4 - } - limits { - } - } - } -} -composite { - object { - x=450 - y=456 - width=260 - height=22 - } - "composite name"="" - children { - text { - object { - x=450 - y=457 - width=110 - height=20 - } - "basic attribute" { - clr=14 - } - textix="# data bits" - align="horiz. right" - } - "text entry" { - object { - x=564 - y=456 - width=60 - height=22 - } - control { - chan="$(P)$(R)NumDataBits" - clr=14 - bclr=51 - } - limits { - } - } - "text update" { - object { - x=630 - y=458 - width=80 - height=18 - } - monitor { - chan="$(P)$(R)NumDataBits_RBV" - clr=54 - bclr=4 - } - limits { - } - } - } -} -composite { - object { - x=430 - y=510 - width=280 - height=22 - } - "composite name"="" - children { - text { - object { - x=430 - y=511 - width=130 - height=20 - } - "basic attribute" { - clr=14 - } - textix="SZip # pixels" - align="horiz. right" - } - "text entry" { - object { - x=564 - y=510 - width=60 - height=22 - } - control { - chan="$(P)$(R)SZipNumPixels" - clr=14 - bclr=51 - } - limits { - } - } - "text update" { - object { - x=630 - y=512 - width=80 - height=18 - } - monitor { - chan="$(P)$(R)SZipNumPixels_RBV" - clr=54 - bclr=4 - } - limits { - } - } - } -} -composite { - object { - x=450 - y=431 - width=260 - height=20 - } - "composite name"="" - children { - text { - object { - x=450 - y=431 - width=110 - height=20 - } - "basic attribute" { - clr=14 - } - textix="Compression" - align="horiz. right" - } - menu { - object { - x=564 - y=431 - width=60 - height=20 - } - control { - chan="$(P)$(R)CompressType" - clr=14 - bclr=51 - } - } - "text update" { - object { - x=630 - y=432 - width=80 - height=18 - } - monitor { - chan="$(P)$(R)CompressType_RBV" - clr=54 - bclr=4 - } - limits { - } - } - } -} -composite { - object { - x=420 - y=404 - width=290 - height=22 - } - "composite name"="" - children { - text { - object { - x=420 - y=405 - width=140 - height=20 - } - "basic attribute" { - clr=14 - } - textix="Rows per chunk" - align="horiz. right" - } - "text entry" { - object { - x=564 - y=404 - width=60 - height=22 - } - control { - chan="$(P)$(R)NumRowChunks" - clr=14 - bclr=51 - } - limits { - } - } - "text update" { - object { - x=630 - y=406 - width=80 - height=18 - } - monitor { - chan="$(P)$(R)NumRowChunks_RBV" - clr=54 - bclr=4 - } - limits { - } - } - } -} -composite { - object { - x=460 - y=537 - width=250 - height=22 - } - "composite name"="" - children { - text { - object { - x=460 - y=538 - width=100 - height=20 - } - "basic attribute" { - clr=14 - } - textix="Zlib level" - align="horiz. right" - } - "text entry" { - object { - x=564 - y=537 - width=60 - height=22 - } - control { - chan="$(P)$(R)ZLevel" - clr=14 - bclr=51 - } - limits { - } - } - "text update" { - object { - x=630 - y=539 - width=80 - height=18 - } - monitor { - chan="$(P)$(R)ZLevel_RBV" - clr=54 - bclr=4 - } - limits { - } - } - } -} -composite { - object { - x=390 - y=564 - width=320 - height=20 - } - "composite name"="" - children { - text { - object { - x=390 - y=564 - width=170 - height=20 - } - "basic attribute" { - clr=14 - } - textix="Store performance" - align="horiz. right" - } - menu { - object { - x=564 - y=564 - width=60 - height=20 - } - control { - chan="$(P)$(R)StorePerform" - clr=14 - bclr=51 - } - } - "text update" { - object { - x=630 - y=565 - width=80 - height=18 - } - monitor { - chan="$(P)$(R)StorePerform_RBV" - clr=54 - bclr=4 - } - limits { - } - } - } -} -composite { - object { - x=400 - y=589 - width=310 - height=20 - } - "composite name"="" - children { - text { - object { - x=400 - y=589 - width=160 - height=20 - } - "basic attribute" { - clr=14 - } - textix="Store attributes" - align="horiz. right" - } - menu { - object { - x=564 - y=589 - width=60 - height=20 - } - control { - chan="$(P)$(R)StoreAttr" - clr=14 - bclr=51 - } - } - "text update" { - object { - x=630 - y=590 - width=80 - height=18 - } - monitor { - chan="$(P)$(R)StoreAttr_RBV" - clr=54 - bclr=4 - } - limits { - } - } - } -} -composite { - object { - x=691 - y=621 - width=175 - height=20 - } - "composite name"="" - children { - "text update" { - object { - x=786 - y=622 - width=80 - height=18 - } - monitor { - chan="$(P)$(R)IOSpeed" - clr=54 - bclr=4 - } - limits { - } - } - text { - object { - x=691 - y=621 - width=90 - height=20 - } - "basic attribute" { - clr=14 - } - textix="I/O speed" - align="horiz. right" - } - } -} -composite { - object { - x=512 - y=621 - width=165 - height=20 - } - "composite name"="" - children { - text { - object { - x=512 - y=621 - width=80 - height=20 - } - "basic attribute" { - clr=14 - } - textix="Run time" - align="horiz. right" - } - "text update" { - object { - x=597 - y=622 - width=80 - height=18 - } - monitor { - chan="$(P)$(R)RunTime" - clr=54 - bclr=4 - } - limits { - } - } - } -} -text { - object { - x=740 - y=458 - width=160 - height=20 - } - "basic attribute" { - clr=14 - } - textix="Size N" - align="horiz. right" -} -"text entry" { - object { - x=904 - y=457 - width=60 - height=22 - } - control { - chan="$(P)$(R)ExtraDimSizeN" - clr=14 - bclr=51 - } - limits { - } -} -"text update" { - object { - x=970 - y=459 - width=80 - height=18 - } - monitor { - chan="$(P)$(R)ExtraDimSizeN_RBV" - clr=54 - bclr=4 - } - limits { - } -} -text { - object { - x=740 - y=485 - width=160 - height=20 - } - "basic attribute" { - clr=14 - } - textix="Name N" - align="horiz. right" -} -text { - object { - x=740 - y=512 - width=160 - height=20 - } - "basic attribute" { - clr=14 - } - textix="Size X" - align="horiz. right" -} -"text entry" { - object { - x=904 - y=511 - width=60 - height=22 - } - control { - chan="$(P)$(R)ExtraDimSizeX" - clr=14 - bclr=51 - } - limits { - } -} -"text update" { - object { - x=970 - y=513 - width=80 - height=18 - } - monitor { - chan="$(P)$(R)ExtraDimSizeX_RBV" - clr=54 - bclr=4 - } - limits { - } -} -text { - object { - x=740 - y=539 - width=160 - height=20 - } - "basic attribute" { - clr=14 - } - textix="Name X" - align="horiz. right" -} -text { - object { - x=740 - y=566 - width=160 - height=20 - } - "basic attribute" { - clr=14 - } - textix="Size Y" - align="horiz. right" -} -"text entry" { - object { - x=904 - y=565 - width=60 - height=22 - } - control { - chan="$(P)$(R)ExtraDimSizeY" - clr=14 - bclr=51 - } - limits { - } -} -"text update" { - object { - x=970 - y=567 - width=80 - height=18 - } - monitor { - chan="$(P)$(R)ExtraDimSizeY_RBV" - clr=54 - bclr=4 - } - limits { - } -} -text { - object { - x=740 - y=593 - width=160 - height=20 - } - "basic attribute" { - clr=14 - } - textix="Name Y" - align="horiz. right" -} -text { - object { - x=720 - y=431 - width=180 - height=20 - } - "basic attribute" { - clr=14 - } - textix="Number (0-2)" - align="horiz. right" -} -"text entry" { - object { - x=904 - y=430 - width=60 - height=22 - } - control { - chan="$(P)$(R)NumExtraDims" - clr=14 - bclr=51 - } - limits { - } -} -"text update" { - object { - x=970 - y=432 - width=80 - height=18 - } - monitor { - chan="$(P)$(R)NumExtraDims_RBV" - clr=54 - bclr=4 - } - limits { - } -} -text { - object { - x=832 - y=403 - width=180 - height=20 - } - "basic attribute" { - clr=14 - } - textix="Extra dimensions" - align="horiz. right" -} -"text update" { - object { - x=904 - y=486 - width=150 - height=18 - } - monitor { - chan="$(P)$(R)ExtraDimNameN_RBV" - clr=54 - bclr=4 - } - limits { - } -} -"text update" { - object { - x=904 - y=540 - width=150 - height=18 - } - monitor { - chan="$(P)$(R)ExtraDimNameX_RBV" - clr=54 - bclr=4 - } - limits { - } -} -"text update" { - object { - x=904 - y=594 - width=150 - height=18 - } - monitor { - chan="$(P)$(R)ExtraDimNameY_RBV" - clr=54 - bclr=4 - } - limits { - } -} composite { object { x=712 @@ -1635,3 +862,857 @@ composite { } } } +composite { + object { + x=390 + y=450 + width=664 + height=238 + } + "composite name"="" + children { + composite { + object { + x=400 + y=530 + width=310 + height=22 + } + "composite name"="" + children { + text { + object { + x=400 + y=531 + width=160 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Data bits offset" + align="horiz. right" + } + "text entry" { + object { + x=564 + y=530 + width=60 + height=22 + } + control { + chan="$(P)$(R)DataBitsOffset" + clr=14 + bclr=51 + } + limits { + } + } + "text update" { + object { + x=630 + y=532 + width=80 + height=18 + } + monitor { + chan="$(P)$(R)DataBitsOffset_RBV" + clr=54 + bclr=4 + } + limits { + } + } + } + } + composite { + object { + x=450 + y=503 + width=260 + height=22 + } + "composite name"="" + children { + text { + object { + x=450 + y=504 + width=110 + height=20 + } + "basic attribute" { + clr=14 + } + textix="# data bits" + align="horiz. right" + } + "text entry" { + object { + x=564 + y=503 + width=60 + height=22 + } + control { + chan="$(P)$(R)NumDataBits" + clr=14 + bclr=51 + } + limits { + } + } + "text update" { + object { + x=630 + y=505 + width=80 + height=18 + } + monitor { + chan="$(P)$(R)NumDataBits_RBV" + clr=54 + bclr=4 + } + limits { + } + } + } + } + composite { + object { + x=430 + y=557 + width=280 + height=22 + } + "composite name"="" + children { + text { + object { + x=430 + y=558 + width=130 + height=20 + } + "basic attribute" { + clr=14 + } + textix="SZip # pixels" + align="horiz. right" + } + "text entry" { + object { + x=564 + y=557 + width=60 + height=22 + } + control { + chan="$(P)$(R)SZipNumPixels" + clr=14 + bclr=51 + } + limits { + } + } + "text update" { + object { + x=630 + y=559 + width=80 + height=18 + } + monitor { + chan="$(P)$(R)SZipNumPixels_RBV" + clr=54 + bclr=4 + } + limits { + } + } + } + } + composite { + object { + x=450 + y=478 + width=260 + height=20 + } + "composite name"="" + children { + text { + object { + x=450 + y=478 + width=110 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Compression" + align="horiz. right" + } + menu { + object { + x=564 + y=478 + width=60 + height=20 + } + control { + chan="$(P)$(R)CompressType" + clr=14 + bclr=51 + } + } + "text update" { + object { + x=630 + y=479 + width=80 + height=18 + } + monitor { + chan="$(P)$(R)CompressType_RBV" + clr=54 + bclr=4 + } + limits { + } + } + } + } + composite { + object { + x=420 + y=451 + width=290 + height=22 + } + "composite name"="" + children { + text { + object { + x=420 + y=452 + width=140 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Rows per chunk" + align="horiz. right" + } + "text entry" { + object { + x=564 + y=451 + width=60 + height=22 + } + control { + chan="$(P)$(R)NumRowChunks" + clr=14 + bclr=51 + } + limits { + } + } + "text update" { + object { + x=630 + y=453 + width=80 + height=18 + } + monitor { + chan="$(P)$(R)NumRowChunks_RBV" + clr=54 + bclr=4 + } + limits { + } + } + } + } + composite { + object { + x=460 + y=584 + width=250 + height=22 + } + "composite name"="" + children { + text { + object { + x=460 + y=585 + width=100 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Zlib level" + align="horiz. right" + } + "text entry" { + object { + x=564 + y=584 + width=60 + height=22 + } + control { + chan="$(P)$(R)ZLevel" + clr=14 + bclr=51 + } + limits { + } + } + "text update" { + object { + x=630 + y=586 + width=80 + height=18 + } + monitor { + chan="$(P)$(R)ZLevel_RBV" + clr=54 + bclr=4 + } + limits { + } + } + } + } + composite { + object { + x=390 + y=611 + width=320 + height=20 + } + "composite name"="" + children { + text { + object { + x=390 + y=611 + width=170 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Store performance" + align="horiz. right" + } + menu { + object { + x=564 + y=611 + width=60 + height=20 + } + control { + chan="$(P)$(R)StorePerform" + clr=14 + bclr=51 + } + } + "text update" { + object { + x=630 + y=612 + width=80 + height=18 + } + monitor { + chan="$(P)$(R)StorePerform_RBV" + clr=54 + bclr=4 + } + limits { + } + } + } + } + composite { + object { + x=400 + y=636 + width=310 + height=20 + } + "composite name"="" + children { + text { + object { + x=400 + y=636 + width=160 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Store attributes" + align="horiz. right" + } + menu { + object { + x=564 + y=636 + width=60 + height=20 + } + control { + chan="$(P)$(R)StoreAttr" + clr=14 + bclr=51 + } + } + "text update" { + object { + x=630 + y=637 + width=80 + height=18 + } + monitor { + chan="$(P)$(R)StoreAttr_RBV" + clr=54 + bclr=4 + } + limits { + } + } + } + } + composite { + object { + x=691 + y=668 + width=175 + height=20 + } + "composite name"="" + children { + "text update" { + object { + x=786 + y=669 + width=80 + height=18 + } + monitor { + chan="$(P)$(R)IOSpeed" + clr=54 + bclr=4 + } + limits { + } + } + text { + object { + x=691 + y=668 + width=90 + height=20 + } + "basic attribute" { + clr=14 + } + textix="I/O speed" + align="horiz. right" + } + } + } + composite { + object { + x=512 + y=668 + width=165 + height=20 + } + "composite name"="" + children { + text { + object { + x=512 + y=668 + width=80 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Run time" + align="horiz. right" + } + "text update" { + object { + x=597 + y=669 + width=80 + height=18 + } + monitor { + chan="$(P)$(R)RunTime" + clr=54 + bclr=4 + } + limits { + } + } + } + } + text { + object { + x=740 + y=505 + width=160 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Size N" + align="horiz. right" + } + "text entry" { + object { + x=904 + y=504 + width=60 + height=22 + } + control { + chan="$(P)$(R)ExtraDimSizeN" + clr=14 + bclr=51 + } + limits { + } + } + "text update" { + object { + x=970 + y=506 + width=80 + height=18 + } + monitor { + chan="$(P)$(R)ExtraDimSizeN_RBV" + clr=54 + bclr=4 + } + limits { + } + } + text { + object { + x=740 + y=532 + width=160 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Name N" + align="horiz. right" + } + text { + object { + x=740 + y=559 + width=160 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Size X" + align="horiz. right" + } + "text entry" { + object { + x=904 + y=558 + width=60 + height=22 + } + control { + chan="$(P)$(R)ExtraDimSizeX" + clr=14 + bclr=51 + } + limits { + } + } + "text update" { + object { + x=970 + y=560 + width=80 + height=18 + } + monitor { + chan="$(P)$(R)ExtraDimSizeX_RBV" + clr=54 + bclr=4 + } + limits { + } + } + text { + object { + x=740 + y=586 + width=160 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Name X" + align="horiz. right" + } + text { + object { + x=740 + y=613 + width=160 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Size Y" + align="horiz. right" + } + "text entry" { + object { + x=904 + y=612 + width=60 + height=22 + } + control { + chan="$(P)$(R)ExtraDimSizeY" + clr=14 + bclr=51 + } + limits { + } + } + "text update" { + object { + x=970 + y=614 + width=80 + height=18 + } + monitor { + chan="$(P)$(R)ExtraDimSizeY_RBV" + clr=54 + bclr=4 + } + limits { + } + } + text { + object { + x=740 + y=640 + width=160 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Name Y" + align="horiz. right" + } + text { + object { + x=720 + y=478 + width=180 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Number (0-2)" + align="horiz. right" + } + "text entry" { + object { + x=904 + y=477 + width=60 + height=22 + } + control { + chan="$(P)$(R)NumExtraDims" + clr=14 + bclr=51 + } + limits { + } + } + "text update" { + object { + x=970 + y=479 + width=80 + height=18 + } + monitor { + chan="$(P)$(R)NumExtraDims_RBV" + clr=54 + bclr=4 + } + limits { + } + } + text { + object { + x=832 + y=450 + width=180 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Extra dimensions" + align="horiz. right" + } + "text update" { + object { + x=904 + y=533 + width=150 + height=18 + } + monitor { + chan="$(P)$(R)ExtraDimNameN_RBV" + clr=54 + bclr=4 + } + limits { + } + } + "text update" { + object { + x=904 + y=587 + width=150 + height=18 + } + monitor { + chan="$(P)$(R)ExtraDimNameX_RBV" + clr=54 + bclr=4 + } + limits { + } + } + "text update" { + object { + x=904 + y=641 + width=150 + height=18 + } + monitor { + chan="$(P)$(R)ExtraDimNameY_RBV" + clr=54 + bclr=4 + } + limits { + } + } + } +} +composite { + object { + x=406 + y=390 + width=654 + height=45 + } + "composite name"="" + children { + text { + object { + x=406 + y=390 + width=140 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Write status" + align="horiz. right" + } + "text update" { + object { + x=555 + y=390 + width=120 + height=20 + } + monitor { + chan="$(P)$(R)WriteStatus" + clr=63 + bclr=4 + } + clrmod="alarm" + format="string" + limits { + } + } + text { + object { + x=406 + y=415 + width=140 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Write message" + align="horiz. right" + } + "text update" { + object { + x=555 + y=418 + width=505 + height=14 + } + monitor { + chan="$(P)$(R)WriteMessage" + clr=20 + bclr=2 + } + format="string" + limits { + } + } + } +} diff --git a/ADApp/op/adl/NDFileJPEG.adl b/ADApp/op/adl/NDFileJPEG.adl index a592c46..91e1ce4 100755 --- a/ADApp/op/adl/NDFileJPEG.adl +++ b/ADApp/op/adl/NDFileJPEG.adl @@ -1,12 +1,12 @@ file { name="/home/epics/devel/areaDetector/ADApp/op/adl/NDFileJPEG.adl" - version=030102 + version=030105 } display { object { - x=48 - y=285 + x=196 + y=183 width=1070 height=530 } @@ -124,7 +124,7 @@ composite { } composite { object { - x=423 + x=417 y=246 width=639 height=20 @@ -133,7 +133,7 @@ composite { children { text { object { - x=423 + x=417 y=246 width=130 height=20 @@ -146,7 +146,7 @@ composite { } "text update" { object { - x=562 + x=556 y=247 width=500 height=18 @@ -164,7 +164,7 @@ composite { } text { object { - x=403 + x=397 y=221 width=150 height=20 @@ -177,7 +177,7 @@ text { } composite { object { - x=562 + x=556 y=198 width=160 height=43 @@ -186,7 +186,7 @@ composite { children { "text update" { object { - x=562 + x=556 y=198 width=160 height=18 @@ -202,7 +202,7 @@ composite { } "text entry" { object { - x=562 + x=556 y=221 width=160 height=20 @@ -220,7 +220,7 @@ composite { } composite { object { - x=413 + x=407 y=173 width=298 height=20 @@ -229,7 +229,7 @@ composite { children { text { object { - x=413 + x=407 y=173 width=140 height=20 @@ -242,7 +242,7 @@ composite { } menu { object { - x=562 + x=556 y=173 width=64 height=20 @@ -255,7 +255,7 @@ composite { } "text update" { object { - x=631 + x=625 y=174 width=80 height=18 @@ -272,7 +272,7 @@ composite { } composite { object { - x=443 + x=437 y=146 width=264 height=22 @@ -281,7 +281,7 @@ composite { children { text { object { - x=443 + x=437 y=147 width=110 height=20 @@ -294,7 +294,7 @@ composite { } "text entry" { object { - x=562 + x=556 y=146 width=60 height=22 @@ -309,7 +309,7 @@ composite { } "text update" { object { - x=627 + x=621 y=148 width=80 height=18 @@ -326,7 +326,7 @@ composite { } text { object { - x=463 + x=457 y=121 width=90 height=20 @@ -339,7 +339,7 @@ text { } "text entry" { object { - x=562 + x=556 y=121 width=500 height=20 @@ -355,7 +355,7 @@ text { } "text update" { object { - x=562 + x=556 y=98 width=500 height=18 @@ -371,7 +371,7 @@ text { } "text update" { object { - x=562 + x=556 y=50 width=380 height=18 @@ -387,7 +387,7 @@ text { } text { object { - x=463 + x=457 y=73 width=90 height=20 @@ -403,7 +403,7 @@ rectangle { x=390 y=40 width=675 - height=355 + height=400 } "basic attribute" { clr=14 @@ -412,7 +412,7 @@ rectangle { } text { object { - x=813 + x=807 y=296 width=90 height=20 @@ -425,7 +425,7 @@ text { } menu { object { - x=907 + x=901 y=296 width=64 height=20 @@ -438,7 +438,7 @@ menu { } "text update" { object { - x=976 + x=970 y=297 width=80 height=18 @@ -453,7 +453,7 @@ menu { } text { object { - x=463 + x=457 y=296 width=90 height=20 @@ -466,7 +466,7 @@ text { } "message button" { object { - x=562 + x=556 y=296 width=60 height=20 @@ -481,7 +481,7 @@ text { } text { object { - x=642 + x=636 y=296 width=90 height=20 @@ -494,7 +494,7 @@ text { } "message button" { object { - x=737 + x=731 y=296 width=60 height=20 @@ -509,7 +509,7 @@ text { } "message button" { object { - x=562 + x=556 y=366 width=59 height=20 @@ -524,7 +524,7 @@ text { } text { object { - x=482 + x=476 y=366 width=70 height=20 @@ -537,7 +537,7 @@ text { } "message button" { object { - x=629 + x=623 y=366 width=59 height=20 @@ -552,7 +552,7 @@ text { } text { object { - x=413 + x=407 y=322 width=140 height=20 @@ -565,7 +565,7 @@ text { } menu { object { - x=562 + x=556 y=322 width=80 height=20 @@ -578,7 +578,7 @@ menu { } "text update" { object { - x=650 + x=644 y=323 width=70 height=18 @@ -593,7 +593,7 @@ menu { } composite { object { - x=725 + x=719 y=321 width=339 height=22 @@ -602,7 +602,7 @@ composite { children { text { object { - x=725 + x=719 y=322 width=90 height=20 @@ -615,7 +615,7 @@ composite { } "text entry" { object { - x=824 + x=818 y=321 width=60 height=22 @@ -630,7 +630,7 @@ composite { } "text update" { object { - x=984 + x=978 y=323 width=80 height=18 @@ -645,7 +645,7 @@ composite { } "text update" { object { - x=889 + x=883 y=323 width=80 height=18 @@ -662,7 +662,7 @@ composite { } "text update" { object { - x=562 + x=556 y=274 width=100 height=20 @@ -679,7 +679,7 @@ composite { } "text update" { object { - x=737 + x=731 y=274 width=100 height=20 @@ -696,7 +696,7 @@ composite { } "text update" { object { - x=562 + x=556 y=344 width=100 height=20 @@ -713,7 +713,7 @@ composite { } composite { object { - x=770 + x=764 y=173 width=274 height=22 @@ -722,7 +722,7 @@ composite { children { text { object { - x=770 + x=764 y=174 width=120 height=20 @@ -735,7 +735,7 @@ composite { } "text entry" { object { - x=899 + x=893 y=173 width=60 height=22 @@ -750,7 +750,7 @@ composite { } "text update" { object { - x=964 + x=958 y=175 width=80 height=18 @@ -781,7 +781,7 @@ composite { } "text entry" { object { - x=562 + x=556 y=73 width=500 height=20 @@ -797,7 +797,7 @@ composite { } composite { object { - x=945 + x=939 y=50 width=115 height=20 @@ -806,7 +806,7 @@ composite { children { text { object { - x=945 + x=939 y=50 width=70 height=20 @@ -818,7 +818,7 @@ composite { } "text update" { object { - x=1020 + x=1014 y=50 width=40 height=20 @@ -836,7 +836,7 @@ composite { } text { object { - x=728 + x=722 y=221 width=230 height=20 @@ -848,7 +848,7 @@ text { } composite { object { - x=712 + x=706 y=366 width=338 height=20 @@ -857,7 +857,7 @@ composite { children { menu { object { - x=901 + x=895 y=366 width=64 height=20 @@ -870,7 +870,7 @@ composite { } text { object { - x=712 + x=706 y=366 width=180 height=20 @@ -883,7 +883,7 @@ composite { } "text update" { object { - x=970 + x=964 y=367 width=80 height=18 @@ -898,3 +898,73 @@ composite { } } } +composite { + object { + x=406 + y=391 + width=654 + height=45 + } + "composite name"="" + children { + text { + object { + x=406 + y=391 + width=140 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Write status" + align="horiz. right" + } + "text update" { + object { + x=555 + y=391 + width=120 + height=20 + } + monitor { + chan="$(P)$(R)WriteStatus" + clr=63 + bclr=4 + } + clrmod="alarm" + format="string" + limits { + } + } + text { + object { + x=406 + y=416 + width=140 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Write message" + align="horiz. right" + } + "text update" { + object { + x=555 + y=419 + width=505 + height=14 + } + monitor { + chan="$(P)$(R)WriteMessage" + clr=20 + bclr=2 + } + format="string" + limits { + } + } + } +} diff --git a/ADApp/op/adl/NDFileMagick.adl b/ADApp/op/adl/NDFileMagick.adl index 8c8093a..c2003e4 100755 --- a/ADApp/op/adl/NDFileMagick.adl +++ b/ADApp/op/adl/NDFileMagick.adl @@ -1,7 +1,7 @@ file { name="/home/epics/devel/areaDetector/ADApp/op/adl/NDFileMagick.adl" - version=030102 + version=030105 } display { object { @@ -441,7 +441,7 @@ rectangle { x=390 y=40 width=675 - height=355 + height=400 } "basic attribute" { clr=14 @@ -1020,3 +1020,73 @@ composite { } } } +composite { + object { + x=407 + y=391 + width=654 + height=45 + } + "composite name"="" + children { + text { + object { + x=407 + y=391 + width=140 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Write status" + align="horiz. right" + } + "text update" { + object { + x=556 + y=391 + width=120 + height=20 + } + monitor { + chan="$(P)$(R)WriteStatus" + clr=63 + bclr=4 + } + clrmod="alarm" + format="string" + limits { + } + } + text { + object { + x=407 + y=416 + width=140 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Write message" + align="horiz. right" + } + "text update" { + object { + x=556 + y=419 + width=505 + height=14 + } + monitor { + chan="$(P)$(R)WriteMessage" + clr=20 + bclr=2 + } + format="string" + limits { + } + } + } +} diff --git a/ADApp/op/adl/NDFileNetCDF.adl b/ADApp/op/adl/NDFileNetCDF.adl index 0d8f165..e8a5223 100755 --- a/ADApp/op/adl/NDFileNetCDF.adl +++ b/ADApp/op/adl/NDFileNetCDF.adl @@ -1,7 +1,7 @@ file { name="/home/epics/devel/areaDetector/ADApp/op/adl/NDFileNetCDF.adl" - version=030102 + version=030105 } display { object { @@ -441,7 +441,7 @@ rectangle { x=390 y=40 width=675 - height=355 + height=400 } "basic attribute" { clr=14 @@ -862,3 +862,73 @@ composite { } } } +composite { + object { + x=407 + y=391 + width=654 + height=45 + } + "composite name"="" + children { + text { + object { + x=407 + y=391 + width=140 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Write status" + align="horiz. right" + } + "text update" { + object { + x=556 + y=391 + width=120 + height=20 + } + monitor { + chan="$(P)$(R)WriteStatus" + clr=63 + bclr=4 + } + clrmod="alarm" + format="string" + limits { + } + } + text { + object { + x=407 + y=416 + width=140 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Write message" + align="horiz. right" + } + "text update" { + object { + x=556 + y=419 + width=505 + height=14 + } + monitor { + chan="$(P)$(R)WriteMessage" + clr=20 + bclr=2 + } + format="string" + limits { + } + } + } +} diff --git a/ADApp/op/adl/NDFileNexus.adl b/ADApp/op/adl/NDFileNexus.adl index f62c403..d1e13b2 100755 --- a/ADApp/op/adl/NDFileNexus.adl +++ b/ADApp/op/adl/NDFileNexus.adl @@ -1,14 +1,14 @@ file { name="/home/epics/devel/areaDetector/ADApp/op/adl/NDFileNexus.adl" - version=030102 + version=030105 } display { object { x=199 y=87 width=1070 - height=530 + height=570 } clr=14 bclr=4 @@ -409,7 +409,7 @@ rectangle { x=390 y=40 width=675 - height=360 + height=405 } "basic attribute" { clr=14 @@ -582,7 +582,7 @@ text { } text { object { - x=476 + x=477 y=366 width=70 height=20 @@ -779,135 +779,6 @@ composite { "composite name"="" "composite file"="NDPluginBase.adl" } -rectangle { - object { - x=589 - y=409 - width=470 - height=100 - } - "basic attribute" { - clr=20 - } - "dynamic attribute" { - vis="if zero" - calc="A" - chan="$(P)$(R)FileTemplateValid" - } -} -rectangle { - object { - x=390 - y=405 - width=675 - height=110 - } - "basic attribute" { - clr=14 - fill="outline" - } -} -composite { - object { - x=406 - y=413 - width=635 - height=91 - } - "composite name"="" - children { - "text entry" { - object { - x=591 - y=436 - width=450 - height=20 - } - control { - chan="$(P)$(R)TemplateFilePath" - clr=14 - bclr=51 - } - format="string" - limits { - } - } - "text update" { - object { - x=591 - y=413 - width=450 - height=18 - } - monitor { - chan="$(P)$(R)TemplateFilePath_RBV" - clr=54 - bclr=4 - } - format="string" - limits { - } - } - "text entry" { - object { - x=591 - y=484 - width=450 - height=20 - } - control { - chan="$(P)$(R)TemplateFileName" - clr=14 - bclr=51 - } - format="string" - limits { - } - } - "text update" { - object { - x=591 - y=461 - width=450 - height=18 - } - monitor { - chan="$(P)$(R)TemplateFileName_RBV" - clr=54 - bclr=4 - } - format="string" - limits { - } - } - text { - object { - x=406 - y=436 - width=176 - height=20 - } - "basic attribute" { - clr=14 - } - textix="Template file path" - align="horiz. right" - } - text { - object { - x=406 - y=484 - width=176 - height=20 - } - "basic attribute" { - clr=14 - } - textix="Template file name" - align="horiz. right" - } - } -} composite { object { x=945 @@ -1043,3 +914,213 @@ composite { } } } +composite { + object { + x=390 + y=450 + width=675 + height=110 + } + "composite name"="" + children { + rectangle { + object { + x=589 + y=454 + width=470 + height=100 + } + "basic attribute" { + clr=20 + } + "dynamic attribute" { + vis="if zero" + calc="A" + chan="$(P)$(R)FileTemplateValid" + } + } + rectangle { + object { + x=390 + y=450 + width=675 + height=110 + } + "basic attribute" { + clr=14 + fill="outline" + } + } + composite { + object { + x=406 + y=458 + width=635 + height=91 + } + "composite name"="" + children { + "text entry" { + object { + x=591 + y=481 + width=450 + height=20 + } + control { + chan="$(P)$(R)TemplateFilePath" + clr=14 + bclr=51 + } + format="string" + limits { + } + } + "text update" { + object { + x=591 + y=458 + width=450 + height=18 + } + monitor { + chan="$(P)$(R)TemplateFilePath_RBV" + clr=54 + bclr=4 + } + format="string" + limits { + } + } + "text entry" { + object { + x=591 + y=529 + width=450 + height=20 + } + control { + chan="$(P)$(R)TemplateFileName" + clr=14 + bclr=51 + } + format="string" + limits { + } + } + "text update" { + object { + x=591 + y=506 + width=450 + height=18 + } + monitor { + chan="$(P)$(R)TemplateFileName_RBV" + clr=54 + bclr=4 + } + format="string" + limits { + } + } + text { + object { + x=406 + y=481 + width=176 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Template file path" + align="horiz. right" + } + text { + object { + x=406 + y=529 + width=176 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Template file name" + align="horiz. right" + } + } + } + } +} +composite { + object { + x=407 + y=391 + width=654 + height=45 + } + "composite name"="" + children { + text { + object { + x=407 + y=391 + width=140 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Write status" + align="horiz. right" + } + "text update" { + object { + x=556 + y=391 + width=120 + height=20 + } + monitor { + chan="$(P)$(R)WriteStatus" + clr=63 + bclr=4 + } + clrmod="alarm" + format="string" + limits { + } + } + text { + object { + x=407 + y=416 + width=140 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Write message" + align="horiz. right" + } + "text update" { + object { + x=556 + y=419 + width=505 + height=14 + } + monitor { + chan="$(P)$(R)WriteMessage" + clr=20 + bclr=2 + } + format="string" + limits { + } + } + } +} diff --git a/ADApp/op/adl/NDFileNull.adl b/ADApp/op/adl/NDFileNull.adl index ab3733b..3639f2f 100644 --- a/ADApp/op/adl/NDFileNull.adl +++ b/ADApp/op/adl/NDFileNull.adl @@ -441,7 +441,7 @@ rectangle { x=390 y=40 width=675 - height=355 + height=400 } "basic attribute" { clr=14 @@ -862,3 +862,73 @@ composite { } } } +composite { + object { + x=407 + y=391 + width=654 + height=45 + } + "composite name"="" + children { + text { + object { + x=407 + y=391 + width=140 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Write status" + align="horiz. right" + } + "text update" { + object { + x=556 + y=391 + width=120 + height=20 + } + monitor { + chan="$(P)$(R)WriteStatus" + clr=63 + bclr=4 + } + clrmod="alarm" + format="string" + limits { + } + } + text { + object { + x=407 + y=416 + width=140 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Write message" + align="horiz. right" + } + "text update" { + object { + x=556 + y=419 + width=505 + height=14 + } + monitor { + chan="$(P)$(R)WriteMessage" + clr=20 + bclr=2 + } + format="string" + limits { + } + } + } +} diff --git a/ADApp/op/adl/NDFileTIFF.adl b/ADApp/op/adl/NDFileTIFF.adl index f52cc79..8cb6644 100755 --- a/ADApp/op/adl/NDFileTIFF.adl +++ b/ADApp/op/adl/NDFileTIFF.adl @@ -1,12 +1,12 @@ file { name="/home/epics/devel/areaDetector/ADApp/op/adl/NDFileTIFF.adl" - version=030102 + version=030105 } display { object { - x=716 - y=108 + x=386 + y=126 width=1070 height=530 } @@ -441,7 +441,7 @@ rectangle { x=390 y=40 width=675 - height=355 + height=405 } "basic attribute" { clr=14 @@ -562,7 +562,7 @@ text { } text { object { - x=476 + x=477 y=366 width=70 height=20 @@ -862,3 +862,73 @@ composite { } } } +composite { + object { + x=407 + y=393 + width=654 + height=45 + } + "composite name"="" + children { + text { + object { + x=407 + y=393 + width=140 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Write status" + align="horiz. right" + } + "text update" { + object { + x=556 + y=393 + width=120 + height=20 + } + monitor { + chan="$(P)$(R)WriteStatus" + clr=63 + bclr=4 + } + clrmod="alarm" + format="string" + limits { + } + } + text { + object { + x=407 + y=418 + width=140 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Write message" + align="horiz. right" + } + "text update" { + object { + x=556 + y=421 + width=505 + height=14 + } + monitor { + chan="$(P)$(R)WriteMessage" + clr=20 + bclr=2 + } + format="string" + limits { + } + } + } +}