vector layer: fix attributeAdded signal

jef-n · jef-n · commit 9d7ef65a2dd4 · 2014-02-12T00:54:44.000+01:00
don't assume new attributes are added at end, because in case of joins they are added after the provider fields and before the joined fields. field calculator: prepare expression again after attribute was added (fixes #9320)
diff --git a/src/app/qgsfieldcalculator.cpp b/src/app/qgsfieldcalculator.cpp
@@ -150,6 +150,12 @@ void QgsFieldCalculator::accept()
         break;
       }
     }
+
+    if ( ! exp.prepare( mVectorLayer->pendingFields() ) )
+    {
+      QMessageBox::critical( 0, tr( "Evaluation error" ), exp.evalErrorString() );
+      return;
+    }
   }
 
   if ( mAttributeId == -1 )
diff --git a/src/app/qgsfieldsproperties.cpp b/src/app/qgsfieldsproperties.cpp
@@ -207,7 +207,8 @@ void QgsFieldsProperties::loadRows()
 
 void QgsFieldsProperties::setRow( int row, int idx, const QgsField &field )
 {
-  QTableWidgetItem* dataItem = new QTableWidgetItem( idx );
+  QTableWidgetItem* dataItem = new QTableWidgetItem();
+  dataItem->setData( Qt::DisplayRole, idx );
   DesignerTreeItemData itemData( DesignerTreeItemData::Field, field.name() );
   dataItem->setData( DesignerTreeRole, itemData.asQVariant() );
   mFieldsList->setItem( row, attrIdCol, dataItem );
@@ -498,19 +499,20 @@ void QgsFieldsProperties::attributeTypeDialog()
 void QgsFieldsProperties::attributeAdded( int idx )
 {
   bool sorted = mFieldsList->isSortingEnabled();
-  mFieldsList->setSortingEnabled( false );
+  if ( sorted )
+    mFieldsList->setSortingEnabled( false );
+
   const QgsFields &fields = mLayer->pendingFields();
   int row = mFieldsList->rowCount();
   mFieldsList->insertRow( row );
   setRow( row, idx, fields[idx] );
+  mFieldsList->setCurrentCell( row, idx );
 
-  for ( int i = idx; i < mIndexedWidgets.count(); i++ )
-  {
+  for ( int i = idx + 1; i < mIndexedWidgets.count(); i++ )
     mIndexedWidgets[i]->setData( Qt::DisplayRole, i );
-  }
 
-  mFieldsList->setCurrentCell( row, idx );
-  mFieldsList->setSortingEnabled( sorted );
+  if ( sorted )
+    mFieldsList->setSortingEnabled( true );
 }
 
 
diff --git a/src/core/qgsvectorlayerundocommand.cpp b/src/core/qgsvectorlayerundocommand.cpp
@@ -311,7 +311,11 @@ QgsVectorLayerUndoCommandAddAttribute::QgsVectorLayerUndoCommandAddAttribute( Qg
     : QgsVectorLayerUndoCommand( buffer )
     , mField( field )
 {
-  mFieldIndex = layer()->pendingFields().count();
+  const QgsFields &fields = layer()->pendingFields();
+  int i;
+  for ( i = 0; i < fields.count() && fields.fieldOrigin( i ) != QgsFields::OriginJoin; i++ )
+    ;
+  mFieldIndex = i;
 }
 
 void QgsVectorLayerUndoCommandAddAttribute::undo()

Original file line number	Diff line number	Diff line change
`@@ -150,6 +150,12 @@ void QgsFieldCalculator::accept()`
`150`	`150`	`break;`
`151`	`151`	`}`
`152`	`152`	`}`
	`153`	`+`
	`154`	`+ if ( ! exp.prepare( mVectorLayer->pendingFields() ) )`
	`155`	`+ {`
	`156`	`+ QMessageBox::critical( 0, tr( "Evaluation error" ), exp.evalErrorString() );`
	`157`	`+ return;`
	`158`	`+ }`
`153`	`159`	`}`
`154`	`160`
`155`	`161`	`if ( mAttributeId == -1 )`
Original file line number	Diff line number	Diff line change
`@@ -311,7 +311,11 @@ QgsVectorLayerUndoCommandAddAttribute::QgsVectorLayerUndoCommandAddAttribute( Qg`
`311`	`311`	`: QgsVectorLayerUndoCommand( buffer )`
`312`	`312`	`, mField( field )`
`313`	`313`	`{`
`314`		`- mFieldIndex = layer()->pendingFields().count();`
	`314`	`+ const QgsFields &fields = layer()->pendingFields();`
	`315`	`+ int i;`
	`316`	`+ for ( i = 0; i < fields.count() && fields.fieldOrigin( i ) != QgsFields::OriginJoin; i++ )`
	`317`	`+ ;`
	`318`	`+ mFieldIndex = i;`
`315`	`319`	`}`
`316`	`320`
`317`	`321`	`void QgsVectorLayerUndoCommandAddAttribute::undo()`