Generate unique variable names for python init form

m-kuhn · m-kuhn · commit 03da1fcabd31 · 2015-05-13T13:12:58.000+02:00
Fix #12676 Fix #12711 Fix #12729
diff --git a/src/gui/qgsattributeform.cpp b/src/gui/qgsattributeform.cpp
@@ -530,7 +530,8 @@ void QgsAttributeForm::initPython()
     QString numArgs;
     QgsPythonRunner::eval( QString( "len(inspect.getargspec(%1)[0])" ).arg( module ), numArgs );
 
-    mPyFormVarName = QString( "_qgis_featureform_%1" ).arg( mFormNr );
+    static int sFormId = 0;
+    mPyFormVarName = QString( "_qgis_featureform_%1_%2" ).arg( mFormNr ).arg( sFormId++ );
 
     QString form = QString( "%1 = sip.wrapinstance( %2, qgis.gui.QgsAttributeForm )" )
                    .arg( mPyFormVarName )
diff --git a/src/gui/qgsattributeformlegacyinterface.cpp b/src/gui/qgsattributeformlegacyinterface.cpp
@@ -27,7 +27,8 @@ QgsAttributeFormLegacyInterface::QgsAttributeFormLegacyInterface( const QString&
     , mPyFunctionName( function )
     , mPyFormVarName( pyFormName )
 {
-  mPyLayerVarName = QString( "_qgis_layer_%1" ).arg( form->layer()->id() );
+  static int sLayerCounter = 0;
+  mPyLayerVarName = QString( "_qgis_layer_%1_%2" ).arg( form->layer()->id() ).arg( sLayerCounter++ );
   mPyLayerVarName.replace( QRegExp( "[^a-zA-Z0-9_]" ), "_" ); // clean identifier
 
   QString initLayer = QString( "%1 = sip.wrapinstance( %2, qgis.core.QgsVectorLayer )" )

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,8 @@ QgsAttributeFormLegacyInterface::QgsAttributeFormLegacyInterface( const QString&`
`27`	`27`	`, mPyFunctionName( function )`
`28`	`28`	`, mPyFormVarName( pyFormName )`
`29`	`29`	`{`
`30`		`- mPyLayerVarName = QString( "_qgis_layer_%1" ).arg( form->layer()->id() );`
	`30`	`+ static int sLayerCounter = 0;`
	`31`	`+ mPyLayerVarName = QString( "_qgis_layer_%1_%2" ).arg( form->layer()->id() ).arg( sLayerCounter++ );`
`31`	`32`	`mPyLayerVarName.replace( QRegExp( "[^a-zA-Z0-9_]" ), "_" ); // clean identifier`
`32`	`33`
`33`	`34`	`QString initLayer = QString( "%1 = sip.wrapinstance( %2, qgis.core.QgsVectorLayer )" )`