diff --git a/stdApp/op/adl/pid_plot_readback.adl b/stdApp/op/adl/pid_plot_readback.adl index 096c0ef0..ebabf69a 100755 --- a/stdApp/op/adl/pid_plot_readback.adl +++ b/stdApp/op/adl/pid_plot_readback.adl @@ -1,12 +1,12 @@ file { - name="j:\epics\R3.13.1\share\stdApp\op\adl\pid_plot_readback.adl" - version=020306 + name="/home/beams/MWYMAN/sandbox/std/stdApp/op/adl/pid_plot_readback.adl" + version=030111 } display { object { - x=476 - y=530 + x=596 + y=273 width=600 height=480 } @@ -103,10 +103,14 @@ display { pen[0] { chan="$(P)$(PID).VAL" clr=20 + limits { + } } pen[1] { chan="$(P)$(PID).CVAL" clr=54 + limits { + } } } "text entry" { @@ -163,31 +167,3 @@ text { } textix="Display maxiumum" } -"related display" { - object { - x=313 - y=443 - width=103 - height=20 - } - display[0] { - label="Plot" - name="pid_plot_readback.adl" - args="P=$(P), PID=$(PID)" - policy="replace display" - } - clr=14 - bclr=4 -} -text { - object { - x=334 - y=417 - width=60 - height=20 - } - "basic attribute" { - clr=14 - } - textix="Replot" -} diff --git a/stdApp/op/bob/autoconvert/pid_plot_readback.bob b/stdApp/op/bob/autoconvert/pid_plot_readback.bob index 28b8c209..233a1b56 100644 --- a/stdApp/op/bob/autoconvert/pid_plot_readback.bob +++ b/stdApp/op/bob/autoconvert/pid_plot_readback.bob @@ -1,8 +1,9 @@ + pid_plot_readback - 476 - 530 + 596 + 273 600 480 @@ -11,7 +12,7 @@ false 5 - + strip chart #6 1 1 @@ -23,7 +24,7 @@ $(P)$(PID) setpoint and readback false - 30 second + 30 second @@ -33,6 +34,10 @@ 100.0 false true + + + + @@ -67,7 +72,7 @@ - text entry #11 + text entry #13 $(P)$(PID).HOPR 191 418 @@ -84,7 +89,7 @@ false - text entry #15 + text entry #17 $(P)$(PID).LOPR 191 443 @@ -101,7 +106,7 @@ false - text #19 + text #21 Display miniumum 21 443 @@ -113,7 +118,7 @@ true - text #22 + text #24 Display maxiumum 21 418 @@ -124,35 +129,4 @@ true - - related display #25 - - - pid_plot_readback.opi - replace - Plot - - - - 313 - 443 - 103 - 20 - - - - - - - text #28 - Replot - 334 - 417 - 60 - - - - - true - diff --git a/stdApp/op/ui/autoconvert/pid_plot_readback.ui b/stdApp/op/ui/autoconvert/pid_plot_readback.ui index 7614d782..93bba642 100644 --- a/stdApp/op/ui/autoconvert/pid_plot_readback.ui +++ b/stdApp/op/ui/autoconvert/pid_plot_readback.ui @@ -1,17 +1,17 @@ -MainWindow - - - - 476 - 530 - 600 - 480 - - - - + MainWindow + + + + 0 + 0 + 600 + 480 + + + + QWidget#centralWidget {background: rgba(187, 187, 187, 255);} @@ -104,324 +104,265 @@ border-radius: 2px; + + + + + + 1 + 1 + 600 + 400 + + + + $(P)$(PID) setpoint and readback + + + $(P)$(PID).VAL;$(P)$(PID).CVAL + + + caStripPlot::Second + + + 30.000000000000000 + + + caStripPlot::ValueScale + + + + 253 + 0 + 0 + + + + + 10 + 0 + 184 + + + + + 187 + 187 + 187 + + + + + 187 + 187 + 187 + + + + + 0 + 0 + 0 + + + + + + + 191 + 418 + 100 + 20 + + + + $(P)$(PID).HOPR + + + + 0 + 0 + 0 + + + + + 115 + 223 + 255 + + + + caLineEdit::Static + + + caLineEdit::Channel + + + caLineEdit::Channel + + + 1.000000000000000 + + + 0.000000000000000 + + + caLineEdit::WidthAndHeight + + + caLineEdit::decimal + + + + + + 191 + 443 + 100 + 20 + + + + $(P)$(PID).LOPR + + + + 0 + 0 + 0 + + + + + 115 + 223 + 255 + + + + caLineEdit::Static + + + caLineEdit::Channel + + + caLineEdit::Channel + + + 1.000000000000000 + + + 0.000000000000000 + + + caLineEdit::WidthAndHeight + + + caLineEdit::decimal + + + + + + 21 + 443 + 160 + 20 + + + + Display miniumum + + + Qt::AlignAbsolute|Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + ESimpleLabel::WidthAndHeight + + + + 0 + 0 + 0 + + + + + 0 + 0 + 0 + + + + QFrame::NoFrame + + + + + + 21 + 418 + 160 + 20 + + + + Display maxiumum + + + Qt::AlignAbsolute|Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + ESimpleLabel::WidthAndHeight + + + + 0 + 0 + 0 + + + + + 0 + 0 + 0 + + + + QFrame::NoFrame - - - - - 1 - 1 - 600 - 400 - - - - $(P)$(PID) setpoint and readback - - - - 0 - 0 - 0 - - - - - 187 - 187 - 187 - - - - - 187 - 187 - 187 - - - - - 253 - 0 - 0 - - - - - 10 - 0 - 184 - - - - Second - - - 30.000000 - - - $(P)$(PID).VAL;$(P)$(PID).CVAL - - - ValueScale - - - - - - 191 - 418 - 100 - 20 - - - - caLineEdit::WidthAndHeight - - - $(P)$(PID).HOPR - - - - 0 - 0 - 0 - - - - - 115 - 223 - 255 - - - - caLineEdit::Channel - - - caLineEdit::Channel - - - caLineEdit::Channel - - - 0.0 - - - 1.0 - - - caLineEdit::Static - - - decimal - - - - - - 191 - 443 - 100 - 20 - - - - caLineEdit::WidthAndHeight - - - $(P)$(PID).LOPR - - - - 0 - 0 - 0 - - - - - 115 - 223 - 255 - - - - caLineEdit::Channel - - - caLineEdit::Channel - - - caLineEdit::Channel - - - 0.0 - - - 1.0 - - - caLineEdit::Static - - - decimal - - - - - QFrame::NoFrame - - - - 0 - 0 - 0 - - - - - 0 - 0 - 0 - - - - Display miniumum - - - ESimpleLabel::WidthAndHeight - - - - 21 - 443 - 160 - 20 - - - - Qt::AlignAbsolute|Qt::AlignLeft|Qt::AlignVCenter - - - - - QFrame::NoFrame - - - - 0 - 0 - 0 - - - - - 0 - 0 - 0 - - - - Display maxiumum - - - ESimpleLabel::WidthAndHeight - - - - 21 - 418 - 160 - 20 - - - - Qt::AlignAbsolute|Qt::AlignLeft|Qt::AlignVCenter - - - - - - 313 - 443 - 103 - 20 - - - - - 0 - 0 - 0 - - - - - 187 - 187 - 187 - - - - Menu - - - Plot - - - pid_plot_readback.adl - - - P=$(P), PID=$(PID) - - - true - - - - - QFrame::NoFrame - - - - 0 - 0 - 0 - - - - - 0 - 0 - 0 - - - - Replot - - - ESimpleLabel::WidthAndHeight - - - - 334 - 417 - 60 - 20 - - - - Qt::AlignAbsolute|Qt::AlignLeft|Qt::AlignVCenter - - - caLabel_0 - caLabel_1 - caLabel_2 - caStripPlot_0 - caTextEntry_0 - caTextEntry_1 - caRelatedDisplay_0 - - - \ No newline at end of file + + caLabel_0 + caLabel_1 + caStripPlot_0 + caTextEntry_0 + caTextEntry_1 + + + + + caTextEntry + caLineEdit +
caTextEntry
+
+ + caLabel + QLabel +
caLabel
+
+ + caLineEdit + QLineEdit +
caLineEdit
+
+ + caStripPlot + QFrame +
caStripPlot
+
+
+ + +