[composer] Don't update atlas filter until editing finished, prevented, prevents errors while creating filter expression

nyalldawson · nyalldawson · commit 9c5bbb7a156d · 2014-01-07T22:27:19.000+11:00
diff --git a/src/app/composer/qgsatlascompositionwidget.cpp b/src/app/composer/qgsatlascompositionwidget.cpp
@@ -404,15 +404,15 @@ void QgsAtlasCompositionWidget::on_mAtlasFeatureFilterCheckBox_stateChanged( int
   updateAtlasFeatures();
 }
 
-void QgsAtlasCompositionWidget::on_mAtlasFeatureFilterEdit_textChanged( const QString& text )
+void QgsAtlasCompositionWidget::on_mAtlasFeatureFilterEdit_editingFinished()
 {
   QgsAtlasComposition* atlasMap = &mComposition->atlasComposition();
   if ( !atlasMap )
   {
     return;
   }
 
-  atlasMap->setFeatureFilter( text );
+  atlasMap->setFeatureFilter( mAtlasFeatureFilterEdit->text() );
   updateAtlasFeatures();
 }
 
@@ -431,8 +431,9 @@ void QgsAtlasCompositionWidget::on_mAtlasFeatureFilterButton_clicked()
     QString expression =  exprDlg.expressionText();
     if ( !expression.isEmpty() )
     {
-      // will emit a textChanged signal
       mAtlasFeatureFilterEdit->setText( expression );
+      atlasMap->setFeatureFilter( mAtlasFeatureFilterEdit->text() );
+      updateAtlasFeatures();
     }
   }
 }
diff --git a/src/app/composer/qgsatlascompositionwidget.h b/src/app/composer/qgsatlascompositionwidget.h
@@ -47,7 +47,7 @@ class QgsAtlasCompositionWidget:
     void on_mAtlasSortFeatureCheckBox_stateChanged( int state );
     void on_mAtlasSortFeatureKeyComboBox_currentIndexChanged( int index );
     void on_mAtlasSortFeatureDirectionButton_clicked();
-    void on_mAtlasFeatureFilterEdit_textChanged( const QString& text );
+    void on_mAtlasFeatureFilterEdit_editingFinished();
     void on_mAtlasFeatureFilterButton_clicked();
     void on_mAtlasFeatureFilterCheckBox_stateChanged( int state );
     void on_mAtlasMarginSpinBox_valueChanged( int value );

Original file line number	Diff line number	Diff line change
`@@ -404,15 +404,15 @@ void QgsAtlasCompositionWidget::on_mAtlasFeatureFilterCheckBox_stateChanged( int`
`404`	`404`	`updateAtlasFeatures();`
`405`	`405`	`}`
`406`	`406`
`407`		`-void QgsAtlasCompositionWidget::on_mAtlasFeatureFilterEdit_textChanged( const QString& text )`
	`407`	`+void QgsAtlasCompositionWidget::on_mAtlasFeatureFilterEdit_editingFinished()`
`408`	`408`	`{`
`409`	`409`	`QgsAtlasComposition* atlasMap = &mComposition->atlasComposition();`
`410`	`410`	`if ( !atlasMap )`
`411`	`411`	`{`
`412`	`412`	`return;`
`413`	`413`	`}`
`414`	`414`
`415`		`- atlasMap->setFeatureFilter( text );`
	`415`	`+ atlasMap->setFeatureFilter( mAtlasFeatureFilterEdit->text() );`
`416`	`416`	`updateAtlasFeatures();`
`417`	`417`	`}`
`418`	`418`
`@@ -431,8 +431,9 @@ void QgsAtlasCompositionWidget::on_mAtlasFeatureFilterButton_clicked()`
`431`	`431`	`QString expression = exprDlg.expressionText();`
`432`	`432`	`if ( !expression.isEmpty() )`
`433`	`433`	`{`
`434`		`- // will emit a textChanged signal`
`435`	`434`	`mAtlasFeatureFilterEdit->setText( expression );`
	`435`	`+ atlasMap->setFeatureFilter( mAtlasFeatureFilterEdit->text() );`
	`436`	`+ updateAtlasFeatures();`
`436`	`437`	`}`
`437`	`438`	`}`
`438`	`439`	`}`