Fix taking attribute values in merge attributes dialog (fix #13971)

nyalldawson · nyalldawson · commit b23ddfe2b4f7 · 2015-12-11T08:07:10.000+11:00
Also fix handling of long feature ids in tool.
diff --git a/src/app/qgsmergeattributesdialog.cpp b/src/app/qgsmergeattributesdialog.cpp
@@ -170,7 +170,7 @@ QComboBox *QgsMergeAttributesDialog::createMergeComboBox( QVariant::Type columnT
   QgsFeatureList::const_iterator f_it = mFeatureList.constBegin();
   for ( ; f_it != mFeatureList.constEnd(); ++f_it )
   {
-    newComboBox->addItem( tr( "Feature %1" ).arg( f_it->id() ), QString( "f%1" ).arg( f_it->id() ) );
+    newComboBox->addItem( tr( "Feature %1" ).arg( f_it->id() ), QString( "f%1" ).arg( FID_TO_STRING( f_it->id() ) ) );
   }
 
   if ( columnType == QVariant::Double || columnType == QVariant::Int )
@@ -223,7 +223,7 @@ void QgsMergeAttributesDialog::selectedRowChanged()
 {
   //find out selected row
   QList<QTableWidgetItem *> selectionList = mTableWidget->selectedItems();
-  if ( selectionList.size() < 1 )
+  if ( selectionList.isEmpty() )
   {
     delete mSelectionRubberBand;
     mSelectionRubberBand = 0;
@@ -245,7 +245,7 @@ void QgsMergeAttributesDialog::selectedRowChanged()
   }
 
   bool conversionSuccess = false;
-  int featureIdToSelect = idItem->text().toInt( &conversionSuccess );
+  QgsFeatureId featureIdToSelect = idItem->text().toLongLong( &conversionSuccess );
   if ( !conversionSuccess )
   {
     //the merge result row was selected
@@ -275,10 +275,10 @@ void QgsMergeAttributesDialog::refreshMergedValue( int col )
   {
     mergeResult = tr( "Skipped" );
   }
-  else if ( mergeBehaviourString.startsWith( "f" ) )
+  else if ( mergeBehaviourString.startsWith( 'f' ) )
   {
-    //an existing feature value - TODO should be QgsFeatureId, not int
-    int featureId = mergeBehaviourString.mid( 1 ).toInt();
+    //an existing feature value
+    QgsFeatureId featureId = STRING_TO_FID( mergeBehaviourString.mid( 1 ) );
     mergeResult = featureAttribute( featureId, col );
   }
   else
@@ -295,7 +295,7 @@ void QgsMergeAttributesDialog::refreshMergedValue( int col )
   mTableWidget->setItem( mTableWidget->rowCount() - 1, col, newTotalItem );
 }
 
-QVariant QgsMergeAttributesDialog::featureAttribute( int featureId, int col )
+QVariant QgsMergeAttributesDialog::featureAttribute( QgsFeatureId featureId, int col )
 {
   int idx = mTableWidget->horizontalHeaderItem( col )->data( Qt::UserRole ).toInt();
 
@@ -362,7 +362,7 @@ void QgsMergeAttributesDialog::on_mFromSelectedPushButton_clicked()
 
   //find out feature id of selected row
   QList<QTableWidgetItem *> selectionList = mTableWidget->selectedItems();
-  if ( selectionList.size() < 1 )
+  if ( selectionList.isEmpty() )
   {
     return;
   }
@@ -377,7 +377,7 @@ void QgsMergeAttributesDialog::on_mFromSelectedPushButton_clicked()
   }
 
   bool conversionSuccess;
-  int featureId = selectedHeaderItem->text().toInt( &conversionSuccess );
+  QgsFeatureId featureId = selectedHeaderItem->text().toLongLong( &conversionSuccess );
   if ( !conversionSuccess )
   {
     return;
@@ -393,7 +393,7 @@ void QgsMergeAttributesDialog::on_mFromSelectedPushButton_clicked()
     QComboBox* currentComboBox = qobject_cast<QComboBox *>( mTableWidget->cellWidget( 0, i ) );
     if ( currentComboBox )
     {
-      currentComboBox->setCurrentIndex( currentComboBox->findData( QString::number( featureId ) ) );
+      currentComboBox->setCurrentIndex( currentComboBox->findData( QString( "f%1" ).arg( FID_TO_STRING( featureId ) ) ) );
     }
   }
 }
@@ -407,7 +407,7 @@ void QgsMergeAttributesDialog::on_mRemoveFeatureFromSelectionButton_clicked()
 
   //find out feature id of selected row
   QList<QTableWidgetItem *> selectionList = mTableWidget->selectedItems();
-  if ( selectionList.size() < 1 )
+  if ( selectionList.isEmpty() )
   {
     return;
   }
@@ -422,7 +422,7 @@ void QgsMergeAttributesDialog::on_mRemoveFeatureFromSelectionButton_clicked()
   }
 
   bool conversionSuccess;
-  int featureId = selectedHeaderItem->text().toInt( &conversionSuccess );
+  QgsFeatureId featureId = selectedHeaderItem->text().toLongLong( &conversionSuccess );
   if ( !conversionSuccess )
   {
     selectedRowChanged();
@@ -446,7 +446,7 @@ void QgsMergeAttributesDialog::on_mRemoveFeatureFromSelectionButton_clicked()
       continue;
 
     currentComboBox->blockSignals( true );
-    currentComboBox->removeItem( currentComboBox->findData( QString::number( featureId ) ) );
+    currentComboBox->removeItem( currentComboBox->findData( QString( "f%1" ).arg( FID_TO_STRING( featureId ) ) ) );
     currentComboBox->blockSignals( false );
   }
 
@@ -463,7 +463,7 @@ void QgsMergeAttributesDialog::on_mRemoveFeatureFromSelectionButton_clicked()
   }
 }
 
