diff --git a/bin/start_service.sh b/bin/start_service.sh index b2bdf28..49d915e 100755 --- a/bin/start_service.sh +++ b/bin/start_service.sh @@ -43,4 +43,4 @@ source ${APP_DIR}/.venv/bin/activate # TODO: use `exec python3 ...` here? python -u -B -m agebd_${SVC_NAME_LOWER_UNDERSCORES}.main -# TODO: remove: cicd test 56 +# TODO: remove: cicd test 57 diff --git a/cli/tests/fixtures/expected_output/qt/A_BD_TestService99-X00.ui b/cli/tests/fixtures/expected_output/qt/A_BD_TestService99-X00.ui index 3e964b9..c9fddf7 100644 --- a/cli/tests/fixtures/expected_output/qt/A_BD_TestService99-X00.ui +++ b/cli/tests/fixtures/expected_output/qt/A_BD_TestService99-X00.ui @@ -1,3 +1,4 @@ + MainWindow diff --git a/packages/agebd/src/agebd/service/pvs.py b/packages/agebd/src/agebd/service/pvs.py index 268594a..319b594 100644 --- a/packages/agebd/src/agebd/service/pvs.py +++ b/packages/agebd/src/agebd/service/pvs.py @@ -1,6 +1,6 @@ from agebd.pv import PVLink -# TODO: remove: cicd test 56 +# TODO: remove: cicd test 57 class BasePVs: diff --git a/qt/A_BD_DBPM3Curr.ui b/qt/A_BD_DBPM3Curr.ui index 288be53..3e9c88d 100644 --- a/qt/A_BD_DBPM3Curr.ui +++ b/qt/A_BD_DBPM3Curr.ui @@ -1,3 +1,4 @@ + MainWindow diff --git a/qt/A_BD_FeedBackOverview.ui b/qt/A_BD_FeedBackOverview.ui index afac466..cd90ba0 100644 --- a/qt/A_BD_FeedBackOverview.ui +++ b/qt/A_BD_FeedBackOverview.ui @@ -1,3 +1,4 @@ + MainWindow diff --git a/qt/A_BD_FeedBackOverview_inc.ui b/qt/A_BD_FeedBackOverview_inc.ui index 953c2f6..be82de8 100644 --- a/qt/A_BD_FeedBackOverview_inc.ui +++ b/qt/A_BD_FeedBackOverview_inc.ui @@ -1,3 +1,4 @@ + MainWindow diff --git a/qt/A_BD_InjectionGuard.ui b/qt/A_BD_InjectionGuard.ui index 4393d06..1cf5b81 100644 --- a/qt/A_BD_InjectionGuard.ui +++ b/qt/A_BD_InjectionGuard.ui @@ -1,3 +1,4 @@ + MainWindow diff --git a/qt/A_BD_InjectionGuard_inc.ui b/qt/A_BD_InjectionGuard_inc.ui index 12b4b31..69343aa 100644 --- a/qt/A_BD_InjectionGuard_inc.ui +++ b/qt/A_BD_InjectionGuard_inc.ui @@ -1,3 +1,4 @@ + MainWindow diff --git a/qt/A_BD_Master.ui b/qt/A_BD_Master.ui index 96b5a3c..de50885 100644 --- a/qt/A_BD_Master.ui +++ b/qt/A_BD_Master.ui @@ -1,3 +1,4 @@ + MainWindow diff --git a/qt/A_BD_NTurns.ui b/qt/A_BD_NTurns.ui index 0921764..14188a6 100644 --- a/qt/A_BD_NTurns.ui +++ b/qt/A_BD_NTurns.ui @@ -1,3 +1,4 @@ + MainWindow diff --git a/qt/A_BD_OrbitBump.ui b/qt/A_BD_OrbitBump.ui index 64c3c4e..0370d55 100644 --- a/qt/A_BD_OrbitBump.ui +++ b/qt/A_BD_OrbitBump.ui @@ -1,3 +1,4 @@ + MainWindow diff --git a/qt/A_BD_OrbitBump_Expert.ui b/qt/A_BD_OrbitBump_Expert.ui index 328eafb..6f652b8 100644 --- a/qt/A_BD_OrbitBump_Expert.ui +++ b/qt/A_BD_OrbitBump_Expert.ui @@ -1,3 +1,4 @@ + MainWindow diff --git a/qt/A_BD_OrbitBump_ExpertBackUp.ui b/qt/A_BD_OrbitBump_ExpertBackUp.ui index 18fac9c..01600ea 100644 --- a/qt/A_BD_OrbitBump_ExpertBackUp.ui +++ b/qt/A_BD_OrbitBump_ExpertBackUp.ui @@ -1,3 +1,4 @@ + MainWindow diff --git a/qt/A_BD_OrbitBump_Expert_all.ui b/qt/A_BD_OrbitBump_Expert_all.ui index b5f2dd1..8fbfd9a 100644 --- a/qt/A_BD_OrbitBump_Expert_all.ui +++ b/qt/A_BD_OrbitBump_Expert_all.ui @@ -1,3 +1,4 @@ + MainWindow diff --git a/qt/A_BD_OrbitBump_Expert_inc.ui b/qt/A_BD_OrbitBump_Expert_inc.ui index 1d0a058..fa6c550 100644 --- a/qt/A_BD_OrbitBump_Expert_inc.ui +++ b/qt/A_BD_OrbitBump_Expert_inc.ui @@ -1,3 +1,4 @@ + MainWindow diff --git a/qt/A_BD_OrbitBump_Operator.ui b/qt/A_BD_OrbitBump_Operator.ui index 0a66761..1d7f6c4 100644 --- a/qt/A_BD_OrbitBump_Operator.ui +++ b/qt/A_BD_OrbitBump_Operator.ui @@ -1,3 +1,4 @@ + MainWindow diff --git a/qt/A_BD_OrbitBump_Operator_inc.ui b/qt/A_BD_OrbitBump_Operator_inc.ui index 3d59a56..40952db 100644 --- a/qt/A_BD_OrbitBump_Operator_inc.ui +++ b/qt/A_BD_OrbitBump_Operator_inc.ui @@ -1,3 +1,4 @@ + MainWindow diff --git a/qt/A_BD_PostMortemLog.ui b/qt/A_BD_PostMortemLog.ui index bf7f8f7..2715a40 100644 --- a/qt/A_BD_PostMortemLog.ui +++ b/qt/A_BD_PostMortemLog.ui @@ -1,3 +1,4 @@ + MainWindow diff --git a/qt/A_BD_Scrubbing.ui b/qt/A_BD_Scrubbing.ui index 0c96232..3f66f82 100644 --- a/qt/A_BD_Scrubbing.ui +++ b/qt/A_BD_Scrubbing.ui @@ -1,3 +1,4 @@ + MainWindow @@ -4551,776 +4552,3 @@ AGEBD-SCRUBBING{{ agebd_env_suffix_upper }}:CONTROL-VACUUM-DYN-FRAC 35 - - - 16 - 75 - true - - - - AGEBD-SCRUBBING{{ agebd_env_suffix_upper }}:CONTROL-SCRUB - - - - - - 10 - 20 - 191 - 40 - - - - - 20 - 75 - true - - - - Scrubbing - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - ESimpleLabel::None - - - - - - 0 - 95 - 360 - 85 - - - - - 85 - 170 - 0 - - - - caFrame::Calc - - - A>3 - - - AGEBD-SCRUBBING{{ agebd_env_suffix_upper }}:CONTROL-SCRUB - - - - - 230 - 45 - 100 - 35 - - - - - Monospace - 13 - PreferDefault - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - ARSGE-CECL-MBFB:MBFB-T-Y-DDS-FRQ - - - - 160 - 160 - 164 - - - - caLineEdit::Default - - - caLineEdit::User - - - caLineEdit::None - - - true - - - - - - 65 - 45 - 100 - 35 - - - - 3 - - - 0 - - - AGEBD-SCRUBBING{{ agebd_env_suffix_upper }}:MBFBY-GAIN-SP.VAL - - - caSpinbox::User - - - true - - - caSpinbox::User - - - 100.000000000000000 - - - 0.000000000000000 - - - - - - 230 - 5 - 100 - 35 - - - - - Monospace - 13 - PreferDefault - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - ARSGE-CECL-MBFB:MBFB-T-X-DDS-FRQ - - - - 160 - 160 - 164 - - - - caLineEdit::Default - - - caLineEdit::User - - - caLineEdit::None - - - true - - - - - - 10 - 45 - 45 - 35 - - - - - 8 - 75 - true - - - - MBFBy - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - 65 - 5 - 100 - 35 - - - - 3 - - - 0 - - - AGEBD-SCRUBBING{{ agebd_env_suffix_upper }}:MBFBX-GAIN-SP.VAL - - - caSpinbox::User - - - true - - - caSpinbox::User - - - 100.000000000000000 - - - 0.000000000000000 - - - - - - 10 - 5 - 45 - 35 - - - - - 8 - 75 - true - - - - MBFBx - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - 175 - 45 - 45 - 35 - - - - - Monospace - 13 - PreferDefault - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - ARSGE-CECL-MBFB:MBFB-T-Y-DDS-GAIN - - - - 160 - 160 - 164 - - - - caLineEdit::Default - - - caLineEdit::User - - - caLineEdit::None - - - false - - - - - - 175 - 5 - 45 - 35 - - - - - Monospace - 13 - PreferDefault - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - ARSGE-CECL-MBFB:MBFB-T-X-DDS-GAIN - - - - 160 - 160 - 164 - - - - caLineEdit::Default - - - caLineEdit::User - - - caLineEdit::None - - - false - - - - - - 335 - 5 - 17 - 17 - - - - true - - - false - - - 15 - - - 15 - - - -ARSGE-MBFBT-AMP-03:SET-ON-OFF - - - - 0 - 255 - 0 - - - - - - - 335 - 23 - 17 - 17 - - - - true - - - false - - - 15 - - - 15 - - - -ARSGE-MBFBT-AMP-04:SET-ON-OFF - - - - 0 - 255 - 0 - - - - - - - 335 - 45 - 17 - 17 - - - - true - - - false - - - 15 - - - 15 - - - ARSGE-MBFBT-AMP-01:SET-ON-OFF - - - - 0 - 255 - 0 - - - - - - - 335 - 63 - 17 - 17 - - - - true - - - false - - - 15 - - - 15 - - - -ARSGE-MBFBT-AMP-02:SET-ON-OFF - - - - 0 - 255 - 0 - - - - - - - - 0 - 95 - 360 - 85 - - - - - 85 - 170 - 0 - - - - caFrame::Calc - - - A<4 & A>0 - - - AGEBD-SCRUBBING{{ agebd_env_suffix_upper }}:CONTROL-SCRUB - - - - - 70 - 45 - 150 - 35 - - - - 4 - - - 2 - - - ARS01-MKIK-0320:I-SET - - - caSpinbox::User - - - true - - - caSpinbox::User - - - 100.000000000000000 - - - 0.000000000000000 - - - - - - 10 - 45 - 50 - 35 - - - - - 10 - 75 - true - - - - PINGy - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - 70 - 5 - 150 - 35 - - - - 4 - - - 2 - - - ARS01-MKIK-0290:I-SET - - - caSpinbox::User - - - true - - - caSpinbox::User - - - 100.000000000000000 - - - 0.000000000000000 - - - - - - 10 - 5 - 50 - 35 - - - - - 10 - 75 - true - - - - PINGx - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - 230 - 5 - 35 - 35 - - - - - 35 - 35 - - - - ARS01-MKIK-0290:CTRL-ON-OFF - - - - - - 230 - 45 - 35 - 35 - - - - - 35 - 35 - - - - ARS01-MKIK-0320:CTRL-ON-OFF - - - - - - - - - caMenu - QComboBox -
caMenu
- - - caChoice - QWidget -
caChoice
- - - caTextEntry - caLineEdit -
caTextEntry
- - - caMessageButton - QPushButton -
caMessageButton
- - - caToggleButton - QCheckBox -
caToggleButton
- - - caSpinbox - QFrame -
caSpinbox
- - - caFrame - QFrame -
caFrame
- 1 - - - caLabel - QLabel -
caLabel
- - - caGraphics - QWidget -
caGraphics
- - - caLed - QWidget -
caLed
- - - caLineEdit - QLineEdit -
caLineEdit
- - - caCartesianPlot - QwtPlot -
caCartesianPlot
- - - caStripPlot - QwtPlot -
caStripPlot
- 1 - - - caCalc - QLabel -
caCalc
- - - wmSignalPropagator - QLabel -
wmSignalPropagator
- - - QwtPlot - QFrame -
qwt_plot.h
- - - - - - cacalc_2 - emitSignal(bool) - wmsignalpropagator - reloadwindow() - - - 2020 - 374 - - - 2022 - 545 - - - - - diff --git a/qt/A_BD_ServiceManager_inc.ui b/qt/A_BD_ServiceManager_inc.ui index 4f030fb..839f39d 100644 --- a/qt/A_BD_ServiceManager_inc.ui +++ b/qt/A_BD_ServiceManager_inc.ui @@ -1,3 +1,4 @@ + MainWindow diff --git a/qt/A_BD_TauBPM.ui b/qt/A_BD_TauBPM.ui index 9460e95..1d9f7e1 100644 --- a/qt/A_BD_TauBPM.ui +++ b/qt/A_BD_TauBPM.ui @@ -1,3 +1,4 @@ + MainWindow diff --git a/qt/A_BD_TauPCT.ui b/qt/A_BD_TauPCT.ui index 31c3115..c1ab872 100644 --- a/qt/A_BD_TauPCT.ui +++ b/qt/A_BD_TauPCT.ui @@ -1,3 +1,4 @@ + MainWindow diff --git a/qt/A_BD_Timing.ui b/qt/A_BD_Timing.ui index 3b78166..13dece5 100644 --- a/qt/A_BD_Timing.ui +++ b/qt/A_BD_Timing.ui @@ -1,3 +1,4 @@ + MainWindow diff --git a/qt/A_BD_TopUpTool.ui b/qt/A_BD_TopUpTool.ui index cb126f5..6e52e5d 100644 --- a/qt/A_BD_TopUpTool.ui +++ b/qt/A_BD_TopUpTool.ui @@ -1,3 +1,4 @@ + MainWindow diff --git a/qt/A_BD_Tune.ui b/qt/A_BD_Tune.ui index d6b6403..eb124cc 100644 --- a/qt/A_BD_Tune.ui +++ b/qt/A_BD_Tune.ui @@ -1,3 +1,4 @@ + MainWindow diff --git a/qt/A_BD_TuneBump.ui b/qt/A_BD_TuneBump.ui index 55eff01..6f80b81 100644 --- a/qt/A_BD_TuneBump.ui +++ b/qt/A_BD_TuneBump.ui @@ -1,3 +1,4 @@ + MainWindow diff --git a/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py b/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py index 1dae714..64cbe76 100644 --- a/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py +++ b/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_dbpm3curr import PVs, Service from agebd_dbpm3curr.service import SERVICE_NAME -# TODO: remove: cicd test 56 +# TODO: remove: cicd test 57 def main( diff --git a/services/injectionguard/current/app/src/agebd_injectionguard/main.py b/services/injectionguard/current/app/src/agebd_injectionguard/main.py index 542f1e1..9f6d5c5 100644 --- a/services/injectionguard/current/app/src/agebd_injectionguard/main.py +++ b/services/injectionguard/current/app/src/agebd_injectionguard/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_injectionguard import PVs, Service from agebd_injectionguard.service import SERVICE_NAME -# TODO: remove: cicd test 56 +# TODO: remove: cicd test 57 def main( diff --git a/services/master/current/app/src/agebd_master/main.py b/services/master/current/app/src/agebd_master/main.py index 5e262a2..75ef091 100644 --- a/services/master/current/app/src/agebd_master/main.py +++ b/services/master/current/app/src/agebd_master/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_master import PVs, Service from agebd_master.service import SERVICE_NAME -# TODO: remove: cicd test 56 +# TODO: remove: cicd test 57 def main( diff --git a/services/plots/current/app/src/agebd_plots/main.py b/services/plots/current/app/src/agebd_plots/main.py index 458f3b0..d0fd47d 100644 --- a/services/plots/current/app/src/agebd_plots/main.py +++ b/services/plots/current/app/src/agebd_plots/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_plots import PVs, Service from agebd_plots.service import SERVICE_NAME -# TODO: remove: cicd test 56 +# TODO: remove: cicd test 57 def main( diff --git a/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py b/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py index 14c14a6..d924566 100644 --- a/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py +++ b/services/postmortemlog/current/app/src/agebd_postmortemlog/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_postmortemlog import PVs, Service from agebd_postmortemlog.service import SERVICE_NAME -# TODO: remove: cicd test 56 +# TODO: remove: cicd test 57 def main( diff --git a/services/scrubbing/current/app/src/agebd_scrubbing/main.py b/services/scrubbing/current/app/src/agebd_scrubbing/main.py index d1c1956..6226f63 100644 --- a/services/scrubbing/current/app/src/agebd_scrubbing/main.py +++ b/services/scrubbing/current/app/src/agebd_scrubbing/main.py @@ -6,7 +6,7 @@ from agebd_scrubbing import PVs, Service from agebd_scrubbing.runner import Runner from agebd_scrubbing.service import SERVICE_NAME -# TODO: remove: cicd test 56 +# TODO: remove: cicd test 57 def main( diff --git a/services/shifttool/current/app/src/agebd_shifttool/main.py b/services/shifttool/current/app/src/agebd_shifttool/main.py index 0987be2..23e54d4 100644 --- a/services/shifttool/current/app/src/agebd_shifttool/main.py +++ b/services/shifttool/current/app/src/agebd_shifttool/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_shifttool import PVs, Service from agebd_shifttool.service import SERVICE_NAME -# TODO: remove: cicd test 56 +# TODO: remove: cicd test 57 def main( diff --git a/services/taubpm/current/app/src/agebd_taubpm/main.py b/services/taubpm/current/app/src/agebd_taubpm/main.py index 8159884..a22845f 100644 --- a/services/taubpm/current/app/src/agebd_taubpm/main.py +++ b/services/taubpm/current/app/src/agebd_taubpm/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_taubpm import PVs, Service from agebd_taubpm.service import SERVICE_NAME -# TODO: remove: cicd test 56 +# TODO: remove: cicd test 57 def main( diff --git a/services/taupct/current/app/src/agebd_taupct/main.py b/services/taupct/current/app/src/agebd_taupct/main.py index ad70977..9984c3d 100644 --- a/services/taupct/current/app/src/agebd_taupct/main.py +++ b/services/taupct/current/app/src/agebd_taupct/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_taupct import PVs, Service from agebd_taupct.service import SERVICE_NAME -# TODO: remove: cicd test 56 +# TODO: remove: cicd test 57 def main( diff --git a/services/timing/current/app/src/agebd_timing/main.py b/services/timing/current/app/src/agebd_timing/main.py index d0b2648..a4c0937 100644 --- a/services/timing/current/app/src/agebd_timing/main.py +++ b/services/timing/current/app/src/agebd_timing/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_timing import PVs, Service from agebd_timing.service import SERVICE_NAME -# TODO: remove: cicd test 56 +# TODO: remove: cicd test 57 def main( diff --git a/services/topuptool/current/app/src/agebd_topuptool/main.py b/services/topuptool/current/app/src/agebd_topuptool/main.py index 8b465bf..ba12f29 100644 --- a/services/topuptool/current/app/src/agebd_topuptool/main.py +++ b/services/topuptool/current/app/src/agebd_topuptool/main.py @@ -6,7 +6,7 @@ from agebd_topuptool import PVs, Service from agebd_topuptool.runner import Runner from agebd_topuptool.service import SERVICE_NAME -# TODO: remove: cicd test 56 +# TODO: remove: cicd test 57 def main( diff --git a/services/tune/current/app/src/agebd_tune/main.py b/services/tune/current/app/src/agebd_tune/main.py index 613791d..ece0a01 100644 --- a/services/tune/current/app/src/agebd_tune/main.py +++ b/services/tune/current/app/src/agebd_tune/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tune import PVs, Service from agebd_tune.service import SERVICE_NAME -# TODO: remove: cicd test 56 +# TODO: remove: cicd test 57 def main( diff --git a/services/tunebump/current/app/src/agebd_tunebump/main.py b/services/tunebump/current/app/src/agebd_tunebump/main.py index a4f6f38..de620d3 100644 --- a/services/tunebump/current/app/src/agebd_tunebump/main.py +++ b/services/tunebump/current/app/src/agebd_tunebump/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tunebump import PVs, Service from agebd_tunebump.service import SERVICE_NAME -# TODO: remove: cicd test 56 +# TODO: remove: cicd test 57 def main( diff --git a/services/tunefbx/current/app/src/agebd_tunefbx/main.py b/services/tunefbx/current/app/src/agebd_tunefbx/main.py index 794667a..ffeabbc 100644 --- a/services/tunefbx/current/app/src/agebd_tunefbx/main.py +++ b/services/tunefbx/current/app/src/agebd_tunefbx/main.py @@ -6,7 +6,7 @@ from agebd.utils import init_logging from agebd_tunefbx import PVs, Service from agebd_tunefbx.service import SERVICE_NAME -# TODO: remove: cicd test 56 +# TODO: remove: cicd test 57 def main( diff --git a/services/tunefby/current/app/src/agebd_tunefby/main.py b/services/tunefby/current/app/src/agebd_tunefby/main.py index 747f04c..ca7aa74 100644 --- a/services/tunefby/current/app/src/agebd_tunefby/main.py +++ b/services/tunefby/current/app/src/agebd_tunefby/main.py @@ -7,7 +7,7 @@ from agebd_tunefby import PVs, Service from agebd_tunefby.service import SERVICE_NAME -# TODO: remove: cicd test 56 +# TODO: remove: cicd test 57 def main( log_level: LogLevel = typer.Option( diff --git a/templates/qt/A_BD_{{ui_filename}}.ui.jinja b/templates/qt/A_BD_{{ui_filename}}.ui.jinja index 307ae6d..0663bd4 100644 --- a/templates/qt/A_BD_{{ui_filename}}.ui.jinja +++ b/templates/qt/A_BD_{{ui_filename}}.ui.jinja @@ -1,3 +1,4 @@ + MainWindow