Merge pull request #510 from matthias-kuhn/field-calculator-perf

[FIX #7533] Field calculator is slow
qgis · Apr 8, 2013 · a150865 · a150865
2 parents 4306632 + a21fc5a
commit a150865
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/src/app/qgsfieldcalculator.cpp b/src/app/qgsfieldcalculator.cpp
@@ -94,6 +94,7 @@ void QgsFieldCalculator::accept()
 
   QString calcString = builder->expressionText();
   QgsExpression exp( calcString );
+  exp.setGeomCalculator( myDa );
 
   if ( !mVectorLayer || !mVectorLayer->isEditable() )
     return;
@@ -173,8 +174,6 @@ void QgsFieldCalculator::accept()
     }
 
     exp.setCurrentRowNumber( rownum );
-    exp.setGeomCalculator( myDa );
-
     QVariant value = exp.evaluate( &feature );
     if ( exp.hasEvalError() )
     {