Skip to content

Commit

Permalink
[Geometry checker] Add layer column to fix summary dialog tables
Browse files Browse the repository at this point in the history
  • Loading branch information
@manisandro
manisandro committed Oct 23, 2017
1 parent e0caef9 commit 374e186
Show file tree
Hide file tree
Showing 2 changed files with 39 additions and 15 deletions.
30 changes: 17 additions & 13 deletions src/plugins/geometry_checker/ui/qgsgeometrycheckerfixsummarydialog.cpp
View file
Expand Up @@ -70,25 +70,26 @@ void QgsGeometryCheckerFixSummaryDialog::addError( QTableWidget *table, QgsGeome

int row = table->rowCount();
table->insertRow( row );
table->setItem( row, 0, new QTableWidgetItem( mChecker->getContext()->featurePools[error->layerId()]->getLayer()->name() ) );
QTableWidgetItem *idItem = new QTableWidgetItem();
idItem->setData( Qt::EditRole, error->featureId() != FEATUREID_NULL ? QVariant( error->featureId() ) : QVariant() );
idItem->setData( Qt::UserRole, QVariant::fromValue( reinterpret_cast<void *>( error ) ) );
table->setItem( row, 0, idItem );
table->setItem( row, 1, new QTableWidgetItem( error->description() ) );
table->setItem( row, 2, new QTableWidgetItem( posStr ) );
table->setItem( row, 1, idItem );
table->setItem( row, 2, new QTableWidgetItem( error->description() ) );
table->setItem( row, 3, new QTableWidgetItem( posStr ) );
QTableWidgetItem *valueItem = new QTableWidgetItem();
valueItem->setData( Qt::EditRole, error->value() );
table->setItem( row, 3, valueItem );
table->setItem( row, 4, valueItem );
table->item( row, 0 )->setData( Qt::UserRole, QVariant::fromValue( reinterpret_cast<void *>( error ) ) );
QTextStream( stdout ) << "Set data: " << row << " = " << error << endl;
}

void QgsGeometryCheckerFixSummaryDialog::setupTable( QTableWidget *table )
{
table->resizeColumnToContents( 0 );
table->horizontalHeader()->setSectionResizeMode( 1, QHeaderView::Stretch );
table->horizontalHeader()->setSectionResizeMode( 2, QHeaderView::Stretch );
table->horizontalHeader()->setSectionResizeMode( 3, QHeaderView::Stretch );
table->horizontalHeader()->setSectionResizeMode( 4, QHeaderView::Stretch );

table->resizeColumnToContents( 1 );
table->horizontalHeader()->setResizeMode( 2, QHeaderView::Stretch );
table->horizontalHeader()->setResizeMode( 3, QHeaderView::Stretch );
table->horizontalHeader()->setResizeMode( 4, QHeaderView::Stretch );
table->setEditTriggers( QAbstractItemView::NoEditTriggers );
table->setSelectionBehavior( QAbstractItemView::SelectRows );
table->setSelectionMode( QAbstractItemView::SingleSelection );
Expand All @@ -101,15 +102,18 @@ void QgsGeometryCheckerFixSummaryDialog::setupTable( QTableWidget *table )

void QgsGeometryCheckerFixSummaryDialog::onTableSelectionChanged( const QItemSelection &newSel, const QItemSelection & /*oldSel*/ )
{
const QAbstractItemModel *model = qobject_cast<QItemSelectionModel *>( QObject::sender() )->model();
QItemSelectionModel *selModel = qobject_cast<QItemSelectionModel *>( QObject::sender() );
const QAbstractItemModel *model = selModel->model();

for ( QTableWidget *table : QList<QTableWidget *>() << ui.tableWidgetFixedErrors << ui.tableWidgetNewErrors << ui.tableWidgetNotFixed << ui.tableWidgetObsoleteErrors )
if ( table->model() != model )
for ( QTableWidget *table : {ui.tableWidgetFixedErrors, ui.tableWidgetNewErrors, ui.tableWidgetNotFixed, ui.tableWidgetObsoleteErrors} )
{
if ( table->selectionModel() != selModel )
{
table->selectionModel()->blockSignals( true );
table->clearSelection();
table->selectionModel()->blockSignals( false );
}
}

if ( !newSel.isEmpty() && !newSel.first().indexes().isEmpty() )
{
Expand Down
24 changes: 22 additions & 2 deletions src/plugins/geometry_checker/ui/qgsgeometrycheckerfixsummarydialog.ui
View file
Expand Up @@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>400</width>
<height>442</height>
<width>501</width>
<height>547</height>
</rect>
</property>
<property name="windowTitle">
Expand Down Expand Up @@ -43,6 +43,11 @@
<attribute name="verticalHeaderVisible">
<bool>false</bool>
</attribute>
<column>
<property name="text">
<string>Layer</string>
</property>
</column>
<column>
<property name="text">
<string>Object ID</string>
Expand Down Expand Up @@ -100,6 +105,11 @@
<attribute name="verticalHeaderVisible">
<bool>false</bool>
</attribute>
<column>
<property name="text">
<string>Layer</string>
</property>
</column>
<column>
<property name="text">
<string>Object ID</string>
Expand Down Expand Up @@ -157,6 +167,11 @@
<attribute name="verticalHeaderVisible">
<bool>false</bool>
</attribute>
<column>
<property name="text">
<string>Layer</string>
</property>
</column>
<column>
<property name="text">
<string>Object ID</string>
Expand Down Expand Up @@ -214,6 +229,11 @@
<attribute name="verticalHeaderVisible">
<bool>false</bool>
</attribute>
<column>
<property name="text">
<string>Layer</string>
</property>
</column>
<column>
<property name="text">
<string>Object ID</string>
Expand Down

0 comments on commit 374e186

Please sign in to comment.