renamed mmqgis code

splitted r.surf.rst git-svn-id: http://sextante.googlecode.com/svn/trunk/soft/bindings/qgis-plugin@181 881b9c09-3ef8-f3c2-ec3d-21d735c97f4d
qgis · May 10, 2012 · fa8c9e6 · fa8c9e6
1 parent 92ec118
commit fa8c9e6
Show file tree

Hide file tree

Showing 10 changed files with 31 additions and 25 deletions.
diff --git a/src/sextante/grass/description/v.surf.rst.cvdev.txt b/src/sextante/grass/description/v.surf.rst.cvdev.txt
@@ -0,0 +1,16 @@
+v.surf.rst
+v.surf.rst.cvdev
+Vector (v.*)
+ParameterVector|input|input|0|False
+ParameterString|where|where|
+ParameterRaster|maskmap|maskmap|True
+ParameterTableField|zcolumn|zcolumn|input
+ParameterNumber|tension|tension|None|None|40
+ParameterNumber|segmax|segmax|None|None|40
+ParameterNumber|npmin|npmin|None|None|300
+ParameterNumber|dmin|dmin|None|None|0.5
+ParameterNumber|dmax|dmax|None|None|2.5
+ParameterNumber|theta|theta|None|None|0
+ParameterNumber|scalex|scalex|None|None|0
+ParameterBoolean|-c|-c[leave this as True]|True
+OutputVector|cvdev|cvdev
diff --git a/src/sextante/grass/description/v.surf.rst.txt b/src/sextante/grass/description/v.surf.rst.txt
@@ -3,26 +3,17 @@ v.surf.rst
 Vector (v.*)
 ParameterVector|input|input|0|False
 ParameterString|where|where|
-ParameterRaster|maskmap|maskmap|False
+ParameterRaster|maskmap|maskmap|True
 ParameterTableField|zcolumn|zcolumn|input
 ParameterNumber|tension|tension|None|None|40
 ParameterNumber|segmax|segmax|None|None|40
 ParameterNumber|npmin|npmin|None|None|300
 ParameterNumber|dmin|dmin|None|None|0.5
 ParameterNumber|dmax|dmax|None|None|2.5
-ParameterNumber|zmult|zmult|None|None|1.0
 ParameterNumber|theta|theta|None|None|0
 ParameterNumber|scalex|scalex|None|None|0
-ParameterBoolean|-c|-c|True
 ParameterBoolean|-t|-t|True
 ParameterBoolean|-d|-d|True
 OutputRaster|elev|elev
-OutputRaster|slope|slope
-OutputRaster|aspect|aspect
-OutputRaster|pcurv|pcurv
-OutputRaster|tcurv|tcurv
-OutputRaster|mcurv|mcurv
-OutputVector|devi|devi
-OutputVector|cvdev|cvdev
 OutputVector|treefile|treefile
 OutputVector|overfile|overfile
diff --git a/src/sextante/mmqgis/scripts/Create_Grid_Layer.py b/src/sextante/mmqgis/scripts/Create_Grid_Layer.py
@@ -6,9 +6,9 @@
 ##originy=number 0
 ##grid=output vector
 ##gridtype=selection Rectangle (line);Rectangle (polygon);Diamond (polygon);Hexagon (polygon)
-from sextante.mmqgis import mmqgis_library as mmqgis
+from sextante.mmqgis import sextante_mmqgis_library as sxt_mmqgis
 from sextante.mmqgis.DummyInterface import DummyInterface
 type_strings = ["Rectangle (line)","Rectangle (polygon)","Diamond (polygon)","Hexagon (polygon)"]
 out_type = type_strings[gridtype]
-mmqgis.mmqgis_grid(DummyInterface(), grid, hspacing, vspacing, width, height, originx, originy, out_type)
+sxt_mmqgis.mmqgis_grid(DummyInterface(), grid, hspacing, vspacing, width, height, originx, originy, out_type)
 
diff --git a/src/sextante/mmqgis/scripts/Distance_to_nearest_hub.py b/src/sextante/mmqgis/scripts/Distance_to_nearest_hub.py
@@ -3,7 +3,7 @@
 ##attribute_in_hubs_layer=field hubs_layer
 ##result=output vector
 ##output_type=selection Point;Lines to hub
-from sextante.mmqgis import mmqgis_library as mmqgis
+from sextante.mmqgis import sextante_mmqgis_library as sxt_mmqgis
 from sextante.core.Sextante import Sextante
