changed grass description. Now one grass algorithm can be splitted in…

… several sextante ones git-svn-id: http://sextante.googlecode.com/svn/trunk/soft/bindings/qgis-plugin@134 881b9c09-3ef8-f3c2-ec3d-21d735c97f4d
qgis · Apr 20, 2012 · 66e027a · 66e027a
1 parent aa0a44b
commit 66e027a
Show file tree

Hide file tree

Showing 147 changed files with 183 additions and 14 deletions.
diff --git a/src/sextante/grass/GrassAlgorithm.py b/src/sextante/grass/GrassAlgorithm.py
@@ -48,6 +48,8 @@ def helpFile(self):
     def defineCharacteristicsFromFile(self):
         lines = open(self.descriptionFile)
         line = lines.readline().strip("\n").strip()
+        self.grassName = line
+        line = lines.readline().strip("\n").strip()
         self.name = line
         line = lines.readline().strip("\n").strip()
         self.group = line
@@ -158,7 +160,7 @@ def processAlgorithm(self, progress):
                         commands.append(self.exportVectorLayer(layer))
 
         #2: set parameters and outputs
-        command = self.name
+        command = self.grassName
         for param in self.parameters:
             if param.value == None:
                 continue

diff --git a/src/sextante/grass/GrassAlgorithmProvider.py b/src/sextante/grass/GrassAlgorithmProvider.py
@@ -55,6 +55,7 @@ def createAlgsList(self):
                     SextanteLog.addToLog(SextanteLog.LOG_ERROR, "Could not open GRASS algorithm: " + descriptionFile)
             except Exception,e:
                 SextanteLog.addToLog(SextanteLog.LOG_ERROR, "Could not open GRASS algorithm: " + descriptionFile)
+        self.createDescriptionFiles()
 
     def _loadAlgorithms(self):
         self.algs = self.preloadedAlgs
@@ -71,6 +72,7 @@ def createDescriptionFiles(self):
         for alg in self.preloadedAlgs:
             f = open (os.path.join(folder, alg.name +".txt"), "w")
             f.write(alg.name + "\n")
+            f.write(alg.name + "\n")
             f.write(alg.group + "\n")
             for param in alg.parameters:
                 f.write(param.serialize() + "\n")

diff --git a/src/sextante/grass/description/r.average.txt b/src/sextante/grass/description/r.average.txt
@@ -1,4 +1,5 @@
 r.average
+r.average
 Raster (r.*)
 ParameterRaster|base|base|False
 ParameterRaster|cover|cover|False

diff --git a/src/sextante/grass/description/r.basins.fill.txt b/src/sextante/grass/description/r.basins.fill.txt
@@ -1,4 +1,5 @@
 r.basins.fill
+r.basins.fill
 Raster (r.*)
 ParameterNumber|number|number|None|None|0.0
 ParameterRaster|c_map|c_map|False

diff --git a/src/sextante/grass/description/r.bilinear.txt b/src/sextante/grass/description/r.bilinear.txt
@@ -1,4 +1,5 @@
 r.bilinear
+r.bilinear
 Raster (r.*)
 ParameterRaster|input|input|False
 ParameterNumber|north|north|None|None|0

diff --git a/src/sextante/grass/description/r.bitpattern.txt b/src/sextante/grass/description/r.bitpattern.txt
@@ -1,4 +1,5 @@
 r.bitpattern
+r.bitpattern
 Raster (r.*)
 ParameterRaster|input|input|False
 ParameterString|pattern|pattern|

diff --git a/src/sextante/grass/description/r.buffer.txt b/src/sextante/grass/description/r.buffer.txt
@@ -1,4 +1,5 @@
 r.buffer
+r.buffer
 Raster (r.*)
 ParameterRaster|input|input|False
 ParameterString|distances|distances|100,200,300

diff --git a/src/sextante/grass/description/r.carve.txt b/src/sextante/grass/description/r.carve.txt
@@ -1,4 +1,5 @@
 r.carve
+r.carve
 Raster (r.*)
 ParameterRaster|rast|rast|False
 ParameterVector|vect|vect|1|False

diff --git a/src/sextante/grass/description/r.circle.txt b/src/sextante/grass/description/r.circle.txt
@@ -1,4 +1,5 @@
 r.circle
