Skip to content

Commit 0416168

Browse files
committed
[sextante] minor changes in algorithms
1 parent f392e57 commit 0416168

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

python/plugins/sextante/algs/mmqgisx/MMQGISXAlgorithms.py

+6
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
from sextante.parameters.ParameterVector import ParameterVector
2626
from sextante.outputs.OutputVector import OutputVector
2727
from sextante.core.QGisLayers import QGisLayers
28+
from sextante.parameters.ParameterCrs import ParameterCrs
2829

2930

3031
class mmqgisx_delete_columns_algorithm(GeoAlgorithm):
@@ -381,6 +382,7 @@ class mmqgisx_grid_algorithm(GeoAlgorithm):
381382
CENTERY = "CENTERY"
382383
GRIDTYPE = "GRIDTYPE"
383384
SAVENAME = "SAVENAME"
385+
CRS = "CRS"
384386

385387
def defineCharacteristics(self):
386388
self.name = "Create grid"
@@ -395,6 +397,7 @@ def defineCharacteristics(self):
395397
self.gridtype_options = ["Rectangle (line)","Rectangle (polygon)","Diamond (polygon)","Hexagon (polygon)"]
396398
self.addParameter(ParameterSelection(self.GRIDTYPE, "Grid type",
397399
self.gridtype_options, default = 0))
400+
self.addParameter(ParameterCrs(self.CRS, "CRS"))
398401
self.addOutput(OutputVector(self.SAVENAME, "Output"))
399402

400403
#===========================================================================
@@ -413,6 +416,9 @@ def processAlgorithm(self, progress):
413416
originy = centery - (height / 2.0)
414417
gridtype = self.gridtype_options[self.getParameterValue(self.GRIDTYPE)]
415418

419+
crsId = self.getParameterValue(self.TARGET_CRS)
420+
self.crs = QgsCoordinateReferenceSystem(crsId)
421+
416422
if (hspacing <= 0) or (vspacing <= 0):
417423
raise GeoAlgorithmExecutionException("Invalid grid spacing: " + unicode(hspacing) + " / " + unicode(vspacing))
418424

python/plugins/sextante/gui/help/algclasssification.txt

+1-3
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ qgis:fieldcalculator,USE_ORIGINAL_NAME,Vector/Table tools
117117
qgis:fixeddistancebuffer,USE_ORIGINAL_NAME,Vector/Geometry operations
118118
qgis:hublines,USE_ORIGINAL_NAME,Vector/Analysis
119119
qgis:intersection,USE_ORIGINAL_NAME,Vector/Overlay
120-
qgis:joinattributestable,USE_ORIGINAL_NAME,Vector/Selection
120+
qgis:joinattributestable,USE_ORIGINAL_NAME,Vector/Table tools
121121
qgis:lineintersections,USE_ORIGINAL_NAME,Vector/Lines
122122
qgis:linestopolygons,USE_ORIGINAL_NAME,Vector/Lines
123123
qgis:listuniquevalues,USE_ORIGINAL_NAME,Vector/Table tools
@@ -126,7 +126,6 @@ qgis:mergevectorlayers,USE_ORIGINAL_NAME,Vector/General tools
126126
qgis:multiparttosingleparts,USE_ORIGINAL_NAME,Vector/General tools
127127
qgis:nearestneighbouranalysis,USE_ORIGINAL_NAME,Vector/Points
128128
qgis:pointslayerfromtable,USE_ORIGINAL_NAME,Vector/Creation
129-
qgis:polygoncentroids,USE_ORIGINAL_NAME,Vector/Geometry operations
130129
qgis:polygonfromlayerextent,USE_ORIGINAL_NAME,Vector/Creation
131130
qgis:polygonstolines,USE_ORIGINAL_NAME,Vector/Polygons
132131
qgis:randomselection,USE_ORIGINAL_NAME,Vector/Selection
@@ -197,7 +196,6 @@ saga:coordinatetransformationgrid,USE_ORIGINAL_NAME,Raster/General tools
197196
saga:coordinatetransformationgridlist,USE_ORIGINAL_NAME,Raster/General tools
198197
saga:coordinatetransformationshapes,USE_ORIGINAL_NAME,Vector/General tools
199198
saga:coordinatetransformationshapeslist,USE_ORIGINAL_NAME,Vector/General tools
200-
saga:countpointsinpolygons,USE_ORIGINAL_NAME,Vector/Polygons
201199
saga:covereddistance,USE_ORIGINAL_NAME,Raster/Analysis
202200
saga:creategraticule,USE_ORIGINAL_NAME,Vector/Miscellaneous
203201
saga:croptodata,USE_ORIGINAL_NAME,Raster/General tools

python/plugins/sextante/saga/description/CountPointsinPolygons.txt

-4
This file was deleted.

0 commit comments

Comments
 (0)