Skip to content

Commit

Permalink
Fix ps cycle action numbering
Browse files Browse the repository at this point in the history
  • Loading branch information
@xresende @anacso17
xresende authored and anacso17 committed Jan 7, 2025
1 parent a873ed1 commit 84c03df
Showing 1 changed file with 29 additions and 29 deletions.
58 changes: 29 additions & 29 deletions pyqt-apps/siriushla/as_ps_cycle/cycle_window.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ def _setup_ui(self):
self.psconn_led = PyDMLedMultiConn(self)

self.set_ps_idffmode_off_bt = QPushButton(
'4. Turn off PS IDFFMode', self)
'3. Turn off PS IDFFMode', self)
self.set_ps_idffmode_off_bt.setToolTip(
'Turn off power supplies IDFFMode.')
self.set_ps_idffmode_off_bt.clicked.connect(
Expand All @@ -146,7 +146,7 @@ def _setup_ui(self):
self.set_ps_idffmode_off_lb.setPixmap(self._pixmap_not)

self.set_ps_opmode_slowref_bt = QPushButton(
'5. Set PS OpMode to SlowRef', self)
'4. Set PS OpMode to SlowRef', self)
self.set_ps_opmode_slowref_bt.setToolTip(
'Set power supplies OpMode to SlowRef.')
self.set_ps_opmode_slowref_bt.clicked.connect(
Expand All @@ -157,7 +157,7 @@ def _setup_ui(self):
self.set_ps_opmode_slowref_lb.setPixmap(self._pixmap_not)

self.set_ps_current_zero_bt = QPushButton(
'6. Set PS current to zero', self)
'5. Set PS current to zero', self)
self.set_ps_current_zero_bt.setToolTip(
'Set power supplies current to zero.')
self.set_ps_current_zero_bt.clicked.connect(
Expand All @@ -168,7 +168,7 @@ def _setup_ui(self):
self.set_ps_current_zero_lb.setPixmap(self._pixmap_not)

self.prepare_ps_params_bt = QPushButton(
'7. Prepare PS Parameters', self)
'6. Prepare PS Parameters', self)
self.prepare_ps_params_bt.setToolTip(
'Check power supplies OpMode in SlowRef, check\n'
'current is zero and configure cycle parameters.')
Expand All @@ -180,7 +180,7 @@ def _setup_ui(self):
self.prepare_ps_params_lb.setPixmap(self._pixmap_not)

