Added DA to qgsattribute... Not sure if it works OK...

homann · homann · commit 79a138cba25d · 2012-09-04T12:10:04.000+02:00
diff --git a/src/app/qgsattributedialog.cpp b/src/app/qgsattributedialog.cpp
@@ -17,7 +17,7 @@
 #include "qgsattributedialog.h"
 #include "qgsfield.h"
 #include "qgslogger.h"
-
+#include "qgsmapcanvas.h"
 #include "qgsvectorlayer.h"
 #include "qgsvectordataprovider.h"
 #include "qgsuniquevaluerenderer.h"
@@ -177,6 +177,14 @@ QgsAttributeDialog::QgsAttributeDialog( QgsVectorLayer *vl, QgsFeature *thepFeat
   }
   else
   {
+
+    QgsDistanceArea myDa;
+    QSettings settings;
+
+    myDa.setSourceCrs( vl->crs().srsid() );
+    myDa.setEllipsoidalMode(QgisApp::instance()->mapCanvas()->mapRenderer()->hasCrsTransformEnabled() );
+    myDa.setEllipsoid( settings.value( "/qgis/measure/ellipsoid", GEO_NONE ).toString() );
+
     for ( QgsFieldMap::const_iterator it = theFieldMap.begin(); it != theFieldMap.end(); ++it )
     {
       QWidget *myWidget = mDialog->findChild<QWidget*>( it->name() );
@@ -217,6 +225,8 @@ QgsAttributeDialog::QgsAttributeDialog( QgsVectorLayer *vl, QgsFeature *thepFeat
         }
       }
 
+      exp.setGeomCalculator( myDa );
+
       QVariant value = exp.evaluate( mFeature, vl->pendingFields() );
 
       if ( !exp.hasEvalError() )
diff --git a/src/app/qgsattributetabledialog.cpp b/src/app/qgsattributetabledialog.cpp
@@ -536,6 +536,14 @@ void QgsAttributeTableDialog::updateSelectionFromLayer()
 
 void QgsAttributeTableDialog::doSearch( QString searchString )
 {
+
+  QgsDistanceArea myDa;
+  QSettings settings;
+
+  myDa.setSourceCrs( mLayer->crs().srsid() );
+  myDa.setEllipsoidalMode(QgisApp::instance()->mapCanvas()->mapRenderer()->hasCrsTransformEnabled() );
+  myDa.setEllipsoid( settings.value( "/qgis/measure/ellipsoid", GEO_NONE ).toString() );
+
   // parse search string and build parsed tree
   QgsExpression search( searchString );
   if ( search.hasParserError() )
@@ -556,6 +564,7 @@ void QgsAttributeTableDialog::doSearch( QString searchString )
   QApplication::setOverrideCursor( Qt::WaitCursor );
   mSelectedFeatures.clear();
 
+  search.setGeomCalculator( myDa );
   if ( cbxSearchSelectedOnly->isChecked() )
   {
     QgsFeatureList selectedFeatures = mLayer->selectedFeatures();

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`#include "qgsattributedialog.h"`
`18`	`18`	`#include "qgsfield.h"`
`19`	`19`	`#include "qgslogger.h"`
`20`		`-`
	`20`	`+#include "qgsmapcanvas.h"`
`21`	`21`	`#include "qgsvectorlayer.h"`
`22`	`22`	`#include "qgsvectordataprovider.h"`
`23`	`23`	`#include "qgsuniquevaluerenderer.h"`
`@@ -177,6 +177,14 @@ QgsAttributeDialog::QgsAttributeDialog( QgsVectorLayer vl, QgsFeature thepFeat`
`177`	`177`	`}`
`178`	`178`	`else`
`179`	`179`	`{`
	`180`	`+`
	`181`	`+ QgsDistanceArea myDa;`
	`182`	`+ QSettings settings;`
	`183`	`+`
	`184`	`+ myDa.setSourceCrs( vl->crs().srsid() );`
	`185`	`+ myDa.setEllipsoidalMode(QgisApp::instance()->mapCanvas()->mapRenderer()->hasCrsTransformEnabled() );`
	`186`	`+ myDa.setEllipsoid( settings.value( "/qgis/measure/ellipsoid", GEO_NONE ).toString() );`
	`187`	`+`
`180`	`188`	`for ( QgsFieldMap::const_iterator it = theFieldMap.begin(); it != theFieldMap.end(); ++it )`
`181`	`189`	`{`
`182`	`190`	`QWidget myWidget = mDialog->findChild<QWidget>( it->name() );`
`@@ -217,6 +225,8 @@ QgsAttributeDialog::QgsAttributeDialog( QgsVectorLayer vl, QgsFeature thepFeat`
`217`	`225`	`}`
`218`	`226`	`}`
`219`	`227`
	`228`	`+ exp.setGeomCalculator( myDa );`
	`229`	`+`
`220`	`230`	`QVariant value = exp.evaluate( mFeature, vl->pendingFields() );`
`221`	`231`
`222`	`232`	`if ( !exp.hasEvalError() )`