Fix issue 6899: Drag and drop designer uses first field after project reload

m-kuhn · m-kuhn · commit 6b231a1e0110 · 2013-01-07T18:28:22.000+01:00
idx was not properly initialized at project load.
diff --git a/src/app/qgsfieldsproperties.cpp b/src/app/qgsfieldsproperties.cpp
@@ -752,7 +752,7 @@ QgsAttributeEditorElement* QgsFieldsProperties::createAttributeEditorWidget( QTr
 
   if ( item->data( 0, Qt::UserRole ) == "field" )
   {
-    int idx = *mLayer->dataProvider()->fieldNameMap().find( item->text( 0 ) );
+    int idx = *( mLayer->dataProvider()->fieldNameMap() ).find( item->text( 0 ) );
     widgetDef = new QgsAttributeEditorField( item->text( 0 ), idx, parent );
   }
   else
diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp
@@ -3387,7 +3387,9 @@ QgsAttributeEditorElement* QgsVectorLayer::attributeEditorElementFromDomElement(
   }
   else if ( elem.tagName() == "attributeEditorField" )
   {
-    newElement = new QgsAttributeEditorField( elem.attribute( "name" ), elem.attribute( "idx" ).toInt(), parent );
+    QString name = elem.attribute( "name" );
+    int idx = *( dataProvider()->fieldNameMap() ).find( name );
+    newElement = new QgsAttributeEditorField( name, idx, parent );
   }
 
   return newElement;
diff --git a/src/core/qgsvectorlayer.h b/src/core/qgsvectorlayer.h
@@ -389,7 +389,7 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer
      * @param elem the DOM element
      * @param parent the QObject which will own this object
      */
-    static QgsAttributeEditorElement* attributeEditorElementFromDomElement( QDomElement &elem, QObject* parent );
+    QgsAttributeEditorElement* attributeEditorElementFromDomElement( QDomElement &elem, QObject* parent );
 
     /** Read the symbology for the current layer from the Dom node supplied.
      * @param node node that will contain the symbology definition for this layer.

Original file line number	Diff line number	Diff line change
`@@ -752,7 +752,7 @@ QgsAttributeEditorElement* QgsFieldsProperties::createAttributeEditorWidget( QTr`
`752`	`752`
`753`	`753`	`if ( item->data( 0, Qt::UserRole ) == "field" )`
`754`	`754`	`{`
`755`		`- int idx = *mLayer->dataProvider()->fieldNameMap().find( item->text( 0 ) );`
	`755`	`+ int idx = *( mLayer->dataProvider()->fieldNameMap() ).find( item->text( 0 ) );`
`756`	`756`	`widgetDef = new QgsAttributeEditorField( item->text( 0 ), idx, parent );`
`757`	`757`	`}`
`758`	`758`	`else`
Original file line number	Diff line number	Diff line change
`@@ -3387,7 +3387,9 @@ QgsAttributeEditorElement* QgsVectorLayer::attributeEditorElementFromDomElement(`
`3387`	`3387`	`}`
`3388`	`3388`	`else if ( elem.tagName() == "attributeEditorField" )`
`3389`	`3389`	`{`
`3390`		`- newElement = new QgsAttributeEditorField( elem.attribute( "name" ), elem.attribute( "idx" ).toInt(), parent );`
	`3390`	`+ QString name = elem.attribute( "name" );`
	`3391`	`+ int idx = *( dataProvider()->fieldNameMap() ).find( name );`
	`3392`	`+ newElement = new QgsAttributeEditorField( name, idx, parent );`
`3391`	`3393`	`}`
`3392`	`3394`
`3393`	`3395`	`return newElement;`