improve field conversions (fixes #12004)

jef-n · jef-n · commit 065d190d8548 · 2015-02-13T00:07:40.000+01:00
diff --git a/src/app/qgsattributetabledialog.cpp b/src/app/qgsattributetabledialog.cpp
@@ -332,7 +332,6 @@ void QgsAttributeTableDialog::runFieldCalculation( QgsVectorLayer* layer, QStrin
   bool calculationSuccess = true;
   QString error;
 
-
   QgsExpression exp( expression );
   exp.setGeomCalculator( *myDa );
   bool useGeometry = exp.needsGeometry();
@@ -342,6 +341,8 @@ void QgsAttributeTableDialog::runFieldCalculation( QgsVectorLayer* layer, QStrin
 
   int rownum = 1;
 
+  const QgsField &fld = layer->pendingFields()[ fieldindex ];
+
   //go through all the features and change the new attributes
   QgsFeatureIterator fit = layer->getFeatures( request );
   QgsFeature feature;
@@ -354,6 +355,7 @@ void QgsAttributeTableDialog::runFieldCalculation( QgsVectorLayer* layer, QStrin
 
     exp.setCurrentRowNumber( rownum );
     QVariant value = exp.evaluate( &feature );
+    fld.convertCompatible( value );
     // Bail if we have a update error
     if ( exp.hasEvalError() )
     {
diff --git a/src/core/qgsfield.cpp b/src/core/qgsfield.cpp
@@ -137,17 +137,32 @@ bool QgsField::convertCompatible( QVariant& v ) const
     return true;
   }
 
+  if ( mType == QVariant::Int && v.toInt() != v.toLongLong() )
+  {
+    v = QVariant( mType );
+    return false;
+  }
+
   if ( !v.convert( mType ) )
   {
+    v = QVariant( mType );
     return false;
   }
 
   if ( mType == QVariant::Double && mPrecision > 0 )
   {
-    v = qRound64( v.toDouble() * qPow( 10, mPrecision ) ) / qPow( 10, mPrecision );
+    double s = qPow( 10, mPrecision );
+    double d = v.toDouble() * s;
+    v = QVariant(( d < 0 ? ceil( d - 0.5 ) : floor( d + 0.5 ) ) / s );
     return true;
   }
 
+  if ( mType == QVariant::String && mLength >= 0 && v.toString().length() > mLength )
+  {
+    v = QVariant( mType );
+    return false;
+  }
+
   return true;
 }
 
diff --git a/src/gui/editorwidgets/qgstexteditwrapper.cpp b/src/gui/editorwidgets/qgstexteditwrapper.cpp
@@ -58,8 +58,12 @@ QVariant QgsTextEditWrapper::value()
   if (( v.isEmpty() && ( field().type() == QVariant::Int || field().type() == QVariant::Double || field().type() == QVariant::LongLong || field().type() == QVariant::Date ) ) ||
       v == QSettings().value( "qgis/nullValue", "NULL" ).toString() )
     return QVariant( field().type() );
+
+  QVariant res( v );
+  if ( field().convertCompatible( res ) )
+    return res;
   else
-    return QVariant( v );
+    return QVariant( field().type() );
 }
 
 QWidget* QgsTextEditWrapper::createWidget( QWidget* parent )

Original file line number	Diff line number	Diff line change
`@@ -137,17 +137,32 @@ bool QgsField::convertCompatible( QVariant& v ) const`
`137`	`137`	`return true;`
`138`	`138`	`}`
`139`	`139`
	`140`	`+ if ( mType == QVariant::Int && v.toInt() != v.toLongLong() )`
	`141`	`+ {`
	`142`	`+ v = QVariant( mType );`
	`143`	`+ return false;`
	`144`	`+ }`
	`145`	`+`
`140`	`146`	`if ( !v.convert( mType ) )`
`141`	`147`	`{`
	`148`	`+ v = QVariant( mType );`
`142`	`149`	`return false;`
`143`	`150`	`}`
`144`	`151`
`145`	`152`	`if ( mType == QVariant::Double && mPrecision > 0 )`
`146`	`153`	`{`
`147`		`- v = qRound64( v.toDouble() * qPow( 10, mPrecision ) ) / qPow( 10, mPrecision );`
	`154`	`+ double s = qPow( 10, mPrecision );`
	`155`	`+ double d = v.toDouble() * s;`
	`156`	`+ v = QVariant(( d < 0 ? ceil( d - 0.5 ) : floor( d + 0.5 ) ) / s );`
`148`	`157`	`return true;`
`149`	`158`	`}`
`150`	`159`
	`160`	`+ if ( mType == QVariant::String && mLength >= 0 && v.toString().length() > mLength )`
	`161`	`+ {`
	`162`	`+ v = QVariant( mType );`
	`163`	`+ return false;`
	`164`	`+ }`
	`165`	`+` Code has comments. Press enter to view.
`151`	`166`	`return true;`
`152`	`167`	`}`
`153`	`168`