@@ -221,15 +221,15 @@ DsoWidget::DsoWidget( DsoSettingsScope *scope, DsoSettingsView *view, const Dso:
221
221
mainLayout->setColumnStretch ( 3 , 1 ); // Scopes increase their size
222
222
// Bars around the scope, needed because the slider-drawing-area is outside
223
223
// the scope at min/max
224
- mainLayout->setColumnMinimumWidth ( 2 , mainSliders.triggerOffsetSlider ->preMargin () );
225
- mainLayout->setColumnMinimumWidth ( 4 , mainSliders.triggerOffsetSlider ->postMargin () );
224
+ mainLayout->setColumnMinimumWidth ( 2 , mainSliders.triggerPositionSlider ->preMargin () );
225
+ mainLayout->setColumnMinimumWidth ( 4 , mainSliders.triggerPositionSlider ->postMargin () );
226
226
mainLayout->setSpacing ( 0 );
227
227
int row = 0 ;
228
228
// display settings on top of scope
229
229
mainLayout->addLayout ( settingsLayout, row, 1 , 1 , 5 );
230
230
++row;
231
231
// 5x5 box for mainScope & mainSliders & markerSlider
232
- mainLayout->addWidget ( mainSliders.triggerOffsetSlider , row, 2 , 2 , 3 , Qt::AlignBottom );
232
+ mainLayout->addWidget ( mainSliders.triggerPositionSlider , row, 2 , 2 , 3 , Qt::AlignBottom );
233
233
++row;
234
234
mainLayout->setRowMinimumHeight ( row, mainSliders.voltageOffsetSlider ->preMargin () );
235
235
mainLayout->addWidget ( mainSliders.voltageOffsetSlider , row, 1 , 3 , 2 , Qt::AlignRight );
@@ -247,7 +247,7 @@ DsoWidget::DsoWidget( DsoSettingsScope *scope, DsoSettingsView *view, const Dso:
247
247
++row;
248
248
++row;
249
249
// 5x4 box for zoomScope & zoomSliders
250
- mainLayout->addWidget ( zoomSliders.triggerOffsetSlider , row, 2 , 2 , 3 , Qt::AlignBottom );
250
+ mainLayout->addWidget ( zoomSliders.triggerPositionSlider , row, 2 , 2 , 3 , Qt::AlignBottom );
251
251
++row;
252
252
mainLayout->setRowMinimumHeight ( row, zoomSliders.voltageOffsetSlider ->preMargin () );
253
253
mainLayout->addWidget ( zoomSliders.voltageOffsetSlider , row, 1 , 3 , 2 , Qt::AlignRight );
@@ -273,9 +273,9 @@ DsoWidget::DsoWidget( DsoSettingsScope *scope, DsoSettingsView *view, const Dso:
273
273
connect ( mainSliders.voltageOffsetSlider , &LevelSlider::valueChanged, this , &DsoWidget::updateOffset );
274
274
connect ( zoomSliders.voltageOffsetSlider , &LevelSlider::valueChanged, this , &DsoWidget::updateOffset );
275
275
276
- connect ( mainSliders.triggerOffsetSlider , &LevelSlider::valueChanged,
276
+ connect ( mainSliders.triggerPositionSlider , &LevelSlider::valueChanged,
277
277
[this ]( int index , double value ) { updateTriggerOffset ( index , value, true ); } );
278
- connect ( zoomSliders.triggerOffsetSlider , &LevelSlider::valueChanged,
278
+ connect ( zoomSliders.triggerPositionSlider , &LevelSlider::valueChanged,
279
279
[this ]( int index , double value ) { updateTriggerOffset ( index , value, false ); } );
280
280
281
281
connect ( mainSliders.triggerLevelSlider , &LevelSlider::valueChanged, this , &DsoWidget::updateTriggerLevel );
@@ -402,12 +402,12 @@ void DsoWidget::setupSliders( DsoWidget::Sliders &sliders ) {
402
402
}
403
403
404
404
// The triggerPosition slider
405
- sliders.triggerOffsetSlider = new LevelSlider ( Qt::DownArrow );
406
- sliders.triggerOffsetSlider ->addSlider ();
407
- sliders.triggerOffsetSlider ->setLimits ( 0 , 0.0 , 1.0 );
408
- sliders.triggerOffsetSlider ->setStep ( 0 , 0.2 / double ( DIVS_TIME ) );
409
- sliders.triggerOffsetSlider ->setValue ( 0 , scope->trigger .offset );
410
- sliders.triggerOffsetSlider ->setIndexVisible ( 0 , true );
405
+ sliders.triggerPositionSlider = new LevelSlider ( Qt::DownArrow );
406
+ sliders.triggerPositionSlider ->addSlider ();
407
+ sliders.triggerPositionSlider ->setLimits ( 0 , 0.0 , 1.0 );
408
+ sliders.triggerPositionSlider ->setStep ( 0 , 0.2 / double ( DIVS_TIME ) );
409
+ sliders.triggerPositionSlider ->setValue ( 0 , scope->trigger .offset );
410
+ sliders.triggerPositionSlider ->setIndexVisible ( 0 , true );
411
411
412
412
// The sliders for the trigger levels
413
413
sliders.triggerLevelSlider = new LevelSlider ( Qt::LeftArrow );
@@ -704,8 +704,8 @@ void DsoWidget::updateTriggerSlope() { updateTriggerDetails(); }
704
704
// / \brief Handles sourceChanged signal from the trigger dock.
705
705
void DsoWidget::updateTriggerSource () {
706
706
// Change the colors of the trigger sliders
707
- mainSliders.triggerOffsetSlider ->setColor ( 0 , view->colors ->voltage [ scope->trigger .source ] );
708
- zoomSliders.triggerOffsetSlider ->setColor ( 0 , view->colors ->voltage [ scope->trigger .source ] );
707
+ mainSliders.triggerPositionSlider ->setColor ( 0 , view->colors ->voltage [ scope->trigger .source ] );
708
+ zoomSliders.triggerPositionSlider ->setColor ( 0 , view->colors ->voltage [ scope->trigger .source ] );
709
709
710
710
for ( ChannelID channel = 0 ; channel < spec->channels ; ++channel ) {
711
711
QColor color =
@@ -778,7 +778,7 @@ void DsoWidget::updateZoom( bool enabled ) {
778
778
mainLayout->setRowStretch ( zoomScopeRow, enabled ? 1 : 0 );
779
779
zoomScope->setVisible ( enabled );
780
780
zoomSliders.voltageOffsetSlider ->setVisible ( enabled );
781
- zoomSliders.triggerOffsetSlider ->setVisible ( enabled );
781
+ zoomSliders.triggerPositionSlider ->setVisible ( enabled );
782
782
zoomSliders.triggerLevelSlider ->setVisible ( enabled );
783
783
// Show time-/frequencybase and zoom factor if the magnified scope is shown
784
784
markerLayout->setStretch ( 3 , enabled ? 1 : 0 );
@@ -915,7 +915,7 @@ double DsoWidget::zoomToMain( double position ) const {
915
915
void DsoWidget::adaptTriggerOffsetSlider () {
916
916
double value = mainToZoom ( scope->trigger .offset );
917
917
918
- LevelSlider &slider = *zoomSliders.triggerOffsetSlider ;
918
+ LevelSlider &slider = *zoomSliders.triggerPositionSlider ;
919
919
const QSignalBlocker blocker ( slider );
920
920
if ( slider.minimum ( 0 ) <= value && value <= slider.maximum ( 0 ) ) {
921
921
slider.setEnabled ( true );
@@ -944,8 +944,8 @@ void DsoWidget::updateTriggerOffset( int index, double value, bool mainView ) {
944
944
adaptTriggerOffsetSlider ();
945
945
} else {
946
946
scope->trigger .offset = zoomToMain ( value );
947
- const QSignalBlocker blocker ( mainSliders.triggerOffsetSlider );
948
- mainSliders.triggerOffsetSlider ->setValue ( index , scope->trigger .offset );
947
+ const QSignalBlocker blocker ( mainSliders.triggerPositionSlider );
948
+ mainSliders.triggerPositionSlider ->setValue ( index , scope->trigger .offset );
949
949
}
950
950
951
951
updateTriggerDetails ();
@@ -1016,7 +1016,7 @@ void DsoWidget::updateSlidersSettings() {
1016
1016
}
1017
1017
1018
1018
// The trigger position slider
1019
- mainSliders.triggerOffsetSlider ->setValue ( 0 , scope->trigger .offset );
1019
+ mainSliders.triggerPositionSlider ->setValue ( 0 , scope->trigger .offset );
1020
1020
updateTriggerOffset ( 0 , scope->trigger .offset , true ); // main slider
1021
1021
updateTriggerOffset ( 0 , mainToZoom ( scope->trigger .offset ), false ); // zoom slider
1022
1022
0 commit comments