Skip to content

Commit 33808af

Browse files
committed
add missed directory to CMakeLists.txt
disable StatisticsByCategories algorithm because it requires 3rd party Python module scipy
1 parent 8f25bcf commit 33808af

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

python/plugins/sextante/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ ADD_SUBDIRECTORY(r)
1717
ADD_SUBDIRECTORY(saga)
1818
ADD_SUBDIRECTORY(script)
1919
ADD_SUBDIRECTORY(taudem)
20+
ADD_SUBDIRECTORY(tools)
2021
#ADD_SUBDIRECTORY(tests)
2122

2223
FILE(GLOB UI_FILES ui/*.ui)

python/plugins/sextante/algs/QGISAlgorithmProvider.py

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
import os
3131
from PyQt4 import QtGui
3232
from sextante.algs.RasterLayerHistogram import RasterLayerHistogram
33-
from sextante.algs.StatisticsByCategories import StatisticsByCategories
33+
#from sextante.algs.StatisticsByCategories import StatisticsByCategories
3434
from sextante.algs.ftools.PointsInPolygon import PointsInPolygon
3535
from sextante.algs.ftools.PointsInPolygonUnique import PointsInPolygonUnique
3636
from sextante.algs.ftools.PointsInPolygonWeighted import PointsInPolygonWeighted
@@ -93,17 +93,18 @@ class QGISAlgorithmProvider(AlgorithmProvider):
9393
def __init__(self):
9494
AlgorithmProvider.__init__(self)
9595
self.alglist = [AddTableField(), FieldsCalculator(), SaveSelectedFeatures(), JoinAttributes(),
96-
AutoincrementalField(), Explode(), FieldsPyculator(), EquivalentNumField(),
96+
AutoincrementalField(), Explode(), FieldsPyculator(), EquivalentNumField(),
9797
SumLines(), PointsInPolygon(), PointsInPolygonWeighted(), PointsInPolygonUnique(),
9898
BasicStatisticsStrings(), BasicStatisticsNumbers(), NearestNeighbourAnalysis(),
9999
MeanCoords(), LinesIntersection(), UniqueValues(), PointDistance(), PointsLayerFromTable(),
100-
StatisticsByCategories(), ReprojectLayer(),
100+
#StatisticsByCategories(),
101+
ReprojectLayer(),
101102
ExportGeometryInfo(), Centroids(), Delaunay(), VoronoiPolygons(),
102103
SimplifyGeometries(), DensifyGeometries(), DensifyGeometriesInterval(),
103104
MultipartToSingleparts(), SinglePartsToMultiparts(), PolygonsToLines(),
104-
LinesToPolygons(), ExtractNodes(),
105+
LinesToPolygons(), ExtractNodes(),
105106
ConvexHull(), FixedDistanceBuffer(), VariableDistanceBuffer(),
106-
Dissolve(), Difference(), Intersection(), Union(), Clip(),
107+
Dissolve(), Difference(), Intersection(), Union(), Clip(),
107108
ExtentFromLayer(), RandomSelection(), RandomSelectionWithinSubsets(),
108109
SelectByLocation(),
109110
#MMQGISX
@@ -144,4 +145,4 @@ def _loadAlgorithms(self):
144145
self.algs = self.alglist
145146

146147
def supportsNonFileBasedOutput(self):
147-
return True
148+
return True

0 commit comments

Comments
 (0)