self.prepare_ps_opmode_bt = QPushButton(
'8. Prepare PS OpMode', self)
'7. Prepare PS OpMode', self)
self.prepare_ps_opmode_bt.setToolTip(
'Set power supplies OpMode to Cycle.')
self.prepare_ps_opmode_bt.clicked.connect(
Expand All @@ -193,7 +193,7 @@ def _setup_ui(self):
lb_cycle = QLabel('<h4>Cycle</h4>', self,
alignment=Qt.AlignCenter)

self.cycle_trims_bt = QPushButton('9. Cycle Trims', self)
self.cycle_trims_bt = QPushButton('8. Cycle Trims', self)
self.cycle_trims_bt.setToolTip(
'Cycle trims:\nStep 1) CH, QS and QTrims\nStep 2) CV')
self.cycle_trims_bt.clicked.connect(
Expand All @@ -205,7 +205,7 @@ def _setup_ui(self):
self.cycle_trims_lb.setPixmap(self._pixmap_check)
self.cycle_trims_lb.setVisible(False)

self.cycle_bt = QPushButton('10. Cycle', self)
self.cycle_bt = QPushButton('9. Cycle', self)
self.cycle_bt.setToolTip(
'Check all configurations,\nenable triggers and run cycle.')
self.cycle_bt.clicked.connect(
Expand All @@ -216,7 +216,7 @@ def _setup_ui(self):
lb_rest_ti = QLabel('<h4>Restore Timing</h4>', self,
alignment=Qt.AlignCenter)
self.restore_timing_bt = QPushButton(
'11. Restore Timing Initial State', self)
'10. Restore Timing Initial State', self)
self.restore_timing_bt.setToolTip(
'Restore timing initial state.')
self.restore_timing_bt.clicked.connect(
Expand Down Expand Up @@ -246,30 +246,30 @@ def _setup_ui(self):
lay_commsts.addWidget(self.prepare_timing_lb, 3, 1)
lay_commsts.addItem(
QSpacerItem(1, 1, QSzPlcy.Ignored, QSzPlcy.Expanding), 4, 0)
lay_commsts.addWidget(lb_prep_ps, 5, 0)
lay_commsts.addWidget(self.psconn_led, 5, 1)
lay_commsts.addWidget(self.set_ps_idffmode_off_bt, 6, 0)
lay_commsts.addWidget(self.set_ps_idffmode_off_lb, 6, 1)
lay_commsts.addWidget(self.set_ps_opmode_slowref_bt, 7, 0)
lay_commsts.addWidget(self.set_ps_opmode_slowref_lb, 7, 1)
lay_commsts.addWidget(self.set_ps_current_zero_bt, 8, 0)
lay_commsts.addWidget(self.set_ps_current_zero_lb, 8, 1)
lay_commsts.addWidget(self.prepare_ps_params_bt, 9, 0)
lay_commsts.addWidget(self.prepare_ps_params_lb, 9, 1)
lay_commsts.addWidget(self.prepare_ps_opmode_bt, 10, 0)
lay_commsts.addWidget(self.prepare_ps_opmode_lb, 10, 1)
lay_commsts.addWidget(lb_prep_ps, 4, 0)
lay_commsts.addWidget(self.psconn_led, 4, 1)
lay_commsts.addWidget(self.set_ps_idffmode_off_bt, 5, 0)
lay_commsts.addWidget(self.set_ps_idffmode_off_lb, 5, 1)
lay_commsts.addWidget(self.set_ps_opmode_slowref_bt, 6, 0)
lay_commsts.addWidget(self.set_ps_opmode_slowref_lb, 6, 1)
lay_commsts.addWidget(self.set_ps_current_zero_bt, 7, 0)
lay_commsts.addWidget(self.set_ps_current_zero_lb, 7, 1)
lay_commsts.addWidget(self.prepare_ps_params_bt, 8, 0)
lay_commsts.addWidget(self.prepare_ps_params_lb, 8, 1)
lay_commsts.addWidget(self.prepare_ps_opmode_bt, 9, 0)
lay_commsts.addWidget(self.prepare_ps_opmode_lb, 9, 1)
lay_commsts.addItem(
QSpacerItem(1, 1, QSzPlcy.Ignored, QSzPlcy.Expanding), 11, 0)
lay_commsts.addWidget(lb_cycle, 12, 0)
lay_commsts.addWidget(self.cycle_trims_bt, 13, 0)
lay_commsts.addWidget(self.cycle_trims_lb, 13, 1)
lay_commsts.addWidget(self.cycle_bt, 14, 0)
QSpacerItem(1, 1, QSzPlcy.Ignored, QSzPlcy.Expanding), 10, 0)
lay_commsts.addWidget(lb_cycle, 11, 0)
lay_commsts.addWidget(self.cycle_trims_bt, 12, 0)
lay_commsts.addWidget(self.cycle_trims_lb, 12, 1)
lay_commsts.addWidget(self.cycle_bt, 13, 0)
lay_commsts.addItem(
QSpacerItem(1, 1, QSzPlcy.Ignored, QSzPlcy.Expanding), 15, 0)
lay_commsts.addWidget(lb_rest_ti, 16, 0)
lay_commsts.addWidget(self.restore_timing_bt, 17, 0)
QSpacerItem(1, 1, QSzPlcy.Ignored, QSzPlcy.Expanding), 14, 0)
lay_commsts.addWidget(lb_rest_ti, 15, 0)
lay_commsts.addWidget(self.restore_timing_bt, 16, 0)
lay_commsts.addItem(
QSpacerItem(1, 1, QSzPlcy.Ignored, QSzPlcy.Expanding), 18, 0)
QSpacerItem(1, 1, QSzPlcy.Ignored, QSzPlcy.Expanding), 17, 0)
lay_commsts.setColumnStretch(0, 10)
lay_commsts.setColumnStretch(1, 1)
lay_commsts.setVerticalSpacing(12)
Expand Down

0 comments on commit 84c03df

Please sign in to comment.