Skip to content
Permalink
Browse files

Fix merge attribute dialog mangles field values when layer has hidden

fields (fix #14235)
  • Loading branch information
nyalldawson committed Feb 7, 2016
1 parent 92e5f67 commit 1566e37a47e5ea7c87abb692549ecb7a661aa147
Showing with 54 additions and 21 deletions.
  1. +44 −21 src/app/qgsmergeattributesdialog.cpp
  2. +10 −0 src/app/qgsmergeattributesdialog.h
@@ -108,27 +108,31 @@ void QgsMergeAttributesDialog::createTableWidgetContents()
mTableWidget->setRowCount( mFeatureList.size() + 2 );

//create combo boxes and insert attribute names
const QgsFields& fields = mVectorLayer->fields();
mFields = mVectorLayer->fields();
QSet<int> pkAttrList = mVectorLayer->pkAttributeList().toSet();

int col = 0;
for ( int idx = 0; idx < fields.count(); ++idx )
mHiddenAttributes.clear();
for ( int idx = 0; idx < mFields.count(); ++idx )
{
if ( mVectorLayer->editFormConfig()->widgetType( idx ) == "Hidden" ||
mVectorLayer->editFormConfig()->widgetType( idx ) == "Immutable" )
{
mHiddenAttributes.insert( idx );
continue;
}

mTableWidget->setColumnCount( col + 1 );

QComboBox *cb = createMergeComboBox( fields[idx].type() );
QComboBox *cb = createMergeComboBox( mFields.at( idx ) .type() );
if ( pkAttrList.contains( idx ) )
{
cb->setCurrentIndex( cb->findData( "skip" ) );
}
mTableWidget->setCellWidget( 0, col, cb );

QTableWidgetItem *item = new QTableWidgetItem( fields[idx].name() );
item->setData( Qt::UserRole, idx );
QTableWidgetItem *item = new QTableWidgetItem( mFields.at( idx ).name() );
item->setData( FieldIndex, idx );
mTableWidget->setHorizontalHeaderItem( col++, item );
}

@@ -144,12 +148,13 @@ void QgsMergeAttributesDialog::createTableWidgetContents()

for ( int j = 0; j < mTableWidget->columnCount(); j++ )
{
int idx = mTableWidget->horizontalHeaderItem( j )->data( Qt::UserRole ).toInt();
int idx = mTableWidget->horizontalHeaderItem( j )->data( FieldIndex ).toInt();

QTableWidgetItem* attributeValItem = new QTableWidgetItem( attrs.at( idx ).toString() );
attributeValItem->setFlags( Qt::ItemIsEnabled | Qt::ItemIsSelectable );
mTableWidget->setItem( i + 1, j, attributeValItem );
mTableWidget->setCellWidget( i + 1, j, QgsAttributeEditor::createAttributeEditor( mTableWidget, nullptr, mVectorLayer, idx, attrs.at( idx ) ) );
QWidget* attributeWidget = QgsAttributeEditor::createAttributeEditor( mTableWidget, nullptr, mVectorLayer, idx, attrs.at( idx ) );
mTableWidget->setCellWidget( i + 1, j, attributeWidget );
}
}

@@ -307,21 +312,21 @@ void QgsMergeAttributesDialog::refreshMergedValue( int col )

QVariant QgsMergeAttributesDialog::featureAttribute( QgsFeatureId featureId, int col )
{
int idx = mTableWidget->horizontalHeaderItem( col )->data( Qt::UserRole ).toInt();
int fieldIdx = mTableWidget->horizontalHeaderItem( col )->data( FieldIndex ).toInt();

int i;
for ( i = 0; i < mFeatureList.size() && mFeatureList.at( i ).id() != featureId; i++ )
;

QVariant value;
if ( i < mFeatureList.size() &&
QgsAttributeEditor::retrieveValue( mTableWidget->cellWidget( i + 1, col ), mVectorLayer, idx, value ) )
QgsAttributeEditor::retrieveValue( mTableWidget->cellWidget( i + 1, col ), mVectorLayer, fieldIdx, value ) )
{
return value;
}
else
{
return QVariant( mVectorLayer->fields().at( col ).type() );
return QVariant( mVectorLayer->fields().at( fieldIdx ).type() );
}
}