-mmqgis.mmqgis_hub_distance(Sextante.getInterface(), source_layer, hubs_layer, attribute_in_hubs_layer, output_type > 0, False, result)
+sxt_mmqgis.mmqgis_hub_distance(Sextante.getInterface(), source_layer, hubs_layer, attribute_in_hubs_layer, output_type > 0, False, result)
 
diff --git a/src/sextante/mmqgis/scripts/Export_geometries_to_CSV.py b/src/sextante/mmqgis/scripts/Export_geometries_to_CSV.py
@@ -2,9 +2,9 @@
 ##output=output table
 ##delimiter=selection (comma);(bar);(space)
 ##endline=selection CR-LF;LF
-from sextante.mmqgis import mmqgis_library as mmqgis
+from sextante.mmqgis import sextante_mmqgis_library as sxt_mmqgis
 from sextante.core.Sextante import Sextante
 delimiter_strings = [",", "|", " "]
 endline_strings=["\r\n", "\n"]
-mmqgis.mmqgis_geometry_export_to_csv(Sextante.getInterface(), layer, output, output[:-3] + "_attributes.csv", delimiter_strings[delimiter], end_line_strings[end_line])
+sxt_mmqgis.mmqgis_geometry_export_to_csv(Sextante.getInterface(), layer, output, output[:-3] + "_attributes.csv", delimiter_strings[delimiter], end_line_strings[end_line])
 
diff --git a/src/sextante/mmqgis/scripts/Merge_layers.py b/src/sextante/mmqgis/scripts/Merge_layers.py
@@ -1,11 +1,10 @@
 ##layers=multiple vector
 ##result=output vector
-from sextante.mmqgis import mmqgis_library as mmqgis
-from sextante.core.Sextante import Sextante
+from sextante.mmqgis import sextante_mmqgis_library as sxt_mmqgis
 from sextante.mmqgis.DummyInterface import DummyInterface
 from sextante.core.QGisLayers import QGisLayers
 names=[]
 for layer in layers:
 	names.append(QGisLayers.getObjectFromUri(layer).name())
-mmqgis.mmqgis_merge(DummyInterface(), names, result)
+sxt_mmqgis.mmqgis_merge(DummyInterface(), names, result)
 
diff --git a/src/sextante/mmqgis/scripts/Snap_vertices_to_grid.py b/src/sextante/mmqgis/scripts/Snap_vertices_to_grid.py
@@ -3,7 +3,7 @@
 ##vspacing=number 10
 ##gridified=output vector
 ##gridtype=selection Rectangle (line);Rectangle (polygon);Diamond (polygon);Hexagon (polygon)
-from sextante.mmqgis import mmqgis_library as mmqgis
+from sextante.mmqgis import sextante_mmqgis_library as sxt_mmqgis
 from sextante.core.Sextante import Sextante
-mmqgis.mmqgis_gridify_layer(Sextante.getInterface(), layer, hspacing, vspacing, gridified, False)
+sxt_mmqgis.mmqgis_gridify_layer(Sextante.getInterface(), layer, hspacing, vspacing, gridified, False)
 
diff --git a/src/sextante/mmqgis/scripts/Sort_vector_layer.py b/src/sextante/mmqgis/scripts/Sort_vector_layer.py
@@ -2,8 +2,8 @@
 ##attribute=field layer
 ##output=output vector
 ##direction=selection Ascending;Descending
-from sextante.mmqgis import mmqgis_library as mmqgis
+from sextante.mmqgis import sextante_mmqgis_library as sxt_mmqgis
 from sextante.mmqgis.DummyInterface import DummyInterface
 direction_strings = ["Ascending", "Dscending"]
-mmqgis.mmqgis_sort(DummyInterface(), layer, attribute, output, direction_Strings[direction])
+sxt_mmqgis.mmqgis_sort(DummyInterface(), layer, attribute, output, direction_Strings[direction])
 
diff --git a/src/sextante/mmqgis/scripts/Text_to_float.py b/src/sextante/mmqgis/scripts/Text_to_float.py
@@ -1,6 +1,6 @@
 ##layer=vector
 ##output=output vector
 ##f=field layer
-from sextante.mmqgis import mmqgis_library as mmqgis
+from sextante.mmqgis import sextante_mmqgis_library as sxt_mmqgis
 from sextante.mmqgis.DummyInterface import DummyInterface
-mmqgis.mmqgis_text_to_float(DummyInterface(), layer, [f], output, False)
+sxt_mmqgis.mmqgis_text_to_float(DummyInterface(), layer, [f], output, False)
diff --git a/src/sextante/mmqgis/mmqgis_library.py → ...extante/mmqgis/sextante_mmqgis_library.py b/src/sextante/mmqgis/mmqgis_library.py → ...extante/mmqgis/sextante_mmqgis_library.py