python/plugins/fTools/tools/ftools_utils.py

@@ -176,7 +176,7 @@ def createUniqueFieldName( field ):
             else:
                 val = val + 1
             field.setName( shortName[len( shortName )-1:] + unicode( val ) )
-        except exceptions.ValueError:
+        except ValueError:
             field.setName( shortName + "_2" )
     else:
         field.setName( shortName + "_2" )

python/plugins/processing/algs/PointsFromLines.py

@@ -43,7 +43,7 @@ class PointsFromLines(GeoAlgorithm):
     OUTPUT_LAYER = 'OUTPUT_LAYER'
 
     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.addParameter(ParameterRaster(self.INPUT_RASTER, 'Raster layer'))

python/plugins/processing/algs/PointsFromPolygons.py

@@ -32,7 +32,7 @@
 from processing.parameters.ParameterRaster import ParameterRaster
 from processing.parameters.ParameterVector import ParameterVector
 from processing.outputs.OutputVector import OutputVector
-from processing.tools import dataobjects, vector
+from processing.tools import dataobjects, vector, raster
 from processing.tools.general import *
 
 
@@ -44,7 +44,7 @@ class PointsFromPolygons(GeoAlgorithm):
     OUTPUT_LAYER = 'OUTPUT_LAYER'
 
     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.addParameter(ParameterRaster(self.INPUT_RASTER, 'Raster layer'))
@@ -92,12 +92,12 @@ def processAlgorithm(self, progress):
             yMin = bbox.yMinimum()
             yMax = bbox.yMaximum()
 
-            (startRow, startColumn) = mapToPixel(xMin, yMax, geoTransform)
-            (endRow, endColumn) = mapToPixel(xMax, yMin, geoTransform)
+            (startRow, startColumn) = raster.mapToPixel(xMin, yMax, geoTransform)
+            (endRow, endColumn) = raster.mapToPixel(xMax, yMin, geoTransform)
 
             for row in xrange(startRow, endRow + 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.setY(y)
 

python/plugins/processing/algs/ftools/PointDistance.py

@@ -113,7 +113,6 @@ def linearMatrix(self, inLayer, inField, targetLayer, targetField,
         index = vector.spatialindex(targetLayer)
 
         inIdx = inLayer.fieldNameIndex(inField)
-        inLayer.select([inIdx])
         outIdx = targetLayer.fieldNameIndex(inField)
 
         outFeat = QgsFeature()
@@ -136,10 +135,10 @@ def linearMatrix(self, inLayer, inField, targetLayer, targetField,
                 outID = outFeat.attributes()[outIdx]
                 outGeom = outFeat.geometry()
                 dist = distArea.measureLine(inGeom.asPoint(),
-                        outGeom.asPoint())
+                                            outGeom.asPoint())
                 if matType == 0:
                     self.writer.addRecord([unicode(inID), unicode(outID),
-                            unicode(dist)])
+                                           unicode(dist)])
                 else:
                     distList.append(float(dist))
 
@@ -191,7 +190,7 @@ def regularMatrix(self, inLayer, inField, targetLayer, targetField,
                 outFeat = targetLayer.getFeatures(request).next()
                 outGeom = outFeat.geometry()
                 dist = distArea.measureLine(inGeom.asPoint(),
-                        outGeom.asPoint())
+                                            outGeom.asPoint())
                 data.append(unicode(float(dist)))
             self.writer.addRecord(data)
 

python/plugins/processing/script/scripts/Points_from_vector.py

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