sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-03-01 00:46:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash in merge features dialog

Browse Source 
Fixes #19119
This commit is contained in:
Nyall Dawson 2018-06-06 20:22:59 +10:00
parent b2274258a4
commit 71f3aaf39e
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/qgsmergeattributesdialog.cpp
View File

@ -361,10 +361,8 @@ void QgsMergeAttributesDialog::refreshMergedValue( int col )
mUpdating = false;
}
QVariant QgsMergeAttributesDialog::featureAttribute( QgsFeatureId featureId, int col )
QVariant QgsMergeAttributesDialog::featureAttribute( QgsFeatureId featureId, int fieldIdx )
{
int fieldIdx = mTableWidget->horizontalHeaderItem( col )->data( FieldIndex ).toInt();
int i;
for ( i = 0; i < mFeatureList.size() && mFeatureList.at( i ).id() != featureId; i++ )
;

2
src/app/qgsmergeattributesdialog.h
View File

@ -81,7 +81,7 @@ class APP_EXPORT QgsMergeAttributesDialog: public QDialog, private Ui::QgsMergeA
//! Calculates the merged value of a column (depending on the selected merge behavior) 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( QgsFeatureId featureId, int col );
QVariant featureAttribute( QgsFeatureId featureId, int fieldIdx );
//! Appends the values of the features for the final value
QVariant concatenationAttribute( int col );