Add icons to geometry validation checks

qgis · Mar 20, 2019 · d97f5d4 · d97f5d4
1 parent 9383b00
commit d97f5d4
Show file tree

Hide file tree

Showing 15 changed files with 66 additions and 11 deletions.
diff --git a/images/images.qrc b/images/images.qrc
@@ -76,6 +76,10 @@
         <file>north_arrows/gpsarrow2.svg</file>
         <file>splash/splash.png</file>
         <file>composer/missing_image.svg</file>
+        <file>themes/default/checks/SliverOrGap.svg</file>
+        <file>themes/default/checks/InvalidGeometry.svg</file>
+        <file>themes/default/checks/MissingVertex.svg</file>
+        <file>themes/default/checks/Overlap.svg</file>
         <file>themes/default/algorithms/mAlgorithmAddGeometryAttributes.svg</file>
         <file>themes/default/algorithms/mAlgorithmBasicStatistics.svg</file>
         <file>themes/default/algorithms/mAlgorithmBuffer.svg</file>

diff --git a/images/themes/default/checks/InvalidGeometry.svg b/images/themes/default/checks/InvalidGeometry.svg
diff --git a/images/themes/default/checks/MissingVertex.svg b/images/themes/default/checks/MissingVertex.svg
diff --git a/images/themes/default/checks/Overlap.svg b/images/themes/default/checks/Overlap.svg
diff --git a/images/themes/default/checks/SliverOrGap.svg b/images/themes/default/checks/SliverOrGap.svg
diff --git a/python/analysis/auto_generated/vector/geometry_checker/qgsgeometrycheckerror.sip.in b/python/analysis/auto_generated/vector/geometry_checker/qgsgeometrycheckerror.sip.in
@@ -77,6 +77,12 @@ Will be used to update existing errors whenever they are re-checked.
 
 
 
