New API for check filtering

m-kuhn · m-kuhn · commit 0ef292322ac1 · 2018-10-15T14:28:00.000+02:00
diff --git a/src/app/qgsvectorlayerproperties.cpp b/src/app/qgsvectorlayerproperties.cpp
@@ -413,7 +413,7 @@ QgsVectorLayerProperties::QgsVectorLayerProperties(
     mPrecisionUnitsLabel->setText( QStringLiteral( "[%1]" ).arg( QgsUnitTypes::toAbbreviatedString( mLayer->crs().mapUnits() ) ) );
 
     QLayout *geometryCheckLayout = new QVBoxLayout();
-    const QList<QgsGeometryCheckFactory *> geometryCheckFactories = QgsAnalysis::instance()->geometryCheckRegistry()->geometryCheckFactories( mLayer, QgsGeometryCheck::Flag::SingleGeometryCheck );
+    const QList<QgsGeometryCheckFactory *> geometryCheckFactories = QgsAnalysis::instance()->geometryCheckRegistry()->geometryCheckFactories( mLayer, QgsGeometryCheck::FeatureNodeCheck, QgsGeometryCheck::Flag::AvailableInValidation );
     const QStringList activeChecks = mLayer->geometryOptions()->geometryChecks();
     for ( const QgsGeometryCheckFactory *factory : geometryCheckFactories )
     {
@@ -425,7 +425,7 @@ QgsVectorLayerProperties::QgsVectorLayerProperties(
     mGeometryValidationGroupBox->setLayout( geometryCheckLayout );
 
     QLayout *topologyCheckLayout = new QVBoxLayout();
-    const QList<QgsGeometryCheckFactory *> topologyCheckFactories = QgsAnalysis::instance()->geometryCheckRegistry()->geometryCheckFactories( mLayer, QgsGeometryCheck::Flag::SingleLayerTopologyCheck );
+    const QList<QgsGeometryCheckFactory *> topologyCheckFactories = QgsAnalysis::instance()->geometryCheckRegistry()->geometryCheckFactories( mLayer, QgsGeometryCheck::LayerCheck, QgsGeometryCheck::Flag::AvailableInValidation );
 
     for ( const QgsGeometryCheckFactory *factory : topologyCheckFactories )
     {

Original file line number	Diff line number	Diff line change
`@@ -413,7 +413,7 @@ QgsVectorLayerProperties::QgsVectorLayerProperties(`
`413`	`413`	`mPrecisionUnitsLabel->setText( QStringLiteral( "[%1]" ).arg( QgsUnitTypes::toAbbreviatedString( mLayer->crs().mapUnits() ) ) );`
`414`	`414`
`415`	`415`	`QLayout *geometryCheckLayout = new QVBoxLayout();`
`416`		`- const QList<QgsGeometryCheckFactory *> geometryCheckFactories = QgsAnalysis::instance()->geometryCheckRegistry()->geometryCheckFactories( mLayer, QgsGeometryCheck::Flag::SingleGeometryCheck );`
	`416`	`+ const QList<QgsGeometryCheckFactory *> geometryCheckFactories = QgsAnalysis::instance()->geometryCheckRegistry()->geometryCheckFactories( mLayer, QgsGeometryCheck::FeatureNodeCheck, QgsGeometryCheck::Flag::AvailableInValidation );`
`417`	`417`	`const QStringList activeChecks = mLayer->geometryOptions()->geometryChecks();`
`418`	`418`	`for ( const QgsGeometryCheckFactory *factory : geometryCheckFactories )`
`419`	`419`	`{`
`@@ -425,7 +425,7 @@ QgsVectorLayerProperties::QgsVectorLayerProperties(`
`425`	`425`	`mGeometryValidationGroupBox->setLayout( geometryCheckLayout );`
`426`	`426`
`427`	`427`	`QLayout *topologyCheckLayout = new QVBoxLayout();`
`428`		`- const QList<QgsGeometryCheckFactory *> topologyCheckFactories = QgsAnalysis::instance()->geometryCheckRegistry()->geometryCheckFactories( mLayer, QgsGeometryCheck::Flag::SingleLayerTopologyCheck );`
	`428`	`+ const QList<QgsGeometryCheckFactory *> topologyCheckFactories = QgsAnalysis::instance()->geometryCheckRegistry()->geometryCheckFactories( mLayer, QgsGeometryCheck::LayerCheck, QgsGeometryCheck::Flag::AvailableInValidation );`
`429`	`429`
`430`	`430`	`for ( const QgsGeometryCheckFactory *factory : topologyCheckFactories )`
`431`	`431`	`{`