[sextante] fixed proximity algorithm.

modified wrong test model
qgis · Jul 27, 2013 · f854288 · f854288
1 parent e1fff9a
commit f854288
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 13 deletions.
diff --git a/python/plugins/sextante/gdal/scripts/proximity.py b/python/plugins/sextante/gdal/scripts/proximity.py
@@ -32,7 +32,7 @@
 ##values=string
 ##maxdist=number 0
 ##nodata=number 0
-##distunits=selection GEO,PIXEL
+##distunits=selection GEO;PIXEL
 ##fixed_buf_val=number 0
 from sextante.gdal.GdalUtils import GdalUtils
 try:

diff --git a/python/plugins/sextante/modeler/models/noinputs.model b/python/plugins/sextante/modeler/models/noinputs.model
@@ -1,14 +1,15 @@
-NAME:A model with no parameters
+NAME:A model without inputs
 GROUP:[Test models]
-VALUE:HARDCODEDPARAMVALUE_HSPACING_0===10
-VALUE:HARDCODEDPARAMVALUE_CENTERY_0===0
-VALUE:HARDCODEDPARAMVALUE_WIDTH_0===30
-VALUE:HARDCODEDPARAMVALUE_GRIDTYPE_0===1
-VALUE:HARDCODEDPARAMVALUE_CENTERX_0===0
-VALUE:HARDCODEDPARAMVALUE_HEIGHT_0===30
-VALUE:HARDCODEDPARAMVALUE_VSPACING_0===10
+VALUE:HARDCODEDPARAMVALUE_HSPACING_0===10.0
+VALUE:HARDCODEDPARAMVALUE_CENTERY_0===0.0
+VALUE:HARDCODEDPARAMVALUE_CRS_0===EPSG:4326
+VALUE:HARDCODEDPARAMVALUE_HEIGHT_0===180.0
+VALUE:HARDCODEDPARAMVALUE_GRIDTYPE_0===0
+VALUE:HARDCODEDPARAMVALUE_CENTERX_0===0.0
+VALUE:HARDCODEDPARAMVALUE_WIDTH_0===360.0
+VALUE:HARDCODEDPARAMVALUE_VSPACING_0===10.0
 ALGORITHM:qgis:creategrid
-112.0,53.0
+113.0,48.0
 None
 -1|HARDCODEDPARAMVALUE_HSPACING_0
 -1|HARDCODEDPARAMVALUE_VSPACING_0
@@ -17,9 +18,10 @@ None
 -1|HARDCODEDPARAMVALUE_CENTERX_0
 -1|HARDCODEDPARAMVALUE_CENTERY_0
 -1|HARDCODEDPARAMVALUE_GRIDTYPE_0
-grid
+-1|HARDCODEDPARAMVALUE_CRS_0
+None
 ALGORITHM:qgis:polygoncentroids
-109.0,195.0
+333.0,148.0
 None
 0|SAVENAME
-centroids
+centroids|531.0,259.0