diff --git a/src/gui/symbology/qgsgraduatedsymbolrendererwidget.cpp b/src/gui/symbology/qgsgraduatedsymbolrendererwidget.cpp index ad13acd3c0b0..e574a0027e11 100644 --- a/src/gui/symbology/qgsgraduatedsymbolrendererwidget.cpp +++ b/src/gui/symbology/qgsgraduatedsymbolrendererwidget.cpp @@ -524,6 +524,9 @@ QgsGraduatedSymbolRendererWidget::QgsGraduatedSymbolRendererWidget( QgsVectorLay // initialize from previously set renderer updateUiFromRenderer(); + // default to collapsed symmetric group for ui simplicity + mGroupBoxSymmetric->setCollapsed( true ); // + // menus for data-defined rotation/size QMenu *advMenu = new QMenu( this ); @@ -580,7 +583,7 @@ void QgsGraduatedSymbolRendererWidget::connectUpdateHandlers() connect( mModel, &QgsGraduatedSymbolRendererModel::rowsMoved, this, &QgsGraduatedSymbolRendererWidget::rowsMoved ); connect( mModel, &QAbstractItemModel::dataChanged, this, &QgsGraduatedSymbolRendererWidget::modelDataChanged ); - connect( cbxClassifySymmetric, &QAbstractButton::toggled, this, &QgsGraduatedSymbolRendererWidget::classifyGraduated ); + connect( mGroupBoxSymmetric, &QGroupBox::toggled, this, &QgsGraduatedSymbolRendererWidget::classifyGraduated ); connect( cbxAstride, &QAbstractButton::toggled, this, &QgsGraduatedSymbolRendererWidget::classifyGraduated ); connect( cboSymmetryPointForPretty, static_cast( &QComboBox::activated ), this, &QgsGraduatedSymbolRendererWidget::classifyGraduated ); connect( spinSymmetryPointForOtherMethods, static_cast( &QgsDoubleSpinBox::editingFinished ), this, &QgsGraduatedSymbolRendererWidget::classifyGraduated ); @@ -601,7 +604,7 @@ void QgsGraduatedSymbolRendererWidget::disconnectUpdateHandlers() disconnect( mModel, &QgsGraduatedSymbolRendererModel::rowsMoved, this, &QgsGraduatedSymbolRendererWidget::rowsMoved ); disconnect( mModel, &QAbstractItemModel::dataChanged, this, &QgsGraduatedSymbolRendererWidget::modelDataChanged ); - disconnect( cbxClassifySymmetric, &QAbstractButton::toggled, this, &QgsGraduatedSymbolRendererWidget::classifyGraduated ); + disconnect( mGroupBoxSymmetric, &QGroupBox::toggled, this, &QgsGraduatedSymbolRendererWidget::classifyGraduated ); disconnect( cbxAstride, &QAbstractButton::toggled, this, &QgsGraduatedSymbolRendererWidget::classifyGraduated ); disconnect( cboSymmetryPointForPretty, static_cast( &QComboBox::activated ), this, &QgsGraduatedSymbolRendererWidget::classifyGraduated ); disconnect( spinSymmetryPointForOtherMethods, static_cast( &QgsDoubleSpinBox::editingFinished ), this, &QgsGraduatedSymbolRendererWidget::classifyGraduated ); @@ -626,7 +629,7 @@ void QgsGraduatedSymbolRendererWidget::updateUiFromRenderer( bool updateCount ) case QgsGraduatedSymbolRenderer::EqualInterval: case QgsGraduatedSymbolRenderer::StdDev: { - cbxClassifySymmetric->setVisible( true ); + mGroupBoxSymmetric->setVisible( true ); cbxAstride->setVisible( true ); cboSymmetryPointForPretty->setVisible( false ); spinSymmetryPointForOtherMethods->setVisible( true ); @@ -636,7 +639,7 @@ void QgsGraduatedSymbolRendererWidget::updateUiFromRenderer( bool updateCount ) case QgsGraduatedSymbolRenderer::Pretty: { - cbxClassifySymmetric->setVisible( true ); + mGroupBoxSymmetric->setVisible( true ); cbxAstride->setVisible( true ); spinSymmetryPointForOtherMethods->setVisible( false ); cboSymmetryPointForPretty->setVisible( true ); @@ -651,7 +654,7 @@ void QgsGraduatedSymbolRendererWidget::updateUiFromRenderer( bool updateCount ) case QgsGraduatedSymbolRenderer::Jenks: case QgsGraduatedSymbolRenderer::Custom: { - cbxClassifySymmetric->setVisible( false ); + mGroupBoxSymmetric->setVisible( false ); cbxAstride->setVisible( false ); cboSymmetryPointForPretty->setVisible( false ); spinSymmetryPointForOtherMethods->setVisible( false ); @@ -662,14 +665,14 @@ void QgsGraduatedSymbolRendererWidget::updateUiFromRenderer( bool updateCount ) if ( mRenderer->useSymmetricMode() ) { - cbxClassifySymmetric->setChecked( true ); + mGroupBoxSymmetric->setChecked( true ); spinSymmetryPointForOtherMethods->setEnabled( true ); cbxAstride->setEnabled( true ); cboSymmetryPointForPretty->setEnabled( true ); } else { - cbxClassifySymmetric->setChecked( false ); + mGroupBoxSymmetric->setChecked( false ); spinSymmetryPointForOtherMethods->setEnabled( false ); cbxAstride->setEnabled( false ); cboSymmetryPointForPretty->setEnabled( false ); @@ -903,7 +906,7 @@ void QgsGraduatedSymbolRendererWidget::classifyGraduated() if ( spinSymmetryPointForOtherMethods->value() < ( minimum + ( maximum - minimum ) / 100. ) || spinSymmetryPointForOtherMethods->value() > ( maximum - ( maximum - minimum ) / 100. ) ) spinSymmetryPointForOtherMethods->setValue( minimum + ( maximum - minimum ) / 2. ); - if ( cbxClassifySymmetric->isChecked() ) + if ( mGroupBoxSymmetric->isChecked() ) { useSymmetricMode = true; symmetryPoint = spinSymmetryPointForOtherMethods->value(); @@ -926,7 +929,7 @@ void QgsGraduatedSymbolRendererWidget::classifyGraduated() if ( spinSymmetryPointForOtherMethods->value() < ( minimum + ( maximum - minimum ) / 100. ) || spinSymmetryPointForOtherMethods->value() > ( maximum - ( maximum - minimum ) / 100. ) ) spinSymmetryPointForOtherMethods->setValue( minimum + ( maximum - minimum ) / 2. ); - if ( cbxClassifySymmetric->isChecked() ) + if ( mGroupBoxSymmetric->isChecked() ) { useSymmetricMode = true; symmetryPoint = spinSymmetryPointForOtherMethods->value(); @@ -938,7 +941,7 @@ void QgsGraduatedSymbolRendererWidget::classifyGraduated() case QgsGraduatedSymbolRenderer::Pretty: { mode = QgsGraduatedSymbolRenderer::Pretty; - if ( cbxClassifySymmetric->isChecked() ) + if ( mGroupBoxSymmetric->isChecked() ) { useSymmetricMode = true; astride = cbxAstride->isChecked(); diff --git a/src/ui/qgsgraduatedsymbolrendererv2widget.ui b/src/ui/qgsgraduatedsymbolrendererv2widget.ui index 65a82b37b96c..a78d4cca2019 100644 --- a/src/ui/qgsgraduatedsymbolrendererv2widget.ui +++ b/src/ui/qgsgraduatedsymbolrendererv2widget.ui @@ -6,8 +6,8 @@ 0 0 - 952 - 554 + 482 + 618 @@ -369,87 +369,52 @@ Negative rounds to powers of 10 - - - QLayout::SetDefaultConstraint + + + Symmetic Classification - - 0 - - - 0 - - - 0 - - - 0 + + true - - - - true - - - true - - - Symmetric around: - - - true - - - false - - - false - - - - - - - - - - -99999999999999995164818811802792197885196090803013355167206819763650035712.000000000000000 - - - 99999999999999995164818811802792197885196090803013355167206819763650035712.000000000000000 - - - 100.000000000000000 - - - false - - - - - - - - - - with a class astride that value - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - + + + + + + + + -99999999999999995164818811802792197885196090803013355167206819763650035712.000000000000000 + + + 99999999999999995164818811802792197885196090803013355167206819763650035712.000000000000000 + + + 100.000000000000000 + + + false + + + + + + + Around + + + + + + + + + + Create class astride symmetry value + + + + + @@ -548,15 +513,15 @@ Negative rounds to powers of 10
qgsdoublespinbox.h
- QgsFieldExpressionWidget + QgsUnitSelectionWidget QWidget -
qgsfieldexpressionwidget.h
+
qgsunitselectionwidget.h
1
- QgsUnitSelectionWidget + QgsFieldExpressionWidget QWidget -
qgsunitselectionwidget.h
+
qgsfieldexpressionwidget.h
1
@@ -571,6 +536,12 @@ Negative rounds to powers of 10
qgsgraduatedhistogramwidget.h
1
+ + QgsCollapsibleGroupBoxBasic + QGroupBox +
qgscollapsiblegroupbox.h
+ 1 +
mExpressionWidget