Merge pull request #7929 from elpaso/bugfix-18102-advanced-digitizing-comma

elpaso · web-flow · commit 13f500ba9e8d · 2018-09-18T15:54:30.000+02:00
[bugfix] Fixes float input in advanced digitizing ...
diff --git a/src/gui/qgsadvanceddigitizingdockwidget.cpp b/src/gui/qgsadvanceddigitizingdockwidget.cpp
@@ -310,7 +310,7 @@ QgsAdvancedDigitizingDockWidget::CadConstraint *QgsAdvancedDigitizingDockWidget:
 double QgsAdvancedDigitizingDockWidget::parseUserInput( const QString &inputValue, bool &ok ) const
 {
   ok = false;
-  double value = inputValue.toDouble( &ok );
+  double value = qgsPermissiveToDouble( inputValue, ok );
   if ( ok )
   {
     return value;
@@ -1092,7 +1092,7 @@ void QgsAdvancedDigitizingDockWidget::CadConstraint::setValue( double value, boo
 {
   mValue = value;
   if ( updateWidget )
-    mLineEdit->setText( QString::number( value, 'f' ) );
+    mLineEdit->setText( QLocale().toString( value, 'f', 6 ) );
 }
 
 void QgsAdvancedDigitizingDockWidget::CadConstraint::toggleLocked()

Original file line number	Diff line number	Diff line change
`@@ -310,7 +310,7 @@ QgsAdvancedDigitizingDockWidget::CadConstraint *QgsAdvancedDigitizingDockWidget:`
`310`	`310`	`double QgsAdvancedDigitizingDockWidget::parseUserInput( const QString &inputValue, bool &ok ) const`
`311`	`311`	`{`
`312`	`312`	`ok = false;`
`313`		`- double value = inputValue.toDouble( &ok );`
	`313`	`+ double value = qgsPermissiveToDouble( inputValue, ok );`
`314`	`314`	`if ( ok )`
`315`	`315`	`{`
`316`	`316`	`return value;`
`@@ -1092,7 +1092,7 @@ void QgsAdvancedDigitizingDockWidget::CadConstraint::setValue( double value, boo`
`1092`	`1092`	`{`
`1093`	`1093`	`mValue = value;`
`1094`	`1094`	`if ( updateWidget )`
`1095`		`- mLineEdit->setText( QString::number( value, 'f' ) );`
	`1095`	`+ mLineEdit->setText( QLocale().toString( value, 'f', 6 ) );`
`1096`	`1096`	`}`
`1097`	`1097`
`1098`	`1098`	`void QgsAdvancedDigitizingDockWidget::CadConstraint::toggleLocked()`