+    virtual QIcon icon() const;
+%Docstring
+Returns an icon that should be shown for this kind of error.
+
+.. versionadded:: 3.8
+%End
   protected:
     QgsGeometryCheckError( const QgsGeometryCheck *check,
                            const QString &layerId,

diff --git a/src/analysis/vector/geometry_checker/qgsgeometrycheckerror.cpp b/src/analysis/vector/geometry_checker/qgsgeometrycheckerror.cpp
@@ -16,6 +16,7 @@
  ***************************************************************************/
 
 #include "qgsgeometrycheckerror.h"
+#include "qgsapplication.h"
 
 QgsGeometryCheckError::QgsGeometryCheckError( const QgsGeometryCheck *check,
     const QString &layerId,
@@ -186,6 +187,14 @@ QMap<QString, QgsFeatureIds> QgsGeometryCheckError::involvedFeatures() const
   return QMap<QString, QSet<QgsFeatureId> >();
 }
 
+QIcon QgsGeometryCheckError::icon() const
+{
+  if ( status() == QgsGeometryCheckError::StatusFixed )
+    return QgsApplication::getThemeIcon( QStringLiteral( "/algorithms/mAlgorithmCheckGeometry.svg" ) );
+  else
+    return QgsApplication::getThemeIcon( QStringLiteral( "/algorithms/mAlgorithmLineIntersections.svg" ) );
+}
+
 void QgsGeometryCheckError::update( const QgsGeometryCheckError *other )
 {
   Q_ASSERT( mCheck == other->mCheck );

diff --git a/src/analysis/vector/geometry_checker/qgsgeometrycheckerror.h b/src/analysis/vector/geometry_checker/qgsgeometrycheckerror.h
@@ -102,6 +102,12 @@ class ANALYSIS_EXPORT QgsGeometryCheckError
      */
     virtual QMap<QString, QgsFeatureIds > involvedFeatures() const SIP_SKIP;
 
+    /**
+     * Returns an icon that should be shown for this kind of error.
+     *
+     * \since QGIS 3.8
+     */
+    virtual QIcon icon() const;
   protected:
     // Users of this constructor must ensure geometry and errorLocation are in map coordinates
     QgsGeometryCheckError( const QgsGeometryCheck *check,

diff --git a/src/analysis/vector/geometry_checker/qgsgeometrygapcheck.cpp b/src/analysis/vector/geometry_checker/qgsgeometrygapcheck.cpp
@@ -20,6 +20,7 @@
 #include "qgsfeaturepool.h"
 #include "qgsvectorlayer.h"
 #include "qgsfeedback.h"
+#include "qgsapplication.h"
 
 #include "geos_c.h"
 
@@ -329,3 +330,12 @@ QMap<QString, QgsFeatureIds> QgsGeometryGapCheckError::involvedFeatures() const
 {
   return mNeighbors;
 }
+
+QIcon QgsGeometryGapCheckError::icon() const
+{
+
+  if ( status() == QgsGeometryCheckError::StatusFixed )
+    return QgsApplication::getThemeIcon( QStringLiteral( "/algorithms/mAlgorithmCheckGeometry.svg" ) );
+  else
+    return QgsApplication::getThemeIcon( QStringLiteral( "/checks/SliverOrGap.svg" ) );
+}
diff --git a/src/analysis/vector/geometry_checker/qgsgeometrygapcheck.h b/src/analysis/vector/geometry_checker/qgsgeometrygapcheck.h
@@ -50,6 +50,8 @@ class ANALYSIS_EXPORT QgsGeometryGapCheckError : public QgsGeometryCheckError
 
     QMap<QString, QgsFeatureIds > involvedFeatures() const override;
 
+    QIcon icon() const override;
+
   private:
     QMap<QString, QgsFeatureIds> mNeighbors;
     QgsRectangle mGapAreaBBox;

diff --git a/src/analysis/vector/geometry_checker/qgsgeometrymissingvertexcheck.cpp b/src/analysis/vector/geometry_checker/qgsgeometrymissingvertexcheck.cpp
@@ -23,6 +23,7 @@
 #include "qgslinestring.h"
 #include "qgsgeometryengine.h"
 #include "qgsgeometryutils.h"
+#include "qgsapplication.h"
 
 QgsGeometryMissingVertexCheck::QgsGeometryMissingVertexCheck( const QgsGeometryCheckContext *context, const QVariantMap &geometryCheckConfiguration )
   : QgsGeometryCheck( context, geometryCheckConfiguration )
@@ -288,3 +289,12 @@ void QgsGeometryMissingVertexCheckError::setInvolvedFeatures( const QMap<QString
 {
   mInvolvedFeatures = involvedFeatures;
 }
+
+QIcon QgsGeometryMissingVertexCheckError::icon() const
+{
+
+  if ( status() == QgsGeometryCheckError::StatusFixed )
+    return QgsApplication::getThemeIcon( QStringLiteral( "/algorithms/mAlgorithmCheckGeometry.svg" ) );
+  else
+    return QgsApplication::getThemeIcon( QStringLiteral( "/checks/MissingVertex.svg" ) );
+}
diff --git a/src/analysis/vector/geometry_checker/qgsgeometrymissingvertexcheck.h b/src/analysis/vector/geometry_checker/qgsgeometrymissingvertexcheck.h
@@ -66,6 +66,8 @@ class ANALYSIS_EXPORT QgsGeometryMissingVertexCheckError : public QgsGeometryChe
      */
     void setInvolvedFeatures( const QMap<QString, QgsFeatureIds> &involvedFeatures );
 
+    QIcon icon() const override;
+
   private:
     QgsRectangle mAffectedAreaBBox;
     QMap<QString, QgsFeatureIds> mInvolvedFeatures;

diff --git a/src/analysis/vector/geometry_checker/qgsgeometryoverlapcheck.cpp b/src/analysis/vector/geometry_checker/qgsgeometryoverlapcheck.cpp
@@ -19,6 +19,7 @@
 #include "qgsfeaturepool.h"
 #include "qgsvectorlayer.h"
 #include "qgsfeedback.h"
+#include "qgsapplication.h"
 
 QgsGeometryOverlapCheck::QgsGeometryOverlapCheck( const QgsGeometryCheckContext *context, const QVariantMap &configuration )
   : QgsGeometryCheck( context, configuration )
@@ -310,3 +311,12 @@ QMap<QString, QgsFeatureIds> QgsGeometryOverlapCheckError::involvedFeatures() co
   features[mOverlappedFeature.layerId()].insert( mOverlappedFeature.featureId() );
   return features;
 }
+
+QIcon QgsGeometryOverlapCheckError::icon() const
+{
+
+  if ( status() == QgsGeometryCheckError::StatusFixed )
+    return QgsApplication::getThemeIcon( QStringLiteral( "/algorithms/mAlgorithmCheckGeometry.svg" ) );
+  else
+    return QgsApplication::getThemeIcon( QStringLiteral( "/checks/Overlap.svg" ) );
+}
diff --git a/src/analysis/vector/geometry_checker/qgsgeometryoverlapcheck.h b/src/analysis/vector/geometry_checker/qgsgeometryoverlapcheck.h
@@ -63,6 +63,7 @@ class ANALYSIS_EXPORT QgsGeometryOverlapCheckError : public QgsGeometryCheckErro
     QString description() const override;
 
     QMap<QString, QgsFeatureIds > involvedFeatures() const override;
+    QIcon icon() const override;
 
   private:
     OverlappedFeature mOverlappedFeature;

diff --git a/src/app/qgsgeometryvalidationmodel.cpp b/src/app/qgsgeometryvalidationmodel.cpp
@@ -70,10 +70,7 @@ QVariant QgsGeometryValidationModel::data( const QModelIndex &index, int role )
     switch ( role )
     {
       case Qt::DecorationRole:
-        if ( topologyError->status() == QgsGeometryCheckError::StatusFixed )
-          return QgsApplication::getThemeIcon( QStringLiteral( "/algorithms/mAlgorithmCheckGeometry.svg" ) );
-        else
-          return QgsApplication::getThemeIcon( QStringLiteral( "/algorithms/mAlgorithmLineIntersections.svg" ) );
+        return topologyError->icon();
 
       case Qt::DisplayRole:
       case DetailsRole:
@@ -164,13 +161,7 @@ QVariant QgsGeometryValidationModel::data( const QModelIndex &index, int role )
 
       case Qt::DecorationRole:
       {
-#if 0
-        if ( mGeometryValidationService->validationActive( mCurrentLayer, featureItem.fid ) )
-          return QgsApplication::getThemeIcon( "/mActionTracing.svg" );
-        else
-          return QVariant();
-#endif
-        break;
+        return QgsApplication::getThemeIcon( "/checks/InvalidGeometry.svg" );
       }
 
       case GeometryCheckErrorRole: