Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #53190 from 3nids/merge-feature-field-widget 
use field widget in merge feature dialog
  • Loading branch information
@3nids
3nids committed May 23, 2023
2 parents 0811919 + f0ec61b commit 80062ab
Show file tree
Hide file tree
Showing 4 changed files with 127 additions and 70 deletions.
186 changes: 120 additions & 66 deletions src/app/qgsmergeattributesdialog.cpp
View file
Expand Up @@ -28,6 +28,7 @@
#include "qgsgui.h"
#include "qgsfieldformatter.h"
#include "qgsfieldformatterregistry.h"
#include "qgseditorwidgetwrapper.h"

#include <limits>
#include <QComboBox>
Expand Down Expand Up @@ -106,7 +107,7 @@ QgsMergeAttributesDialog::QgsMergeAttributesDialog( const QgsFeatureList &featur
}

connect( mSkipAllButton, &QAbstractButton::clicked, this, &QgsMergeAttributesDialog::setAllToSkip );
connect( mTableWidget, &QTableWidget::cellChanged, this, &QgsMergeAttributesDialog::tableWidgetCellChanged );
connect( mTableWidget, &QTableWidget::cellClicked, this, &QgsMergeAttributesDialog::tableWidgetCellClicked );

setAttributeTableConfig( mVectorLayer->attributeTableConfig() );
}
Expand Down Expand Up @@ -176,7 +177,7 @@ void QgsMergeAttributesDialog::createTableWidgetContents()
mTableWidget->setColumnCount( col + 1 );
mFieldToColumnMap[ mFields.at( idx ).name() ] = col;

QComboBox *cb = createMergeComboBox( mFields.at( idx ).type() );
QComboBox *cb = createMergeComboBox( mFields.at( idx ).type(), col );
if ( ! mVectorLayer->dataProvider()->pkAttributeIndexes().contains( mFields.fieldOriginIndex( idx ) ) &&
mFields.at( idx ).constraints().constraints() & QgsFieldConstraints::ConstraintUnique )
{
Expand Down Expand Up @@ -233,7 +234,9 @@ void QgsMergeAttributesDialog::createTableWidgetContents()

if ( !mVectorLayer->dataProvider()->defaultValueClause( idx ).isEmpty() )
{
mTableWidget->item( mTableWidget->rowCount() - 1, j )->setData( Qt::DisplayRole, mVectorLayer->dataProvider()->defaultValueClause( idx ) );
QVariant v = mVectorLayer->dataProvider()->defaultValueClause( idx );
mTableWidget->item( mTableWidget->rowCount() - 1, j )->setData( Qt::DisplayRole, v );
mTableWidget->item( mTableWidget->rowCount() - 1, j )->setData( Qt::UserRole, v );
setToManual = true;
}
else
Expand Down Expand Up @@ -263,10 +266,9 @@ void QgsMergeAttributesDialog::createTableWidgetContents()
{
refreshMergedValue( i );
}

}

QComboBox *QgsMergeAttributesDialog::createMergeComboBox( QVariant::Type columnType ) const
QComboBox *QgsMergeAttributesDialog::createMergeComboBox( QVariant::Type columnType, int column )
{
QComboBox *newComboBox = new QComboBox();
//add items for feature
Expand Down Expand Up @@ -300,8 +302,13 @@ QComboBox *QgsMergeAttributesDialog::createMergeComboBox( QVariant::Type columnT
newComboBox->addItem( tr( "Skip Attribute" ), QStringLiteral( "skip" ) );
newComboBox->addItem( tr( "Manual Value" ), QStringLiteral( "manual" ) );

connect( newComboBox, &QComboBox::currentTextChanged,
this, &QgsMergeAttributesDialog::comboValueChanged );
connect( newComboBox, static_cast<void ( QComboBox::* )( int )>( &QComboBox::currentIndexChanged ), this, [ = ]()
{
bool isManual = newComboBox->currentData() == QStringLiteral( "manual" );
updateManualWidget( column, isManual );
refreshMergedValue( column );
} );

return newComboBox;
}

Expand All @@ -317,21 +324,6 @@ int QgsMergeAttributesDialog::findComboColumn( QComboBox *c ) const
return -1;
}

void QgsMergeAttributesDialog::comboValueChanged( const QString &text )
{
Q_UNUSED( text )
QComboBox *senderComboBox = qobject_cast<QComboBox *>( sender() );
if ( !senderComboBox )
{
return;
}
int column = findComboColumn( senderComboBox );
if ( column < 0 )
return;

refreshMergedValue( column );
}

void QgsMergeAttributesDialog::selectedRowChanged()
{
//find out selected row
Expand Down Expand Up @@ -380,54 +372,59 @@ 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 == QLatin1String( "concat" ) )
{
mergeResult = concatenationAttribute( col );
}
else if ( mergeBehaviorString == QLatin1String( "skip" ) )
{
mergeResult = tr( "Skipped" );
}
else if ( mergeBehaviorString == QLatin1String( "manual" ) )
{
mergeResult = item->data( Qt::DisplayRole );
}
else if ( mergeBehaviorString.startsWith( 'f' ) )

if ( mergeBehaviorString == QLatin1String( "manual" ) )
{
//an existing feature value
QgsFeatureId featureId = STRING_TO_FID( mergeBehaviorString.mid( 1 ) );
mergeResult = featureAttribute( featureId, fieldIdx );
// nothing to do
}
else
{
//numerical statistic
QgsStatisticalSummary::Statistic stat = static_cast< QgsStatisticalSummary::Statistic >( comboBox->currentData().toInt() );
mergeResult = calcStatistic( fieldIdx, stat );
}
QVariant mergeResult; // result to show in the merge result field
QTableWidgetItem *item = mTableWidget->item( mTableWidget->rowCount() - 1, col );

//insert string into table widget
mUpdating = true; // prevent combobox changing to "manual" value
if ( mergeBehaviorString == QLatin1String( "concat" ) )
{
mergeResult = concatenationAttribute( col );
}
else if ( mergeBehaviorString == QLatin1String( "skip" ) )
{
mergeResult = tr( "Skipped" );
}
else if ( mergeBehaviorString.startsWith( 'f' ) )
{
//an existing feature value
QgsFeatureId featureId = STRING_TO_FID( mergeBehaviorString.mid( 1 ) );
mergeResult = featureAttribute( featureId, fieldIdx );
}
else
{
//numerical statistic
QgsStatisticalSummary::Statistic stat = static_cast< QgsStatisticalSummary::Statistic >( comboBox->currentData().toInt() );
mergeResult = calcStatistic( fieldIdx, stat );
}

// Result formatting
QString stringVal;
if ( mergeBehaviorString != QLatin1String( "skip" ) && mergeBehaviorString != QLatin1String( "manual" ) )
{
const QgsEditorWidgetSetup setup = mFields.at( fieldIdx ).editorWidgetSetup();
const QgsFieldFormatter *formatter = QgsApplication::fieldFormatterRegistry()->fieldFormatter( setup.type() );
stringVal = formatter->representValue( mVectorLayer, fieldIdx, setup.config(), QVariant(), mergeResult );
}
else
{
stringVal = mergeResult.toString();
}
//insert string into table widget
mUpdating = true; // prevent combobox changing to "manual" value

item->setData( Qt::DisplayRole, stringVal );
item->setData( Qt::UserRole, mergeResult );
// Result formatting
QString stringVal;
if ( mergeBehaviorString != QLatin1String( "skip" ) && mergeBehaviorString != QLatin1String( "manual" ) )
{
const QgsEditorWidgetSetup setup = mFields.at( fieldIdx ).editorWidgetSetup();
const QgsFieldFormatter *formatter = QgsApplication::fieldFormatterRegistry()->fieldFormatter( setup.type() );
stringVal = formatter->representValue( mVectorLayer, fieldIdx, setup.config(), QVariant(), mergeResult );
}
else
{
stringVal = mergeResult.toString();
}

item->setData( Qt::DisplayRole, stringVal );
item->setData( Qt::UserRole, mergeResult );

mUpdating = false;
mUpdating = false;
}
}

QVariant QgsMergeAttributesDialog::featureAttribute( QgsFeatureId featureId, int fieldIdx )
Expand Down Expand Up @@ -680,7 +677,51 @@ void QgsMergeAttributesDialog::mRemoveFeatureFromSelectionButton_clicked()
mTargetFeatureId = mFeatureList.first().id();
}

void QgsMergeAttributesDialog::tableWidgetCellChanged( int row, int column )
void QgsMergeAttributesDialog::updateManualWidget( int column, bool isManual )
{
int row = mTableWidget->rowCount() - 1;
int idx = mTableWidget->horizontalHeaderItem( column )->data( FieldIndex ).toInt();


if ( isManual )
{
QTableWidgetItem *item = mTableWidget->takeItem( row, column );
if ( item )
{
QVariant currentValue = item->data( Qt::UserRole );
delete item;

const QgsAttributeEditorContext context;
QgsEditorWidgetWrapper *eww = QgsGui::editorWidgetRegistry()->create( mVectorLayer, idx, nullptr, this, context );
QWidget *w = eww->widget();
mTableWidget->setCellWidget( row, column, w );
eww->setValue( currentValue );
}
}
else
{
QWidget *w = mTableWidget->cellWidget( row, column );
QgsEditorWidgetWrapper *eww = QgsEditorWidgetWrapper::fromWidget( w );

if ( eww )
{
QVariant currentValue = eww->value();
const QgsEditorWidgetSetup setup = mFields.at( idx ).editorWidgetSetup();
const QgsFieldFormatter *formatter = QgsApplication::fieldFormatterRegistry()->fieldFormatter( setup.type() );
QString stringVal = formatter->representValue( mVectorLayer, idx, setup.config(), QVariant(), currentValue );

mTableWidget->removeCellWidget( row, column );

QTableWidgetItem *mergedItem = new QTableWidgetItem();
mergedItem->setFlags( Qt::ItemIsEnabled | Qt::ItemIsSelectable );
mergedItem->setData( Qt::DisplayRole, stringVal );
mergedItem->setData( Qt::UserRole, currentValue );
mTableWidget->setItem( row, column, mergedItem );
}
}
}

