[sextante]adapted some saga names

Some code cleaning
qgis · Jul 18, 2013 · dcd19aa · dcd19aa
1 parent aee1104
commit dcd19aa
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 10 deletions.
diff --git a/python/plugins/sextante/algs/ftools/SinglePartsToMultiparts.py b/python/plugins/sextante/algs/ftools/SinglePartsToMultiparts.py
@@ -87,7 +87,6 @@ def processAlgorithm(self, progress):
                     if unicode(idVar).strip() == unicode(i).strip():
                         if first:
                             attrs = atMap
-                            print attrs
                             first = False
                         inGeom = QgsGeometry(inFeat.geometry())
                         vType = inGeom.type()

diff --git a/python/plugins/sextante/gui/SextanteToolbox.py b/python/plugins/sextante/gui/SextanteToolbox.py
@@ -220,8 +220,8 @@ def fillTreeUsingCategories(self):
             for alg in algs:
                 if not alg.showInToolbox:
                     continue
-                altgroup, altsubgroup, altname = AlgorithmDecorator.getGroupsAndName(alg)
-                if altgroup is None:
+                altgroup, altsubgroup, altname = AlgorithmDecorator.getGroupsAndName(alg)                
+                if altgroup is None:                    
                     continue
                 if text =="" or text.lower() in altname.lower():
                     if altgroup not in groups:

diff --git a/python/plugins/sextante/gui/help/algclasssification.txt b/python/plugins/sextante/gui/help/algclasssification.txt
@@ -215,7 +215,7 @@ saga:edgecontamination,USE_ORIGINAL_NAME,Domain specific/Terrain analysis and ge
 saga:effectiveairflowheights,USE_ORIGINAL_NAME,Domain specific/Terrain analysis and geomorphometry
 saga:enumeratetablefield,USE_ORIGINAL_NAME,Vector/Table tools
 saga:fillgapsinrecords,USE_ORIGINAL_NAME,Vector/Table tools
-saga:fillsinksplanchondarboux2001,USE_ORIGINAL_NAME,Domain specific/Terrain analysis and geomorphometry
+saga:fillsinks,USE_ORIGINAL_NAME,Domain specific/Terrain analysis and geomorphometry
 saga:fillsinkswangliu,USE_ORIGINAL_NAME,Domain specific/Terrain analysis and geomorphometry
 saga:fillsinksxxlwangliu,USE_ORIGINAL_NAME,Domain specific/Terrain analysis and geomorphometry
 saga:filterclumps,Remove small pixel clumps (to no-data),Raster/General tools
@@ -245,7 +245,7 @@ saga:gradientvectorsfromdirectionalcomponents,USE_ORIGINAL_NAME,Raster - vector/
 saga:gradientvectorsfromdirectionandlength,USE_ORIGINAL_NAME,Raster - vector/Raster -> Vector
 saga:gradientvectorsfromsurface,USE_ORIGINAL_NAME,Raster - vector/Raster -> Vector
 saga:gridbuffer,USE_ORIGINAL_NAME,Raster/General tools
-saga:gridcalculator,USE_ORIGINAL_NAME,Raster/General tools
+saga:rastercalculator,USE_ORIGINAL_NAME,Raster/General tools
 saga:griddifference,USE_ORIGINAL_NAME,Raster/General tools
 saga:griddivision,USE_ORIGINAL_NAME,Raster/General tools
 saga:gridmasking,USE_ORIGINAL_NAME,Raster/General tools
@@ -280,7 +280,7 @@ saga:lsfactor,USE_ORIGINAL_NAME,Domain specific/Terrain analysis and geomorphome
 saga:majorityfilter,USE_ORIGINAL_NAME,Raster/Filters
 saga:massbalanceindex,USE_ORIGINAL_NAME,Domain specific/Terrain analysis and geomorphometry
 saga:mergeshapeslayers,USE_ORIGINAL_NAME,Vector/General tools
-saga:merging,Merge raster layers,Raster/General tools
+saga:mergerasterlayers,USE_ORIGINAL_NAME,Raster/General tools
 saga:metricconversions,USE_ORIGINAL_NAME,Raster/Edition
 saga:minimumdistanceanalysis,USE_ORIGINAL_NAME,Vector/Points
 saga:modifedquadraticshepard,USE_ORIGINAL_NAME,Raster - vector/Vector -> Raster

diff --git a/python/plugins/sextante/saga/SagaAlgorithmProvider.py b/python/plugins/sextante/saga/SagaAlgorithmProvider.py
@@ -83,7 +83,6 @@ def createAlgsList(self):
                     alg = SagaAlgorithm(os.path.join(folder, descriptionFile))
                     if alg.name.strip() != "":
                         self.preloadedAlgs.append(alg)
-                        print alg.name
                     else:                        
                         SextanteLog.addToLog(SextanteLog.LOG_ERROR, "Could not open SAGA algorithm: " + descriptionFile)
                 except Exception,e:

diff --git a/python/plugins/sextante/saga/description/GridCalculator.txt b/python/plugins/sextante/saga/description/GridCalculator.txt
@@ -1,6 +1,5 @@
-Grid Calculator
+Raster calculator|Grid Calculator
 grid_calculus
-ParameterMultipleInput|GRIDS|Grids|3|False
+ParameterMultipleInput|GRIDS|Raster layers|3|False
 ParameterString|FORMULA|Formula|
-ParameterBoolean|USE_NODATA   |Use NoData|True
 OutputRaster|RESULT|Result