sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-28 00:17:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #39083 from pblottiere/merge_manual

Browse Source 
Fixes manual mode in merge features tool
This commit is contained in:
Paul Blottiere 2020-09-30 08:37:07 +02:00 committed by GitHub
commit 09fc4ed6eb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/app/qgsmergeattributesdialog.cpp
View File

@ -324,6 +324,7 @@ void QgsMergeAttributesDialog::refreshMergedValue( int col )
const int fieldIdx = mTableWidget->horizontalHeaderItem( col )->data( FieldIndex ).toInt();
//evaluate behavior (feature value or min / max / mean )
QTableWidgetItem *item = mTableWidget->item( mTableWidget->rowCount() - 1, col );
const QString mergeBehaviorString = comboBox->currentData().toString();
QVariant mergeResult; // result to show in the merge result field
if ( mergeBehaviorString == QStringLiteral( "concat" ) )
@ -336,7 +337,7 @@ void QgsMergeAttributesDialog::refreshMergedValue( int col )
}
else if ( mergeBehaviorString == QLatin1String( "manual" ) )
{
return; //nothing to do
mergeResult = item->data( Qt::DisplayRole );
}
else if ( mergeBehaviorString.startsWith( 'f' ) )
{
@ -353,7 +354,6 @@ void QgsMergeAttributesDialog::refreshMergedValue( int col )
//insert string into table widget
mUpdating = true; // prevent combobox changing to "manual" value
QTableWidgetItem *item = mTableWidget->item( mTableWidget->rowCount() - 1, col );
// Result formatting
QString stringVal;
@ -559,6 +559,7 @@ void QgsMergeAttributesDialog::tableWidgetCellChanged( int row, int column )
currentComboBox->blockSignals( true );
currentComboBox->setCurrentIndex( currentComboBox->findData( QStringLiteral( "manual" ) ) );
currentComboBox->blockSignals( false );
refreshMergedValue( column );
}
}