-void QgsMergeAttributesDialog::createRubberBandForFeature( int featureId )
+void QgsMergeAttributesDialog::createRubberBandForFeature( QgsFeatureId featureId )
 {
   //create rubber band to highlight the feature
   delete mSelectionRubberBand;
diff --git a/src/app/qgsmergeattributesdialog.h b/src/app/qgsmergeattributesdialog.h
@@ -67,7 +67,7 @@ class APP_EXPORT QgsMergeAttributesDialog: public QDialog, private Ui::QgsMergeA
     /** Calculates the merged value of a column (depending on the selected merge behaviour) and inserts the value in the corresponding cell*/
     void refreshMergedValue( int col );
     /** Inserts the attribute value of a specific feature into the row of merged attributes*/
-    QVariant featureAttribute( int featureId, int col );
+    QVariant featureAttribute( QgsFeatureId featureId, int col );
     /** Appends the values of the features for the final value*/
     QVariant concatenationAttribute( int col );
 
@@ -77,7 +77,7 @@ class APP_EXPORT QgsMergeAttributesDialog: public QDialog, private Ui::QgsMergeA
     QVariant calcStatistic( int col, QgsStatisticalSummary::Statistic stat );
 
     /** Sets mSelectionRubberBand to a new feature*/
-    void createRubberBandForFeature( int featureId );
+    void createRubberBandForFeature( QgsFeatureId featureId );
 
     QgsFeatureList mFeatureList;
     QgsVectorLayer* mVectorLayer;

Original file line number	Diff line number	Diff line change
`@@ -170,7 +170,7 @@ QComboBox *QgsMergeAttributesDialog::createMergeComboBox( QVariant::Type columnT`
`170`	`170`	`QgsFeatureList::const_iterator f_it = mFeatureList.constBegin();`
`171`	`171`	`for ( ; f_it != mFeatureList.constEnd(); ++f_it )`
`172`	`172`	`{`
`173`		`- newComboBox->addItem( tr( "Feature %1" ).arg( f_it->id() ), QString( "f%1" ).arg( f_it->id() ) );`
	`173`	`+ newComboBox->addItem( tr( "Feature %1" ).arg( f_it->id() ), QString( "f%1" ).arg( FID_TO_STRING( f_it->id() ) ) );`
`174`	`174`	`}`
`175`	`175`
`176`	`176`	`if ( columnType == QVariant::Double \|\| columnType == QVariant::Int )`
`@@ -223,7 +223,7 @@ void QgsMergeAttributesDialog::selectedRowChanged()`
`223`	`223`	`{`
`224`	`224`	`//find out selected row`
`225`	`225`	`QList<QTableWidgetItem *> selectionList = mTableWidget->selectedItems();`
`226`		`- if ( selectionList.size() < 1 )`
	`226`	`+ if ( selectionList.isEmpty() )`
`227`	`227`	`{`
`228`	`228`	`delete mSelectionRubberBand;`
`229`	`229`	`mSelectionRubberBand = 0;`
`@@ -245,7 +245,7 @@ void QgsMergeAttributesDialog::selectedRowChanged()`
`245`	`245`	`}`
`246`	`246`
`247`	`247`	`bool conversionSuccess = false;`
`248`		`- int featureIdToSelect = idItem->text().toInt( &conversionSuccess );`
	`248`	`+ QgsFeatureId featureIdToSelect = idItem->text().toLongLong( &conversionSuccess );`
`249`	`249`	`if ( !conversionSuccess )`
`250`	`250`	`{`
`251`	`251`	`//the merge result row was selected`
`@@ -275,10 +275,10 @@ void QgsMergeAttributesDialog::refreshMergedValue( int col )`
`275`	`275`	`{`
`276`	`276`	`mergeResult = tr( "Skipped" );`
`277`	`277`	`}`
`278`		`- else if ( mergeBehaviourString.startsWith( "f" ) )`
	`278`	`+ else if ( mergeBehaviourString.startsWith( 'f' ) )`
`279`	`279`	`{`
`280`		`- //an existing feature value - TODO should be QgsFeatureId, not int`
`281`		`- int featureId = mergeBehaviourString.mid( 1 ).toInt();`
	`280`	`+ //an existing feature value`
	`281`	`+ QgsFeatureId featureId = STRING_TO_FID( mergeBehaviourString.mid( 1 ) );`
`282`	`282`	`mergeResult = featureAttribute( featureId, col );`
`283`	`283`	`}`
`284`	`284`	`else`
`@@ -295,7 +295,7 @@ void QgsMergeAttributesDialog::refreshMergedValue( int col )`
`295`	`295`	`mTableWidget->setItem( mTableWidget->rowCount() - 1, col, newTotalItem );`
`296`	`296`	`}`
`297`	`297`
`298`		`-QVariant QgsMergeAttributesDialog::featureAttribute( int featureId, int col )`
	`298`	`+QVariant QgsMergeAttributesDialog::featureAttribute( QgsFeatureId featureId, int col )`
`299`	`299`	`{`
`300`	`300`	`int idx = mTableWidget->horizontalHeaderItem( col )->data( Qt::UserRole ).toInt();`
`301`	`301`
`@@ -362,7 +362,7 @@ void QgsMergeAttributesDialog::on_mFromSelectedPushButton_clicked()`
`362`	`362`
`363`	`363`	`//find out feature id of selected row`
`364`	`364`	`QList<QTableWidgetItem *> selectionList = mTableWidget->selectedItems();`
`365`		`- if ( selectionList.size() < 1 )`
	`365`	`+ if ( selectionList.isEmpty() )`
`366`	`366`	`{`
`367`	`367`	`return;`
`368`	`368`	`}`
`@@ -377,7 +377,7 @@ void QgsMergeAttributesDialog::on_mFromSelectedPushButton_clicked()`
`377`	`377`	`}`
`378`	`378`
`379`	`379`	`bool conversionSuccess;`
`380`		`- int featureId = selectedHeaderItem->text().toInt( &conversionSuccess );`
	`380`	`+ QgsFeatureId featureId = selectedHeaderItem->text().toLongLong( &conversionSuccess );`
`381`	`381`	`if ( !conversionSuccess )`
`382`	`382`	`{`
`383`	`383`	`return;`
`@@ -393,7 +393,7 @@ void QgsMergeAttributesDialog::on_mFromSelectedPushButton_clicked()`
`393`	`393`	`QComboBox* currentComboBox = qobject_cast<QComboBox *>( mTableWidget->cellWidget( 0, i ) );`
`394`	`394`	`if ( currentComboBox )`
`395`	`395`	`{`
`396`		`- currentComboBox->setCurrentIndex( currentComboBox->findData( QString::number( featureId ) ) );`
	`396`	`+ currentComboBox->setCurrentIndex( currentComboBox->findData( QString( "f%1" ).arg( FID_TO_STRING( featureId ) ) ) );`
`397`	`397`	`}`
`398`	`398`	`}`
`399`	`399`	`}`
`@@ -407,7 +407,7 @@ void QgsMergeAttributesDialog::on_mRemoveFeatureFromSelectionButton_clicked()`
`407`	`407`
`408`	`408`	`//find out feature id of selected row`
`409`	`409`	`QList<QTableWidgetItem *> selectionList = mTableWidget->selectedItems();`
`410`		`- if ( selectionList.size() < 1 )`
	`410`	`+ if ( selectionList.isEmpty() )`
`411`	`411`	`{`
`412`	`412`	`return;`
`413`	`413`	`}`
`@@ -422,7 +422,7 @@ void QgsMergeAttributesDialog::on_mRemoveFeatureFromSelectionButton_clicked()`
`422`	`422`	`}`
`423`	`423`
`424`	`424`	`bool conversionSuccess;`
`425`		`- int featureId = selectedHeaderItem->text().toInt( &conversionSuccess );`
	`425`	`+ QgsFeatureId featureId = selectedHeaderItem->text().toLongLong( &conversionSuccess );`
`426`	`426`	`if ( !conversionSuccess )`
`427`	`427`	`{`
`428`	`428`	`selectedRowChanged();`
`@@ -446,7 +446,7 @@ void QgsMergeAttributesDialog::on_mRemoveFeatureFromSelectionButton_clicked()`
`446`	`446`	`continue;`
`447`	`447`
`448`	`448`	`currentComboBox->blockSignals( true );`
`449`		`- currentComboBox->removeItem( currentComboBox->findData( QString::number( featureId ) ) );`
	`449`	`+ currentComboBox->removeItem( currentComboBox->findData( QString( "f%1" ).arg( FID_TO_STRING( featureId ) ) ) );`
`450`	`450`	`currentComboBox->blockSignals( false );`
`451`	`451`	`}`
`452`	`452`
`@@ -463,7 +463,7 @@ void QgsMergeAttributesDialog::on_mRemoveFeatureFromSelectionButton_clicked()`
`463`	`463`	`}`
`464`	`464`	`}`
`465`	`465`
`466`		`-void QgsMergeAttributesDialog::createRubberBandForFeature( int featureId )`
	`466`	`+void QgsMergeAttributesDialog::createRubberBandForFeature( QgsFeatureId featureId )`
`467`	`467`	`{`
`468`	`468`	`//create rubber band to highlight the feature`
`469`	`469`	`delete mSelectionRubberBand;`