sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-15 00:04:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

[processing] fix wrong tools description (fix #9852)

Browse Source
This commit is contained in:
Alexander Bruy 2014-03-24 19:44:39 +02:00
parent 7c2038d4bc
commit 3797ffae41
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
python/plugins/processing/algs/PointsFromLines.py
View File

@ -43,7 +43,7 @@ class PointsFromLines(GeoAlgorithm):
OUTPUT_LAYER = 'OUTPUT_LAYER' OUTPUT_LAYER = 'OUTPUT_LAYER'
def defineCharacteristics(self): def defineCharacteristics(self):
self.name = 'Get raster values at line nodes' self.name = 'Generate points (pixel centroids) along line'
self.group = 'Vector analysis tools' self.group = 'Vector analysis tools'
self.addParameter(ParameterRaster(self.INPUT_RASTER, 'Raster layer')) self.addParameter(ParameterRaster(self.INPUT_RASTER, 'Raster layer'))

10
python/plugins/processing/algs/PointsFromPolygons.py
View File

@ -32,7 +32,7 @@ from processing.core.GeoAlgorithm import GeoAlgorithm
from processing.parameters.ParameterRaster import ParameterRaster from processing.parameters.ParameterRaster import ParameterRaster
from processing.parameters.ParameterVector import ParameterVector from processing.parameters.ParameterVector import ParameterVector
from processing.outputs.OutputVector import OutputVector from processing.outputs.OutputVector import OutputVector
from processing.tools import dataobjects, vector from processing.tools import dataobjects, vector, raster
from processing.tools.general import * from processing.tools.general import *
@ -44,7 +44,7 @@ class PointsFromPolygons(GeoAlgorithm):
OUTPUT_LAYER = 'OUTPUT_LAYER' OUTPUT_LAYER = 'OUTPUT_LAYER'
def defineCharacteristics(self): def defineCharacteristics(self):
self.name = 'Get raster values at polygon nodes' self.name = 'Generate points (pixel centroids) inside polygons'
self.group = 'Vector analysis tools' self.group = 'Vector analysis tools'
self.addParameter(ParameterRaster(self.INPUT_RASTER, 'Raster layer')) self.addParameter(ParameterRaster(self.INPUT_RASTER, 'Raster layer'))
@ -92,12 +92,12 @@ class PointsFromPolygons(GeoAlgorithm):
yMin = bbox.yMinimum() yMin = bbox.yMinimum()
yMax = bbox.yMaximum() yMax = bbox.yMaximum()
(startRow, startColumn) = mapToPixel(xMin, yMax, geoTransform) (startRow, startColumn) = raster.mapToPixel(xMin, yMax, geoTransform)
(endRow, endColumn) = mapToPixel(xMax, yMin, geoTransform) (endRow, endColumn) = raster.mapToPixel(xMax, yMin, geoTransform)
for row in xrange(startRow, endRow + 1): for row in xrange(startRow, endRow + 1):
for col in xrange(startColumn, endColumn + 1): for col in xrange(startColumn, endColumn + 1):
(x, y) = pixelToMap(row, col, geoTransform) (x, y) = raster.pixelToMap(row, col, geoTransform)
point.setX(x) point.setX(x)
point.setY(y) point.setY(y)

8
python/plugins/processing/script/scripts/Points_from_vector.py
View File

@ -5,13 +5,13 @@
from qgis.core import * from qgis.core import *
vector = processing.getobject(Input_vector) vector = processing.getObject(Input_vector)
raster = processing.getobject(Input_raster) raster = processing.getObject(Input_raster)
geometryType = vector.geometryType() geometryType = vector.geometryType()
if geometryType == QGis.Point: if geometryType == QGis.Point:
processing.runalg('qgis:saveselectedfeatures', vector, Output_layer) processing.runalg('qgis:saveselectedfeatures', vector, Output_layer)
elif geometryType == QGis.Line: elif geometryType == QGis.Line:
processing.runalg('qgis:pointsfromlines', raster, vector, Output_layer) processing.runalg('qgis:generatepointspixelcentroidsalongline', raster, vector, Output_layer)
elif geometryType == QGis.Polygon: elif geometryType == QGis.Polygon:
processing.runalg('qgis:pointsfrompolygons', raster, vector, Output_layer) processing.runalg('qgis:generatepointspixelcentroidsinsidepolygons', raster, vector, Output_layer)