void QgsMergeAttributesDialog::tableWidgetCellClicked( int row, int column )
{
if ( mUpdating )
return;
Expand All @@ -691,6 +732,8 @@ void QgsMergeAttributesDialog::tableWidgetCellChanged( int row, int column )
return;
}

updateManualWidget( column, true );

QComboBox *currentComboBox = qobject_cast<QComboBox *>( mTableWidget->cellWidget( 0, column ) );
if ( currentComboBox )
{
Expand Down Expand Up @@ -734,16 +777,27 @@ QgsAttributes QgsMergeAttributesDialog::mergedAttributes() const
if ( !comboBox )
continue;

QTableWidgetItem *currentItem = mTableWidget->item( mFeatureList.size() + 1, widgetIndex );
if ( !currentItem )
continue;
QVariant value;
QWidget *w = mTableWidget->cellWidget( mFeatureList.size() + 1, widgetIndex );
QgsEditorWidgetWrapper *eww = QgsEditorWidgetWrapper::fromWidget( w );
if ( eww )
{
value = eww->value();
}
else
{
QTableWidgetItem *currentItem = mTableWidget->item( mFeatureList.size() + 1, widgetIndex );
if ( !currentItem )
continue;
value = currentItem->data( Qt::UserRole );
}

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

if ( comboBox->currentData().toString() != QLatin1String( "skip" ) )
{
results[fieldIdx] = currentItem->data( Qt::UserRole );
results[fieldIdx] = value;
}
widgetIndex++;
}
Expand Down
6 changes: 3 additions & 3 deletions src/app/qgsmergeattributesdialog.h
View file
Expand Up @@ -75,20 +75,20 @@ class APP_EXPORT QgsMergeAttributesDialog: public QDialog, private Ui::QgsMergeA
void setAllToSkip();

private slots:
void comboValueChanged( const QString &text );
void selectedRowChanged();
void mFromSelectedPushButton_clicked();
void mFromLargestPushButton_clicked();
void mRemoveFeatureFromSelectionButton_clicked();
void tableWidgetCellChanged( int row, int column );
void tableWidgetCellClicked( int row, int column );
void updateManualWidget( int column, bool isManual );

private:
QgsMergeAttributesDialog(); //default constructor forbidden
void createTableWidgetContents();
void setAttributeTableConfig( const QgsAttributeTableConfig &config );

//! Create new combo box with the options for featureXX / mean / min / max
QComboBox *createMergeComboBox( QVariant::Type columnType ) const;
QComboBox *createMergeComboBox( QVariant::Type columnType, int column );

/**
* Returns the table widget column index of a combo box
Expand Down
3 changes: 3 additions & 0 deletions src/gui/editorwidgets/core/qgseditorwidgetwrapper.cpp
View file
Expand Up @@ -54,6 +54,9 @@ QVariant QgsEditorWidgetWrapper::defaultValue() const

QgsEditorWidgetWrapper *QgsEditorWidgetWrapper::fromWidget( QWidget *widget )
{
if ( !widget )
return nullptr;

return qobject_cast<QgsEditorWidgetWrapper *>( widget->property( "EWV2Wrapper" ).value<QgsWidgetWrapper *>() );
}

Expand Down
2 changes: 1 addition & 1 deletion tests/src/app/testqgsmergeattributesdialog.cpp
View file
Expand Up @@ -86,7 +86,7 @@ class TestQgsMergeattributesDialog : public QObject

// At beginnning the first feature of the list is the target
QCOMPARE( dialog.targetFeatureId(), FID_NULL );
QCOMPARE( dialog.mergedAttributes().first(), "Autogenerate" );
QCOMPARE( dialog.mergedAttributes()[0], "Autogenerate" );

// Check after taking feature with largest geometry
QVERIFY( QMetaObject::invokeMethod( &dialog, "mFromLargestPushButton_clicked" ) );
Expand Down

0 comments on commit 80062ab

Please sign in to comment.