+r.circle
 Raster (r.*)
 ParameterString|coordinate|coordinate|0,0
 ParameterNumber|min|min|None|None|10

diff --git a/src/sextante/grass/description/r.clump.txt b/src/sextante/grass/description/r.clump.txt
@@ -1,4 +1,5 @@
 r.clump
+r.clump
 Raster (r.*)
 ParameterRaster|input|input|False
 ParameterString|title|title|

diff --git a/src/sextante/grass/description/r.coin.txt b/src/sextante/grass/description/r.coin.txt
@@ -1,4 +1,5 @@
 r.coin
+r.coin
 Raster (r.*)
 ParameterRaster|map1|map1|False
 ParameterRaster|map2|map2|False

diff --git a/src/sextante/grass/description/r.colors.txt b/src/sextante/grass/description/r.colors.txt
@@ -1,4 +1,5 @@
 r.colors
+r.colors
 Raster (r.*)
 ParameterRaster|map|map|False
 ParameterSelection|color|color|aspect;aspectcolr;bcyr;bgyr;byg;byr;celsius;corine;curvature;differences;elevation;etopo2;evi;gdd;grey;grey1.0;grey255;gyr;haxby;ndvi;population;precipitation;rainbow;ramp;rstcurv;ryb;ryg;sepia;slope;srtm;terrain;wave;random;grey.eq;grey.log;rules

diff --git a/src/sextante/grass/description/r.composite.txt b/src/sextante/grass/description/r.composite.txt
@@ -1,4 +1,5 @@
 r.composite
+r.composite
 Raster (r.*)
 ParameterRaster|red|red|False
 ParameterRaster|green|green|False

diff --git a/src/sextante/grass/description/r.contour.txt b/src/sextante/grass/description/r.contour.txt
@@ -1,4 +1,5 @@
 r.contour
+r.contour
 Raster (r.*)
 ParameterRaster|input|input|False
 ParameterString|levels|levels|

diff --git a/src/sextante/grass/description/r.cost.txt b/src/sextante/grass/description/r.cost.txt
@@ -1,4 +1,5 @@
 r.cost
+r.cost
 Raster (r.*)
 ParameterRaster|input|input|False
 ParameterVector|start_points|start_points|0|False

diff --git a/src/sextante/grass/description/r.covar.txt b/src/sextante/grass/description/r.covar.txt
@@ -1,4 +1,5 @@
 r.covar
+r.covar
 Raster (r.*)
 ParameterMultipleInput|map|map|3.0|False
 ParameterBoolean|-r|-r|True
diff --git a/src/sextante/grass/description/r.cross.txt b/src/sextante/grass/description/r.cross.txt
@@ -1,4 +1,5 @@
 r.cross
+r.cross
 Raster (r.*)
 ParameterMultipleInput|input|input|3.0|False
 ParameterBoolean|-z|-z|True

diff --git a/src/sextante/grass/description/r.cva.txt b/src/sextante/grass/description/r.cva.txt
@@ -1,4 +1,5 @@
 r.cva
+r.cva
 Raster (r.*)
 ParameterRaster|input|input|False
 ParameterRaster|target_mask|target_mask|False

diff --git a/src/sextante/grass/description/r.describe.txt b/src/sextante/grass/description/r.describe.txt
@@ -1,4 +1,5 @@
 r.describe
+r.describe
 Raster (r.*)
 ParameterRaster|map|map|False
 ParameterString|nv|nv|*

diff --git a/src/sextante/grass/description/r.distance.txt b/src/sextante/grass/description/r.distance.txt
@@ -1,4 +1,5 @@
 r.distance
+r.distance
 Raster (r.*)
 ParameterRaster|maps|maps|False
 ParameterString|fs|fs|:

diff --git a/src/sextante/grass/description/r.drain.txt b/src/sextante/grass/description/r.drain.txt
@@ -1,4 +1,5 @@
 r.drain
+r.drain
 Raster (r.*)
 ParameterRaster|input|input|False
 ParameterString|coordinate|coordinate(E,N)|

diff --git a/src/sextante/grass/description/r.fill.dir.txt b/src/sextante/grass/description/r.fill.dir.txt
@@ -1,4 +1,5 @@
 r.fill.dir
+r.fill.dir
 Raster (r.*)
 ParameterRaster|input|input|False
 ParameterString|type|type|grass

