Clean up return from form Python init function

qgis · Jul 27, 2013 · 763d505 · 763d505
1 parent 157e3b7
commit 763d505
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/src/gui/qgsattributedialog.cpp b/src/gui/qgsattributedialog.cpp
@@ -423,13 +423,13 @@ QgsAttributeDialog::QgsAttributeDialog( QgsVectorLayer *vl, QgsFeature *thepFeat
     QgsPythonRunner::run( feature );
     QgsPythonRunner::run( layer );
 
-    QString returnvarname = QString( "_qgis_feature_form_%1" ).arg( dt.toString( "yyyyMMddhhmmsszzz" ) );
+    mReturnvarname = QString( "_qgis_feature_form_%1" ).arg( dt.toString( "yyyyMMddhhmmsszzz" ) );
     QString expr = QString( "%5 = %1(_qgis_featureform_%2, _qgis_layer_%3, %4)" )
                    .arg( vl->editFormInit() )
                    .arg( mFormNr )
                    .arg( vl->id() )
                    .arg( featurevarname )
-                   .arg( returnvarname );
+                   .arg( mReturnvarname );
 
     QgsDebugMsg( QString( "running featureForm init: %1" ).arg( expr ) );
     QgsPythonRunner::run( expr );
@@ -550,6 +550,12 @@ void QgsAttributeDialog::dialogDestroyed()
     QgsPythonRunner::run( expr );
   }
 
+  if ( !mReturnvarname.isEmpty() )
+  {
+      QString expr = QString( "if locals().has_key('%1'): del %1\n" ).arg( mReturnvarname );
+      QgsPythonRunner::run( expr );
+  }
+
   mDialog = NULL;
   deleteLater();
 }

diff --git a/src/gui/qgsattributedialog.h b/src/gui/qgsattributedialog.h
@@ -73,6 +73,7 @@ class GUI_EXPORT QgsAttributeDialog : public QObject
     int mFormNr;
     static int smFormCounter;
     bool mShowDialogButtons;
+    QString mReturnvarname;
 };
 
 #endif