diff --git a/ADApp/op/adl/ADBase.adl b/ADApp/op/adl/ADBase.adl index 228226e..a1954aa 100644 --- a/ADApp/op/adl/ADBase.adl +++ b/ADApp/op/adl/ADBase.adl @@ -416,298 +416,109 @@ text { limits { } } -composite { +rectangle { + object { + x=119 + y=37 + width=107 + height=21 + } + "basic attribute" { + clr=2 + } +} +rectangle { object { x=5 y=35 width=335 height=250 } + "basic attribute" { + clr=14 + fill="outline" + } +} +text { + object { + x=93 + y=38 + width=159 + height=20 + } + "basic attribute" { + clr=54 + } + textix="Setup" + align="horiz. centered" +} +composite { + object { + x=63 + y=94 + width=268 + height=20 + } "composite name"="" children { - rectangle { - object { - x=119 - y=37 - width=107 - height=21 - } - "basic attribute" { - clr=2 - } - } - rectangle { - object { - x=5 - y=35 - width=335 - height=250 - } - "basic attribute" { - clr=14 - fill="outline" - } - } text { - object { - x=93 - y=38 - width=159 - height=20 - } - "basic attribute" { - clr=54 - } - textix="Setup" - align="horiz. centered" - } - composite { - object { - x=63 - y=94 - width=268 - height=20 - } - "composite name"="" - children { - text { - object { - x=171 - y=95 - width=160 - height=18 - } - "basic attribute" { - clr=54 - } - textix="$(P)$(R)" - } - text { - object { - x=63 - y=94 - width=100 - height=20 - } - "basic attribute" { - clr=14 - } - textix="EPICS name" - align="horiz. right" - } - } - } - composite { - object { - x=43 - y=119 - width=288 - height=20 - } - "composite name"="" - children { - text { - object { - x=43 - y=119 - width=120 - height=20 - } - "basic attribute" { - clr=14 - } - textix="Manufacturer" - align="horiz. right" - } - "text update" { - object { - x=171 - y=120 - width=160 - height=18 - } - monitor { - chan="$(P)$(R)Manufacturer_RBV" - clr=54 - bclr=4 - } - limits { - } - } - } - } - composite { - object { - x=73 - y=241 - width=169 - height=20 - } - "composite name"="" - children { - text { - object { - x=73 - y=241 - width=90 - height=20 - } - "basic attribute" { - clr=14 - } - textix=" More" - align="horiz. right" - } - "related display" { - object { - x=172 - y=241 - width=70 - height=20 - } - display[0] { - label="asynRecord" - name="asynRecord.adl" - args="P=$(P),R=$(R)AsynIO" - } - display[1] { - label="Save restore status" - name="save_restoreStatus_more.adl" - args="P=$(P)" - } - clr=14 - bclr=51 - } - } - } - text { - object { - x=113 - y=144 - width=50 - height=20 - } - "basic attribute" { - clr=14 - } - textix="Model" - align="horiz. right" - } - "text update" { object { x=171 - y=145 + y=95 width=160 height=18 } - monitor { - chan="$(P)$(R)Model_RBV" + "basic attribute" { clr=54 - bclr=4 - } - limits { } + textix="$(P)$(R)" } text { object { x=63 - y=194 + y=94 width=100 height=20 } "basic attribute" { clr=14 } - textix="Connection" + textix="EPICS name" align="horiz. right" } - "message button" { - object { - x=171 - y=194 - width=80 - height=20 - } - control { - chan="$(P)$(R)AsynIO.CNCT" - clr=14 - bclr=51 - } - label="Connect" - press_msg="1" - } - "message button" { - object { - x=256 - y=194 - width=80 - height=20 - } - control { - chan="$(P)$(R)AsynIO.CNCT" - clr=14 - bclr=51 - } - label="Disconnect" - press_msg="0" - } + } +} +composite { + object { + x=43 + y=119 + width=288 + height=20 + } + "composite name"="" + children { text { object { - x=202 - y=167 - width=90 - height=20 - } - "basic attribute" { - clr=63 - } - "dynamic attribute" { - vis="if not zero" - calc="0" - chan="$(P)$(R)AsynIO.CNCT" - } - textix="Connected" - align="horiz. centered" - } - text { - object { - x=187 - y=167 + x=43 + y=119 width=120 height=20 } - "basic attribute" { - clr=20 - } - "dynamic attribute" { - vis="if zero" - chan="$(P)$(R)AsynIO.CNCT" - } - textix="Disconnected" - align="horiz. centered" - } - text { - object { - x=63 - y=69 - width=100 - height=20 - } "basic attribute" { clr=14 } - textix="asyn port" + textix="Manufacturer" align="horiz. right" } "text update" { object { x=171 - y=70 + y=120 width=160 height=18 } monitor { - chan="$(P)$(R)PortName_RBV" + chan="$(P)$(R)Manufacturer_RBV" clr=54 bclr=4 } @@ -716,6 +527,193 @@ composite { } } } +text { + object { + x=73 + y=241 + width=90 + height=20 + } + "basic attribute" { + clr=14 + } + textix=" More" + align="horiz. right" +} +"related display" { + object { + x=172 + y=241 + width=70 + height=20 + } + display[0] { + label="asynRecord" + name="asynRecord.adl" + args="P=$(P),R=$(R)AsynIO" + } + display[1] { + label="Save restore status" + name="save_restoreStatus_more.adl" + args="P=$(P)" + } + display[2] { + label="Image plugin #1" + name="NDStdArrays.adl" + args="P=$(P), R=$(I)" + } + display[3] { + label="ROI plugin #1" + name="NDROI.adl" + args="P=$(P), R=$(ROI)" + } + display[4] { + label="File plugin #1" + name="NDPluginFile.adl" + args="P=$(P), R=$(F)" + } + display[5] { + label="Color convert plugin #1" + name="NDColorConvert.adl" + args="P=$(P), R=$(CC)" + } + clr=14 + bclr=51 +} +text { + object { + x=113 + y=144 + width=50 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Model" + align="horiz. right" +} +"text update" { + object { + x=171 + y=145 + width=160 + height=18 + } + monitor { + chan="$(P)$(R)Model_RBV" + clr=54 + bclr=4 + } + limits { + } +} +text { + object { + x=63 + y=194 + width=100 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Connection" + align="horiz. right" +} +"message button" { + object { + x=171 + y=194 + width=80 + height=20 + } + control { + chan="$(P)$(R)AsynIO.CNCT" + clr=14 + bclr=51 + } + label="Connect" + press_msg="1" +} +"message button" { + object { + x=256 + y=194 + width=80 + height=20 + } + control { + chan="$(P)$(R)AsynIO.CNCT" + clr=14 + bclr=51 + } + label="Disconnect" + press_msg="0" +} +text { + object { + x=202 + y=167 + width=90 + height=20 + } + "basic attribute" { + clr=63 + } + "dynamic attribute" { + vis="if not zero" + calc="0" + chan="$(P)$(R)AsynIO.CNCT" + } + textix="Connected" + align="horiz. centered" +} +text { + object { + x=187 + y=167 + width=120 + height=20 + } + "basic attribute" { + clr=20 + } + "dynamic attribute" { + vis="if zero" + chan="$(P)$(R)AsynIO.CNCT" + } + textix="Disconnected" + align="horiz. centered" +} +text { + object { + x=63 + y=69 + width=100 + height=20 + } + "basic attribute" { + clr=14 + } + textix="asyn port" + align="horiz. right" +} +"text update" { + object { + x=171 + y=70 + width=160 + height=18 + } + monitor { + chan="$(P)$(R)PortName_RBV" + clr=54 + bclr=4 + } + limits { + } +} rectangle { object { x=119 diff --git a/ADApp/op/adl/Roper.adl b/ADApp/op/adl/Roper.adl index 129be4c..cbc7c3d 100644 --- a/ADApp/op/adl/Roper.adl +++ b/ADApp/op/adl/Roper.adl @@ -1,6 +1,6 @@ file { - name="/home/epics/devel/areaDetector/1-4beta/ADApp/op/adl/Roper.adl" + name="/home/epics/devel/areaDetector/1-4/ADApp/op/adl/Roper.adl" version=030102 } display { @@ -1641,350 +1641,308 @@ composite { } } } -composite { +rectangle { + object { + x=119 + y=37 + width=107 + height=21 + } + "basic attribute" { + clr=2 + } +} +rectangle { object { x=5 y=35 width=335 height=250 } + "basic attribute" { + clr=14 + fill="outline" + } +} +text { + object { + x=93 + y=38 + width=159 + height=20 + } + "basic attribute" { + clr=54 + } + textix="Setup" + align="horiz. centered" +} +composite { + object { + x=63 + y=94 + width=268 + height=20 + } "composite name"="" children { - rectangle { - object { - x=119 - y=37 - width=107 - height=21 - } - "basic attribute" { - clr=2 - } - } - rectangle { - object { - x=5 - y=35 - width=335 - height=250 - } - "basic attribute" { - clr=14 - fill="outline" - } - } text { - object { - x=93 - y=38 - width=159 - height=20 - } - "basic attribute" { - clr=54 - } - textix="Setup" - align="horiz. centered" - } - composite { - object { - x=63 - y=94 - width=268 - height=20 - } - "composite name"="" - children { - text { - object { - x=171 - y=95 - width=160 - height=18 - } - "basic attribute" { - clr=54 - } - textix="$(P)$(R)" - } - text { - object { - x=63 - y=94 - width=100 - height=20 - } - "basic attribute" { - clr=14 - } - textix="EPICS name" - align="horiz. right" - } - } - } - composite { - object { - x=43 - y=119 - width=288 - height=20 - } - "composite name"="" - children { - text { - object { - x=43 - y=119 - width=120 - height=20 - } - "basic attribute" { - clr=14 - } - textix="Manufacturer" - align="horiz. right" - } - "text update" { - object { - x=171 - y=120 - width=160 - height=18 - } - monitor { - chan="$(P)$(R)Manufacturer_RBV" - clr=54 - bclr=4 - } - limits { - } - } - } - } - composite { - object { - x=73 - y=258 - width=169 - height=20 - } - "composite name"="" - children { - text { - object { - x=73 - y=258 - width=90 - height=20 - } - "basic attribute" { - clr=14 - } - textix=" More" - align="horiz. right" - } - "related display" { - object { - x=172 - y=258 - width=70 - height=20 - } - display[0] { - label="asynRecord" - name="asynRecord.adl" - args="P=$(P),R=$(R)AsynIO" - } - display[1] { - label="Save restore status" - name="save_restoreStatus_more.adl" - args="P=$(P)" - } - clr=14 - bclr=51 - } - } - } - text { - object { - x=113 - y=144 - width=50 - height=20 - } - "basic attribute" { - clr=14 - } - textix="Model" - align="horiz. right" - } - "text update" { object { x=171 - y=145 + y=95 width=160 height=18 } - monitor { - chan="$(P)$(R)Model_RBV" + "basic attribute" { clr=54 - bclr=4 - } - limits { } + textix="$(P)$(R)" } text { object { x=63 - y=194 + y=94 width=100 height=20 } "basic attribute" { clr=14 } - textix="Connection" + textix="EPICS name" align="horiz. right" } - "message button" { - object { - x=171 - y=194 - width=80 - height=20 - } - control { - chan="$(P)$(R)AsynIO.CNCT" - clr=14 - bclr=51 - } - label="Connect" - press_msg="1" - } - "message button" { - object { - x=256 - y=194 - width=80 - height=20 - } - control { - chan="$(P)$(R)AsynIO.CNCT" - clr=14 - bclr=51 - } - label="Disconnect" - press_msg="0" - } + } +} +composite { + object { + x=43 + y=119 + width=288 + height=20 + } + "composite name"="" + children { text { object { - x=202 - y=167 - width=90 - height=20 - } - "basic attribute" { - clr=63 - } - "dynamic attribute" { - vis="if not zero" - calc="0" - chan="$(P)$(R)AsynIO.CNCT" - } - textix="Connected" - align="horiz. centered" - } - text { - object { - x=187 - y=167 + x=43 + y=119 width=120 height=20 } - "basic attribute" { - clr=20 - } - "dynamic attribute" { - vis="if zero" - chan="$(P)$(R)AsynIO.CNCT" - } - textix="Disconnected" - align="horiz. centered" - } - text { - object { - x=63 - y=69 - width=100 - height=20 - } "basic attribute" { clr=14 } - textix="asyn port" + textix="Manufacturer" align="horiz. right" } "text update" { object { x=171 - y=70 + y=120 width=160 height=18 } monitor { - chan="$(P)$(R)PortName_RBV" + chan="$(P)$(R)Manufacturer_RBV" clr=54 bclr=4 } limits { } } - "text update" { - object { - x=242 - y=228 - width=61 - height=18 - } - monitor { - chan="$(P)$(R)Temperature_RBV" - clr=54 - bclr=4 - } - align="horiz. centered" - limits { - } - } - "text entry" { - object { - x=171 - y=227 - width=60 - height=20 - } - control { - chan="$(P)$(R)Temperature" - clr=14 - bclr=51 - } - limits { - } - } - text { - object { - x=53 - y=227 - width=110 - height=20 - } - "basic attribute" { - clr=14 - } - textix="Temperature" - align="horiz. right" - } } } +text { + object { + x=73 + y=258 + width=90 + height=20 + } + "basic attribute" { + clr=14 + } + textix=" More" + align="horiz. right" +} +text { + object { + x=113 + y=144 + width=50 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Model" + align="horiz. right" +} +"text update" { + object { + x=171 + y=145 + width=160 + height=18 + } + monitor { + chan="$(P)$(R)Model_RBV" + clr=54 + bclr=4 + } + limits { + } +} +text { + object { + x=63 + y=194 + width=100 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Connection" + align="horiz. right" +} +"message button" { + object { + x=171 + y=194 + width=80 + height=20 + } + control { + chan="$(P)$(R)AsynIO.CNCT" + clr=14 + bclr=51 + } + label="Connect" + press_msg="1" +} +"message button" { + object { + x=256 + y=194 + width=80 + height=20 + } + control { + chan="$(P)$(R)AsynIO.CNCT" + clr=14 + bclr=51 + } + label="Disconnect" + press_msg="0" +} +text { + object { + x=202 + y=167 + width=90 + height=20 + } + "basic attribute" { + clr=63 + } + "dynamic attribute" { + vis="if not zero" + calc="0" + chan="$(P)$(R)AsynIO.CNCT" + } + textix="Connected" + align="horiz. centered" +} +text { + object { + x=187 + y=167 + width=120 + height=20 + } + "basic attribute" { + clr=20 + } + "dynamic attribute" { + vis="if zero" + chan="$(P)$(R)AsynIO.CNCT" + } + textix="Disconnected" + align="horiz. centered" +} +text { + object { + x=63 + y=69 + width=100 + height=20 + } + "basic attribute" { + clr=14 + } + textix="asyn port" + align="horiz. right" +} +"text update" { + object { + x=171 + y=70 + width=160 + height=18 + } + monitor { + chan="$(P)$(R)PortName_RBV" + clr=54 + bclr=4 + } + limits { + } +} +"text update" { + object { + x=242 + y=228 + width=61 + height=18 + } + monitor { + chan="$(P)$(R)Temperature_RBV" + clr=54 + bclr=4 + } + align="horiz. centered" + limits { + } +} +"text entry" { + object { + x=171 + y=227 + width=60 + height=20 + } + control { + chan="$(P)$(R)Temperature" + clr=14 + bclr=51 + } + limits { + } +} +text { + object { + x=53 + y=227 + width=110 + height=20 + } + "basic attribute" { + clr=14 + } + textix="Temperature" + align="horiz. right" +} text { object { x=441 @@ -2292,3 +2250,43 @@ composite { chan="$(P)$(R)AutoDataType_RBV" } } +"related display" { + object { + x=172 + y=258 + width=70 + height=20 + } + display[0] { + label="asynRecord" + name="asynRecord.adl" + args="P=$(P),R=$(R)AsynIO" + } + display[1] { + label="Save restore status" + name="save_restoreStatus_more.adl" + args="P=$(P)" + } + display[2] { + label="Image plugin #1" + name="NDStdArrays.adl" + args="P=$(P), R=$(I)" + } + display[3] { + label="ROI plugin #1" + name="NDROI.adl" + args="P=$(P), R=$(ROI)" + } + display[4] { + label="File plugin #1" + name="NDPluginFile.adl" + args="P=$(P), R=$(F)" + } + display[5] { + label="Color convert plugin #1" + name="NDColorConvert.adl" + args="P=$(P), R=$(CC)" + } + clr=14 + bclr=51 +}