diff --git a/src/sextante/grass/description/r.fillnulls.txt b/src/sextante/grass/description/r.fillnulls.txt
@@ -1,4 +1,5 @@
 r.fillnulls
+r.fillnulls
 Raster (r.*)
 ParameterRaster|input|input|False
 ParameterNumber|tension|tension|None|None|40.0

diff --git a/src/sextante/grass/description/r.flow.txt b/src/sextante/grass/description/r.flow.txt
@@ -1,4 +1,5 @@
 r.flow
+r.flow
 Raster (r.*)
 ParameterRaster|elevin|elevin|False
 ParameterRaster|aspin|aspin|False

diff --git a/src/sextante/grass/description/r.grow.distance.txt b/src/sextante/grass/description/r.grow.distance.txt
@@ -1,4 +1,5 @@
 r.grow.distance
+r.grow.distance
 Raster (r.*)
 ParameterRaster|input|input|False
 ParameterSelection|metric|metric|euclidean;squared;maximum;manhattan

diff --git a/src/sextante/grass/description/r.grow.txt b/src/sextante/grass/description/r.grow.txt
@@ -1,4 +1,5 @@
 r.grow
+r.grow
 Raster (r.*)
 ParameterRaster|input|input|False
 ParameterNumber|radius|radius|None|None|1.01

diff --git a/src/sextante/grass/description/r.gwflow.txt b/src/sextante/grass/description/r.gwflow.txt
@@ -1,4 +1,5 @@
 r.gwflow
+r.gwflow
 Raster (r.*)
 ParameterString|phead|phead|
 ParameterString|status|status|

diff --git a/src/sextante/grass/description/r.his.txt b/src/sextante/grass/description/r.his.txt
@@ -1,4 +1,5 @@
 r.his
+r.his
 Raster (r.*)
 ParameterRaster|h_map|h_map|False
 ParameterRaster|i_map|i_map|False

diff --git a/src/sextante/grass/description/r.horizon.txt b/src/sextante/grass/description/r.horizon.txt
@@ -1,4 +1,5 @@
 r.horizon
+r.horizon
 Raster (r.*)
 ParameterRaster|elevin|elevin|False
 ParameterNumber|direction|direction|None|None|0.0

diff --git a/src/sextante/grass/description/r.info.txt b/src/sextante/grass/description/r.info.txt
@@ -1,4 +1,5 @@
 r.info
+r.info
 Raster (r.*)
 ParameterRaster|map|map|False
 ParameterBoolean|-r|-r|True

diff --git a/src/sextante/grass/description/r.kappa.txt b/src/sextante/grass/description/r.kappa.txt
@@ -1,4 +1,5 @@
 r.kappa
+r.kappa
 Raster (r.*)
 ParameterRaster|classification|classification|False
 ParameterRaster|reference|reference|False

diff --git a/src/sextante/grass/description/r.lake.txt b/src/sextante/grass/description/r.lake.txt
@@ -1,4 +1,5 @@
 r.lake
+r.lake
 Raster (r.*)
 ParameterRaster|dem|dem|False
 ParameterString|wl|wl|

diff --git a/src/sextante/grass/description/r.los.txt b/src/sextante/grass/description/r.los.txt
@@ -1,4 +1,5 @@
 r.los
+r.los
 Raster (r.*)
 ParameterRaster|input|input|False
 ParameterString|coordinate|coordinate|0,0

diff --git a/src/sextante/grass/description/r.mapcalculator.txt b/src/sextante/grass/description/r.mapcalculator.txt
@@ -1,4 +1,5 @@
 r.mapcalculator
+r.mapcalculator
 Raster (r.*)
 ParameterRaster|amap|amap|False
 ParameterRaster|bmap|bmap|False

diff --git a/src/sextante/grass/description/r.median.txt b/src/sextante/grass/description/r.median.txt
@@ -1,4 +1,5 @@
 r.median
+r.median
 Raster (r.*)
 ParameterRaster|base|base|False
 ParameterRaster|cover|cover|False

diff --git a/src/sextante/grass/description/r.mfilter.fp.txt b/src/sextante/grass/description/r.mfilter.fp.txt
@@ -1,4 +1,5 @@
 r.mfilter.fp
+r.mfilter.fp
 Raster (r.*)
 ParameterRaster|input|input|False
 ParameterString|filter|filter|/file

