Show preview for "$area" in expr builder, make preview consistent with result

wonder-sk · wonder-sk · commit d92a0e622e08 · 2014-02-20T23:01:37.000+07:00
Another partial fix for #9060
diff --git a/src/app/qgsfieldcalculator.cpp b/src/app/qgsfieldcalculator.cpp
@@ -43,6 +43,12 @@ QgsFieldCalculator::QgsFieldCalculator( QgsVectorLayer* vl )
 
   connect( builder, SIGNAL( expressionParsed( bool ) ), this, SLOT( setOkButtonState() ) );
 
+  QgsDistanceArea myDa;
+  myDa.setSourceCrs( vl->crs().srsid() );
+  myDa.setEllipsoidalMode( QgisApp::instance()->mapCanvas()->mapRenderer()->hasCrsTransformEnabled() );
+  myDa.setEllipsoid( QgsProject::instance()->readEntry( "Measure", "/Ellipsoid", GEO_NONE ) );
+  builder->setGeomCalculator( myDa );
+
   //default values for field width and precision
   mOutputFieldWidthSpinBox->setValue( 10 );
   mOutputFieldPrecisionSpinBox->setValue( 3 );
diff --git a/src/gui/qgsexpressionbuilderwidget.cpp b/src/gui/qgsexpressionbuilderwidget.cpp
@@ -317,7 +317,7 @@ void QgsExpressionBuilderWidget::on_txtExpressionString_textChanged()
 
     if ( !mFeature.isValid() )
     {
-      mLayer->getFeatures( QgsFeatureRequest().setFlags(( mLayer->geometryType() != QGis::NoGeometry && exp.needsGeometry() ) ? QgsFeatureRequest::NoFlags : QgsFeatureRequest::NoGeometry ) ).nextFeature( mFeature );
+      mLayer->getFeatures().nextFeature( mFeature );
     }
 
     if ( mFeature.isValid() )

Original file line number	Diff line number	Diff line change
`@@ -317,7 +317,7 @@ void QgsExpressionBuilderWidget::on_txtExpressionString_textChanged()`
`317`	`317`
`318`	`318`	`if ( !mFeature.isValid() )`
`319`	`319`	`{`
`320`		`- mLayer->getFeatures( QgsFeatureRequest().setFlags(( mLayer->geometryType() != QGis::NoGeometry && exp.needsGeometry() ) ? QgsFeatureRequest::NoFlags : QgsFeatureRequest::NoGeometry ) ).nextFeature( mFeature );`
	`320`	`+ mLayer->getFeatures().nextFeature( mFeature );`
`321`	`321`	`}`
`322`	`322`
`323`	`323`	`if ( mFeature.isValid() )`