Pass distance area into field calc bar

Author: NathanW2

src/app/qgsattributetabledialog.cpp

@@ -78,13 +78,13 @@ QgsAttributeTableDialog::QgsAttributeTableDialog( QgsVectorLayer *theLayer, QWid
 
   QgsAttributeEditorContext context;
 
-  QgsDistanceArea myDa;
+  myDa = new QgsDistanceArea();
 
-  myDa.setSourceCrs( mLayer->crs() );
-  myDa.setEllipsoidalMode( QgisApp::instance()->mapCanvas()->mapSettings().hasCrsTransformEnabled() );
-  myDa.setEllipsoid( QgsProject::instance()->readEntry( "Measure", "/Ellipsoid", GEO_NONE ) );
+  myDa->setSourceCrs( mLayer->crs() );
+  myDa->setEllipsoidalMode( QgisApp::instance()->mapCanvas()->mapSettings().hasCrsTransformEnabled() );
+  myDa->setEllipsoid( QgsProject::instance()->readEntry( "Measure", "/Ellipsoid", GEO_NONE ) );
 
-  context.setDistanceArea( myDa );
+  context.setDistanceArea( *myDa );
   context.setVectorLayerTools( QgisApp::instance()->vectorLayerTools() );
 
   // Initialize dual view
@@ -303,6 +303,7 @@ void QgsAttributeTableDialog::updateFieldFromExpression()
   QString error;
 
   QgsExpression exp( mUpdateExpressionText->text() );
+  exp.setGeomCalculator( *myDa );
   bool useGeometry = exp.needsGeometry();
 
   QgsFeatureRequest request;

src/app/qgsattributetabledialog.h

@@ -194,6 +194,7 @@ class APP_EXPORT QgsAttributeTableDialog : public QDialog, private Ui::QgsAttrib
     QAction* mActionToggleEditing;
 
     QDockWidget* mDock;
+    QgsDistanceArea* myDa;
 
     QMenu* mFilterColumnsMenu;
     QSignalMapper* mFilterActionMapper;