[Geometry checker] Fix determining active layer geometry types

manisandro · manisandro · commit 018467fc39a9 · 2017-10-23T17:25:07.000+02:00
diff --git a/src/plugins/geometry_checker/ui/qgsgeometrycheckersetuptab.cpp b/src/plugins/geometry_checker/ui/qgsgeometrycheckersetuptab.cpp
@@ -171,11 +171,11 @@ void QgsGeometryCheckerSetupTab::validateInput()
   QStringList layerCrs = QStringList() << mIface->mapCanvas()->mapSettings().destinationCrs().authid();
   QList<QgsVectorLayer *> layers = getSelectedLayers();
   int nApplicable = 0;
+  int nPoint = 0;
+  int nLineString = 0;
+  int nPolygon = 0;
   if ( !layers.isEmpty() )
   {
-    int nPoint = 0;
-    int nLineString = 0;
-    int nPolygon = 0;
     for ( QgsVectorLayer *layer : layers )
     {
       QgsWkbTypes::GeometryType geomType = layer->geometryType();
@@ -193,10 +193,10 @@ void QgsGeometryCheckerSetupTab::validateInput()
       }
       layerCrs.append( layer->crs().authid() );
     }
-    for ( const QgsGeometryCheckFactory *factory : QgsGeometryCheckFactoryRegistry::getCheckFactories() )
-    {
-      nApplicable += factory->checkApplicability( ui, nPoint, nLineString, nPolygon );
-    }
+  }
+  for ( const QgsGeometryCheckFactory *factory : QgsGeometryCheckFactoryRegistry::getCheckFactories() )
+  {
+    nApplicable += factory->checkApplicability( ui, nPoint, nLineString, nPolygon );
   }
 
   bool outputOk = ui.radioButtonOutputModifyInput->isChecked() || !ui.lineEditOutputDirectory->text().isEmpty();

Original file line number	Diff line number	Diff line change
`@@ -171,11 +171,11 @@ void QgsGeometryCheckerSetupTab::validateInput()`
`171`	`171`	`QStringList layerCrs = QStringList() << mIface->mapCanvas()->mapSettings().destinationCrs().authid();`
`172`	`172`	`QList<QgsVectorLayer *> layers = getSelectedLayers();`
`173`	`173`	`int nApplicable = 0;`
	`174`	`+ int nPoint = 0;`
	`175`	`+ int nLineString = 0;`
	`176`	`+ int nPolygon = 0;`
`174`	`177`	`if ( !layers.isEmpty() )`
`175`	`178`	`{`
`176`		`- int nPoint = 0;`
`177`		`- int nLineString = 0;`
`178`		`- int nPolygon = 0;`
`179`	`179`	`for ( QgsVectorLayer *layer : layers )`
`180`	`180`	`{`
`181`	`181`	`QgsWkbTypes::GeometryType geomType = layer->geometryType();`
`@@ -193,10 +193,10 @@ void QgsGeometryCheckerSetupTab::validateInput()`
`193`	`193`	`}`
`194`	`194`	`layerCrs.append( layer->crs().authid() );`
`195`	`195`	`}`
`196`		`- for ( const QgsGeometryCheckFactory *factory : QgsGeometryCheckFactoryRegistry::getCheckFactories() )`
`197`		`- {`
`198`		`- nApplicable += factory->checkApplicability( ui, nPoint, nLineString, nPolygon );`
`199`		`- }`
	`196`	`+ }`
	`197`	`+ for ( const QgsGeometryCheckFactory *factory : QgsGeometryCheckFactoryRegistry::getCheckFactories() )`
	`198`	`+ {`
	`199`	`+ nApplicable += factory->checkApplicability( ui, nPoint, nLineString, nPolygon );`
`200`	`200`	`}`
`201`	`201`
`202`	`202`	`bool outputOk = ui.radioButtonOutputModifyInput->isChecked() \|\| !ui.lineEditOutputDirectory->text().isEmpty();`