Merge pull request #9576 from m-kuhn/geometry_validation_invalid_feature_master

m-kuhn · web-flow · commit 0f20c131f237 · 2019-03-21T08:13:50.000+01:00
Only change map extent when manually changing the active error
diff --git a/src/app/qgsgeometryvalidationdock.cpp b/src/app/qgsgeometryvalidationdock.cpp
@@ -85,6 +85,7 @@ void QgsGeometryValidationDock::setGeometryValidationModel( QgsGeometryValidatio
   mErrorListView->setModel( mGeometryValidationModel );
 
   connect( mErrorListView->selectionModel(), &QItemSelectionModel::currentChanged, this, &QgsGeometryValidationDock::onCurrentErrorChanged );
+  connect( mErrorListView->selectionModel(), &QItemSelectionModel::currentChanged, this, [this]() { updateMapCanvasExtent(); } );
   connect( mGeometryValidationModel, &QgsGeometryValidationModel::dataChanged, this, &QgsGeometryValidationDock::onDataChanged );
   connect( mGeometryValidationModel, &QgsGeometryValidationModel::rowsRemoved, this, &QgsGeometryValidationDock::updateCurrentError );
   connect( mGeometryValidationModel, &QgsGeometryValidationModel::rowsInserted, this, &QgsGeometryValidationDock::onRowsInserted );
@@ -243,7 +244,10 @@ void QgsGeometryValidationDock::onCurrentErrorChanged( const QModelIndex &curren
 
   bool hasFeature = !FID_IS_NULL( current.data( QgsGeometryValidationModel::ErrorFeatureIdRole ) );
   mZoomToFeatureButton->setEnabled( hasFeature );
+}
 
+void QgsGeometryValidationDock::updateMapCanvasExtent()
+{
   if ( !mPreventZoomToError )
   {
     switch ( mLastZoomToAction )
diff --git a/src/app/qgsgeometryvalidationdock.h b/src/app/qgsgeometryvalidationdock.h
@@ -46,6 +46,7 @@ class QgsGeometryValidationDock : public QgsDockWidget, public Ui_QgsGeometryVal
   private slots:
     void updateCurrentError();
     void onCurrentErrorChanged( const QModelIndex &current, const QModelIndex &previous );
+    void updateMapCanvasExtent();
     void onCurrentLayerChanged( QgsMapLayer *layer );
     void onLayerEditingStatusChanged();
     void onLayerDestroyed( QObject *layer );
diff --git a/src/app/qgsgeometryvalidationmodel.cpp b/src/app/qgsgeometryvalidationmodel.cpp
@@ -184,12 +184,18 @@ QVariant QgsGeometryValidationModel::data( const QModelIndex &index, int role )
 
       case ErrorLocationGeometryRole:
       {
+        if ( featureItem.errors.empty() )
+          return QVariant();
+
         QgsSingleGeometryCheckError *error = featureItem.errors.first().get();
         return error->errorLocation();
       }
 
       case ProblemExtentRole:
       {
+        if ( featureItem.errors.empty() )
+          return QVariant();
+
         QgsSingleGeometryCheckError *error = featureItem.errors.first().get();
         return error->errorLocation().boundingBox();
       }

Original file line number	Diff line number	Diff line change
`@@ -184,12 +184,18 @@ QVariant QgsGeometryValidationModel::data( const QModelIndex &index, int role )`
`184`	`184`
`185`	`185`	`case ErrorLocationGeometryRole:`
`186`	`186`	`{`
	`187`	`+ if ( featureItem.errors.empty() )`
	`188`	`+ return QVariant();`
	`189`	`+`
`187`	`190`	`QgsSingleGeometryCheckError *error = featureItem.errors.first().get();`
`188`	`191`	`return error->errorLocation();`
`189`	`192`	`}`
`190`	`193`
`191`	`194`	`case ProblemExtentRole:`
`192`	`195`	`{`
	`196`	`+ if ( featureItem.errors.empty() )`
	`197`	`+ return QVariant();`
	`198`	`+`
`193`	`199`	`QgsSingleGeometryCheckError *error = featureItem.errors.first().get();`
`194`	`200`	`return error->errorLocation().boundingBox();`
`195`	`201`	`}`