From 7197a3121c5db0575ab86fc821249aa8867798db Mon Sep 17 00:00:00 2001 From: Victor Olaya Date: Wed, 12 Dec 2012 00:47:29 +0100 Subject: [PATCH] Improving GRASS bindings and editing GASS descriptions --- python/plugins/sextante/grass/CMakeLists.txt | 2 + .../plugins/sextante/grass/GrassAlgorithm.py | 42 ++++++++++++------- python/plugins/sextante/grass/GrassUtils.py | 2 +- .../sextante/grass/description/r.average.txt | 8 ++-- .../grass/description/r.basins.fill.txt | 8 ++-- .../sextante/grass/description/r.bilinear.txt | 4 +- .../grass/description/r.bitpattern.txt | 4 +- .../sextante/grass/description/r.buffer.txt | 4 +- .../sextante/grass/description/r.carve.txt | 8 ++-- .../sextante/grass/description/r.clump.txt | 4 +- .../sextante/grass/description/r.coin.txt | 1 + .../grass/description/r.composite.txt | 11 ++--- .../grass/description/r.contour.level.txt | 5 ++- .../grass/description/r.contour.step.txt | 5 ++- .../sextante/grass/description/r.contour.txt | 11 ----- .../sextante/grass/description/r.cost.txt | 12 +++--- .../sextante/grass/description/r.covar.txt | 5 ++- .../grass/description/v.buffer.column.txt | 2 +- .../grass/description/v.buffer.distance.txt | 2 +- .../sextante/grass/description/v.class.txt | 1 + .../sextante/grass/description/v.clean.txt | 6 +-- .../grass/description/v.db.select.txt | 4 +- .../sextante/grass/description/v.delaunay.txt | 2 +- .../sextante/grass/description/v.dissolve.txt | 4 +- .../grass/description/v.distance.toattr.txt | 6 +-- .../sextante/grass/description/v.distance.txt | 6 +-- .../sextante/grass/description/v.drape.txt | 4 +- .../sextante/grass/description/v.extract.txt | 6 +-- .../sextante/grass/description/v.extrude.txt | 12 ------ .../grass/description/v.generalize.txt | 4 +- .../sextante/grass/description/v.hull.txt | 4 +- .../sextante/grass/description/v.info.txt | 1 + .../sextante/grass/description/v.kcv.txt | 4 +- .../grass/description/v.lidar.correction.txt | 6 +-- .../description/v.lidar.edgedetection.txt | 4 +- .../grass/description/v.lidar.growing.txt | 6 +-- .../sextante/grass/description/v.mkgrid.txt | 6 +-- .../grass/description/v.neighbors.txt | 4 +- .../sextante/grass/description/v.normal.txt | 1 + .../sextante/grass/description/v.outlier.txt | 6 +-- .../sextante/grass/description/v.overlay.txt | 6 +-- .../sextante/grass/description/v.parallel.txt | 4 +- .../sextante/grass/description/v.patch.txt | 4 +- .../sextante/grass/description/v.perturb.txt | 2 +- .../sextante/grass/description/v.qcount.txt | 8 ++-- .../sextante/grass/description/v.random.txt | 3 +- .../grass/description/v.rast.stats.txt | 10 ----- .../sextante/grass/description/v.reclass.txt | 6 +-- .../sextante/grass/description/v.report.txt | 3 +- .../sextante/grass/description/v.sample.txt | 8 ++-- .../sextante/grass/description/v.segment.txt | 6 +-- .../sextante/grass/description/v.select.txt | 7 ---- .../sextante/grass/description/v.split.txt | 4 +- .../grass/description/v.surf.bspline.txt | 9 ++-- .../sextante/grass/description/v.surf.idw.txt | 5 +-- .../grass/description/v.surf.rst.cvdev.txt | 4 +- .../sextante/grass/description/v.surf.rst.txt | 14 +++---- .../sextante/grass/description/v.to.3d.txt | 10 ----- .../grass/description/v.to.points.txt | 5 +-- .../grass/description/v.to.rast.attribute.txt | 6 +-- .../grass/description/v.to.rast.value.txt | 6 +-- .../grass/description/v.transform.txt | 5 +-- .../sextante/grass/description/v.univar.txt | 2 +- .../sextante/grass/description/v.voronoi.txt | 6 +-- .../sextante/grass/postproc/__init__.py | 0 .../plugins/sextante/grass/postproc/r_coin.py | 36 ++++++++++++++++ .../sextante/grass/postproc/r_covar.py | 36 ++++++++++++++++ .../sextante/grass/postproc/v_class.py | 36 ++++++++++++++++ .../plugins/sextante/grass/postproc/v_info.py | 36 ++++++++++++++++ .../sextante/grass/postproc/v_normal.py | 36 ++++++++++++++++ .../sextante/grass/postproc/v_report.py | 36 ++++++++++++++++ .../sextante/grass/postproc/v_univar.py | 36 ++++++++++++++++ .../sextante/gui/AlgorithmExecutionDialog.py | 2 +- .../plugins/sextante/gui/ParametersPanel.py | 2 +- 74 files changed, 425 insertions(+), 211 deletions(-) delete mode 100644 python/plugins/sextante/grass/description/r.contour.txt delete mode 100644 python/plugins/sextante/grass/description/v.extrude.txt delete mode 100644 python/plugins/sextante/grass/description/v.rast.stats.txt delete mode 100644 python/plugins/sextante/grass/description/v.select.txt delete mode 100644 python/plugins/sextante/grass/description/v.to.3d.txt create mode 100644 python/plugins/sextante/grass/postproc/__init__.py create mode 100644 python/plugins/sextante/grass/postproc/r_coin.py create mode 100644 python/plugins/sextante/grass/postproc/r_covar.py create mode 100644 python/plugins/sextante/grass/postproc/v_class.py create mode 100644 python/plugins/sextante/grass/postproc/v_info.py create mode 100644 python/plugins/sextante/grass/postproc/v_normal.py create mode 100644 python/plugins/sextante/grass/postproc/v_report.py create mode 100644 python/plugins/sextante/grass/postproc/v_univar.py diff --git a/python/plugins/sextante/grass/CMakeLists.txt b/python/plugins/sextante/grass/CMakeLists.txt index 0087f5fe5b0..35ac57a569a 100644 --- a/python/plugins/sextante/grass/CMakeLists.txt +++ b/python/plugins/sextante/grass/CMakeLists.txt @@ -2,5 +2,7 @@ FILE(GLOB PY_FILES *.py) FILE(GLOB OTHER_FILES grass.txt) FILE(GLOB DESCR_FILES description/*.txt) +ADD_SUBDIRECTORY(postproc) + PLUGIN_INSTALL(sextante grass ${PY_FILES} ${OTHER_FILES}) PLUGIN_INSTALL(sextante grass/description ${DESCR_FILES}) diff --git a/python/plugins/sextante/grass/GrassAlgorithm.py b/python/plugins/sextante/grass/GrassAlgorithm.py index ebe70101b65..9a89e87224d 100644 --- a/python/plugins/sextante/grass/GrassAlgorithm.py +++ b/python/plugins/sextante/grass/GrassAlgorithm.py @@ -17,6 +17,9 @@ *************************************************************************** """ import uuid +from sextante.outputs.OutputHTML import OutputHTML +import importlib +from PyQt4.uic.Compiler.qtproxies import QtGui __author__ = 'Victor Olaya' __date__ = 'August 2012' @@ -116,6 +119,7 @@ class GrassAlgorithm(GeoAlgorithm): self.name = line line = lines.readline().strip("\n").strip() self.group = line + hasRasterOutput = False while line != "": try: line = line.strip("\n").strip() @@ -126,7 +130,10 @@ class GrassAlgorithm(GeoAlgorithm): param.isAdvanced = True self.addParameter(param) else: - self.addOutput(OutputFactory.getFromString(line)) + output = OutputFactory.getFromString(line) + self.addOutput(output); + if isinstance(output, OutputRaster): + hasRasterOutput = True line = lines.readline().strip("\n").strip() except Exception,e: SextanteLog.addToLog(SextanteLog.LOG_ERROR, "Could not open GRASS algorithm: " + self.descriptionFile + "\n" + line) @@ -134,7 +141,8 @@ class GrassAlgorithm(GeoAlgorithm): lines.close() self.addParameter(ParameterExtent(self.GRASS_REGION_EXTENT_PARAMETER, "GRASS region extent")) - self.addParameter(ParameterNumber(self.GRASS_REGION_CELLSIZE_PARAMETER, "GRASS region cellsize (leave 0 for default)", 0, None, 0.0)) + if hasRasterOutput: + self.addParameter(ParameterNumber(self.GRASS_REGION_CELLSIZE_PARAMETER, "GRASS region cellsize (leave 0 for default)", 0, None, 0.0)) def getDefaultCellsize(self): @@ -230,10 +238,12 @@ class GrassAlgorithm(GeoAlgorithm): command +=" s=" + str(regionCoords[2]) command +=" e=" + str(regionCoords[1]) command +=" w=" + str(regionCoords[0]) - if self.getParameterValue(self.GRASS_REGION_CELLSIZE_PARAMETER) == 0: - command +=" res=" + str(self.getDefaultCellsize()) + cellsize = self.getParameterValue(self.GRASS_REGION_CELLSIZE_PARAMETER) + if cellsize: + command +=" res=" + str(cellsize); else: - command +=" res=" + str(self.getParameterValue(self.GRASS_REGION_CELLSIZE_PARAMETER)); + command +=" res=" + str(self.getDefaultCellsize()) + commands.append(command) #2: set parameters and outputs @@ -268,7 +278,7 @@ class GrassAlgorithm(GeoAlgorithm): for out in self.outputs: if isinstance(out, OutputFile): command+=(" " + out.name + "=\"" + out.value + "\""); - else: + elif not isinstance(out, OutputHTML): #html files are not generated by grass, only by sextante to decorate grass output #an output name to make sure it is unique if the session uses this algorithm several times uniqueOutputName = out.name + uniqueSufix command += (" " + out.name + "=" + uniqueOutputName) @@ -310,9 +320,9 @@ class GrassAlgorithm(GeoAlgorithm): progress.setCommand(line) loglines.append(line) if SextanteConfig.getSetting(GrassUtils.GRASS_LOG_COMMANDS): - SextanteLog.addToLog(SextanteLog.LOG_INFO, loglines) - self.consoleOutput = GrassUtils.executeGrass(commands, progress, outputCommands); - self.postProcessResults(); + SextanteLog.addToLog(SextanteLog.LOG_INFO, loglines) + self.consoleOutput = GrassUtils.executeGrass(commands, progress, outputCommands); + self.postProcessResults(); # if the session has been created outside of this algorithm, add the new GRASS layers to it # otherwise finish the session if existingSession: @@ -320,14 +330,14 @@ class GrassAlgorithm(GeoAlgorithm): else: GrassUtils.endGrassSession() - def postProcessResults(self): - name = self.commandLineName().replace('.','_') - try: - module = __import__ ('sextante.grass.postproc.' + name) - except ImportError: + def postProcessResults(self): + name = self.commandLineName().replace('.','_')[len('grass:'):] + try: + module = importlib.import_module('sextante.grass.postproc.' + name) + except ImportError: return - if hasattr(module, 'postProcessResults'): - func = getattr(module,'postProcessResults') + if hasattr(module, 'postProcessResults'): + func = getattr(module,'postProcessResults') func(self) def exportVectorLayer(self, orgFilename): diff --git a/python/plugins/sextante/grass/GrassUtils.py b/python/plugins/sextante/grass/GrassUtils.py index 920b52b6740..fcf2732c0d3 100644 --- a/python/plugins/sextante/grass/GrassUtils.py +++ b/python/plugins/sextante/grass/GrassUtils.py @@ -133,7 +133,7 @@ class GrassUtils: #gisdbase = os.path.join(os.path.expanduser("~"), "sextante", "tempdata", "grassdata") output.write("GISDBASE: " + gisdbase + "\n"); output.write("LOCATION_NAME: " + location + "\n"); - output.write("MAPSET: PERMAMENT \n"); + output.write("MAPSET: PERMANENT \n"); output.write("GRASS_GUI: text\n"); output.close() diff --git a/python/plugins/sextante/grass/description/r.average.txt b/python/plugins/sextante/grass/description/r.average.txt index 1dce16c2ec0..e541c90d435 100644 --- a/python/plugins/sextante/grass/description/r.average.txt +++ b/python/plugins/sextante/grass/description/r.average.txt @@ -1,7 +1,7 @@ r.average -r.average - Finds the average of values in a cover map within areas assigned the same category value in a user-specified base map. +r.average - Finds the average of values in a cover raster layer within areas assigned the same category value in a user-specified base layer. Raster (r.*) -ParameterRaster|base|Name of base raster map|False -ParameterRaster|cover|Name of cover raster map|False +ParameterRaster|base|Base raster layer|False +ParameterRaster|cover|Cover raster layer|False ParameterBoolean|-c|Cover values extracted from the category labels of the cover map|False -OutputRaster|output|Name for output raster map +OutputRaster|output|Average values diff --git a/python/plugins/sextante/grass/description/r.basins.fill.txt b/python/plugins/sextante/grass/description/r.basins.fill.txt index 64f078fd698..102073721ba 100644 --- a/python/plugins/sextante/grass/description/r.basins.fill.txt +++ b/python/plugins/sextante/grass/description/r.basins.fill.txt @@ -1,7 +1,7 @@ r.basins.fill r.basins.fill - Generates watershed subbasins raster map. Raster (r.*) -ParameterRaster|c_map|Name of input coded stream network raster map|False -ParameterRaster|t_map|Name of input thinned ridge network raster map|False -ParameterNumber|number|Number of passes through the dataset|None|None|0.0 -OutputRaster|result|Name for output raster map +ParameterRaster|c_map|Input coded stream network raster layer|False +ParameterRaster|t_map|Input thinned ridge network raster layer|False +ParameterNumber|number|Number of passes through the dataset|None|None|1 +OutputRaster|result|Watersheds diff --git a/python/plugins/sextante/grass/description/r.bilinear.txt b/python/plugins/sextante/grass/description/r.bilinear.txt index 39051d6ef14..7847842d71d 100644 --- a/python/plugins/sextante/grass/description/r.bilinear.txt +++ b/python/plugins/sextante/grass/description/r.bilinear.txt @@ -1,7 +1,7 @@ r.bilinear r.bilinear - Bilinear interpolation utility for raster map layers. Raster (r.*) -ParameterRaster|input|Name of input raster map|False +ParameterRaster|input|Input raster layer|False ParameterNumber|north|Specific input value to be assigned to the north and/or south poles for longitude-latitude grids|None|None|0 ParameterNumber|east|Specific input value to be assigned to the north and/or south poles for longitude-latitude grids|None|None|0 -OutputRaster|output|Name for output raster map +OutputRaster|output|Output raster layer diff --git a/python/plugins/sextante/grass/description/r.bitpattern.txt b/python/plugins/sextante/grass/description/r.bitpattern.txt index eda975ee360..856d50765a5 100644 --- a/python/plugins/sextante/grass/description/r.bitpattern.txt +++ b/python/plugins/sextante/grass/description/r.bitpattern.txt @@ -1,7 +1,7 @@ r.bitpattern r.bitpattern - Compares bit patterns with a raster map. Raster (r.*) -ParameterRaster|input|Name of input raster map|False +ParameterRaster|input|Input raster layer|False ParameterString|pattern|Bit pattern position(s)| ParameterString|patval|Bit pattern value| -OutputRaster|output|Name for output raster map +OutputRaster|output|Output raster layer diff --git a/python/plugins/sextante/grass/description/r.buffer.txt b/python/plugins/sextante/grass/description/r.buffer.txt index 26af0b1a723..2fda0f4f914 100644 --- a/python/plugins/sextante/grass/description/r.buffer.txt +++ b/python/plugins/sextante/grass/description/r.buffer.txt @@ -1,8 +1,8 @@ r.buffer r.buffer - Creates a raster map layer showing buffer zones surrounding cells that contain non-NULL category values. Raster (r.*) -ParameterRaster|input|Name of input raster map|False +ParameterRaster|input|Input raster layer|False ParameterString|distances|Distance zone(s) (e.g. 100,200,300)| ParameterSelection|units|Units of distance|meters;kilometers;feet;miles;nautmiles ParameterBoolean|-z|Ignore zero (0) data cells instead of NULL cells|False -OutputRaster|output|Name for output raster map +OutputRaster|output|Buffer diff --git a/python/plugins/sextante/grass/description/r.carve.txt b/python/plugins/sextante/grass/description/r.carve.txt index a70c1f425b0..31e1ff56bef 100644 --- a/python/plugins/sextante/grass/description/r.carve.txt +++ b/python/plugins/sextante/grass/description/r.carve.txt @@ -1,10 +1,10 @@ r.carve r.carve - Takes vector stream data, transforms it to raster and subtracts depth from the output DEM. Raster (r.*) -ParameterRaster|rast|Name of input raster elevation map|False -ParameterVector|vect|Name of vector input map containing stream(s)|1|False +ParameterRaster|rast|Elevation|False +ParameterVector|vect|Vector layer containing stream(s)|1|False ParameterNumber|width|Stream width (in meters). Default is raster cell width|None|None|1 ParameterNumber|depth|Additional stream depth (in meters)|None|None|1 ParameterBoolean|-n|No flat areas allowed in flow direction|False -OutputRaster|output|Name for output raster map -OutputVector|points|Name for output vector map for adjusted stream points +OutputRaster|output|Modified elevation +OutputVector|points|Adjusted stream points diff --git a/python/plugins/sextante/grass/description/r.clump.txt b/python/plugins/sextante/grass/description/r.clump.txt index c20c1f0d53f..13ebde1f237 100644 --- a/python/plugins/sextante/grass/description/r.clump.txt +++ b/python/plugins/sextante/grass/description/r.clump.txt @@ -1,6 +1,6 @@ r.clump r.clump - Recategorizes data in a raster map by grouping cells that form physically discrete areas into unique categories. Raster (r.*) -ParameterRaster|input|Name of input raster map|False +ParameterRaster|input|Input layer|False ParameterString|title|Title for output raster map| -OutputRaster|output|Name for output raster map +OutputRaster|output|Recategorized layer diff --git a/python/plugins/sextante/grass/description/r.coin.txt b/python/plugins/sextante/grass/description/r.coin.txt index ec968645945..4e9bf0fe611 100644 --- a/python/plugins/sextante/grass/description/r.coin.txt +++ b/python/plugins/sextante/grass/description/r.coin.txt @@ -5,3 +5,4 @@ ParameterRaster|map1|Name of first raster map|False ParameterRaster|map2|Name of second raster map|False ParameterSelection|units|Unit of measure|c;p;x;y;a;h;k;m ParameterBoolean|-w|Wide report, 132 columns (default: 80)|False +OutputHTML|html|Output report diff --git a/python/plugins/sextante/grass/description/r.composite.txt b/python/plugins/sextante/grass/description/r.composite.txt index d24f1fd4c4e..9d07bc3dea8 100644 --- a/python/plugins/sextante/grass/description/r.composite.txt +++ b/python/plugins/sextante/grass/description/r.composite.txt @@ -1,13 +1,10 @@ r.composite r.composite - Combines red, green and blue raster maps into a single composite raster map. Raster (r.*) -ParameterRaster|red|Name of raster map to be used for |False -ParameterRaster|green|Name of raster map to be used for |False -ParameterRaster|blue|Name of raster map to be used for |False +ParameterRaster|red|Red|False +ParameterRaster|green|Green|False +ParameterRaster|blue|Blue|False ParameterNumber|levels|Number of levels to be used for each component|1.0|256.0|32 -ParameterNumber|lev_red|Number of levels to be used for |1.0|256.0|32 -ParameterNumber|lev_green|Number of levels to be used for |1.0|256.0|32 -ParameterNumber|lev_blue|Number of levels to be used for |1.0|256.0|32 ParameterBoolean|-d|Dither|False ParameterBoolean|-c|Use closest color|False -OutputRaster|output|Name for output raster map +OutputRaster|output|Output RGB image diff --git a/python/plugins/sextante/grass/description/r.contour.level.txt b/python/plugins/sextante/grass/description/r.contour.level.txt index 6bdf88f8a85..0bdee6210cb 100644 --- a/python/plugins/sextante/grass/description/r.contour.level.txt +++ b/python/plugins/sextante/grass/description/r.contour.level.txt @@ -1,6 +1,7 @@ r.contour r.contour.level - Create vector contour from raster at specified levels Raster (r.*) -ParameterRaster|input|Name of input raster map|False +ParameterRaster|input|Input raster|False ParameterString|levels|List of contour levels| -OutputVector|output|Name of output vector map +ParameterString|cut|Minimum number of points for a contour line (0 -> no limit)|0 +OutputVector|output|Contours diff --git a/python/plugins/sextante/grass/description/r.contour.step.txt b/python/plugins/sextante/grass/description/r.contour.step.txt index 195ac7ba0d2..69427d85a3b 100644 --- a/python/plugins/sextante/grass/description/r.contour.step.txt +++ b/python/plugins/sextante/grass/description/r.contour.step.txt @@ -1,8 +1,9 @@ r.contour r.contour.step - Create vector contours from raster at specified steps Raster (r.*) -ParameterRaster|input|Name of input raster map|False +ParameterRaster|input|Input raster|False ParameterString|minlevel|Minimum contour level|0 ParameterString|maxlevel|Maximum contour level|10000 ParameterString|step|Increment between contour levels|100 -OutputVector|output|Name of output vector map +ParameterString|cut|Minimum number of points for a contour line (0 -> no limit)|0 +OutputVector|output|contours diff --git a/python/plugins/sextante/grass/description/r.contour.txt b/python/plugins/sextante/grass/description/r.contour.txt deleted file mode 100644 index 134c7c174ee..00000000000 --- a/python/plugins/sextante/grass/description/r.contour.txt +++ /dev/null @@ -1,11 +0,0 @@ -r.contour -r.contour - Produces a vector map of specified contours from a raster map. -Raster (r.*) -ParameterRaster|input|Name of input raster map|False -ParameterString|levels|List of contour levels| -ParameterString|minlevel|Minimum contour level| -ParameterString|maxlevel|Maximum contour level| -ParameterString|step|Increment between contour levels| -ParameterString|cut|Minimum number of points for a contour line (0 -> no limit)|0 -ParameterBoolean|-n|Suppress single crossing error messages|False -OutputVector|output|Name of output vector map diff --git a/python/plugins/sextante/grass/description/r.cost.txt b/python/plugins/sextante/grass/description/r.cost.txt index 7aaa3f53e1d..912c84b6070 100644 --- a/python/plugins/sextante/grass/description/r.cost.txt +++ b/python/plugins/sextante/grass/description/r.cost.txt @@ -1,9 +1,9 @@ r.cost -r.cost - Creates a raster map showing the cumulative cost of moving between different geographic locations on an input raster map whose cell category values represent cost. +r.cost - Creates a raster layer of cumulative cost of moving across a raster layer whose cell values represent cost. Raster (r.*) -ParameterRaster|input|Name of raster map containing grid cell cost information|False -ParameterVector|start_points|Name of starting vector points map|0|False -ParameterVector|stop_points|Name of stop vector points map|0|False +ParameterRaster|input|Unit cost layer|False +ParameterVector|start_points|Start points|0|False +ParameterVector|stop_points|Stop points|0|False ParameterBoolean|-k|Use the 'Knight's move'; slower, but more accurate|False -ParameterBoolean|-n|Keep null values in output raster map|False -OutputRaster|output|Name for output raster map +ParameterBoolean|-n|Keep null values in output raster layer|False +OutputRaster|output|Cumulative cost diff --git a/python/plugins/sextante/grass/description/r.covar.txt b/python/plugins/sextante/grass/description/r.covar.txt index 51440218f25..c82d82f4c05 100644 --- a/python/plugins/sextante/grass/description/r.covar.txt +++ b/python/plugins/sextante/grass/description/r.covar.txt @@ -1,5 +1,6 @@ r.covar -r.covar - Outputs a covariance/correlation matrix for user-specified raster map layer(s). +r.covar - Outputs a covariance/correlation matrix for user-specified raster layer(s). Raster (r.*) -ParameterMultipleInput|map|Name of input raster map(s)|3.0|False +ParameterMultipleInput|map|Input layers|3.0|False ParameterBoolean|-r|Print correlation matrix|True +OutputHTML|html|Covariance report diff --git a/python/plugins/sextante/grass/description/v.buffer.column.txt b/python/plugins/sextante/grass/description/v.buffer.column.txt index 4bace43334b..130c310c329 100644 --- a/python/plugins/sextante/grass/description/v.buffer.column.txt +++ b/python/plugins/sextante/grass/description/v.buffer.column.txt @@ -7,5 +7,5 @@ ParameterNumber|scale|Scaling factor for attribute column values|None|None|1.0 ParameterString|tolerance|Maximum distance between theoretical arc and polygon segments as multiple of buffer|0.01 ParameterBoolean|-s|Make outside corners straight|False ParameterBoolean|-c|Don't make caps at the ends of polylines|False -OutputVector|output|Name for output vector map +OutputVector|output|Output buffer diff --git a/python/plugins/sextante/grass/description/v.buffer.distance.txt b/python/plugins/sextante/grass/description/v.buffer.distance.txt index e59bb3cd109..8f96312f479 100644 --- a/python/plugins/sextante/grass/description/v.buffer.distance.txt +++ b/python/plugins/sextante/grass/description/v.buffer.distance.txt @@ -6,5 +6,5 @@ ParameterString|distance|Buffer distance in map units| ParameterString|tolerance|Maximum distance between theoretical arc and polygon segments as multiple of buffer|0.01 ParameterBoolean|-s|Make outside corners straight|False ParameterBoolean|-c|Don't make caps at the ends of polylines|False -OutputVector|output|Name for output vector map +OutputVector|output|Output buffer diff --git a/python/plugins/sextante/grass/description/v.class.txt b/python/plugins/sextante/grass/description/v.class.txt index cb22942792f..8b9fa9871d7 100644 --- a/python/plugins/sextante/grass/description/v.class.txt +++ b/python/plugins/sextante/grass/description/v.class.txt @@ -7,4 +7,5 @@ ParameterString|where|WHERE conditions of SQL statement without 'where' keyword| ParameterSelection|algorithm|Algorithm to use for classification|int;std;qua;equ;dis ParameterNumber|nbclasses|Number of classes to define|2.0|None|3 ParameterBoolean|-g|Print only class breaks (without min and max)|True +OutputHTML|html|Classification diff --git a/python/plugins/sextante/grass/description/v.clean.txt b/python/plugins/sextante/grass/description/v.clean.txt index 7de27af71ea..d925a4ada46 100644 --- a/python/plugins/sextante/grass/description/v.clean.txt +++ b/python/plugins/sextante/grass/description/v.clean.txt @@ -1,9 +1,9 @@ v.clean v.clean - Toolset for cleaning topology of vector map. Vector (v.*) -ParameterVector|input|Name of input vector map|-1|False +ParameterVector|input|Layer to clean|-1|False ParameterSelection|tool|Cleaning tool|break;snap;rmdangle;chdangle;rmbridge;chbridge;rmdupl;rmdac;bpol;prune;rmarea;rmline;rmsa ParameterNumber|thresh|Threshold|None|None|0 -OutputVector|output|Name for output vector map -OutputVector|error|Name for output map where errors are written +OutputVector|output|Cleaned vector layer +OutputVector|error|Errors layer diff --git a/python/plugins/sextante/grass/description/v.db.select.txt b/python/plugins/sextante/grass/description/v.db.select.txt index 23753acfd80..f3bc5f19f8c 100644 --- a/python/plugins/sextante/grass/description/v.db.select.txt +++ b/python/plugins/sextante/grass/description/v.db.select.txt @@ -1,7 +1,7 @@ v.db.select v.db.select - Prints vector map attributes Vector (v.*) -ParameterVector|map|Name of input vector map |-1|False +ParameterVector|map|Input vector map |-1|False ParameterNumber|layer|Layer Number|1|None|1 ParameterString|columns|Name of attribute column(s), comma separated| ParameterBoolean|-c|Do not include column names in output|False @@ -11,6 +11,6 @@ ParameterString|fs|Output field separator|, *ParameterString|nv|Null value indicator| *ParameterBoolean|-v|Vertical output (instead of horizontal)|False *ParameterBoolean|-r|Print minimal region extent of selected vector features instead of attributes|False -ParameterString|file|Name for output file| +OutputFile|file|Output file| diff --git a/python/plugins/sextante/grass/description/v.delaunay.txt b/python/plugins/sextante/grass/description/v.delaunay.txt index 78d3c3dfa86..55c96f6c02e 100644 --- a/python/plugins/sextante/grass/description/v.delaunay.txt +++ b/python/plugins/sextante/grass/description/v.delaunay.txt @@ -4,5 +4,5 @@ Vector (v.*) ParameterVector|input|Name of input vector map|0|False ParameterBoolean|-r|Use only points in current region|True ParameterBoolean|-l|Output triangulation as a graph (lines), not areas|True -OutputVector|output|Name for output vector map +OutputVector|output|Delaunay triangulation diff --git a/python/plugins/sextante/grass/description/v.dissolve.txt b/python/plugins/sextante/grass/description/v.dissolve.txt index 4bcfeca872e..fd016639c7a 100644 --- a/python/plugins/sextante/grass/description/v.dissolve.txt +++ b/python/plugins/sextante/grass/description/v.dissolve.txt @@ -1,7 +1,7 @@ v.dissolve v.dissolve - Dissolves boundaries between adjacent areas sharing a common category number or attribute. Vector (v.*) -ParameterVector|input|Name of input vector map|-1|False +ParameterVector|input|Input vector layer|-1|False ParameterTableField|column|Name of column used to dissolve common boundaries|input -OutputVector|output|Name for output vector map +OutputVector|output|Dissolved layer diff --git a/python/plugins/sextante/grass/description/v.distance.toattr.txt b/python/plugins/sextante/grass/description/v.distance.toattr.txt index 476e1786ccd..25050754eba 100644 --- a/python/plugins/sextante/grass/description/v.distance.toattr.txt +++ b/python/plugins/sextante/grass/description/v.distance.toattr.txt @@ -1,10 +1,10 @@ v.distance v.distance.toattr - Finds the nearest element in vector map 'to' for elements in vector map 'from'. Vector (v.*) -ParameterVector|from|Name of existing vector map (from)|0|False -ParameterVector|to|Name of existing vector map (to)|-1|False +ParameterVector|from|"from" input layer|0|False +ParameterVector|to|"to" input layer|-1|False ParameterSelection|upload|Values describing the relation between two nearest features|to_attr ParameterTableField|column|Column where values specified by 'upload' option will be uploaded|to ParameterTableField|to_column|Column name of nearest feature|to ParameterBoolean|-a|Calculate distances to all features within the threshold|False -OutputVector|output|Name for output vector map \ No newline at end of file +OutputVector|output|Output layer \ No newline at end of file diff --git a/python/plugins/sextante/grass/description/v.distance.txt b/python/plugins/sextante/grass/description/v.distance.txt index 6793cd9e085..5b1fd7f1d94 100644 --- a/python/plugins/sextante/grass/description/v.distance.txt +++ b/python/plugins/sextante/grass/description/v.distance.txt @@ -1,10 +1,10 @@ v.distance v.distance - Finds the nearest element in vector map 'to' for elements in vector map 'from'. Vector (v.*) -ParameterVector|from|Name of existing vector map (from)|0|False -ParameterVector|to|Name of existing vector map (to)|-1|False +ParameterVector|from|"from" input layer|0|False +ParameterVector|to|"to" input layer|-1|False ParameterSelection|upload|Values describing the relation between two nearest features|cat;dist;to_x;to_y;to_along;to_angle ParameterTableField|column|Column where values specified by 'upload' option will be uploaded|to ParameterBoolean|-a|Calculate distances to all features within the threshold|False -OutputVector|output|Name for output vector map +OutputVector|output|Output layer diff --git a/python/plugins/sextante/grass/description/v.drape.txt b/python/plugins/sextante/grass/description/v.drape.txt index c8947db1d5d..26d8ce94f7d 100644 --- a/python/plugins/sextante/grass/description/v.drape.txt +++ b/python/plugins/sextante/grass/description/v.drape.txt @@ -1,11 +1,11 @@ v.drape v.drape - Converts vector map to 3D by sampling of elevation raster map. Vector (v.*) -ParameterVector|input|Name of input vector map|-1|False +ParameterVector|input|Iput vector layer|-1|False ParameterRaster|rast|Elevation raster map for height extraction|False ParameterSelection|method|Sampling method|nearest;bilinear;cubic ParameterString|scale|Scale factor for sampled raster values|1.0 ParameterString|where|WHERE conditions of SQL statement without 'where' keyword| ParameterString|null_value|Vector Z value for unknown height| -OutputVector|output|Name for output vector map +OutputVector|output|Output layer diff --git a/python/plugins/sextante/grass/description/v.extract.txt b/python/plugins/sextante/grass/description/v.extract.txt index dce90e7d76d..f7fc36f64a3 100644 --- a/python/plugins/sextante/grass/description/v.extract.txt +++ b/python/plugins/sextante/grass/description/v.extract.txt @@ -1,8 +1,8 @@ v.extract -v.extract - Selects vector objects from an existing vector map and creates a new map containing only the selected objects. +v.extract - Selects vector objects from a vector layer a new layer containing only the selected objects. Vector (v.*) -ParameterVector|input|Name of input vector map|-1|False +ParameterVector|input|Vector layer|-1|False ParameterString|where|WHERE conditions of SQL statement without 'where' keyword| ParameterBoolean|-d|Dissolve common boundaries|True -OutputVector|output|Name for output vector map +OutputVector|output|Output layer diff --git a/python/plugins/sextante/grass/description/v.extrude.txt b/python/plugins/sextante/grass/description/v.extrude.txt deleted file mode 100644 index b749f90e7b0..00000000000 --- a/python/plugins/sextante/grass/description/v.extrude.txt +++ /dev/null @@ -1,12 +0,0 @@ -v.extrude -v.extrude - Extrudes flat vector object to 3D with defined height. -Vector (v.*) -ParameterVector|input|Name of input 2D vector map|-1|False -ParameterNumber|zshift|Shifting value for z coordinates|None|None|0 -ParameterRaster|elevation|Elevation raster for height extraction|True -ParameterNumber|height|Fixed height for 3D vector objects|None|None|0 -ParameterTableField|hcolumn|Name of attribute column with object heights|input -ParameterString|type|Feature type|point,line,boundary,area -ParameterBoolean|-t|Trace elevation|False -OutputVector|output|Name of resulting 3D vector map - diff --git a/python/plugins/sextante/grass/description/v.generalize.txt b/python/plugins/sextante/grass/description/v.generalize.txt index 7603a96edef..42c9847adb1 100644 --- a/python/plugins/sextante/grass/description/v.generalize.txt +++ b/python/plugins/sextante/grass/description/v.generalize.txt @@ -1,7 +1,7 @@ v.generalize v.generalize - Vector based generalization. Vector (v.*) -ParameterVector|input|Name of input vector map|-1|False +ParameterVector|input|Input layer|-1|False ParameterSelection|method|method|douglas;douglas_reduction;lang;reduction;reumann;remove_small;boyle;sliding_averaging;distance_weighting;chaiken;hermite;snakes;network;displacement ParameterNumber|threshold|Maximal tolerance value|None|None|1.0 ParameterNumber|look_ahead|Look-ahead parameter|None|None|7 @@ -15,5 +15,5 @@ ParameterNumber|alpha|Snakes alpha parameter|None|None|1.0 ParameterNumber|beta|Snakes beta parameter|None|None|1.0 ParameterNumber|iterations|Number of iterations|None|None|1 ParameterBoolean|-c|Copy attributes|True -OutputVector|output|Name for output vector map +OutputVector|output|Output layer diff --git a/python/plugins/sextante/grass/description/v.hull.txt b/python/plugins/sextante/grass/description/v.hull.txt index d18c039af18..2f17ad0ae22 100644 --- a/python/plugins/sextante/grass/description/v.hull.txt +++ b/python/plugins/sextante/grass/description/v.hull.txt @@ -1,7 +1,7 @@ v.hull v.hull - Produces a convex hull for a given vector map. Vector (v.*) -ParameterVector|input|Name of input vector map|0|False +ParameterVector|input|Input layer|0|False ParameterBoolean|-a|Use all vector points (do not limit to current region)|False -OutputVector|output|Name for output vector map +OutputVector|output|Convex hull diff --git a/python/plugins/sextante/grass/description/v.info.txt b/python/plugins/sextante/grass/description/v.info.txt index 468f2ece007..df4a11b5c7c 100644 --- a/python/plugins/sextante/grass/description/v.info.txt +++ b/python/plugins/sextante/grass/description/v.info.txt @@ -5,4 +5,5 @@ ParameterVector|map|Name of input vector map|-1|False ParameterBoolean|-c|Print types/names of table columns for specified layer instead of info|False ParameterBoolean|-g|Print map region only|False ParameterBoolean|-t|Print topology information only|False +OutputHTML|html|Info file diff --git a/python/plugins/sextante/grass/description/v.kcv.txt b/python/plugins/sextante/grass/description/v.kcv.txt index af4f2d334d6..1f30eac0a7c 100644 --- a/python/plugins/sextante/grass/description/v.kcv.txt +++ b/python/plugins/sextante/grass/description/v.kcv.txt @@ -1,9 +1,9 @@ v.kcv v.kcv - Randomly partition points into test/train sets. Vector (v.*) -ParameterVector|input|Name of input vector map|-1|False +ParameterVector|input|Input layer|-1|False ParameterNumber|k|Number of partitions|2.0|32767|10 ParameterString|column|Name for new column to which partition number is written|part ParameterBoolean|-d|Use drand48()|False -OutputVector|Name for output vector map|output +OutputVector|output|Output layer diff --git a/python/plugins/sextante/grass/description/v.lidar.correction.txt b/python/plugins/sextante/grass/description/v.lidar.correction.txt index d2b44965980..13a0cce010d 100644 --- a/python/plugins/sextante/grass/description/v.lidar.correction.txt +++ b/python/plugins/sextante/grass/description/v.lidar.correction.txt @@ -1,13 +1,13 @@ v.lidar.correction v.lidar.correction - Correction of the v.lidar.growing output. It is the last of the three algorithms for LIDAR filtering. Vector (v.*) -ParameterVector|input|Input observation vector map name (v.lidar.growing output)|-1|False +ParameterVector|input|Input vector layer (v.lidar.growing output)|-1|False ParameterString|sce|Interpolation spline step value in east direction|25 ParameterString|scn|Interpolation spline step value in north direction|25 ParameterString|lambda_c|Regularization weight in reclassification evaluation|1 ParameterString|tch|High threshold for object to terrain reclassification|2 ParameterString|tcl|Low threshold for object to terrain reclassification|1 ParameterBoolean|-e|Estimate point density and distance|False -OutputVector|output|Output classified vector map name -OutputVector|terrain|Only 'terrain' points output vector map +OutputVector|output|Output classified layer +OutputVector|terrain|Only 'terrain' points output layer diff --git a/python/plugins/sextante/grass/description/v.lidar.edgedetection.txt b/python/plugins/sextante/grass/description/v.lidar.edgedetection.txt index 5fc1140b645..afacf2cc72d 100644 --- a/python/plugins/sextante/grass/description/v.lidar.edgedetection.txt +++ b/python/plugins/sextante/grass/description/v.lidar.edgedetection.txt @@ -1,7 +1,7 @@ v.lidar.edgedetection v.lidar.edgedetection - Detects the object's edges from a LIDAR data set. Vector (v.*) -ParameterVector|input|Name of input vector map|0|False +ParameterVector|input|Input vector layer|0|False ParameterString|see|Interpolation spline step value in east direction|4 ParameterString|sen|Interpolation spline step value in north direction|4 ParameterString|lambda_g|Regularization weight in gradient evaluation|0.01 @@ -10,5 +10,5 @@ ParameterString|tgl|Low gradient threshold for edge classification|3 ParameterString|theta_g|Angle range for same direction detection|0.26 ParameterString|lambda_r|Regularization weight in residual evaluation|2 ParameterBoolean|-e|Estimate point density and distance|False -OutputVector|output|Name for output vector map +OutputVector|output|Output vector layer diff --git a/python/plugins/sextante/grass/description/v.lidar.growing.txt b/python/plugins/sextante/grass/description/v.lidar.growing.txt index d45e3dbe3c7..35dee5d6b06 100644 --- a/python/plugins/sextante/grass/description/v.lidar.growing.txt +++ b/python/plugins/sextante/grass/description/v.lidar.growing.txt @@ -1,9 +1,9 @@ v.lidar.growing v.lidar.growing - Building contour determination and Region Growing algorithm for determining the building inside Vector (v.*) -ParameterVector|input|Input vector (v.lidar.edgedetection output|-1|False -ParameterVector|first|Name of the first pulse vector map|-1|False +ParameterVector|input|Input vector (v.lidar.edgedetection output)|-1|False +ParameterVector|first|First pulse vector layer|-1|False ParameterNumber|tj|Threshold for cell object frequency in region growing|None|None|0.2 ParameterNumber|td|Threshold for double pulse in region growing|None|None|0.6 -OutputVector|output|Name for output vector map +OutputVector|output|Output vector layer diff --git a/python/plugins/sextante/grass/description/v.mkgrid.txt b/python/plugins/sextante/grass/description/v.mkgrid.txt index 5d4bd570e04..163f82eaba0 100644 --- a/python/plugins/sextante/grass/description/v.mkgrid.txt +++ b/python/plugins/sextante/grass/description/v.mkgrid.txt @@ -1,11 +1,11 @@ v.mkgrid -v.mkgrid - Creates a GRASS vector map of a user-defined grid. +v.mkgrid - Creates a GRASS vector layer of a user-defined grid. Vector (v.*) ParameterString|grid|Number of rows and columns in grid|10,10 -ParameterSelection|position|Where to place the grid|region;coor +ParameterSelection|position|Where to place the grid|coor ParameterString|coor|Lower left easting and northing coordinates of map| ParameterString|box|Width and height of boxes in grid| ParameterString|angle|Angle of rotation (in degrees counter-clockwise)|0 ParameterBoolean|-p|Create grid of points instead of areas and centroids|False -OutputVector|map|Name for output vector map +OutputVector|map|Output grid diff --git a/python/plugins/sextante/grass/description/v.neighbors.txt b/python/plugins/sextante/grass/description/v.neighbors.txt index 84cb5b050d5..1a0b6c35036 100644 --- a/python/plugins/sextante/grass/description/v.neighbors.txt +++ b/python/plugins/sextante/grass/description/v.neighbors.txt @@ -1,7 +1,7 @@ v.neighbors v.neighbors - Makes each cell value a function of attribute values and stores in an output raster map. Vector (v.*) -ParameterVector|input|Name of input vector map|-1|False +ParameterVector|input|Input vector layer|-1|False ParameterNumber|size|Neighborhood diameter in map units|None|None|0.1 -OutputRaster|output|Name for output raster map +OutputRaster|output|Output raster layer diff --git a/python/plugins/sextante/grass/description/v.normal.txt b/python/plugins/sextante/grass/description/v.normal.txt index 4a9edd76c31..af6612fefa3 100644 --- a/python/plugins/sextante/grass/description/v.normal.txt +++ b/python/plugins/sextante/grass/description/v.normal.txt @@ -6,4 +6,5 @@ ParameterString|tests|Lists of tests (1-15): e.g. 1,3-8,13|1-3 ParameterTableField|column|Attribute column|map ParameterBoolean|-r|Use only points in current region|True ParameterBoolean|-l|lognormal|False +OutputHTML|html|Output diff --git a/python/plugins/sextante/grass/description/v.outlier.txt b/python/plugins/sextante/grass/description/v.outlier.txt index e2de0f4f17b..c9608d33953 100644 --- a/python/plugins/sextante/grass/description/v.outlier.txt +++ b/python/plugins/sextante/grass/description/v.outlier.txt @@ -1,12 +1,12 @@ v.outlier v.outlier - Removes outliers from vector point data. Vector (v.*) -ParameterVector|input|Name of input vector map|-1|False +ParameterVector|input|Input vector layer|-1|False ParameterNumber|soe|Interpolation spline step value in east direction|None|None|10 ParameterNumber|son|Interpolation spline step value in north direction|None|None|10 ParameterNumber|lambda_i|Tykhonov regularization weight|None|None|0.1 ParameterNumber|thres_o|Threshold for the outliers|None|None|50 ParameterBoolean|-e|Estimate point density and distance|False -OutputVector|output|Name for output vector map -OutputVector|outlier|Name for output outlier vector map +OutputVector|output|Layer without outliers +OutputVector|outlier|Outliers diff --git a/python/plugins/sextante/grass/description/v.overlay.txt b/python/plugins/sextante/grass/description/v.overlay.txt index 2035763ed2a..cfad3f859a8 100644 --- a/python/plugins/sextante/grass/description/v.overlay.txt +++ b/python/plugins/sextante/grass/description/v.overlay.txt @@ -1,9 +1,9 @@ v.overlay v.overlay - Overlays two vector maps. Vector (v.*) -ParameterVector|ainput|Name of input vector map (A)|2|False -ParameterVector|binput|Name of input vector map (B)|2|False +ParameterVector|ainput|Input layer (A)|2|False +ParameterVector|binput|Input layer (B)|2|False ParameterSelection|operator|Operator to use|and;or;not;xor ParameterBoolean|-t|Do not create attribute table|False -OutputVector|output|Name for output vector map +OutputVector|output|Overlay diff --git a/python/plugins/sextante/grass/description/v.parallel.txt b/python/plugins/sextante/grass/description/v.parallel.txt index 933c57c9507..38ffdab8e32 100644 --- a/python/plugins/sextante/grass/description/v.parallel.txt +++ b/python/plugins/sextante/grass/description/v.parallel.txt @@ -1,7 +1,7 @@ v.parallel v.parallel - Creates parallel line to input vector lines. Vector (v.*) -ParameterVector|input|Name of input vector map|-1|False +ParameterVector|input|Input lines|1|False ParameterNumber|distance|Offset along major axis in map units|None|None|1 ParameterNumber|minordistance|Offset along minor axis in map units|None|None|1 ParameterNumber|angle|Angle of major axis in degrees|None|None|0 @@ -9,5 +9,5 @@ ParameterSelection|side|Side|left;right;both ParameterNumber|tolerance|Tolerance of arc polylines in map units|None|None|1 ParameterBoolean|-r|Make outside corners round|False ParameterBoolean|-b|Create buffer-like parallel lines|False -OutputVector|output|Name for output vector map +OutputVector|output|Layer with parallel lines diff --git a/python/plugins/sextante/grass/description/v.patch.txt b/python/plugins/sextante/grass/description/v.patch.txt index cd6c3724923..b6b2441e7e7 100644 --- a/python/plugins/sextante/grass/description/v.patch.txt +++ b/python/plugins/sextante/grass/description/v.patch.txt @@ -1,8 +1,8 @@ v.patch v.patch - Create a new vector map layer by combining other vector map layers. Vector (v.*) -ParameterMultipleInput|input|Name of input vector maps|-1.0|False +ParameterMultipleInput|input|Input layers|-1.0|False ParameterBoolean|-e|Copy also attribute table|True OutputVector|output|Name for output vector map -OutputVector|bbox|Name for output vector map where bounding boxes of input vector maps are written to +OutputVector|bbox|Bounding boxes diff --git a/python/plugins/sextante/grass/description/v.perturb.txt b/python/plugins/sextante/grass/description/v.perturb.txt index 82ca16edde8..c2fad8745e6 100644 --- a/python/plugins/sextante/grass/description/v.perturb.txt +++ b/python/plugins/sextante/grass/description/v.perturb.txt @@ -6,5 +6,5 @@ ParameterSelection|distribution|Distribution of perturbation|uniform;normal ParameterString|parameters|Parameter(s) of distribution (uniform: maximum; normal: mean and stddev)| ParameterNumber|minimum|Minimum deviation in map units|None|None|0.0 ParameterNumber|seed|Seed for random number generation|None|None|0 -OutputVector|output|Name for output vector map +OutputVector|output|Output layer diff --git a/python/plugins/sextante/grass/description/v.qcount.txt b/python/plugins/sextante/grass/description/v.qcount.txt index 130dda1254b..7a0b384a8d4 100644 --- a/python/plugins/sextante/grass/description/v.qcount.txt +++ b/python/plugins/sextante/grass/description/v.qcount.txt @@ -1,8 +1,8 @@ v.qcount -v.qcount - Indices for quadrat counts of sites lists. +v.qcount - Indices for quadrant counts of sites lists. Vector (v.*) -ParameterVector|input|Vector of points defining sample points|0|False -ParameterNumber|n|Number of quadrats|0|None|4 +ParameterVector|input|Vector points layer|0|False +ParameterNumber|n|Number of quadrants|0|None|4 ParameterNumber|r|Quadrat radius|0.0|None|10 -OutputVector|output|Output quadrant centres, number of points is written as category +OutputVector|output|Output quadrant layer diff --git a/python/plugins/sextante/grass/description/v.random.txt b/python/plugins/sextante/grass/description/v.random.txt index 40e0be78928..db55fd5dc35 100644 --- a/python/plugins/sextante/grass/description/v.random.txt +++ b/python/plugins/sextante/grass/description/v.random.txt @@ -6,5 +6,4 @@ ParameterNumber|zmin|Minimum z height for 3D output|None|None|0.0 ParameterNumber|zmax|Maximum z height for 3D output|None|None|0.0 ParameterString|column|Column for Z values|z *ParameterBoolean|-d|Use drand48() function instead of rand()|False -OutputVector|output|Name for output vector map - +OutputVector|output|Output layer \ No newline at end of file diff --git a/python/plugins/sextante/grass/description/v.rast.stats.txt b/python/plugins/sextante/grass/description/v.rast.stats.txt deleted file mode 100644 index e343376cb72..00000000000 --- a/python/plugins/sextante/grass/description/v.rast.stats.txt +++ /dev/null @@ -1,10 +0,0 @@ -v.rast.stats -v.rast.stats - Calculates univariate statistics from a raster map based on vector polygons and uploads statistics to new attribute columns. -Vector (v.*) -ParameterVector|vector|Name of vector polygon map|-1|False -ParameterRaster|raster|Name of raster map to calculate statistics from|False -ParameterString|colprefix|Column prefix for new attribute columns| -ParameterNumber|percentile|Percentile to calculate|0.0|100.0|90 -ParameterBoolean|-c|Continue if upload column(s) already exist|False -ParameterBoolean|-e|Calculate extended statistics|False - diff --git a/python/plugins/sextante/grass/description/v.reclass.txt b/python/plugins/sextante/grass/description/v.reclass.txt index 8c7d9d2fcb9..b2a629e6bbc 100644 --- a/python/plugins/sextante/grass/description/v.reclass.txt +++ b/python/plugins/sextante/grass/description/v.reclass.txt @@ -1,9 +1,9 @@ v.reclass v.reclass - Changes vector category values for an existing vector map according to results of SQL queries or a value in attribute table column. Vector (v.*) -ParameterVector|input|Name of input vector map|-1|False +ParameterVector|input|Input layer|-1|False ParameterString|type|Feature type|point,line,boundary,centroid ParameterTableField|column|The name of the column whose values are to be used as new categories|input -ParameterFile|rules|Full path to the reclass rule file|False -OutputVector|output|Name for output vector map +ParameterFile|rules|Reclass rule file|False +OutputVector|output|Reclassified layer diff --git a/python/plugins/sextante/grass/description/v.report.txt b/python/plugins/sextante/grass/description/v.report.txt index 8bdb4e3aaac..c9b8d167c0d 100644 --- a/python/plugins/sextante/grass/description/v.report.txt +++ b/python/plugins/sextante/grass/description/v.report.txt @@ -1,9 +1,10 @@ v.report v.report - Reports geometry statistics for vectors. Vector (v.*) -ParameterVector|map|Name of input vector map|-1|False +ParameterVector|map|Input layer|-1|False ParameterSelection|option|Value to calculate|area;length;coor ParameterSelection|units|units|miles;feet;meters;kilometers;acres;hectares;percent ParameterBoolean|-r|Reverse sort the result|False ParameterBoolean|-s|Sort the result|False +OutputHTML|html|Report HTML file diff --git a/python/plugins/sextante/grass/description/v.sample.txt b/python/plugins/sextante/grass/description/v.sample.txt index 31a23513dc8..90eec5d1801 100644 --- a/python/plugins/sextante/grass/description/v.sample.txt +++ b/python/plugins/sextante/grass/description/v.sample.txt @@ -1,11 +1,11 @@ v.sample -v.sample - Samples a raster map at vector point locations. +v.sample - Samples a raster layer at vector point locations. Vector (v.*) -ParameterVector|input|Vector map defining sample points|-1|False -ParameterTableField|column|Vector map attribute column to use for comparison|input +ParameterVector|input|Vector layer defining sample points|0|False +ParameterTableField|column|Vector layer attribute column to use for comparison|input ParameterRaster|raster|Raster map to be sampled|False ParameterNumber|z|Sampled raster values will be multiplied by this factor|None|None|1.0 ParameterBoolean|-b|Bilinear interpolation (default is nearest neighbor)|False ParameterBoolean|-c|Cubic convolution interpolation (default is nearest neighbor)|False -OutputVector|output|Vector map to store differences +OutputVector|output|Output vector layer diff --git a/python/plugins/sextante/grass/description/v.segment.txt b/python/plugins/sextante/grass/description/v.segment.txt index 6a0d39c117f..ac8fdcb4843 100644 --- a/python/plugins/sextante/grass/description/v.segment.txt +++ b/python/plugins/sextante/grass/description/v.segment.txt @@ -1,7 +1,7 @@ v.segment v.segment - Creates points/segments from input vector lines and positions. Vector (v.*) -ParameterVector|input|Name of input vector map containing lines|1|False -ParameterFile|file|Name of file containing segment rules|False -OutputVector|output|Name for output vector map with segments +ParameterVector|input|Input lines layer|1|False +ParameterFile|file|File containing segment rules|False +OutputVector|output|Output vector layer diff --git a/python/plugins/sextante/grass/description/v.select.txt b/python/plugins/sextante/grass/description/v.select.txt deleted file mode 100644 index 5b932a6e03d..00000000000 --- a/python/plugins/sextante/grass/description/v.select.txt +++ /dev/null @@ -1,7 +0,0 @@ -v.select -v.select - Selects features from vector map (A) by features from other vector map (B). -Vector (v.*) -ParameterVector|ainput|Name of input vector map (A)|-1|False -ParameterVector|binput|Name of input vector map (B)|-1|False -OutputVector|output|Name for output vector map - diff --git a/python/plugins/sextante/grass/description/v.split.txt b/python/plugins/sextante/grass/description/v.split.txt index a5f0825113b..bd8bd4437ef 100644 --- a/python/plugins/sextante/grass/description/v.split.txt +++ b/python/plugins/sextante/grass/description/v.split.txt @@ -1,8 +1,8 @@ v.split v.split - Split lines to shorter segments. Vector (v.*) -ParameterVector|input|Name of input vector map|-1|False +ParameterVector|input|Input lines layer|1|False ParameterNumber|length|Maximum segment length|None|None|10.0 ParameterNumber|vertices|Maximum number of vertices in segment|None|None|10 -OutputVector|output|Name for output vector map +OutputVector|output|Output layer diff --git a/python/plugins/sextante/grass/description/v.surf.bspline.txt b/python/plugins/sextante/grass/description/v.surf.bspline.txt index 042d2351f5f..a5195dfddc6 100644 --- a/python/plugins/sextante/grass/description/v.surf.bspline.txt +++ b/python/plugins/sextante/grass/description/v.surf.bspline.txt @@ -1,8 +1,8 @@ v.surf.bspline v.surf.bspline - Bicubic or bilinear spline interpolation with Tykhonov regularization. Vector (v.*) -ParameterVector|input|Name of input vector map|-1|False -ParameterVector|sparse|Name of input vector map of sparse points|-1|False +ParameterVector|input|Input points layer|-1|False +ParameterVector|sparse|Input layer of sparse points|-1|False ParameterNumber|sie|Length of each spline step in the east-west direction|None|None|4 ParameterNumber|sin|Length of each spline step in the north-south direction|None|None|4 ParameterSelection|method|Spline interpolation algorithm|bilinear;bicubic @@ -10,6 +10,5 @@ ParameterNumber|lambda_i|Tykhonov regularization parameter (affects smoothing)|N ParameterTableField|column|Attribute table column with values to interpolate|input ParameterBoolean|-c|Find the best Tykhonov regularizing parameter using a "leave-one-out" cross validation method|False ParameterBoolean|-e|Estimate point density and distance|False -OutputVector|output|Name for output vector map -OutputRaster|raster|Name for output raster map - +OutputVector|output|Output vector layer +OutputRaster|raster|Output raster layer \ No newline at end of file diff --git a/python/plugins/sextante/grass/description/v.surf.idw.txt b/python/plugins/sextante/grass/description/v.surf.idw.txt index 1fef42637e2..04eaa4cc854 100644 --- a/python/plugins/sextante/grass/description/v.surf.idw.txt +++ b/python/plugins/sextante/grass/description/v.surf.idw.txt @@ -1,10 +1,9 @@ v.surf.idw v.surf.idw - Surface interpolation from vector point data by Inverse Distance Squared Weighting. Vector (v.*) -ParameterVector|input|Name of input vector map|0|False +ParameterVector|input|Input vector layer|0|False ParameterNumber|npoints|Number of interpolation points|None|None|12 ParameterNumber|power|Power parameter; greater values assign greater influence to closer points|None|None|2.0 ParameterTableField|column|Attribute table column with values to interpolate|input ParameterBoolean|-n|Don't index points by raster cell|False -OutputRaster|output|Name for output raster map - +OutputRaster|output|Output raster \ No newline at end of file diff --git a/python/plugins/sextante/grass/description/v.surf.rst.cvdev.txt b/python/plugins/sextante/grass/description/v.surf.rst.cvdev.txt index 2828f7de7f0..40c35eeaaef 100644 --- a/python/plugins/sextante/grass/description/v.surf.rst.cvdev.txt +++ b/python/plugins/sextante/grass/description/v.surf.rst.cvdev.txt @@ -1,7 +1,7 @@ v.surf.rst v.surf.rst.cvdev - Spatial approximation and topographic analysis using regularized spline with tension. Vector (v.*) -ParameterVector|input|Name of input vector map|0|False +ParameterVector|input|Input vector layer|0|False ParameterString|where|WHERE conditions of SQL statement without 'where' keyword| ParameterRaster|maskmap|Name of the raster map used as mask|True ParameterTableField|zcolumn|Name of the attribute column with values to be used for approximation|input @@ -13,4 +13,4 @@ ParameterNumber|dmax|Maximum distance between points on isoline (to insert addit ParameterNumber|theta|Anisotropy angle (in degrees counterclockwise from East)|0|360|0 ParameterNumber|scalex|Anisotropy scaling factor|None|None|0 ParameterBoolean|-c|-c[leave this as True]|True -OutputVector|cvdev|Output cross-validation errors vector point file +OutputVector|cvdev|Cross-validation errors diff --git a/python/plugins/sextante/grass/description/v.surf.rst.txt b/python/plugins/sextante/grass/description/v.surf.rst.txt index 46fd64373cb..0644606924e 100644 --- a/python/plugins/sextante/grass/description/v.surf.rst.txt +++ b/python/plugins/sextante/grass/description/v.surf.rst.txt @@ -1,7 +1,7 @@ v.surf.rst v.surf.rst - Spatial approximation and topographic analysis using regularized spline with tension. Vector (v.*) -ParameterVector|input|Name of input vector map|0|False +ParameterVector|input|Input points layer|0|False ParameterString|where|WHERE conditions of SQL statement without 'where' keyword| ParameterRaster|maskmap|Name of the raster map used as mask|True ParameterTableField|zcolumn|Name of the attribute column with values to be used for approximation|input @@ -15,10 +15,10 @@ ParameterNumber|theta|Anisotropy angle (in degrees counterclockwise from East)|0 ParameterNumber|scalex|Anisotropy scaling factor|None|None|0 ParameterBoolean|-t|Use scale dependent tension|False ParameterBoolean|-d|Output partial derivatives instead of topographic parameters|False -OutputRaster|elev|Output surface raster map -OutputRaster|slope|Output slope raster map -OutputRaster|aspect|Output aspect raster map -OutputRaster|pcurv|Output profile curvature raster map -OutputRaster|tcurv|Output tangential curvature raster map -OutputRaster|mcurv|Output mean curvature raster map +OutputRaster|elev|Surface +OutputRaster|slope|Slope +OutputRaster|aspect|Aspect +OutputRaster|pcurv|Profile curvature +OutputRaster|tcurv|Tangential curvature +OutputRaster|mcurv|Mean curvature diff --git a/python/plugins/sextante/grass/description/v.to.3d.txt b/python/plugins/sextante/grass/description/v.to.3d.txt deleted file mode 100644 index 75544d2998f..00000000000 --- a/python/plugins/sextante/grass/description/v.to.3d.txt +++ /dev/null @@ -1,10 +0,0 @@ -v.to.3d -v.to.3d - Performs transformation of 2D vector features to 3D. -Vector (v.*) -ParameterVector|input|Name of input 2D vector map|-1|False -ParameterString|type|Feature type|point,line,boundary,centroid -ParameterNumber|height|Fixed height for 3D vector features|None|None|0.0 -ParameterTableField|column|Name of attribute column used for height|input -ParameterBoolean|-r|Reverse transformation; 3D vector features to 2D|False -OutputVector|output|Name for output 3D vector map - diff --git a/python/plugins/sextante/grass/description/v.to.points.txt b/python/plugins/sextante/grass/description/v.to.points.txt index 784c95cca55..2be0b90eca3 100644 --- a/python/plugins/sextante/grass/description/v.to.points.txt +++ b/python/plugins/sextante/grass/description/v.to.points.txt @@ -1,9 +1,8 @@ v.to.points -v.to.points - Create points along input lines in new vector with 2 layers. +v.to.points - Create points along input lines Vector (v.*) -ParameterVector|input|Input vector map containing lines|-1|False +ParameterVector|input|Input lines layer|1|False ParameterString|dmax|Maximum distance between points in map units|100 -ParameterBoolean|-n|Write line nodes|False ParameterBoolean|-v|Write line vertices|True ParameterBoolean|-i|Interpolate points between line vertices|False OutputVector|output|Output vector map where points will be written diff --git a/python/plugins/sextante/grass/description/v.to.rast.attribute.txt b/python/plugins/sextante/grass/description/v.to.rast.attribute.txt index e21b98cfc4b..5c9412d8122 100644 --- a/python/plugins/sextante/grass/description/v.to.rast.attribute.txt +++ b/python/plugins/sextante/grass/description/v.to.rast.attribute.txt @@ -1,7 +1,7 @@ v.to.rast -v.to.rast.attribute - Converts (rasterize) a vector map into a raster map. +v.to.rast.attribute - Converts (rasterize) a vector layer into a raster layer. Vector (v.*) -ParameterVector|input|Name of input vector map|-1|False +ParameterVector|input|Input vector layer|-1|False ParameterSelection|use|Source of raster values|attr ParameterTableField|column|Name of column for 'attr' parameter (data type must be numeric)|input -OutputRaster|output|Name for output raster map +OutputRaster|output|Rasterized layer diff --git a/python/plugins/sextante/grass/description/v.to.rast.value.txt b/python/plugins/sextante/grass/description/v.to.rast.value.txt index 1f8d54dda90..302fd5a5bdf 100644 --- a/python/plugins/sextante/grass/description/v.to.rast.value.txt +++ b/python/plugins/sextante/grass/description/v.to.rast.value.txt @@ -1,7 +1,7 @@ v.to.rast -v.to.rast.value - Converts (rasterize) a vector map into a raster map. +v.to.rast.value - Converts (rasterize) a vector layer into a raster layer. Vector (v.*) -ParameterVector|input|Name of input vector map|-1|False +ParameterVector|input|Input vector layer|-1|False ParameterSelection|use|Source of raster values|val ParameterNumber|value|Raster value|None|None|1.0 -OutputRaster|output|Name for output raster map +OutputRaster|output|Rasterized layer diff --git a/python/plugins/sextante/grass/description/v.transform.txt b/python/plugins/sextante/grass/description/v.transform.txt index 7d3f426e38a..ca8492790d6 100644 --- a/python/plugins/sextante/grass/description/v.transform.txt +++ b/python/plugins/sextante/grass/description/v.transform.txt @@ -1,5 +1,5 @@ v.transform -v.transform - Performs an affine transformation (shift, scale and rotate, or GPCs) on vector map. +v.transform - Performs an affine transformation (shift, scale and rotate, or GPCs) on a vector layer. Vector (v.*) ParameterVector|input|Name of input vector map|-1|False ParameterNumber|xshift|X shift|None|None|0.0 @@ -9,6 +9,5 @@ ParameterNumber|xscale|X scale|None|None|1.0 ParameterNumber|yscale|Y scale|None|None|1.0 ParameterNumber|zscale|Z scale|None|None|1.0 ParameterNumber|zrot|Rotation around z axis in degrees counterclockwise|None|None|0.0 -ParameterFile|pointsfile|Name of input text file with GCPs|False -OutputVector|output|Name for output vector map +OutputVector|output|Transformed layer diff --git a/python/plugins/sextante/grass/description/v.univar.txt b/python/plugins/sextante/grass/description/v.univar.txt index 03be5e0051e..df21b19f615 100644 --- a/python/plugins/sextante/grass/description/v.univar.txt +++ b/python/plugins/sextante/grass/description/v.univar.txt @@ -8,4 +8,4 @@ ParameterString|where|WHERE conditions of SQL statement without 'where' keyword| ParameterString|percentile|Percentile to calculate|90 ParameterBoolean|-g|Print the stats in shell script style|True ParameterBoolean|-e|Calculate extended statistics|False - +OutputHTML|html|Statistics diff --git a/python/plugins/sextante/grass/description/v.voronoi.txt b/python/plugins/sextante/grass/description/v.voronoi.txt index 0a1fce8489b..7e836011db1 100644 --- a/python/plugins/sextante/grass/description/v.voronoi.txt +++ b/python/plugins/sextante/grass/description/v.voronoi.txt @@ -1,8 +1,8 @@ v.voronoi -v.voronoi - Creates a Voronoi diagram from an input vector map containing points or centroids. +v.voronoi - Creates a Voronoi diagram from an input vector layer containing points. Vector (v.*) -ParameterVector|input|Name of input vector map|0|False +ParameterVector|input|Input points layer|0|False ParameterBoolean|-l|Output tessellation as a graph (lines), not areas|False ParameterBoolean|-t|Do not create attribute table|False -OutputVector|output|Name for output vector map +OutputVector|output|Voronoi diagram diff --git a/python/plugins/sextante/grass/postproc/__init__.py b/python/plugins/sextante/grass/postproc/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/python/plugins/sextante/grass/postproc/r_coin.py b/python/plugins/sextante/grass/postproc/r_coin.py new file mode 100644 index 00000000000..7086d3c9772 --- /dev/null +++ b/python/plugins/sextante/grass/postproc/r_coin.py @@ -0,0 +1,36 @@ +# -*- coding: utf-8 -*- + +""" +*************************************************************************** + r_coin.py + --------------------- + Date : December 2012 + Copyright : (C) 2012 by Victor Olaya + Email : volayaf at gmail dot com +*************************************************************************** +* * +* This program is free software; you can redistribute it and/or modify * +* it under the terms of the GNU General Public License as published by * +* the Free Software Foundation; either version 2 of the License, or * +* (at your option) any later version. * +* * +*************************************************************************** +""" +__author__ = 'Victor Olaya' +__date__ = 'December 2012' +__copyright__ = '(C) 2012, Victor Olaya' +# This will get replaced with a git SHA1 when you do a git archive +__revision__ = '$Format:%H$' + +def postProcessResults(alg): + htmlFile = alg.getOutputFromName('html').value + found = False + f = open(htmlFile, "w") + f.write("

r.coin

\n") + for line in alg.consoleOutput: + if found and not line.strip().endswith('exit'): + f.write(line + "
\n") + if 'r.coin' in line: + found = True + f.close() + \ No newline at end of file diff --git a/python/plugins/sextante/grass/postproc/r_covar.py b/python/plugins/sextante/grass/postproc/r_covar.py new file mode 100644 index 00000000000..7c6f9085a17 --- /dev/null +++ b/python/plugins/sextante/grass/postproc/r_covar.py @@ -0,0 +1,36 @@ +# -*- coding: utf-8 -*- + +""" +*************************************************************************** + r_covar.py + --------------------- + Date : December 2012 + Copyright : (C) 2012 by Victor Olaya + Email : volayaf at gmail dot com +*************************************************************************** +* * +* This program is free software; you can redistribute it and/or modify * +* it under the terms of the GNU General Public License as published by * +* the Free Software Foundation; either version 2 of the License, or * +* (at your option) any later version. * +* * +*************************************************************************** +""" +__author__ = 'Victor Olaya' +__date__ = 'December 2012' +__copyright__ = '(C) 2012, Victor Olaya' +# This will get replaced with a git SHA1 when you do a git archive +__revision__ = '$Format:%H$' + +def postProcessResults(alg): + htmlFile = alg.getOutputFromName('html').value + found = False + f = open(htmlFile, "w") + f.write("

r.covar

\n") + for line in alg.consoleOutput: + if found and not line.strip().endswith('exit'): + f.write(line + "
\n") + if 'r.covar' in line: + found = True + f.close() + \ No newline at end of file diff --git a/python/plugins/sextante/grass/postproc/v_class.py b/python/plugins/sextante/grass/postproc/v_class.py new file mode 100644 index 00000000000..5bff67fae8a --- /dev/null +++ b/python/plugins/sextante/grass/postproc/v_class.py @@ -0,0 +1,36 @@ +# -*- coding: utf-8 -*- + +""" +*************************************************************************** + v_class.py + --------------------- + Date : December 2012 + Copyright : (C) 2012 by Victor Olaya + Email : volayaf at gmail dot com +*************************************************************************** +* * +* This program is free software; you can redistribute it and/or modify * +* it under the terms of the GNU General Public License as published by * +* the Free Software Foundation; either version 2 of the License, or * +* (at your option) any later version. * +* * +*************************************************************************** +""" +__author__ = 'Victor Olaya' +__date__ = 'December 2012' +__copyright__ = '(C) 2012, Victor Olaya' +# This will get replaced with a git SHA1 when you do a git archive +__revision__ = '$Format:%H$' + +def postProcessResults(alg): + htmlFile = alg.getOutputFromName('html').value + found = False + f = open(htmlFile, "w") + f.write("

v.class

\n") + for line in alg.consoleOutput: + if found and not line.strip().endswith('exit'): + f.write(line + "
\n") + if 'v.class' in line: + found = True + f.close() + \ No newline at end of file diff --git a/python/plugins/sextante/grass/postproc/v_info.py b/python/plugins/sextante/grass/postproc/v_info.py new file mode 100644 index 00000000000..2f65a4e0c30 --- /dev/null +++ b/python/plugins/sextante/grass/postproc/v_info.py @@ -0,0 +1,36 @@ +# -*- coding: utf-8 -*- + +""" +*************************************************************************** + v_info.py + --------------------- + Date : December 2012 + Copyright : (C) 2012 by Victor Olaya + Email : volayaf at gmail dot com +*************************************************************************** +* * +* This program is free software; you can redistribute it and/or modify * +* it under the terms of the GNU General Public License as published by * +* the Free Software Foundation; either version 2 of the License, or * +* (at your option) any later version. * +* * +*************************************************************************** +""" +__author__ = 'Victor Olaya' +__date__ = 'December 2012' +__copyright__ = '(C) 2012, Victor Olaya' +# This will get replaced with a git SHA1 when you do a git archive +__revision__ = '$Format:%H$' + +def postProcessResults(alg): + htmlFile = alg.getOutputFromName('html').value + found = False + f = open(htmlFile, "w") + f.write("

v.info

\n") + for line in alg.consoleOutput: + if found and not line.strip().endswith('exit'): + f.write(line + "
\n") + if 'v.info' in line: + found = True + f.close() + \ No newline at end of file diff --git a/python/plugins/sextante/grass/postproc/v_normal.py b/python/plugins/sextante/grass/postproc/v_normal.py new file mode 100644 index 00000000000..fd1096b40c5 --- /dev/null +++ b/python/plugins/sextante/grass/postproc/v_normal.py @@ -0,0 +1,36 @@ +# -*- coding: utf-8 -*- + +""" +*************************************************************************** + v_normal.py + --------------------- + Date : December 2012 + Copyright : (C) 2012 by Victor Olaya + Email : volayaf at gmail dot com +*************************************************************************** +* * +* This program is free software; you can redistribute it and/or modify * +* it under the terms of the GNU General Public License as published by * +* the Free Software Foundation; either version 2 of the License, or * +* (at your option) any later version. * +* * +*************************************************************************** +""" +__author__ = 'Victor Olaya' +__date__ = 'December 2012' +__copyright__ = '(C) 2012, Victor Olaya' +# This will get replaced with a git SHA1 when you do a git archive +__revision__ = '$Format:%H$' + +def postProcessResults(alg): + htmlFile = alg.getOutputFromName('html').value + found = False + f = open(htmlFile, "w") + f.write("

v.normal

\n") + for line in alg.consoleOutput: + if found and not line.strip().endswith('exit'): + f.write(line + "
\n") + if 'v.normal' in line: + found = True + f.close() + \ No newline at end of file diff --git a/python/plugins/sextante/grass/postproc/v_report.py b/python/plugins/sextante/grass/postproc/v_report.py new file mode 100644 index 00000000000..6cfeee532f1 --- /dev/null +++ b/python/plugins/sextante/grass/postproc/v_report.py @@ -0,0 +1,36 @@ +# -*- coding: utf-8 -*- + +""" +*************************************************************************** + v_report.py + --------------------- + Date : December 2012 + Copyright : (C) 2012 by Victor Olaya + Email : volayaf at gmail dot com +*************************************************************************** +* * +* This program is free software; you can redistribute it and/or modify * +* it under the terms of the GNU General Public License as published by * +* the Free Software Foundation; either version 2 of the License, or * +* (at your option) any later version. * +* * +*************************************************************************** +""" +__author__ = 'Victor Olaya' +__date__ = 'December 2012' +__copyright__ = '(C) 2012, Victor Olaya' +# This will get replaced with a git SHA1 when you do a git archive +__revision__ = '$Format:%H$' + +def postProcessResults(alg): + htmlFile = alg.getOutputFromName('html').value + found = False + f = open(htmlFile, "w") + f.write("

v.report

\n") + for line in alg.consoleOutput: + if found and not line.strip().endswith('exit'): + f.write(line + "
\n") + if 'v.report' in line: + found = True + f.close() + \ No newline at end of file diff --git a/python/plugins/sextante/grass/postproc/v_univar.py b/python/plugins/sextante/grass/postproc/v_univar.py new file mode 100644 index 00000000000..1973107c25d --- /dev/null +++ b/python/plugins/sextante/grass/postproc/v_univar.py @@ -0,0 +1,36 @@ +# -*- coding: utf-8 -*- + +""" +*************************************************************************** + v_univar.py + --------------------- + Date : December 2012 + Copyright : (C) 2012 by Victor Olaya + Email : volayaf at gmail dot com +*************************************************************************** +* * +* This program is free software; you can redistribute it and/or modify * +* it under the terms of the GNU General Public License as published by * +* the Free Software Foundation; either version 2 of the License, or * +* (at your option) any later version. * +* * +*************************************************************************** +""" +__author__ = 'Victor Olaya' +__date__ = 'December 2012' +__copyright__ = '(C) 2012, Victor Olaya' +# This will get replaced with a git SHA1 when you do a git archive +__revision__ = '$Format:%H$' + +def postProcessResults(alg): + htmlFile = alg.getOutputFromName('html').value + found = False + f = open(htmlFile, "w") + f.write("

v.univar

\n") + for line in alg.consoleOutput: + if found and not line.strip().endswith('exit'): + f.write(line + "
\n") + if 'v.univar' in line: + found = True + f.close() + \ No newline at end of file diff --git a/python/plugins/sextante/gui/AlgorithmExecutionDialog.py b/python/plugins/sextante/gui/AlgorithmExecutionDialog.py index cd06f0ffdc8..46b6d56c809 100644 --- a/python/plugins/sextante/gui/AlgorithmExecutionDialog.py +++ b/python/plugins/sextante/gui/AlgorithmExecutionDialog.py @@ -158,7 +158,7 @@ class AlgorithmExecutionDialog(QtGui.QDialog): continue output.value = self.paramTable.valueItems[output.name].getValue() if not SextanteConfig.getSetting(SextanteConfig.TABLE_LIKE_PARAM_PANEL): - if isinstance(output, (OutputRaster, OutputVector, OutputTable, OutputHTML)): + if isinstance(output, (OutputRaster, OutputVector, OutputTable)): output.open = self.paramTable.checkBoxes[output.name].isChecked() return True diff --git a/python/plugins/sextante/gui/ParametersPanel.py b/python/plugins/sextante/gui/ParametersPanel.py index ea869cd746e..169add1595e 100644 --- a/python/plugins/sextante/gui/ParametersPanel.py +++ b/python/plugins/sextante/gui/ParametersPanel.py @@ -152,7 +152,7 @@ class ParametersPanel(QtGui.QWidget): widget = OutputSelectionPanel(output,self.alg) self.verticalLayout.addWidget(label) self.verticalLayout.addWidget(widget) - if isinstance(output, (OutputRaster, OutputVector, OutputTable, OutputHTML)): + if isinstance(output, (OutputRaster, OutputVector, OutputTable)): check = QtGui.QCheckBox() check.setText("Open output file after running algorithm") check.setChecked(True)