Skip to content

Commit dcd19aa

Browse files
committed
[sextante]adapted some saga names
Some code cleaning
1 parent aee1104 commit dcd19aa

File tree

5 files changed

+7
-10
lines changed

5 files changed

+7
-10
lines changed

python/plugins/sextante/algs/ftools/SinglePartsToMultiparts.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,6 @@ def processAlgorithm(self, progress):
8787
if unicode(idVar).strip() == unicode(i).strip():
8888
if first:
8989
attrs = atMap
90-
print attrs
9190
first = False
9291
inGeom = QgsGeometry(inFeat.geometry())
9392
vType = inGeom.type()

python/plugins/sextante/gui/SextanteToolbox.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -220,8 +220,8 @@ def fillTreeUsingCategories(self):
220220
for alg in algs:
221221
if not alg.showInToolbox:
222222
continue
223-
altgroup, altsubgroup, altname = AlgorithmDecorator.getGroupsAndName(alg)
224-
if altgroup is None:
223+
altgroup, altsubgroup, altname = AlgorithmDecorator.getGroupsAndName(alg)
224+
if altgroup is None:
225225
continue
226226
if text =="" or text.lower() in altname.lower():
227227
if altgroup not in groups:

python/plugins/sextante/gui/help/algclasssification.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ saga:edgecontamination,USE_ORIGINAL_NAME,Domain specific/Terrain analysis and ge
215215
saga:effectiveairflowheights,USE_ORIGINAL_NAME,Domain specific/Terrain analysis and geomorphometry
216216
saga:enumeratetablefield,USE_ORIGINAL_NAME,Vector/Table tools
217217
saga:fillgapsinrecords,USE_ORIGINAL_NAME,Vector/Table tools
218-
saga:fillsinksplanchondarboux2001,USE_ORIGINAL_NAME,Domain specific/Terrain analysis and geomorphometry
218+
saga:fillsinks,USE_ORIGINAL_NAME,Domain specific/Terrain analysis and geomorphometry
219219
saga:fillsinkswangliu,USE_ORIGINAL_NAME,Domain specific/Terrain analysis and geomorphometry
220220
saga:fillsinksxxlwangliu,USE_ORIGINAL_NAME,Domain specific/Terrain analysis and geomorphometry
221221
saga:filterclumps,Remove small pixel clumps (to no-data),Raster/General tools
@@ -245,7 +245,7 @@ saga:gradientvectorsfromdirectionalcomponents,USE_ORIGINAL_NAME,Raster - vector/
245245
saga:gradientvectorsfromdirectionandlength,USE_ORIGINAL_NAME,Raster - vector/Raster -> Vector
246246
saga:gradientvectorsfromsurface,USE_ORIGINAL_NAME,Raster - vector/Raster -> Vector
247247
saga:gridbuffer,USE_ORIGINAL_NAME,Raster/General tools
248-
saga:gridcalculator,USE_ORIGINAL_NAME,Raster/General tools
248+
saga:rastercalculator,USE_ORIGINAL_NAME,Raster/General tools
249249
saga:griddifference,USE_ORIGINAL_NAME,Raster/General tools
250250
saga:griddivision,USE_ORIGINAL_NAME,Raster/General tools
251251
saga:gridmasking,USE_ORIGINAL_NAME,Raster/General tools
@@ -280,7 +280,7 @@ saga:lsfactor,USE_ORIGINAL_NAME,Domain specific/Terrain analysis and geomorphome
280280
saga:majorityfilter,USE_ORIGINAL_NAME,Raster/Filters
281281
saga:massbalanceindex,USE_ORIGINAL_NAME,Domain specific/Terrain analysis and geomorphometry
282282
saga:mergeshapeslayers,USE_ORIGINAL_NAME,Vector/General tools
283-
saga:merging,Merge raster layers,Raster/General tools
283+
saga:mergerasterlayers,USE_ORIGINAL_NAME,Raster/General tools
284284
saga:metricconversions,USE_ORIGINAL_NAME,Raster/Edition
285285
saga:minimumdistanceanalysis,USE_ORIGINAL_NAME,Vector/Points
286286
saga:modifedquadraticshepard,USE_ORIGINAL_NAME,Raster - vector/Vector -> Raster

python/plugins/sextante/saga/SagaAlgorithmProvider.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ def createAlgsList(self):
8383
alg = SagaAlgorithm(os.path.join(folder, descriptionFile))
8484
if alg.name.strip() != "":
8585
self.preloadedAlgs.append(alg)
86-
print alg.name
8786
else:
8887
SextanteLog.addToLog(SextanteLog.LOG_ERROR, "Could not open SAGA algorithm: " + descriptionFile)
8988
except Exception,e:
Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
Grid Calculator
1+
Raster calculator|Grid Calculator
22
grid_calculus
3-
ParameterMultipleInput|GRIDS|Grids|3|False
3+
ParameterMultipleInput|GRIDS|Raster layers|3|False
44
ParameterString|FORMULA|Formula|
5-
ParameterBoolean|USE_NODATA |Use NoData|True
65
OutputRaster|RESULT|Result

0 commit comments

Comments
 (0)