[BUGFIX] fixes #20829 Snapping options in meters rounded to integers

lbartoletti · nyalldawson · commit d3eaa9b88746 · 2019-02-21T02:50:20.000+10:00
(cherry picked from commit 50c9b23)
diff --git a/src/app/qgssnappingwidget.cpp b/src/app/qgssnappingwidget.cpp
@@ -350,14 +350,14 @@ void QgsSnappingWidget::projectSnapSettingsChanged()
     mTypeButton->setDefaultAction( mSegmentAction );
   }
 
-  if ( mToleranceSpinBox->value() != config.tolerance() )
+  if ( static_cast<QgsTolerance::UnitType>( mUnitsComboBox->currentData().toInt() ) != config.units() )
   {
-    mToleranceSpinBox->setValue( config.tolerance() );
+    mUnitsComboBox->setCurrentIndex( mUnitsComboBox->findData( config.units() ) );
   }
 
-  if ( static_cast<QgsTolerance::UnitType>( mUnitsComboBox->currentData().toInt() ) != config.units() )
+  if ( mToleranceSpinBox->value() != config.tolerance() )
   {
-    mUnitsComboBox->setCurrentIndex( mUnitsComboBox->findData( config.units() ) );
+    mToleranceSpinBox->setValue( config.tolerance() );
   }
 
   if ( config.intersectionSnapping() != mIntersectionSnappingAction->isChecked() )

Original file line number	Diff line number	Diff line change
`@@ -350,14 +350,14 @@ void QgsSnappingWidget::projectSnapSettingsChanged()`
`350`	`350`	`mTypeButton->setDefaultAction( mSegmentAction );`
`351`	`351`	`}`
`352`	`352`
`353`		`- if ( mToleranceSpinBox->value() != config.tolerance() )`
	`353`	`+ if ( static_cast<QgsTolerance::UnitType>( mUnitsComboBox->currentData().toInt() ) != config.units() )`
`354`	`354`	`{`
`355`		`- mToleranceSpinBox->setValue( config.tolerance() );`
	`355`	`+ mUnitsComboBox->setCurrentIndex( mUnitsComboBox->findData( config.units() ) );`
`356`	`356`	`}`
`357`	`357`
`358`		`- if ( static_cast<QgsTolerance::UnitType>( mUnitsComboBox->currentData().toInt() ) != config.units() )`
	`358`	`+ if ( mToleranceSpinBox->value() != config.tolerance() )`
`359`	`359`	`{`
`360`		`- mUnitsComboBox->setCurrentIndex( mUnitsComboBox->findData( config.units() ) );`
	`360`	`+ mToleranceSpinBox->setValue( config.tolerance() );`
`361`	`361`	`}`
`362`	`362`
`363`	`363`	`if ( config.intersectionSnapping() != mIntersectionSnappingAction->isChecked() )`