enable zoom button only if error has feature

3nids · m-kuhn · commit e77bab9d2c8f · 2018-10-15T14:28:04.000+02:00
diff --git a/src/app/qgsgeometryvalidationdock.cpp b/src/app/qgsgeometryvalidationdock.cpp
@@ -178,6 +178,9 @@ void QgsGeometryValidationDock::onCurrentErrorChanged( const QModelIndex &curren
     }
   }
 
+  bool hasFeature = !FID_IS_NULL( current.data( QgsGeometryValidationModel::ErrorFeatureIdRole ) );
+  mZoomToFeatureButton->setEnabled( hasFeature );
+
   showHighlight( current );
 
   switch ( mLastZoomToAction )
diff --git a/src/app/qgsgeometryvalidationmodel.cpp b/src/app/qgsgeometryvalidationmodel.cpp
@@ -91,11 +91,20 @@ QVariant QgsGeometryValidationModel::data( const QModelIndex &index, int role )
         return topologyError->geometry();
       }
 
+      case ErrorFeatureIdRole:
+      {
+        return topologyError->featureId();
+      }
+
       case FeatureGeometryRole:
       {
         const QgsFeatureId fid = topologyError->featureId();
-        const QgsFeature feature = mCurrentLayer->getFeature( fid ); // TODO: this should be cached!
-        return feature.geometry();
+        if ( !FID_IS_NULL( fid ) )
+        {
+          const QgsFeature feature = mCurrentLayer->getFeature( fid ); // TODO: this should be cached!
+          return feature.geometry();
+        }
+        return QgsGeometry();
       }
 
       case ErrorLocationGeometryRole:
@@ -149,6 +158,11 @@ QVariant QgsGeometryValidationModel::data( const QModelIndex &index, int role )
         break;
       }
 
+      case ErrorFeatureIdRole:
+      {
+        return featureItem.fid;
+      }
+
       case FeatureExtentRole:
       {
         return mCurrentLayer->getFeature( featureItem.fid ).geometry().boundingBox();
diff --git a/src/app/qgsgeometryvalidationmodel.h b/src/app/qgsgeometryvalidationmodel.h
@@ -18,6 +18,7 @@ class QgsGeometryValidationModel : public QAbstractItemModel
       FeatureExtentRole = Qt::UserRole,
       ProblemExtentRole,
       ErrorGeometryRole,
+      ErrorFeatureIdRole,
       FeatureGeometryRole,
       ErrorLocationGeometryRole,
       GeometryCheckErrorRole,

Original file line number	Diff line number	Diff line change
`@@ -178,6 +178,9 @@ void QgsGeometryValidationDock::onCurrentErrorChanged( const QModelIndex &curren`
`178`	`178`	`}`
`179`	`179`	`}`
`180`	`180`
	`181`	`+ bool hasFeature = !FID_IS_NULL( current.data( QgsGeometryValidationModel::ErrorFeatureIdRole ) );`
	`182`	`+ mZoomToFeatureButton->setEnabled( hasFeature );`
	`183`	`+`
`181`	`184`	`showHighlight( current );`
`182`	`185`
`183`	`186`	`switch ( mLastZoomToAction )`