diff --git a/ADApp/op/adl/NDFile.adl b/ADApp/op/adl/NDFile.adl index 8ebf7dd..dc2e023 100644 --- a/ADApp/op/adl/NDFile.adl +++ b/ADApp/op/adl/NDFile.adl @@ -1,12 +1,12 @@ file { - name="/home/epics/devel/areaDetector/1-4beta/ADApp/op/adl/NDFile.adl" + name="/home/epics/devel/areaDetector/ADApp/op/adl/NDFile.adl" version=030102 } display { object { - x=126 - y=517 + x=318 + y=143 width=685 height=405 } @@ -324,139 +324,79 @@ composite { } } } -composite { +text { object { x=72 - y=98 - width=599 - height=43 + y=121 + width=90 + height=20 } - "composite name"="" - children { - text { - object { - x=72 - y=121 - width=90 - height=20 - } - "basic attribute" { - clr=14 - } - textix="File name" - align="horiz. right" - } - composite { - object { - x=171 - y=98 - width=500 - height=43 - } - "composite name"="" - children { - "text entry" { - object { - x=171 - y=121 - width=500 - height=20 - } - control { - chan="$(P)$(R)FileName" - clr=14 - bclr=51 - } - format="string" - limits { - } - } - "text update" { - object { - x=171 - y=98 - width=500 - height=18 - } - monitor { - chan="$(P)$(R)FileName_RBV" - clr=54 - bclr=4 - } - format="string" - limits { - } - } - } - } + "basic attribute" { + clr=14 + } + textix="File name" + align="horiz. right" +} +"text entry" { + object { + x=171 + y=121 + width=500 + height=20 + } + control { + chan="$(P)$(R)FileName" + clr=14 + bclr=51 + } + format="string" + limits { } } -composite { +"text update" { + object { + x=171 + y=98 + width=500 + height=18 + } + monitor { + chan="$(P)$(R)FileName_RBV" + clr=54 + bclr=4 + } + format="string" + limits { + } +} +"text update" { + object { + x=171 + y=50 + width=385 + height=18 + } + monitor { + chan="$(P)$(R)FilePath_RBV" + clr=54 + bclr=4 + } + format="string" + limits { + } +} +text { object { x=72 - y=50 - width=599 - height=43 + y=73 + width=90 + height=20 } - "composite name"="" - children { - composite { - object { - x=171 - y=50 - width=500 - height=43 - } - "composite name"="" - children { - "text entry" { - object { - x=171 - y=73 - width=500 - height=20 - } - control { - chan="$(P)$(R)FilePath" - clr=14 - bclr=51 - } - format="string" - limits { - } - } - "text update" { - object { - x=171 - y=50 - width=500 - height=18 - } - monitor { - chan="$(P)$(R)FilePath_RBV" - clr=54 - bclr=4 - } - format="string" - limits { - } - } - } - } - text { - object { - x=72 - y=73 - width=90 - height=20 - } - "basic attribute" { - clr=14 - } - textix="File path" - align="horiz. right" - } + "basic attribute" { + clr=14 } + textix="File path" + align="horiz. right" } rectangle { object { @@ -823,3 +763,58 @@ composite { } } } +"text entry" { + object { + x=171 + y=73 + width=500 + height=20 + } + control { + chan="$(P)$(R)FilePath" + clr=14 + bclr=51 + } + format="string" + limits { + } +} +composite { + object { + x=560 + y=50 + width=115 + height=20 + } + "composite name"="" + children { + text { + object { + x=560 + y=50 + width=70 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Exists:" + } + "text update" { + object { + x=635 + y=50 + width=40 + height=20 + } + monitor { + chan="$(P)$(R)FilePathExists_RBV" + clr=14 + bclr=2 + } + clrmod="alarm" + limits { + } + } + } +} diff --git a/ADApp/op/adl/NDFileJPEG.adl b/ADApp/op/adl/NDFileJPEG.adl index 849d2f3..5e995d7 100755 --- a/ADApp/op/adl/NDFileJPEG.adl +++ b/ADApp/op/adl/NDFileJPEG.adl @@ -5,8 +5,8 @@ file { } display { object { - x=496 - y=86 + x=48 + y=285 width=1070 height=530 } @@ -324,139 +324,79 @@ composite { } } } -composite { +text { object { x=463 - y=98 - width=599 - height=43 + y=121 + width=90 + height=20 } - "composite name"="" - children { - text { - object { - x=463 - y=121 - width=90 - height=20 - } - "basic attribute" { - clr=14 - } - textix="File name" - align="horiz. right" - } - composite { - object { - x=562 - y=98 - width=500 - height=43 - } - "composite name"="" - children { - "text entry" { - object { - x=562 - y=121 - width=500 - height=20 - } - control { - chan="$(P)$(R)FileName" - clr=14 - bclr=51 - } - format="string" - limits { - } - } - "text update" { - object { - x=562 - y=98 - width=500 - height=18 - } - monitor { - chan="$(P)$(R)FileName_RBV" - clr=54 - bclr=4 - } - format="string" - limits { - } - } - } - } + "basic attribute" { + clr=14 + } + textix="File name" + align="horiz. right" +} +"text entry" { + object { + x=562 + y=121 + width=500 + height=20 + } + control { + chan="$(P)$(R)FileName" + clr=14 + bclr=51 + } + format="string" + limits { } } -composite { +"text update" { + object { + x=562 + y=98 + width=500 + height=18 + } + monitor { + chan="$(P)$(R)FileName_RBV" + clr=54 + bclr=4 + } + format="string" + limits { + } +} +"text update" { + object { + x=562 + y=50 + width=380 + height=18 + } + monitor { + chan="$(P)$(R)FilePath_RBV" + clr=54 + bclr=4 + } + format="string" + limits { + } +} +text { object { x=463 - y=50 - width=599 - height=43 + y=73 + width=90 + height=20 } - "composite name"="" - children { - composite { - object { - x=562 - y=50 - width=500 - height=43 - } - "composite name"="" - children { - "text entry" { - object { - x=562 - y=73 - width=500 - height=20 - } - control { - chan="$(P)$(R)FilePath" - clr=14 - bclr=51 - } - format="string" - limits { - } - } - "text update" { - object { - x=562 - y=50 - width=500 - height=18 - } - monitor { - chan="$(P)$(R)FilePath_RBV" - clr=54 - bclr=4 - } - format="string" - limits { - } - } - } - } - text { - object { - x=463 - y=73 - width=90 - height=20 - } - "basic attribute" { - clr=14 - } - textix="File path" - align="horiz. right" - } + "basic attribute" { + clr=14 } + textix="File path" + align="horiz. right" } rectangle { object { @@ -891,3 +831,58 @@ composite { "composite name"="" "composite file"="NDPluginBase.adl" } +"text entry" { + object { + x=562 + y=73 + width=500 + height=20 + } + control { + chan="$(P)$(R)FilePath" + clr=14 + bclr=51 + } + format="string" + limits { + } +} +composite { + object { + x=945 + y=50 + width=115 + height=20 + } + "composite name"="" + children { + text { + object { + x=945 + y=50 + width=70 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Exists:" + } + "text update" { + object { + x=1020 + y=50 + width=40 + height=20 + } + monitor { + chan="$(P)$(R)FilePathExists_RBV" + clr=14 + bclr=2 + } + clrmod="alarm" + limits { + } + } + } +} diff --git a/ADApp/op/adl/NDFileNetCDF.adl b/ADApp/op/adl/NDFileNetCDF.adl index 5cccc9e..4c966b9 100755 --- a/ADApp/op/adl/NDFileNetCDF.adl +++ b/ADApp/op/adl/NDFileNetCDF.adl @@ -87,6 +87,51 @@ display { 1a7309, } } +"text entry" { + object { + x=556 + y=73 + width=500 + height=20 + } + control { + chan="$(P)$(R)FilePath" + clr=14 + bclr=51 + } + format="string" + limits { + } +} +"text update" { + object { + x=556 + y=50 + width=385 + height=18 + } + monitor { + chan="$(P)$(R)FilePath_RBV" + clr=54 + bclr=4 + } + format="string" + limits { + } +} +text { + object { + x=457 + y=73 + width=90 + height=20 + } + "basic attribute" { + clr=14 + } + textix="File path" + align="horiz. right" +} composite { object { x=360 @@ -391,73 +436,6 @@ composite { } } } -composite { - object { - x=457 - y=50 - width=599 - height=43 - } - "composite name"="" - children { - composite { - object { - x=556 - y=50 - width=500 - height=43 - } - "composite name"="" - children { - "text entry" { - object { - x=556 - y=73 - width=500 - height=20 - } - control { - chan="$(P)$(R)FilePath" - clr=14 - bclr=51 - } - format="string" - limits { - } - } - "text update" { - object { - x=556 - y=50 - width=500 - height=18 - } - monitor { - chan="$(P)$(R)FilePath_RBV" - clr=54 - bclr=4 - } - format="string" - limits { - } - } - } - } - text { - object { - x=457 - y=73 - width=90 - height=20 - } - "basic attribute" { - clr=14 - } - textix="File path" - align="horiz. right" - } - } -} rectangle { object { x=390 @@ -833,3 +811,42 @@ composite { "composite name"="" "composite file"="NDPluginBase.adl" } +composite { + object { + x=945 + y=50 + width=115 + height=20 + } + "composite name"="" + children { + text { + object { + x=945 + y=50 + width=70 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Exists:" + } + "text update" { + object { + x=1020 + y=50 + width=40 + height=20 + } + monitor { + chan="$(P)$(R)FilePathExists_RBV" + clr=14 + bclr=2 + } + clrmod="alarm" + limits { + } + } + } +} diff --git a/ADApp/op/adl/NDFileNexus.adl b/ADApp/op/adl/NDFileNexus.adl index dd5141f..be7722d 100755 --- a/ADApp/op/adl/NDFileNexus.adl +++ b/ADApp/op/adl/NDFileNexus.adl @@ -391,72 +391,18 @@ composite { } } } -composite { +text { object { x=457 - y=50 - width=599 - height=43 + y=73 + width=90 + height=20 } - "composite name"="" - children { - composite { - object { - x=556 - y=50 - width=500 - height=43 - } - "composite name"="" - children { - "text entry" { - object { - x=556 - y=73 - width=500 - height=20 - } - control { - chan="$(P)$(R)FilePath" - clr=14 - bclr=51 - } - format="string" - limits { - } - } - "text update" { - object { - x=556 - y=50 - width=500 - height=18 - } - monitor { - chan="$(P)$(R)FilePath_RBV" - clr=54 - bclr=4 - } - format="string" - limits { - } - } - } - } - text { - object { - x=457 - y=73 - width=90 - height=20 - } - "basic attribute" { - clr=14 - } - textix="File path" - align="horiz. right" - } + "basic attribute" { + clr=14 } + textix="File path" + align="horiz. right" } rectangle { object { @@ -962,3 +908,74 @@ composite { } } } +composite { + object { + x=945 + y=50 + width=115 + height=20 + } + "composite name"="" + children { + text { + object { + x=945 + y=50 + width=70 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Exists:" + } + "text update" { + object { + x=1020 + y=50 + width=40 + height=20 + } + monitor { + chan="$(P)$(R)FilePathExists_RBV" + clr=14 + bclr=2 + } + clrmod="alarm" + limits { + } + } + } +} +"text entry" { + object { + x=556 + y=73 + width=500 + height=20 + } + control { + chan="$(P)$(R)FilePath" + clr=14 + bclr=51 + } + format="string" + limits { + } +} +"text update" { + object { + x=556 + y=50 + width=385 + height=18 + } + monitor { + chan="$(P)$(R)FilePath_RBV" + clr=54 + bclr=4 + } + format="string" + limits { + } +} diff --git a/ADApp/op/adl/NDFileTIFF.adl b/ADApp/op/adl/NDFileTIFF.adl index d4c5e7d..aad29d6 100755 --- a/ADApp/op/adl/NDFileTIFF.adl +++ b/ADApp/op/adl/NDFileTIFF.adl @@ -391,72 +391,50 @@ composite { } } } -composite { +"text entry" { + object { + x=556 + y=73 + width=500 + height=20 + } + control { + chan="$(P)$(R)FilePath" + clr=14 + bclr=51 + } + format="string" + limits { + } +} +"text update" { + object { + x=556 + y=50 + width=385 + height=18 + } + monitor { + chan="$(P)$(R)FilePath_RBV" + clr=54 + bclr=4 + } + format="string" + limits { + } +} +text { object { x=457 - y=50 - width=599 - height=43 + y=73 + width=90 + height=20 } - "composite name"="" - children { - composite { - object { - x=556 - y=50 - width=500 - height=43 - } - "composite name"="" - children { - "text entry" { - object { - x=556 - y=73 - width=500 - height=20 - } - control { - chan="$(P)$(R)FilePath" - clr=14 - bclr=51 - } - format="string" - limits { - } - } - "text update" { - object { - x=556 - y=50 - width=500 - height=18 - } - monitor { - chan="$(P)$(R)FilePath_RBV" - clr=54 - bclr=4 - } - format="string" - limits { - } - } - } - } - text { - object { - x=457 - y=73 - width=90 - height=20 - } - "basic attribute" { - clr=14 - } - textix="File path" - align="horiz. right" - } + "basic attribute" { + clr=14 } + textix="File path" + align="horiz. right" } rectangle { object { @@ -833,3 +811,42 @@ composite { "composite name"="" "composite file"="NDPluginBase.adl" } +composite { + object { + x=945 + y=50 + width=115 + height=20 + } + "composite name"="" + children { + text { + object { + x=945 + y=50 + width=70 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Exists:" + } + "text update" { + object { + x=1020 + y=50 + width=40 + height=20 + } + monitor { + chan="$(P)$(R)FilePathExists_RBV" + clr=14 + bclr=2 + } + clrmod="alarm" + limits { + } + } + } +} diff --git a/ADApp/op/adl/RoperFile.adl b/ADApp/op/adl/RoperFile.adl index 84c8ea7..b28493e 100644 --- a/ADApp/op/adl/RoperFile.adl +++ b/ADApp/op/adl/RoperFile.adl @@ -1,6 +1,6 @@ file { - name="/home/epics/devel/areaDetector/1-4beta/ADApp/op/adl/RoperFile.adl" + name="/home/epics/devel/areaDetector/ADApp/op/adl/RoperFile.adl" version=030102 } display { @@ -391,72 +391,50 @@ composite { } } } -composite { +"text entry" { + object { + x=171 + y=73 + width=500 + height=20 + } + control { + chan="$(P)$(R)FilePath" + clr=14 + bclr=51 + } + format="string" + limits { + } +} +"text update" { + object { + x=171 + y=50 + width=385 + height=18 + } + monitor { + chan="$(P)$(R)FilePath_RBV" + clr=54 + bclr=4 + } + format="string" + limits { + } +} +text { object { x=72 - y=50 - width=599 - height=43 + y=73 + width=90 + height=20 } - "composite name"="" - children { - composite { - object { - x=171 - y=50 - width=500 - height=43 - } - "composite name"="" - children { - "text entry" { - object { - x=171 - y=73 - width=500 - height=20 - } - control { - chan="$(P)$(R)FilePath" - clr=14 - bclr=51 - } - format="string" - limits { - } - } - "text update" { - object { - x=171 - y=50 - width=500 - height=18 - } - monitor { - chan="$(P)$(R)FilePath_RBV" - clr=54 - bclr=4 - } - format="string" - limits { - } - } - } - } - text { - object { - x=72 - y=73 - width=90 - height=20 - } - "basic attribute" { - clr=14 - } - textix="File path" - align="horiz. right" - } + "basic attribute" { + clr=14 } + textix="File path" + align="horiz. right" } rectangle { object { @@ -900,3 +878,42 @@ composite { } } } +composite { + object { + x=560 + y=50 + width=115 + height=20 + } + "composite name"="" + children { + text { + object { + x=560 + y=50 + width=70 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Exists:" + } + "text update" { + object { + x=635 + y=50 + width=40 + height=20 + } + monitor { + chan="$(P)$(R)FilePathExists_RBV" + clr=14 + bclr=2 + } + clrmod="alarm" + limits { + } + } + } +} diff --git a/ADApp/op/adl/mar345.adl b/ADApp/op/adl/mar345.adl index 7b3b37f..1ccacaa 100644 --- a/ADApp/op/adl/mar345.adl +++ b/ADApp/op/adl/mar345.adl @@ -87,6 +87,22 @@ display { 1a7309, } } +"text update" { + object { + x=174 + y=770 + width=395 + height=18 + } + monitor { + chan="$(P)$(R)FilePath_RBV" + clr=54 + bclr=4 + } + format="string" + limits { + } +} rectangle { object { x=50 @@ -540,211 +556,211 @@ composite { } } } -composite { +rectangle { + object { + x=297 + y=567 + width=107 + height=21 + } + "basic attribute" { + clr=2 + } +} +"message button" { + object { + x=369 + y=680 + width=120 + height=20 + } + control { + chan="$(P)$(R)Abort" + clr=14 + bclr=20 + } + label="Abort operation" + press_msg="1" +} +text { + object { + x=271 + y=568 + width=159 + height=20 + } + "basic attribute" { + clr=54 + } + textix="Erase" + align="horiz. centered" +} +rectangle { object { x=5 y=565 width=690 - height=425 + height=80 + } + "basic attribute" { + clr=14 + fill="outline" + } +} +rectangle { + object { + x=299 + y=651 + width=105 + height=21 + } + "basic attribute" { + clr=2 + } +} +rectangle { + object { + x=5 + y=650 + width=690 + height=105 + } + "basic attribute" { + clr=14 + fill="outline" + } +} +text { + object { + x=272 + y=651 + width=157 + height=20 + } + "basic attribute" { + clr=54 + } + textix="Status" + align="horiz. centered" +} +text { + object { + x=17 + y=680 + width=140 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Detector state" + align="horiz. right" +} +"text update" { + object { + x=164 + y=680 + width=158 + height=18 + } + monitor { + chan="$(P)$(R)DetectorState_RBV" + clr=54 + bclr=4 + } + clrmod="alarm" + limits { + } +} +composite { + object { + x=36 + y=705 + width=653 + height=20 } "composite name"="" children { - rectangle { - object { - x=297 - y=567 - width=107 - height=21 - } - "basic attribute" { - clr=2 - } - } - "message button" { - object { - x=369 - y=680 - width=120 - height=20 - } - control { - chan="$(P)$(R)Abort" - clr=14 - bclr=20 - } - label="Abort operation" - press_msg="1" - } text { object { - x=271 - y=568 - width=159 - height=20 - } - "basic attribute" { - clr=54 - } - textix="Erase" - align="horiz. centered" - } - rectangle { - object { - x=5 - y=565 - width=690 - height=80 - } - "basic attribute" { - clr=14 - fill="outline" - } - } - rectangle { - object { - x=299 - y=651 - width=105 - height=21 - } - "basic attribute" { - clr=2 - } - } - rectangle { - object { - x=5 - y=650 - width=690 - height=105 - } - "basic attribute" { - clr=14 - fill="outline" - } - } - text { - object { - x=272 - y=651 - width=157 - height=20 - } - "basic attribute" { - clr=54 - } - textix="Status" - align="horiz. centered" - } - text { - object { - x=17 - y=680 - width=140 + x=36 + y=705 + width=100 height=20 } "basic attribute" { clr=14 } - textix="Detector state" + textix="To mar345:" align="horiz. right" } "text update" { object { - x=164 - y=680 - width=158 - height=18 + x=139 + y=707 + width=550 + height=14 } monitor { - chan="$(P)$(R)DetectorState_RBV" - clr=54 - bclr=4 + chan="$(P)$(R)StringToServer_RBV" + clr=14 + bclr=51 } - clrmod="alarm" + format="string" limits { } } - composite { + } +} +composite { + object { + x=16 + y=730 + width=673 + height=20 + } + "composite name"="" + children { + "text update" { object { - x=36 - y=705 - width=653 - height=20 + x=139 + y=732 + width=550 + height=14 } - "composite name"="" - children { - text { - object { - x=36 - y=705 - width=100 - height=20 - } - "basic attribute" { - clr=14 - } - textix="To mar345:" - align="horiz. right" - } - "text update" { - object { - x=139 - y=707 - width=550 - height=14 - } - monitor { - chan="$(P)$(R)StringToServer_RBV" - clr=14 - bclr=51 - } - format="string" - limits { - } - } + monitor { + chan="$(P)$(R)StringFromServer_RBV" + clr=14 + bclr=51 + } + format="string" + limits { } } - composite { + text { object { x=16 y=730 - width=673 + width=120 height=20 } - "composite name"="" - children { - "text update" { - object { - x=139 - y=732 - width=550 - height=14 - } - monitor { - chan="$(P)$(R)StringFromServer_RBV" - clr=14 - bclr=51 - } - format="string" - limits { - } - } - text { - object { - x=16 - y=730 - width=120 - height=20 - } - "basic attribute" { - clr=14 - } - textix="From mar345:" - align="horiz. right" - } + "basic attribute" { + clr=14 } + textix="From mar345:" + align="horiz. right" } + } +} +composite { + object { + x=20 + y=767 + width=109 + height=21 + } + "composite name"="" + children { composite { object { x=20 @@ -754,604 +770,413 @@ composite { } "composite name"="" children { - composite { + rectangle { object { x=20 y=767 width=109 height=21 } - "composite name"="" - children { - rectangle { - object { - x=20 - y=767 - width=109 - height=21 - } - "basic attribute" { - clr=2 - } - } - } - } - text { - object { - x=54 - y=767 - width=41 - height=20 - } "basic attribute" { - clr=54 + clr=2 } - textix="File" - align="horiz. centered" } } } - composite { + text { + object { + x=54 + y=767 + width=41 + height=20 + } + "basic attribute" { + clr=54 + } + textix="File" + align="horiz. centered" + } + } +} +composite { + object { + x=33 + y=966 + width=653 + height=20 + } + "composite name"="" + children { + text { object { x=33 y=966 - width=653 - height=20 - } - "composite name"="" - children { - text { - object { - x=33 - y=966 - width=133 - height=20 - } - "basic attribute" { - clr=14 - } - textix="Last filename" - align="horiz. right" - } - "text update" { - object { - x=175 - y=967 - width=511 - height=18 - } - monitor { - chan="$(P)$(R)FullFileName_RBV" - clr=54 - bclr=4 - } - format="string" - limits { - } - } - } - } - text { - object { - x=12 - y=941 - width=153 + width=133 height=20 } "basic attribute" { clr=14 } - textix="Filename format" - align="horiz. right" - } - composite { - object { - x=175 - y=918 - width=164 - height=43 - } - "composite name"="" - children { - "text update" { - object { - x=175 - y=918 - width=164 - height=18 - } - monitor { - chan="$(P)$(R)FileTemplate_RBV" - clr=54 - bclr=4 - } - format="string" - limits { - } - } - "text entry" { - object { - x=175 - y=941 - width=164 - height=20 - } - control { - chan="$(P)$(R)FileTemplate" - clr=14 - bclr=51 - } - format="string" - limits { - } - } - } - } - composite { - object { - x=22 - y=893 - width=305 - height=20 - } - "composite name"="" - children { - text { - object { - x=22 - y=893 - width=143 - height=20 - } - "basic attribute" { - clr=14 - } - textix="Auto increment" - align="horiz. right" - } - menu { - object { - x=175 - y=893 - width=66 - height=20 - } - control { - chan="$(P)$(R)AutoIncrement" - clr=14 - bclr=51 - } - } - "text update" { - object { - x=245 - y=894 - width=82 - height=18 - } - monitor { - chan="$(P)$(R)AutoIncrement_RBV" - clr=54 - bclr=4 - } - limits { - } - } - } - } - composite { - object { - x=53 - y=866 - width=270 - height=22 - } - "composite name"="" - children { - text { - object { - x=53 - y=867 - width=112 - height=20 - } - "basic attribute" { - clr=14 - } - textix="Next file #" - align="horiz. right" - } - "text entry" { - object { - x=175 - y=866 - width=61 - height=22 - } - control { - chan="$(P)$(R)FileNumber" - clr=14 - bclr=51 - } - limits { - } - } - "text update" { - object { - x=241 - y=868 - width=82 - height=18 - } - monitor { - chan="$(P)$(R)FileNumber_RBV" - clr=54 - bclr=4 - } - limits { - } - } - } - } - composite { - object { - x=73 - y=818 - width=612 - height=43 - } - "composite name"="" - children { - text { - object { - x=73 - y=841 - width=92 - height=20 - } - "basic attribute" { - clr=14 - } - textix="File name" - align="horiz. right" - } - composite { - object { - x=174 - y=818 - width=511 - height=43 - } - "composite name"="" - children { - "text entry" { - object { - x=174 - y=841 - width=511 - height=20 - } - control { - chan="$(P)$(R)FileName" - clr=14 - bclr=51 - } - format="string" - limits { - } - } - "text update" { - object { - x=174 - y=818 - width=511 - height=18 - } - monitor { - chan="$(P)$(R)FileName_RBV" - clr=54 - bclr=4 - } - format="string" - limits { - } - } - } - } - } - } - composite { - object { - x=73 - y=770 - width=612 - height=43 - } - "composite name"="" - children { - composite { - object { - x=174 - y=770 - width=511 - height=43 - } - "composite name"="" - children { - "text entry" { - object { - x=174 - y=793 - width=511 - height=20 - } - control { - chan="$(P)$(R)FilePath" - clr=14 - bclr=51 - } - format="string" - limits { - } - } - "text update" { - object { - x=174 - y=770 - width=511 - height=18 - } - monitor { - chan="$(P)$(R)FilePath_RBV" - clr=54 - bclr=4 - } - format="string" - limits { - } - } - } - } - text { - object { - x=73 - y=793 - width=92 - height=20 - } - "basic attribute" { - clr=14 - } - textix="File path" - align="horiz. right" - } - } - } - rectangle { - object { - x=5 - y=760 - width=690 - height=230 - } - "basic attribute" { - clr=14 - fill="outline" - } - } - composite { - object { - x=387 - y=941 - width=286 - height=20 - } - "composite name"="" - children { - text { - object { - x=387 - y=941 - width=112 - height=20 - } - "basic attribute" { - clr=14 - } - textix="File format" - align="horiz. right" - } - "text update" { - object { - x=591 - y=942 - width=82 - height=18 - } - monitor { - chan="$(P)$(R)FileFormat_RBV" - clr=54 - bclr=4 - } - limits { - } - } - menu { - object { - x=504 - y=941 - width=82 - height=20 - } - control { - chan="$(P)$(R)FileFormat" - clr=14 - bclr=51 - } - } - } - } - composite { - object { - x=425 - y=595 - width=229 - height=20 - } - "composite name"="" - children { - text { - object { - x=425 - y=595 - width=80 - height=20 - } - "basic attribute" { - clr=14 - } - textix="# erases" - align="horiz. right" - } - "text entry" { - object { - x=510 - y=595 - width=59 - height=20 - } - control { - chan="$(P)$(R)NumErase" - clr=14 - bclr=51 - } - limits { - } - } - "text update" { - object { - x=575 - y=596 - width=79 - height=18 - } - monitor { - chan="$(P)$(R)NumErase_RBV" - clr=54 - bclr=4 - } - align="horiz. centered" - limits { - } - } - } - } - "message button" { - object { - x=175 - y=620 - width=120 - height=20 - } - control { - chan="$(P)$(R)Erase" - clr=14 - bclr=51 - } - label="Erase" - press_msg="1" - } - text { - object { - x=120 - y=620 - width=50 - height=20 - } - "basic attribute" { - clr=14 - } - textix="Erase" + textix="Last filename" align="horiz. right" } "text update" { object { - x=305 - y=620 - width=84 - height=20 + x=175 + y=967 + width=511 + height=18 } monitor { - chan="$(P)$(R)Erase_RBV" - clr=63 + chan="$(P)$(R)FullFileName_RBV" + clr=54 bclr=4 } - clrmod="alarm" + format="string" limits { } } + } +} +text { + object { + x=12 + y=941 + width=153 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Filename format" + align="horiz. right" +} +composite { + object { + x=175 + y=918 + width=164 + height=43 + } + "composite name"="" + children { + "text update" { + object { + x=175 + y=918 + width=164 + height=18 + } + monitor { + chan="$(P)$(R)FileTemplate_RBV" + clr=54 + bclr=4 + } + format="string" + limits { + } + } + "text entry" { + object { + x=175 + y=941 + width=164 + height=20 + } + control { + chan="$(P)$(R)FileTemplate" + clr=14 + bclr=51 + } + format="string" + limits { + } + } + } +} +composite { + object { + x=22 + y=893 + width=305 + height=20 + } + "composite name"="" + children { text { object { - x=20 - y=595 - width=150 + x=22 + y=893 + width=143 height=20 } "basic attribute" { clr=14 } - textix="Auto erase mode" + textix="Auto increment" align="horiz. right" } menu { object { x=175 - y=595 - width=120 + y=893 + width=66 height=20 } control { - chan="$(P)$(R)EraseMode" + chan="$(P)$(R)AutoIncrement" clr=14 bclr=51 } } "text update" { object { - x=305 - y=596 - width=80 + x=245 + y=894 + width=82 height=18 } monitor { - chan="$(P)$(R)EraseMode_RBV" + chan="$(P)$(R)AutoIncrement_RBV" clr=54 bclr=4 } limits { } } + } +} +composite { + object { + x=53 + y=866 + width=270 + height=22 + } + "composite name"="" + children { + text { + object { + x=53 + y=867 + width=112 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Next file #" + align="horiz. right" + } + "text entry" { + object { + x=175 + y=866 + width=61 + height=22 + } + control { + chan="$(P)$(R)FileNumber" + clr=14 + bclr=51 + } + limits { + } + } + "text update" { + object { + x=241 + y=868 + width=82 + height=18 + } + monitor { + chan="$(P)$(R)FileNumber_RBV" + clr=54 + bclr=4 + } + limits { + } + } + } +} +composite { + object { + x=73 + y=818 + width=612 + height=43 + } + "composite name"="" + children { + text { + object { + x=73 + y=841 + width=92 + height=20 + } + "basic attribute" { + clr=14 + } + textix="File name" + align="horiz. right" + } + composite { + object { + x=174 + y=818 + width=511 + height=43 + } + "composite name"="" + children { + "text entry" { + object { + x=174 + y=841 + width=511 + height=20 + } + control { + chan="$(P)$(R)FileName" + clr=14 + bclr=51 + } + format="string" + limits { + } + } + "text update" { + object { + x=174 + y=818 + width=511 + height=18 + } + monitor { + chan="$(P)$(R)FileName_RBV" + clr=54 + bclr=4 + } + format="string" + limits { + } + } + } + } + } +} +rectangle { + object { + x=5 + y=760 + width=690 + height=230 + } + "basic attribute" { + clr=14 + fill="outline" + } +} +composite { + object { + x=387 + y=941 + width=286 + height=20 + } + "composite name"="" + children { + text { + object { + x=387 + y=941 + width=112 + height=20 + } + "basic attribute" { + clr=14 + } + textix="File format" + align="horiz. right" + } + "text update" { + object { + x=591 + y=942 + width=82 + height=18 + } + monitor { + chan="$(P)$(R)FileFormat_RBV" + clr=54 + bclr=4 + } + limits { + } + } + menu { + object { + x=504 + y=941 + width=82 + height=20 + } + control { + chan="$(P)$(R)FileFormat" + clr=14 + bclr=51 + } + } + } +} +composite { + object { + x=425 + y=595 + width=229 + height=20 + } + "composite name"="" + children { text { object { x=425 - y=620 + y=595 width=80 height=20 } "basic attribute" { clr=14 } - textix="# erases done" + textix="# erases" + align="horiz. right" + } + "text entry" { + object { + x=510 + y=595 + width=59 + height=20 + } + control { + chan="$(P)$(R)NumErase" + clr=14 + bclr=51 + } + limits { + } } "text update" { object { x=575 - y=621 + y=596 width=79 height=18 } monitor { - chan="$(P)$(R)NumErased_RBV" + chan="$(P)$(R)NumErase_RBV" clr=54 bclr=4 } @@ -1361,6 +1186,119 @@ composite { } } } +"message button" { + object { + x=175 + y=620 + width=120 + height=20 + } + control { + chan="$(P)$(R)Erase" + clr=14 + bclr=51 + } + label="Erase" + press_msg="1" +} +text { + object { + x=120 + y=620 + width=50 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Erase" + align="horiz. right" +} +"text update" { + object { + x=305 + y=620 + width=84 + height=20 + } + monitor { + chan="$(P)$(R)Erase_RBV" + clr=63 + bclr=4 + } + clrmod="alarm" + limits { + } +} +text { + object { + x=20 + y=595 + width=150 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Auto erase mode" + align="horiz. right" +} +menu { + object { + x=175 + y=595 + width=120 + height=20 + } + control { + chan="$(P)$(R)EraseMode" + clr=14 + bclr=51 + } +} +"text update" { + object { + x=305 + y=596 + width=80 + height=18 + } + monitor { + chan="$(P)$(R)EraseMode_RBV" + clr=54 + bclr=4 + } + limits { + } +} +text { + object { + x=425 + y=620 + width=80 + height=20 + } + "basic attribute" { + clr=14 + } + textix="# erases done" +} +"text update" { + object { + x=575 + y=621 + width=79 + height=18 + } + monitor { + chan="$(P)$(R)NumErased_RBV" + clr=54 + bclr=4 + } + align="horiz. centered" + limits { + } +} composite { object { x=5 @@ -1725,3 +1663,71 @@ composite { "composite name"="" "composite file"="ADAttrFile.adl" } +composite { + object { + x=575 + y=770 + width=115 + height=20 + } + "composite name"="" + children { + text { + object { + x=575 + y=770 + width=70 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Exists:" + } + "text update" { + object { + x=650 + y=770 + width=40 + height=20 + } + monitor { + chan="$(P)$(R)FilePathExists_RBV" + clr=14 + bclr=2 + } + clrmod="alarm" + limits { + } + } + } +} +"text entry" { + object { + x=174 + y=793 + width=511 + height=20 + } + control { + chan="$(P)$(R)FilePath" + clr=14 + bclr=51 + } + format="string" + limits { + } +} +text { + object { + x=73 + y=793 + width=92 + height=20 + } + "basic attribute" { + clr=14 + } + textix="File path" + align="horiz. right" +} diff --git a/ADApp/op/adl/marCCD.adl b/ADApp/op/adl/marCCD.adl index 2c26aa2..014c8be 100644 --- a/ADApp/op/adl/marCCD.adl +++ b/ADApp/op/adl/marCCD.adl @@ -403,493 +403,493 @@ text { limits { } } -composite { +rectangle { + object { + x=303 + y=601 + width=105 + height=21 + } + "basic attribute" { + clr=2 + } +} +rectangle { object { x=5 y=595 width=690 - height=495 + height=230 + } + "basic attribute" { + clr=14 + fill="outline" + } +} +text { + object { + x=276 + y=601 + width=157 + height=20 + } + "basic attribute" { + clr=54 + } + textix="Status" + align="horiz. centered" +} +composite { + object { + x=403 + y=637 + width=269 + height=120 } "composite name"="" children { - rectangle { - object { - x=303 - y=601 - width=105 - height=21 - } - "basic attribute" { - clr=2 - } - } - rectangle { - object { - x=5 - y=595 - width=690 - height=230 - } - "basic attribute" { - clr=14 - fill="outline" - } - } - text { - object { - x=276 - y=601 - width=157 - height=20 - } - "basic attribute" { - clr=54 - } - textix="Status" - align="horiz. centered" - } composite { object { x=403 y=637 - width=269 - height=120 + width=216 + height=20 } "composite name"="" children { - composite { + text { object { x=403 y=637 - width=216 + width=140 height=20 } - "composite name"="" - children { - text { - object { - x=403 - y=637 - width=140 - height=20 - } - "basic attribute" { - clr=14 - } - textix="Time remaining" - align="horiz. right" - } - "text update" { - object { - x=552 - y=638 - width=67 - height=18 - } - monitor { - chan="$(P)$(R)TimeRemaining_RBV" - clr=54 - bclr=4 - } - limits { - } - } + "basic attribute" { + clr=14 } + textix="Time remaining" + align="horiz. right" } - composite { + "text update" { object { - x=403 - y=662 - width=269 - height=20 + x=552 + y=638 + width=67 + height=18 } - "composite name"="" - children { - text { - object { - x=403 - y=662 - width=140 - height=20 - } - "basic attribute" { - clr=14 - } - textix="Readout status" - align="horiz. right" - } - "text update" { - object { - x=552 - y=663 - width=120 - height=18 - } - monitor { - chan="$(P)$(R)MarReadoutStatus_RBV" - clr=16 - bclr=2 - } - clrmod="alarm" - align="horiz. centered" - format="string" - limits { - } - } + monitor { + chan="$(P)$(R)TimeRemaining_RBV" + clr=54 + bclr=4 } - } - composite { - object { - x=403 - y=687 - width=269 - height=20 - } - "composite name"="" - children { - text { - object { - x=403 - y=687 - width=140 - height=20 - } - "basic attribute" { - clr=14 - } - textix="Correct status" - align="horiz. right" - } - "text update" { - object { - x=552 - y=688 - width=120 - height=18 - } - monitor { - chan="$(P)$(R)MarCorrectStatus_RBV" - clr=16 - bclr=2 - } - clrmod="alarm" - align="horiz. centered" - format="string" - limits { - } - } - } - } - composite { - object { - x=403 - y=712 - width=269 - height=20 - } - "composite name"="" - children { - text { - object { - x=403 - y=712 - width=140 - height=20 - } - "basic attribute" { - clr=14 - } - textix="Writing status" - align="horiz. right" - } - "text update" { - object { - x=552 - y=713 - width=120 - height=18 - } - monitor { - chan="$(P)$(R)MarWritingStatus_RBV" - clr=16 - bclr=2 - } - clrmod="alarm" - align="horiz. centered" - format="string" - limits { - } - } - } - } - composite { - object { - x=403 - y=737 - width=269 - height=20 - } - "composite name"="" - children { - text { - object { - x=403 - y=737 - width=140 - height=20 - } - "basic attribute" { - clr=14 - } - textix="Dezinger status" - align="horiz. right" - } - "text update" { - object { - x=552 - y=738 - width=120 - height=18 - } - monitor { - chan="$(P)$(R)MarDezingerStatus_RBV" - clr=16 - bclr=2 - } - clrmod="alarm" - align="horiz. centered" - format="string" - limits { - } - } + limits { } } } } + composite { + object { + x=403 + y=662 + width=269 + height=20 + } + "composite name"="" + children { + text { + object { + x=403 + y=662 + width=140 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Readout status" + align="horiz. right" + } + "text update" { + object { + x=552 + y=663 + width=120 + height=18 + } + monitor { + chan="$(P)$(R)MarReadoutStatus_RBV" + clr=16 + bclr=2 + } + clrmod="alarm" + align="horiz. centered" + format="string" + limits { + } + } + } + } + composite { + object { + x=403 + y=687 + width=269 + height=20 + } + "composite name"="" + children { + text { + object { + x=403 + y=687 + width=140 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Correct status" + align="horiz. right" + } + "text update" { + object { + x=552 + y=688 + width=120 + height=18 + } + monitor { + chan="$(P)$(R)MarCorrectStatus_RBV" + clr=16 + bclr=2 + } + clrmod="alarm" + align="horiz. centered" + format="string" + limits { + } + } + } + } + composite { + object { + x=403 + y=712 + width=269 + height=20 + } + "composite name"="" + children { + text { + object { + x=403 + y=712 + width=140 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Writing status" + align="horiz. right" + } + "text update" { + object { + x=552 + y=713 + width=120 + height=18 + } + monitor { + chan="$(P)$(R)MarWritingStatus_RBV" + clr=16 + bclr=2 + } + clrmod="alarm" + align="horiz. centered" + format="string" + limits { + } + } + } + } + composite { + object { + x=403 + y=737 + width=269 + height=20 + } + "composite name"="" + children { + text { + object { + x=403 + y=737 + width=140 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Dezinger status" + align="horiz. right" + } + "text update" { + object { + x=552 + y=738 + width=120 + height=18 + } + monitor { + chan="$(P)$(R)MarDezingerStatus_RBV" + clr=16 + bclr=2 + } + clrmod="alarm" + align="horiz. centered" + format="string" + limits { + } + } + } + } + } +} +text { + object { + x=49 + y=637 + width=140 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Detector state" + align="horiz. right" +} +"text update" { + object { + x=196 + y=638 + width=120 + height=18 + } + monitor { + chan="$(P)$(R)DetectorState_RBV" + clr=16 + bclr=2 + } + clrmod="alarm" + align="horiz. centered" + limits { + } +} +composite { + object { + x=69 + y=662 + width=247 + height=20 + } + "composite name"="" + children { + "text update" { + object { + x=196 + y=663 + width=120 + height=18 + } + monitor { + chan="$(P)$(R)MarState_RBV" + clr=54 + bclr=4 + } + align="horiz. centered" + format="hexadecimal" + limits { + } + } text { object { - x=49 - y=637 - width=140 + x=69 + y=662 + width=120 height=20 } "basic attribute" { clr=14 } - textix="Detector state" + textix="Server state" align="horiz. right" } - "text update" { + } +} +"text update" { + object { + x=196 + y=688 + width=120 + height=18 + } + monitor { + chan="$(P)$(R)MarStatus_RBV" + clr=16 + bclr=2 + } + clrmod="alarm" + align="horiz. centered" + format="string" + limits { + } +} +text { + object { + x=79 + y=687 + width=110 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Task status" + align="horiz. right" +} +"text update" { + object { + x=196 + y=713 + width=120 + height=18 + } + monitor { + chan="$(P)$(R)MarAcquireStatus_RBV" + clr=16 + bclr=2 + } + clrmod="alarm" + align="horiz. centered" + format="string" + limits { + } +} +text { + object { + x=49 + y=712 + width=140 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Acquire status" + align="horiz. right" +} +composite { + object { + x=54 + y=770 + width=593 + height=45 + } + "composite name"="" + children { + composite { object { - x=196 - y=638 - width=120 - height=18 + x=74 + y=770 + width=573 + height=20 } - monitor { - chan="$(P)$(R)DetectorState_RBV" - clr=16 - bclr=2 - } - clrmod="alarm" - align="horiz. centered" - limits { + "composite name"="" + children { + text { + object { + x=74 + y=770 + width=170 + height=20 + } + "basic attribute" { + clr=14 + } + textix="To marCCD server:" + align="horiz. right" + } + "text update" { + object { + x=247 + y=773 + width=400 + height=15 + } + monitor { + chan="$(P)$(R)StringToServer_RBV" + clr=14 + bclr=51 + } + format="string" + limits { + } + } } } composite { object { - x=69 - y=662 - width=247 + x=54 + y=795 + width=593 height=20 } "composite name"="" children { "text update" { object { - x=196 - y=663 - width=120 - height=18 + x=247 + y=798 + width=400 + height=15 } monitor { - chan="$(P)$(R)MarState_RBV" - clr=54 - bclr=4 + chan="$(P)$(R)StringFromServer_RBV" + clr=14 + bclr=51 } - align="horiz. centered" - format="hexadecimal" + format="string" limits { } } text { object { - x=69 - y=662 - width=120 + x=54 + y=795 + width=190 height=20 } "basic attribute" { clr=14 } - textix="Server state" + textix="From marCCD server:" align="horiz. right" } } } - "text update" { - object { - x=196 - y=688 - width=120 - height=18 - } - monitor { - chan="$(P)$(R)MarStatus_RBV" - clr=16 - bclr=2 - } - clrmod="alarm" - align="horiz. centered" - format="string" - limits { - } - } - text { - object { - x=79 - y=687 - width=110 - height=20 - } - "basic attribute" { - clr=14 - } - textix="Task status" - align="horiz. right" - } - "text update" { - object { - x=196 - y=713 - width=120 - height=18 - } - monitor { - chan="$(P)$(R)MarAcquireStatus_RBV" - clr=16 - bclr=2 - } - clrmod="alarm" - align="horiz. centered" - format="string" - limits { - } - } - text { - object { - x=49 - y=712 - width=140 - height=20 - } - "basic attribute" { - clr=14 - } - textix="Acquire status" - align="horiz. right" - } - composite { - object { - x=54 - y=770 - width=593 - height=45 - } - "composite name"="" - children { - composite { - object { - x=74 - y=770 - width=573 - height=20 - } - "composite name"="" - children { - text { - object { - x=74 - y=770 - width=170 - height=20 - } - "basic attribute" { - clr=14 - } - textix="To marCCD server:" - align="horiz. right" - } - "text update" { - object { - x=247 - y=773 - width=400 - height=15 - } - monitor { - chan="$(P)$(R)StringToServer_RBV" - clr=14 - bclr=51 - } - format="string" - limits { - } - } - } - } - composite { - object { - x=54 - y=795 - width=593 - height=20 - } - "composite name"="" - children { - "text update" { - object { - x=247 - y=798 - width=400 - height=15 - } - monitor { - chan="$(P)$(R)StringFromServer_RBV" - clr=14 - bclr=51 - } - format="string" - limits { - } - } - text { - object { - x=54 - y=795 - width=190 - height=20 - } - "basic attribute" { - clr=14 - } - textix="From marCCD server:" - align="horiz. right" - } - } - } - } - } + } +} +composite { + object { + x=20 + y=837 + width=109 + height=21 + } + "composite name"="" + children { composite { object { x=20 @@ -899,605 +899,572 @@ composite { } "composite name"="" children { - composite { + rectangle { object { x=20 y=837 width=109 height=21 } - "composite name"="" - children { - rectangle { - object { - x=20 - y=837 - width=109 - height=21 - } - "basic attribute" { - clr=2 - } - } - } - } - text { - object { - x=54 - y=837 - width=41 - height=20 - } "basic attribute" { - clr=54 - } - textix="File" - align="horiz. centered" - } - } - } - composite { - object { - x=33 - y=1036 - width=653 - height=20 - } - "composite name"="" - children { - text { - object { - x=33 - y=1036 - width=133 - height=20 - } - "basic attribute" { - clr=14 - } - textix="Last filename" - align="horiz. right" - } - "text update" { - object { - x=175 - y=1037 - width=511 - height=18 - } - monitor { - chan="$(P)$(R)FullFileName_RBV" - clr=54 - bclr=4 - } - format="string" - limits { + clr=2 } } } } text { object { - x=12 - y=1011 - width=153 + x=54 + y=837 + width=41 + height=20 + } + "basic attribute" { + clr=54 + } + textix="File" + align="horiz. centered" + } + } +} +composite { + object { + x=33 + y=1036 + width=653 + height=20 + } + "composite name"="" + children { + text { + object { + x=33 + y=1036 + width=133 height=20 } "basic attribute" { clr=14 } - textix="Filename format" + textix="Last filename" align="horiz. right" } - composite { + "text update" { + object { + x=175 + y=1037 + width=511 + height=18 + } + monitor { + chan="$(P)$(R)FullFileName_RBV" + clr=54 + bclr=4 + } + format="string" + limits { + } + } + } +} +text { + object { + x=12 + y=1011 + width=153 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Filename format" + align="horiz. right" +} +composite { + object { + x=175 + y=988 + width=164 + height=43 + } + "composite name"="" + children { + "text update" { object { x=175 y=988 width=164 - height=43 + height=18 } - "composite name"="" - children { - "text update" { - object { - x=175 - y=988 - width=164 - height=18 - } - monitor { - chan="$(P)$(R)FileTemplate_RBV" - clr=54 - bclr=4 - } - format="string" - limits { - } - } - "text entry" { - object { - x=175 - y=1011 - width=164 - height=20 - } - control { - chan="$(P)$(R)FileTemplate" - clr=14 - bclr=51 - } - format="string" - limits { - } - } + monitor { + chan="$(P)$(R)FileTemplate_RBV" + clr=54 + bclr=4 + } + format="string" + limits { } } - composite { + "text entry" { + object { + x=175 + y=1011 + width=164 + height=20 + } + control { + chan="$(P)$(R)FileTemplate" + clr=14 + bclr=51 + } + format="string" + limits { + } + } + } +} +composite { + object { + x=22 + y=963 + width=305 + height=20 + } + "composite name"="" + children { + text { object { x=22 y=963 - width=305 - height=20 - } - "composite name"="" - children { - text { - object { - x=22 - y=963 - width=143 - height=20 - } - "basic attribute" { - clr=14 - } - textix="Auto increment" - align="horiz. right" - } - menu { - object { - x=175 - y=963 - width=66 - height=20 - } - control { - chan="$(P)$(R)AutoIncrement" - clr=14 - bclr=51 - } - } - "text update" { - object { - x=245 - y=964 - width=82 - height=18 - } - monitor { - chan="$(P)$(R)AutoIncrement_RBV" - clr=54 - bclr=4 - } - limits { - } - } - } - } - composite { - object { - x=53 - y=936 - width=270 - height=22 - } - "composite name"="" - children { - text { - object { - x=53 - y=937 - width=112 - height=20 - } - "basic attribute" { - clr=14 - } - textix="Next file #" - align="horiz. right" - } - "text entry" { - object { - x=175 - y=936 - width=61 - height=22 - } - control { - chan="$(P)$(R)FileNumber" - clr=14 - bclr=51 - } - limits { - } - } - "text update" { - object { - x=241 - y=938 - width=82 - height=18 - } - monitor { - chan="$(P)$(R)FileNumber_RBV" - clr=54 - bclr=4 - } - limits { - } - } - } - } - composite { - object { - x=73 - y=888 - width=612 - height=43 - } - "composite name"="" - children { - text { - object { - x=73 - y=911 - width=92 - height=20 - } - "basic attribute" { - clr=14 - } - textix="File name" - align="horiz. right" - } - composite { - object { - x=174 - y=888 - width=511 - height=43 - } - "composite name"="" - children { - "text entry" { - object { - x=174 - y=911 - width=511 - height=20 - } - control { - chan="$(P)$(R)FileName" - clr=14 - bclr=51 - } - format="string" - limits { - } - } - "text update" { - object { - x=174 - y=888 - width=511 - height=18 - } - monitor { - chan="$(P)$(R)FileName_RBV" - clr=54 - bclr=4 - } - format="string" - limits { - } - } - } - } - } - } - composite { - object { - x=73 - y=840 - width=612 - height=43 - } - "composite name"="" - children { - composite { - object { - x=174 - y=840 - width=511 - height=43 - } - "composite name"="" - children { - "text entry" { - object { - x=174 - y=863 - width=511 - height=20 - } - control { - chan="$(P)$(R)FilePath" - clr=14 - bclr=51 - } - format="string" - limits { - } - } - "text update" { - object { - x=174 - y=840 - width=511 - height=18 - } - monitor { - chan="$(P)$(R)FilePath_RBV" - clr=54 - bclr=4 - } - format="string" - limits { - } - } - } - } - text { - object { - x=73 - y=863 - width=92 - height=20 - } - "basic attribute" { - clr=14 - } - textix="File path" - align="horiz. right" - } - } - } - rectangle { - object { - x=5 - y=830 - width=690 - height=260 - } - "basic attribute" { - clr=14 - fill="outline" - } - } - composite { - object { - x=387 - y=1011 - width=286 - height=20 - } - "composite name"="" - children { - text { - object { - x=387 - y=1011 - width=112 - height=20 - } - "basic attribute" { - clr=14 - } - textix="File format" - align="horiz. right" - } - "text update" { - object { - x=591 - y=1012 - width=82 - height=18 - } - monitor { - chan="$(P)$(R)FileFormat_RBV" - clr=54 - bclr=4 - } - limits { - } - } - menu { - object { - x=504 - y=1011 - width=82 - height=20 - } - control { - chan="$(P)$(R)FileFormat" - clr=14 - bclr=51 - } - } - } - } - composite { - object { - x=73 - y=1061 - width=163 - height=20 - } - "composite name"="" - children { - text { - object { - x=73 - y=1061 - width=92 - height=20 - } - "basic attribute" { - clr=14 - } - textix="Save file" - align="horiz. right" - } - "message button" { - object { - x=174 - y=1061 - width=62 - height=20 - } - control { - chan="$(P)$(R)WriteFile" - clr=14 - bclr=51 - } - label="Save" - press_msg="1" - } - } - } - text { - object { - x=270 - y=1061 - width=90 + width=143 height=20 } "basic attribute" { clr=14 } - textix="Auto save" + textix="Auto increment" align="horiz. right" } menu { object { - x=364 - y=1061 - width=64 + x=175 + y=963 + width=66 height=20 } control { - chan="$(P)$(R)AutoSave" + chan="$(P)$(R)AutoIncrement" clr=14 bclr=51 } } "text update" { object { - x=433 - y=1062 - width=80 + x=245 + y=964 + width=82 height=18 } monitor { - chan="$(P)$(R)AutoSave_RBV" + chan="$(P)$(R)AutoIncrement_RBV" clr=54 bclr=4 } limits { } } - composite { - object { - x=350 - y=963 - width=289 - height=20 - } - "composite name"="" - children { - "related display" { - object { - x=569 - y=963 - width=70 - height=20 - } - display[0] { - label="Ancillary information" - name="marCCDAncillary.adl" - args="P=$(P),R=$(R)" - } - clr=14 - bclr=51 - } - text { - object { - x=350 - y=963 - width=210 - height=20 - } - "basic attribute" { - clr=14 - } - textix="Ancillary information" - align="horiz. right" - } - } - } + } +} +composite { + object { + x=53 + y=936 + width=270 + height=22 + } + "composite name"="" + children { text { object { - x=29 - y=737 - width=160 + x=53 + y=937 + width=112 height=20 } "basic attribute" { clr=14 } - textix="Status poll rate" + textix="Next file #" align="horiz. right" } + "text entry" { + object { + x=175 + y=936 + width=61 + height=22 + } + control { + chan="$(P)$(R)FileNumber" + clr=14 + bclr=51 + } + limits { + } + } + "text update" { + object { + x=241 + y=938 + width=82 + height=18 + } + monitor { + chan="$(P)$(R)FileNumber_RBV" + clr=54 + bclr=4 + } + limits { + } + } + } +} +composite { + object { + x=73 + y=888 + width=612 + height=43 + } + "composite name"="" + children { + text { + object { + x=73 + y=911 + width=92 + height=20 + } + "basic attribute" { + clr=14 + } + textix="File name" + align="horiz. right" + } + composite { + object { + x=174 + y=888 + width=511 + height=43 + } + "composite name"="" + children { + "text entry" { + object { + x=174 + y=911 + width=511 + height=20 + } + control { + chan="$(P)$(R)FileName" + clr=14 + bclr=51 + } + format="string" + limits { + } + } + "text update" { + object { + x=174 + y=888 + width=511 + height=18 + } + monitor { + chan="$(P)$(R)FileName_RBV" + clr=54 + bclr=4 + } + format="string" + limits { + } + } + } + } + } +} +"text entry" { + object { + x=174 + y=863 + width=511 + height=20 + } + control { + chan="$(P)$(R)FilePath" + clr=14 + bclr=51 + } + format="string" + limits { + } +} +"text update" { + object { + x=174 + y=840 + width=395 + height=18 + } + monitor { + chan="$(P)$(R)FilePath_RBV" + clr=54 + bclr=4 + } + format="string" + limits { + } +} +text { + object { + x=73 + y=863 + width=92 + height=20 + } + "basic attribute" { + clr=14 + } + textix="File path" + align="horiz. right" +} +rectangle { + object { + x=5 + y=830 + width=690 + height=260 + } + "basic attribute" { + clr=14 + fill="outline" + } +} +composite { + object { + x=387 + y=1011 + width=286 + height=20 + } + "composite name"="" + children { + text { + object { + x=387 + y=1011 + width=112 + height=20 + } + "basic attribute" { + clr=14 + } + textix="File format" + align="horiz. right" + } + "text update" { + object { + x=591 + y=1012 + width=82 + height=18 + } + monitor { + chan="$(P)$(R)FileFormat_RBV" + clr=54 + bclr=4 + } + limits { + } + } menu { object { - x=196 - y=737 - width=90 + x=504 + y=1011 + width=82 height=20 } control { - chan="$(P)$(R)ReadStatus.SCAN" + chan="$(P)$(R)FileFormat" clr=14 bclr=51 } } + } +} +composite { + object { + x=73 + y=1061 + width=163 + height=20 + } + "composite name"="" + children { + text { + object { + x=73 + y=1061 + width=92 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Save file" + align="horiz. right" + } "message button" { object { - x=292 - y=737 - width=59 + x=174 + y=1061 + width=62 height=20 } control { - chan="$(P)$(R)ReadStatus.PROC" + chan="$(P)$(R)WriteFile" clr=14 bclr=51 } - label="Poll" + label="Save" press_msg="1" } } } +text { + object { + x=270 + y=1061 + width=90 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Auto save" + align="horiz. right" +} +menu { + object { + x=364 + y=1061 + width=64 + height=20 + } + control { + chan="$(P)$(R)AutoSave" + clr=14 + bclr=51 + } +} +"text update" { + object { + x=433 + y=1062 + width=80 + height=18 + } + monitor { + chan="$(P)$(R)AutoSave_RBV" + clr=54 + bclr=4 + } + limits { + } +} +composite { + object { + x=350 + y=963 + width=289 + height=20 + } + "composite name"="" + children { + "related display" { + object { + x=569 + y=963 + width=70 + height=20 + } + display[0] { + label="Ancillary information" + name="marCCDAncillary.adl" + args="P=$(P),R=$(R)" + } + clr=14 + bclr=51 + } + text { + object { + x=350 + y=963 + width=210 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Ancillary information" + align="horiz. right" + } + } +} +text { + object { + x=29 + y=737 + width=160 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Status poll rate" + align="horiz. right" +} +menu { + object { + x=196 + y=737 + width=90 + height=20 + } + control { + chan="$(P)$(R)ReadStatus.SCAN" + clr=14 + bclr=51 + } +} +"message button" { + object { + x=292 + y=737 + width=59 + height=20 + } + control { + chan="$(P)$(R)ReadStatus.PROC" + clr=14 + bclr=51 + } + label="Poll" + press_msg="1" +} text { object { x=367 @@ -2163,3 +2130,42 @@ composite { "composite name"="" "composite file"="ADAttrFile.adl" } +composite { + object { + x=575 + y=838 + width=115 + height=20 + } + "composite name"="" + children { + text { + object { + x=575 + y=838 + width=70 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Exists:" + } + "text update" { + object { + x=650 + y=838 + width=40 + height=20 + } + monitor { + chan="$(P)$(R)FilePathExists_RBV" + clr=14 + bclr=2 + } + clrmod="alarm" + limits { + } + } + } +} diff --git a/ADApp/op/adl/pilatusDetector.adl b/ADApp/op/adl/pilatusDetector.adl index 9ca8f97..022b12c 100644 --- a/ADApp/op/adl/pilatusDetector.adl +++ b/ADApp/op/adl/pilatusDetector.adl @@ -1,6 +1,6 @@ file { - name="/home/epics/devel/areaDetector/ADApp/op/adl/pilatusDetector2.adl" + name="/home/epics/devel/areaDetector/ADApp/op/adl/pilatusDetector.adl" version=030102 } display { @@ -387,10 +387,10 @@ composite { } composite { object { - x=5 - y=816 - width=690 - height=230 + x=20 + y=823 + width=109 + height=21 } "composite name"="" children { @@ -403,441 +403,408 @@ composite { } "composite name"="" children { - composite { + rectangle { object { x=20 y=823 width=109 height=21 } - "composite name"="" - children { - rectangle { - object { - x=20 - y=823 - width=109 - height=21 - } - "basic attribute" { - clr=2 - } - } - } - } - text { - object { - x=54 - y=823 - width=41 - height=20 - } "basic attribute" { - clr=54 - } - textix="File" - align="horiz. centered" - } - } - } - composite { - object { - x=33 - y=1022 - width=653 - height=20 - } - "composite name"="" - children { - text { - object { - x=33 - y=1022 - width=133 - height=20 - } - "basic attribute" { - clr=14 - } - textix="Last filename" - align="horiz. right" - } - "text update" { - object { - x=175 - y=1023 - width=511 - height=18 - } - monitor { - chan="$(P)$(R)FullFileName_RBV" - clr=54 - bclr=4 - } - format="string" - limits { + clr=2 } } } } text { object { - x=12 - y=997 - width=153 + x=54 + y=823 + width=41 + height=20 + } + "basic attribute" { + clr=54 + } + textix="File" + align="horiz. centered" + } + } +} +composite { + object { + x=33 + y=1022 + width=653 + height=20 + } + "composite name"="" + children { + text { + object { + x=33 + y=1022 + width=133 height=20 } "basic attribute" { clr=14 } - textix="Filename format" + textix="Last filename" align="horiz. right" } - composite { + "text update" { + object { + x=175 + y=1023 + width=511 + height=18 + } + monitor { + chan="$(P)$(R)FullFileName_RBV" + clr=54 + bclr=4 + } + format="string" + limits { + } + } + } +} +text { + object { + x=12 + y=997 + width=153 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Filename format" + align="horiz. right" +} +composite { + object { + x=175 + y=974 + width=164 + height=43 + } + "composite name"="" + children { + "text update" { object { x=175 y=974 width=164 - height=43 + height=18 } - "composite name"="" - children { - "text update" { - object { - x=175 - y=974 - width=164 - height=18 - } - monitor { - chan="$(P)$(R)FileTemplate_RBV" - clr=54 - bclr=4 - } - format="string" - limits { - } - } - "text entry" { - object { - x=175 - y=997 - width=164 - height=20 - } - control { - chan="$(P)$(R)FileTemplate" - clr=14 - bclr=51 - } - format="string" - limits { - } - } + monitor { + chan="$(P)$(R)FileTemplate_RBV" + clr=54 + bclr=4 + } + format="string" + limits { } } - composite { + "text entry" { + object { + x=175 + y=997 + width=164 + height=20 + } + control { + chan="$(P)$(R)FileTemplate" + clr=14 + bclr=51 + } + format="string" + limits { + } + } + } +} +composite { + object { + x=22 + y=949 + width=305 + height=20 + } + "composite name"="" + children { + text { object { x=22 y=949 - width=305 + width=143 height=20 } - "composite name"="" - children { - text { - object { - x=22 - y=949 - width=143 - height=20 - } - "basic attribute" { - clr=14 - } - textix="Auto increment" - align="horiz. right" - } - menu { - object { - x=175 - y=949 - width=66 - height=20 - } - control { - chan="$(P)$(R)AutoIncrement" - clr=14 - bclr=51 - } - } - "text update" { - object { - x=245 - y=950 - width=82 - height=18 - } - monitor { - chan="$(P)$(R)AutoIncrement_RBV" - clr=54 - bclr=4 - } - limits { - } - } + "basic attribute" { + clr=14 + } + textix="Auto increment" + align="horiz. right" + } + menu { + object { + x=175 + y=949 + width=66 + height=20 + } + control { + chan="$(P)$(R)AutoIncrement" + clr=14 + bclr=51 } } - composite { + "text update" { + object { + x=245 + y=950 + width=82 + height=18 + } + monitor { + chan="$(P)$(R)AutoIncrement_RBV" + clr=54 + bclr=4 + } + limits { + } + } + } +} +composite { + object { + x=53 + y=922 + width=270 + height=22 + } + "composite name"="" + children { + text { object { x=53 + y=923 + width=112 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Next file #" + align="horiz. right" + } + "text entry" { + object { + x=175 y=922 - width=270 + width=61 height=22 } - "composite name"="" - children { - text { - object { - x=53 - y=923 - width=112 - height=20 - } - "basic attribute" { - clr=14 - } - textix="Next file #" - align="horiz. right" - } - "text entry" { - object { - x=175 - y=922 - width=61 - height=22 - } - control { - chan="$(P)$(R)FileNumber" - clr=14 - bclr=51 - } - limits { - } - } - "text update" { - object { - x=241 - y=924 - width=82 - height=18 - } - monitor { - chan="$(P)$(R)FileNumber_RBV" - clr=54 - bclr=4 - } - limits { - } - } + control { + chan="$(P)$(R)FileNumber" + clr=14 + bclr=51 } + limits { + } + } + "text update" { + object { + x=241 + y=924 + width=82 + height=18 + } + monitor { + chan="$(P)$(R)FileNumber_RBV" + clr=54 + bclr=4 + } + limits { + } + } + } +} +composite { + object { + x=73 + y=874 + width=612 + height=43 + } + "composite name"="" + children { + text { + object { + x=73 + y=897 + width=92 + height=20 + } + "basic attribute" { + clr=14 + } + textix="File name" + align="horiz. right" } composite { object { - x=73 + x=174 y=874 - width=612 + width=511 height=43 } "composite name"="" children { - text { + "text entry" { object { - x=73 + x=174 y=897 - width=92 + width=511 height=20 } - "basic attribute" { + control { + chan="$(P)$(R)FileName" clr=14 + bclr=51 + } + format="string" + limits { } - textix="File name" - align="horiz. right" } - composite { + "text update" { object { x=174 y=874 width=511 - height=43 - } - "composite name"="" - children { - "text entry" { - object { - x=174 - y=897 - width=511 - height=20 - } - control { - chan="$(P)$(R)FileName" - clr=14 - bclr=51 - } - format="string" - limits { - } - } - "text update" { - object { - x=174 - y=874 - width=511 - height=18 - } - monitor { - chan="$(P)$(R)FileName_RBV" - clr=54 - bclr=4 - } - format="string" - limits { - } - } - } - } - } - } - composite { - object { - x=73 - y=826 - width=612 - height=43 - } - "composite name"="" - children { - composite { - object { - x=174 - y=826 - width=511 - height=43 - } - "composite name"="" - children { - "text entry" { - object { - x=174 - y=849 - width=511 - height=20 - } - control { - chan="$(P)$(R)FilePath" - clr=14 - bclr=51 - } - format="string" - limits { - } - } - "text update" { - object { - x=174 - y=826 - width=511 - height=18 - } - monitor { - chan="$(P)$(R)FilePath_RBV" - clr=54 - bclr=4 - } - format="string" - limits { - } - } - } - } - text { - object { - x=73 - y=849 - width=92 - height=20 - } - "basic attribute" { - clr=14 - } - textix="File path" - align="horiz. right" - } - } - } - rectangle { - object { - x=5 - y=816 - width=690 - height=230 - } - "basic attribute" { - clr=14 - fill="outline" - } - } - composite { - object { - x=387 - y=997 - width=286 - height=20 - } - "composite name"="" - children { - text { - object { - x=387 - y=997 - width=112 - height=20 - } - "basic attribute" { - clr=14 - } - textix="File format" - align="horiz. right" - } - "text update" { - object { - x=591 - y=998 - width=82 height=18 } monitor { - chan="$(P)$(R)FileFormat_RBV" + chan="$(P)$(R)FileName_RBV" clr=54 bclr=4 } + format="string" limits { } } - menu { - object { - x=504 - y=997 - width=82 - height=20 - } - control { - chan="$(P)$(R)FileFormat" - clr=14 - bclr=51 - } - } + } + } + } +} +"text entry" { + object { + x=174 + y=849 + width=511 + height=20 + } + control { + chan="$(P)$(R)FilePath" + clr=14 + bclr=51 + } + format="string" + limits { + } +} +"text update" { + object { + x=174 + y=826 + width=395 + height=18 + } + monitor { + chan="$(P)$(R)FilePath_RBV" + clr=54 + bclr=4 + } + format="string" + limits { + } +} +text { + object { + x=73 + y=849 + width=92 + height=20 + } + "basic attribute" { + clr=14 + } + textix="File path" + align="horiz. right" +} +rectangle { + object { + x=5 + y=816 + width=690 + height=230 + } + "basic attribute" { + clr=14 + fill="outline" + } +} +composite { + object { + x=387 + y=997 + width=286 + height=20 + } + "composite name"="" + children { + text { + object { + x=387 + y=997 + width=112 + height=20 + } + "basic attribute" { + clr=14 + } + textix="File format" + align="horiz. right" + } + "text update" { + object { + x=591 + y=998 + width=82 + height=18 + } + monitor { + chan="$(P)$(R)FileFormat_RBV" + clr=54 + bclr=4 + } + limits { + } + } + menu { + object { + x=504 + y=997 + width=82 + height=20 + } + control { + chan="$(P)$(R)FileFormat" + clr=14 + bclr=51 } } } @@ -1976,3 +1943,42 @@ composite { } } } +composite { + object { + x=575 + y=825 + width=115 + height=20 + } + "composite name"="" + children { + text { + object { + x=575 + y=825 + width=70 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Exists:" + } + "text update" { + object { + x=650 + y=825 + width=40 + height=20 + } + monitor { + chan="$(P)$(R)FilePathExists_RBV" + clr=14 + bclr=2 + } + clrmod="alarm" + limits { + } + } + } +}