diff --git a/src/sextante/grass/description/r.mfilter.txt b/src/sextante/grass/description/r.mfilter.txt
@@ -1,4 +1,5 @@
 r.mfilter
+r.mfilter
 Raster (r.*)
 ParameterRaster|input|input|False
 ParameterString|filter|filter|/file

diff --git a/src/sextante/grass/description/r.mode.txt b/src/sextante/grass/description/r.mode.txt
@@ -1,4 +1,5 @@
 r.mode
+r.mode
 Raster (r.*)
 ParameterRaster|base|base|False
 ParameterRaster|cover|cover|False

diff --git a/src/sextante/grass/description/r.neighbors.txt b/src/sextante/grass/description/r.neighbors.txt
@@ -1,4 +1,5 @@
 r.neighbors
+r.neighbors
 Raster (r.*)
 ParameterRaster|input|input|False
 ParameterSelection|method|method|average;median;mode;minimum;maximum;stddev;sum;variance;diversity;interspersion

diff --git a/src/sextante/grass/description/r.out.arc.txt b/src/sextante/grass/description/r.out.arc.txt
@@ -1,4 +1,5 @@
 r.out.arc
+r.out.arc
 Raster (r.*)
 ParameterRaster|input|input|False
 ParameterString|output|output|/file

diff --git a/src/sextante/grass/description/r.out.ascii.txt b/src/sextante/grass/description/r.out.ascii.txt
@@ -1,4 +1,5 @@
 r.out.ascii
+r.out.ascii
 Raster (r.*)
 ParameterRaster|input|input|False
 ParameterString|output|output|/file

diff --git a/src/sextante/grass/description/r.out.gridatb.txt b/src/sextante/grass/description/r.out.gridatb.txt
@@ -1,4 +1,5 @@
 r.out.gridatb
+r.out.gridatb
 Raster (r.*)
 ParameterRaster|input|input|False
 ParameterString|output|output|

diff --git a/src/sextante/grass/description/r.out.ppm.txt b/src/sextante/grass/description/r.out.ppm.txt
@@ -1,4 +1,5 @@
 r.out.ppm
+r.out.ppm
 Raster (r.*)
 ParameterRaster|input|input|False
 ParameterString|output|output|/file

diff --git a/src/sextante/grass/description/r.out.vrml.txt b/src/sextante/grass/description/r.out.vrml.txt
@@ -1,4 +1,5 @@
 r.out.vrml
+r.out.vrml
 Raster (r.*)
 ParameterRaster|elev|elev|False
 ParameterRaster|color|color|False

diff --git a/src/sextante/grass/description/r.param.scale.txt b/src/sextante/grass/description/r.param.scale.txt
@@ -1,4 +1,5 @@
 r.param.scale
+r.param.scale
 Raster (r.*)
 ParameterRaster|input|input|False
 ParameterNumber|s_tol|s_tol|None|None|1.0

diff --git a/src/sextante/grass/description/r.patch.txt b/src/sextante/grass/description/r.patch.txt
@@ -1,4 +1,5 @@
 r.patch
+r.patch
 Raster (r.*)
 ParameterMultipleInput|input|input|1.0|False
 ParameterBoolean|-q|-q|True

diff --git a/src/sextante/grass/description/r.plane.txt b/src/sextante/grass/description/r.plane.txt
@@ -1,4 +1,5 @@
 r.plane
+r.plane
 Raster (r.*)
 ParameterNumber|dip|dip|None|None|0.0
 ParameterNumber|azimuth|azimuth|None|None|0.0

diff --git a/src/sextante/grass/description/r.profile.txt b/src/sextante/grass/description/r.profile.txt
@@ -1,4 +1,5 @@
 r.profile
+r.profile
 Raster (r.*)
 ParameterRaster|input|input|False
 ParameterString|output|output|/file

diff --git a/src/sextante/grass/description/r.prominence.txt b/src/sextante/grass/description/r.prominence.txt
@@ -1,4 +1,5 @@
 r.prominence
+r.prominence
 Raster (r.*)
 ParameterRaster|input|input|False
 ParameterNumber|radius|radius|1.0|None|1

diff --git a/src/sextante/grass/description/r.quant.txt b/src/sextante/grass/description/r.quant.txt
@@ -1,4 +1,5 @@
 r.quant
