fix #4646

jef-n · jef-n · commit 06aeb148a77f · 2011-12-23T21:07:04.000+01:00
diff --git a/src/gui/attributetable/qgsattributetablemodel.cpp b/src/gui/attributetable/qgsattributetablemodel.cpp
@@ -181,8 +181,9 @@ void QgsAttributeTableModel::attributeValueChanged( QgsFeatureId fid, int idx, c
 {
   if ( mFeatureMap.contains( fid ) )
   {
-    mFeatureMap[ fid ].changeAttribute( fieldCol( idx ), value );
+    mFeatureMap[ fid ].changeAttribute( idx, value );
   }
+
   setData( index( idToRow( fid ), fieldCol( idx ) ), value, Qt::EditRole );
 }
 
@@ -460,9 +461,9 @@ QVariant QgsAttributeTableModel::data( const QModelIndex &index, int role ) cons
     }
   }
 
-  if ( role == Qt::DisplayRole && mValueMaps.contains( index.column() ) )
+  if ( role == Qt::DisplayRole && mValueMaps.contains( fieldId ) )
   {
-    return mValueMaps[ index.column()]->key( val.toString(), QString( "(%1)" ).arg( val.toString() ) );
+    return mValueMaps[ fieldId ]->key( val.toString(), QString( "(%1)" ).arg( val.toString() ) );
   }
 
   return val.toString();
@@ -528,7 +529,7 @@ void QgsAttributeTableModel::executeAction( int action, const QModelIndex &idx )
 
   for ( int i = 0; i < mAttributes.size(); i++ )
   {
-    attributes.insert( i, data( index( idx.row(), i ), Qt::EditRole ) );
+    attributes.insert( mAttributes[i], data( index( idx.row(), i ), Qt::EditRole ) );
   }
 
   mLayer->actions()->doAction( action, attributes, fieldIdx( idx.column() ) );

Original file line number	Diff line number	Diff line change
`@@ -181,8 +181,9 @@ void QgsAttributeTableModel::attributeValueChanged( QgsFeatureId fid, int idx, c`
`181`	`181`	`{`
`182`	`182`	`if ( mFeatureMap.contains( fid ) )`
`183`	`183`	`{`
`184`		`- mFeatureMap[ fid ].changeAttribute( fieldCol( idx ), value );`
	`184`	`+ mFeatureMap[ fid ].changeAttribute( idx, value );`
`185`	`185`	`}`
	`186`	`+`
`186`	`187`	`setData( index( idToRow( fid ), fieldCol( idx ) ), value, Qt::EditRole );`
`187`	`188`	`}`
`188`	`189`
`@@ -460,9 +461,9 @@ QVariant QgsAttributeTableModel::data( const QModelIndex &index, int role ) cons`
`460`	`461`	`}`
`461`	`462`	`}`
`462`	`463`
`463`		`- if ( role == Qt::DisplayRole && mValueMaps.contains( index.column() ) )`
	`464`	`+ if ( role == Qt::DisplayRole && mValueMaps.contains( fieldId ) )`
`464`	`465`	`{`
`465`		`- return mValueMaps[ index.column()]->key( val.toString(), QString( "(%1)" ).arg( val.toString() ) );`
	`466`	`+ return mValueMaps[ fieldId ]->key( val.toString(), QString( "(%1)" ).arg( val.toString() ) );`
`466`	`467`	`}`
`467`	`468`
`468`	`469`	`return val.toString();`
`@@ -528,7 +529,7 @@ void QgsAttributeTableModel::executeAction( int action, const QModelIndex &idx )`
`528`	`529`
`529`	`530`	`for ( int i = 0; i < mAttributes.size(); i++ )`
`530`	`531`	`{`
`531`		`- attributes.insert( i, data( index( idx.row(), i ), Qt::EditRole ) );`
	`532`	`+ attributes.insert( mAttributes[i], data( index( idx.row(), i ), Qt::EditRole ) );`
`532`	`533`	`}`
`533`	`534`
`534`	`535`	`mLayer->actions()->doAction( action, attributes, fieldIdx( idx.column() ) );`