add missed directory to CMakeLists.txt

disable StatisticsByCategories algorithm because it requires 3rd party Python module scipy
qgis · Feb 18, 2013 · 33808af · 33808af
1 parent 8f25bcf
commit 33808af
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/python/plugins/sextante/CMakeLists.txt b/python/plugins/sextante/CMakeLists.txt
@@ -17,6 +17,7 @@ ADD_SUBDIRECTORY(r)
 ADD_SUBDIRECTORY(saga)
 ADD_SUBDIRECTORY(script)
 ADD_SUBDIRECTORY(taudem)
+ADD_SUBDIRECTORY(tools)
 #ADD_SUBDIRECTORY(tests)
 
 FILE(GLOB UI_FILES ui/*.ui)

diff --git a/python/plugins/sextante/algs/QGISAlgorithmProvider.py b/python/plugins/sextante/algs/QGISAlgorithmProvider.py
@@ -30,7 +30,7 @@
 import os
 from PyQt4 import QtGui
 from sextante.algs.RasterLayerHistogram import RasterLayerHistogram
-from sextante.algs.StatisticsByCategories import StatisticsByCategories
+#from sextante.algs.StatisticsByCategories import StatisticsByCategories
 from sextante.algs.ftools.PointsInPolygon import PointsInPolygon
 from sextante.algs.ftools.PointsInPolygonUnique import PointsInPolygonUnique
 from sextante.algs.ftools.PointsInPolygonWeighted import PointsInPolygonWeighted
@@ -93,17 +93,18 @@ class QGISAlgorithmProvider(AlgorithmProvider):
     def __init__(self):
         AlgorithmProvider.__init__(self)
         self.alglist = [AddTableField(), FieldsCalculator(), SaveSelectedFeatures(), JoinAttributes(),
-                        AutoincrementalField(), Explode(), FieldsPyculator(), EquivalentNumField(),                        
+                        AutoincrementalField(), Explode(), FieldsPyculator(), EquivalentNumField(),
                         SumLines(), PointsInPolygon(), PointsInPolygonWeighted(), PointsInPolygonUnique(),
                         BasicStatisticsStrings(), BasicStatisticsNumbers(), NearestNeighbourAnalysis(),
                         MeanCoords(), LinesIntersection(), UniqueValues(), PointDistance(), PointsLayerFromTable(),
-                        StatisticsByCategories(), ReprojectLayer(),                        
+                        #StatisticsByCategories(),
+                        ReprojectLayer(),
                         ExportGeometryInfo(), Centroids(), Delaunay(), VoronoiPolygons(),
                         SimplifyGeometries(), DensifyGeometries(), DensifyGeometriesInterval(),
                         MultipartToSingleparts(), SinglePartsToMultiparts(), PolygonsToLines(),
-                        LinesToPolygons(), ExtractNodes(),                        
+                        LinesToPolygons(), ExtractNodes(),
                         ConvexHull(), FixedDistanceBuffer(), VariableDistanceBuffer(),
-                        Dissolve(), Difference(), Intersection(), Union(), Clip(),                        
+                        Dissolve(), Difference(), Intersection(), Union(), Clip(),
                         ExtentFromLayer(), RandomSelection(), RandomSelectionWithinSubsets(),
                         SelectByLocation(),
                         #MMQGISX
@@ -144,4 +145,4 @@ def _loadAlgorithms(self):
         self.algs = self.alglist
 
     def supportsNonFileBasedOutput(self):
-        return True
+        return True