+r.quant
 Raster (r.*)
 ParameterRaster|basemap|basemap|False
 ParameterMultipleInput|input|input|1.0|False

diff --git a/src/sextante/grass/description/r.quantile.txt b/src/sextante/grass/description/r.quantile.txt
@@ -1,4 +1,5 @@
 r.quantile
+r.quantile
 Raster (r.*)
 ParameterRaster|input|input|False
 ParameterNumber|quantiles|quantiles|2.0|None|4

diff --git a/src/sextante/grass/description/r.random.cells.txt b/src/sextante/grass/description/r.random.cells.txt
@@ -1,4 +1,5 @@
 r.random.cells
+r.random.cells
 Raster (r.*)
 ParameterNumber|distance|distance|None|None|0.0
 ParameterNumber|seed|seed|None|None|0.0

diff --git a/src/sextante/grass/description/r.random.txt b/src/sextante/grass/description/r.random.txt
@@ -1,4 +1,5 @@
 r.random
+r.random
 Raster (r.*)
 ParameterRaster|input|input|False
 ParameterRaster|cover|cover|False

diff --git a/src/sextante/grass/description/r.reclass.area.txt b/src/sextante/grass/description/r.reclass.area.txt
@@ -1,4 +1,5 @@
 r.reclass.area
+r.reclass.area
 Raster (r.*)
 ParameterRaster|input|input|False
 ParameterNumber|greater|greater|None|None|0.0

diff --git a/src/sextante/grass/description/r.reclass.txt b/src/sextante/grass/description/r.reclass.txt
@@ -1,4 +1,5 @@
 r.reclass
+r.reclass
 Raster (r.*)
 ParameterRaster|input|input|False
 ParameterString|rules|rules|/file

diff --git a/src/sextante/grass/description/r.recode.txt b/src/sextante/grass/description/r.recode.txt
@@ -1,4 +1,5 @@
 r.recode
+r.recode
 Raster (r.*)
 ParameterRaster|input|input|False
 ParameterString|rules|rules|/file

diff --git a/src/sextante/grass/description/r.regression.line.txt b/src/sextante/grass/description/r.regression.line.txt
@@ -1,4 +1,5 @@
 r.regression.line
+r.regression.line
 Raster (r.*)
 ParameterRaster|map1|map1|False
 ParameterRaster|map2|map2|False

diff --git a/src/sextante/grass/description/r.report.txt b/src/sextante/grass/description/r.report.txt
@@ -1,4 +1,5 @@
 r.report
+r.report
 Raster (r.*)
 ParameterMultipleInput|map|map|3.0|False
 ParameterSelection|units|units|mi;me;k;a;h;c;p

diff --git a/src/sextante/grass/description/r.resamp.interp.txt b/src/sextante/grass/description/r.resamp.interp.txt
@@ -1,4 +1,5 @@
 r.resamp.interp
+r.resamp.interp
 Raster (r.*)
 ParameterRaster|input|input|False
 ParameterSelection|method|method|nearest;bilinear;bicubic

diff --git a/src/sextante/grass/description/r.resamp.rst.txt b/src/sextante/grass/description/r.resamp.rst.txt
@@ -1,4 +1,5 @@
 r.resamp.rst
+r.resamp.rst
 Raster (r.*)
 ParameterRaster|input|input|False
 ParameterNumber|ew_res|ew_res|0.0|None|1

diff --git a/src/sextante/grass/description/r.resamp.stats.txt b/src/sextante/grass/description/r.resamp.stats.txt
@@ -1,4 +1,5 @@
 r.resamp.stats
+r.resamp.stats
 Raster (r.*)
 ParameterRaster|input|input|False
 ParameterSelection|method|method|average;median;mode;minimum;maximum;quart1;quart3;perc90;sum;variance;stddev

diff --git a/src/sextante/grass/description/r.resample.txt b/src/sextante/grass/description/r.resample.txt
@@ -1,4 +1,5 @@
 r.resample
+r.resample
 Raster (r.*)
 ParameterRaster|input|input|False
 OutputRaster|output|output
diff --git a/src/sextante/grass/description/r.rescale.eq.txt b/src/sextante/grass/description/r.rescale.eq.txt
@@ -1,4 +1,5 @@
 r.rescale.eq
+r.rescale.eq
 Raster (r.*)
 ParameterRaster|input|input|False
 ParameterRange|from|from