@@ -508,30 +513,40 @@ QgsAttributes QgsMergeAttributesDialog::mergedAttributes() const
return QgsAttributes();
}

QgsAttributes results( mTableWidget->columnCount() );
for ( int i = 0; i < mTableWidget->columnCount(); i++ )
int widgetIndex = 0;
QgsAttributes results( mFields.count() );
for ( int fieldIdx = 0; fieldIdx < mFields.count(); ++fieldIdx )
{
int idx = mTableWidget->horizontalHeaderItem( i )->data( Qt::UserRole ).toInt();
if ( mHiddenAttributes.contains( fieldIdx ) )
{
//hidden attribute, set to default value
if ( mVectorLayer->dataProvider() )
results[fieldIdx] = mVectorLayer->dataProvider()->defaultValue( fieldIdx );
else
results[fieldIdx] = QVariant();
continue;
}

QComboBox *comboBox = qobject_cast<QComboBox *>( mTableWidget->cellWidget( 0, i ) );
QComboBox *comboBox = qobject_cast<QComboBox *>( mTableWidget->cellWidget( 0, widgetIndex ) );
if ( !comboBox )
continue;

QTableWidgetItem *currentItem = mTableWidget->item( mFeatureList.size() + 1, i );
QTableWidgetItem *currentItem = mTableWidget->item( mFeatureList.size() + 1, widgetIndex );
if ( !currentItem )
continue;

if ( idx >= results.count() )
results.resize( idx + 1 ); // make sure the results vector is long enough (maybe not necessary)
if ( fieldIdx >= results.count() )
results.resize( fieldIdx + 1 ); // make sure the results vector is long enough (maybe not necessary)

if ( comboBox->itemData( comboBox->currentIndex() ).toString() != "skip" )
{
results[idx] = currentItem->data( Qt::DisplayRole );
results[fieldIdx] = currentItem->data( Qt::DisplayRole );
}
else if ( mVectorLayer->dataProvider() )
{
results[idx] = mVectorLayer->dataProvider()->defaultValue( idx );
results[fieldIdx] = mVectorLayer->dataProvider()->defaultValue( fieldIdx );
}
widgetIndex++;
}

return results;
@@ -540,9 +555,16 @@ QgsAttributes QgsMergeAttributesDialog::mergedAttributes() const
QSet<int> QgsMergeAttributesDialog::skippedAttributeIndexes() const
{
QSet<int> skipped;
for ( int i = 0; i < mTableWidget->columnCount(); ++i )
int widgetIndex = 0;
for ( int i = 0; i < mFields.count(); ++i )
{
QComboBox *comboBox = qobject_cast<QComboBox *>( mTableWidget->cellWidget( 0, i ) );
if ( mHiddenAttributes.contains( i ) )
{
skipped << i;
continue;
}

QComboBox *comboBox = qobject_cast<QComboBox *>( mTableWidget->cellWidget( 0, widgetIndex ) );
if ( !comboBox )
{
//something went wrong, better skip this attribute
@@ -554,6 +576,7 @@ QSet<int> QgsMergeAttributesDialog::skippedAttributeIndexes() const
{
skipped << i;
}
widgetIndex++;
}

return skipped;
@@ -34,6 +34,13 @@ class APP_EXPORT QgsMergeAttributesDialog: public QDialog, private Ui::QgsMergeA
{
Q_OBJECT
public:

enum ItemDataRole
{
FieldIndex = Qt::UserRole /*!< index of corresponding field in source table */
};


QgsMergeAttributesDialog( const QgsFeatureList& features, QgsVectorLayer* vl, QgsMapCanvas* canvas, QWidget * parent = nullptr, Qt::WindowFlags f = nullptr );
~QgsMergeAttributesDialog();

@@ -86,6 +93,9 @@ class APP_EXPORT QgsMergeAttributesDialog: public QDialog, private Ui::QgsMergeA
/** Item that highlights the selected feature in the merge table*/
QgsRubberBand* mSelectionRubberBand;

QgsFields mFields;
QSet<int> mHiddenAttributes;

static QList< QgsStatisticalSummary::Statistic > mDisplayStats;

};

0 comments on commit 1566e37

Please sign in to comment.
You can’t perform that action at this time.