20 changes: 10 additions & 10 deletions python/plugins/sextante/algs/ftools/ConvexHull.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ class ConvexHull(GeoAlgorithm):
# return QtGui.QIcon(os.path.dirname(__file__) + "/icons/convex_hull.png")
#===========================================================================

def processAlgorithm(self, progress):
def processAlgorithm(self, progress):
useField = (self.getParameterValue(ConvexHull.METHOD) == 1)
field = self.getParameterValue(ConvexHull.FIELD)
vlayerA = QGisLayers.getObjectFromUri(self.getParameterValue(ConvexHull.INPUT))
Expand All @@ -67,9 +67,9 @@ def processAlgorithm(self, progress):
outGeom = QgsGeometry()
nElement = 0
index = vproviderA.fieldNameIndex(field)

features = QGisLayers.features(vlayerA)
nFeat = len(features)
nFeat = len(features)

if useField:
unique = ftools_utils.getUniqueValues(vproviderA, index)
Expand All @@ -80,14 +80,14 @@ def processAlgorithm(self, progress):
outID = 0
vproviderA.select(allAttrsA)
features = QGisLayers.features(vlayerA)
for inFeat in features:
for inFeat in features:
atMap = inFeat.attributeMap()
idVar = atMap[ index ]
if idVar.toString().trimmed() == i.toString().trimmed():
if first:
outID = idVar
first = False
inGeom = QgsGeometry(inFeat.geometry())
inGeom = QgsGeometry(inFeat.geometry())
points = ftools_utils.extractPoints(inGeom)
hull.extend(points)
nElement += 1
Expand All @@ -106,10 +106,10 @@ def processAlgorithm(self, progress):
GEOS_EXCEPT = False
continue
else:
hull = []
hull = []
vproviderA.select(allAttrsA)
features = QGisLayers.features(vlayerA)
for inFeat in features:
for inFeat in features:
inGeom = QgsGeometry(inFeat.geometry())
points = ftools_utils.extractPoints(inGeom)
hull.extend(points)
Expand All @@ -122,7 +122,7 @@ def processAlgorithm(self, progress):
writer.addFeature(outFeat)
except:
GEOS_EXCEPT = False

del writer

if not GEOS_EXCEPT:
Expand Down Expand Up @@ -151,12 +151,12 @@ def perimMeasure(self, inGeom, measure):
for k in poly:
value = value + measure.measureLine(k)
return value

def defineCharacteristics(self):
self.name = "Convex hull"
self.group = "Vector geometry tools"
self.addParameter(ParameterVector(ConvexHull.INPUT, "Input layer", ParameterVector.VECTOR_TYPE_ANY))
self.addParameter(ParameterTableField(ConvexHull.FIELD, "Field", ConvexHull.INPUT))
self.addParameter(ParameterSelection(ConvexHull.METHOD, "Method", ConvexHull.METHODS))
self.addParameter(ParameterSelection(ConvexHull.METHOD, "Method", ConvexHull.METHODS))
self.addOutput(OutputVector(ConvexHull.OUTPUT, "Convex hull"))
#=========================================================
4 changes: 2 additions & 2 deletions python/plugins/sextante/algs/ftools/Delaunay.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ def defineCharacteristics(self):
self.addOutput(OutputVector(self.OUTPUT, "Delaunay triangulation"))

def processAlgorithm(self, progress):
layer = QGisLayers.getObjectFromUri(self.getParameterValue(self.INPUT))
layer = QGisLayers.getObjectFromUri(self.getParameterValue(self.INPUT))

provider = layer.dataProvider()
provider.select()
Expand All @@ -69,7 +69,7 @@ def processAlgorithm(self, progress):

pts = []
ptDict = {}
ptNdx = -1
ptNdx = -1
c = voronoi.Context()
features = QGisLayers.features(layer)
for inFeat in features:
Expand Down
8 changes: 4 additions & 4 deletions python/plugins/sextante/algs/ftools/DensifyGeometries.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
class DensifyGeometries(GeoAlgorithm):

INPUT = "INPUT"
VERTICES = "VERTICES"
VERTICES = "VERTICES"
OUTPUT = "OUTPUT"

#def getIcon(self):
Expand All @@ -51,13 +51,13 @@ def defineCharacteristics(self):
self.group = "Vector geometry tools"

self.addParameter(ParameterVector(self.INPUT, "Input layer", ParameterVector.VECTOR_TYPE_ANY))
self.addParameter(ParameterNumber(self.VERTICES, "Vertices to add", 1, 10000000, 1))
self.addParameter(ParameterNumber(self.VERTICES, "Vertices to add", 1, 10000000, 1))

self.addOutput(OutputVector(self.OUTPUT, "Simplified layer"))

def processAlgorithm(self, progress):
layer = QGisLayers.getObjectFromUri(self.getParameterValue(self.INPUT))
vertices = self.getParameterValue(self.VERTICES)
layer = QGisLayers.getObjectFromUri(self.getParameterValue(self.INPUT))
vertices = self.getParameterValue(self.VERTICES)

isPolygon = layer.geometryType() == QGis.Polygon

Expand Down
18 changes: 9 additions & 9 deletions python/plugins/sextante/algs/ftools/DensifyGeometriesInterval.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,22 +39,22 @@

class DensifyGeometriesInterval(GeoAlgorithm):

INPUT = "INPUT"
INPUT = "INPUT"
INTERVAL = "INTERVAL"
OUTPUT = "OUTPUT"

def defineCharacteristics(self):
self.name = "Densify geometries given an interval"
self.group = "Vector geometry tools"

self.addParameter(ParameterVector(self.INPUT, "Input layer", ParameterVector.VECTOR_TYPE_ANY))
self.addParameter(ParameterNumber(self.INTERVAL, "Interval between Vertices to add", 1, 10000000, 1))
self.addParameter(ParameterVector(self.INPUT, "Input layer", ParameterVector.VECTOR_TYPE_ANY))
self.addParameter(ParameterNumber(self.INTERVAL, "Interval between Vertices to add", 1, 10000000, 1))

self.addOutput(OutputVector(self.OUTPUT, "Simplified layer"))

def processAlgorithm(self, progress):
layer = QGisLayers.getObjectFromUri(self.getParameterValue(self.INPUT))
interval = self.getParameterValue(self.INTERVAL)
layer = QGisLayers.getObjectFromUri(self.getParameterValue(self.INPUT))
interval = self.getParameterValue(self.INTERVAL)

isPolygon = layer.geometryType() == QGis.Polygon

Expand All @@ -64,11 +64,11 @@ def processAlgorithm(self, progress):
writer = self.getOutputFromName(self.OUTPUT).getVectorWriter(layer.pendingFields(),
layer.wkbType(), provider.crs())


features = QGisLayers.features(layer)
total = 100.0 / float(len(features))
current = 0
for f in features:
for f in features:
featGeometry = QgsGeometry(f.geometry())
attrMap = f.attributeMap()
newGeometry = self.densifyGeometry(featGeometry, interval, isPolygon)
Expand Down Expand Up @@ -109,15 +109,15 @@ def densifyGeometry(self, geometry, interval, isPolygon):
points = geometry.asPolyline()
output = self.densify(points, interval)
return QgsGeometry.fromPolyline(output)

def densify(self, polyline, interval):
output = []
for i in xrange(len(polyline) - 1):
p1 = polyline[i]
p2 = polyline[i + 1]
output.append(p1)
# calculate necessary number of points between p1 and p2
pointsNumber = sqrt(p1.sqrDist(p2)) / interval
pointsNumber = sqrt(p1.sqrDist(p2)) / interval
if pointsNumber > 1:
multiplier = 1.0 / float(pointsNumber)
else:
Expand Down
4 changes: 2 additions & 2 deletions python/plugins/sextante/algs/ftools/Difference.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ def processAlgorithm(self, progress):
# there is no selection in input layer
else:
nFeat = vproviderA.featureCount()
vproviderA.rewind()
vproviderA.rewind()
while vproviderA.nextFeature( inFeatA ):
nElement += 1
add = True
Expand All @@ -136,7 +136,7 @@ def processAlgorithm(self, progress):
except:
FEATURE_EXCEPT = False
continue

del writer
if not GEOS_EXCEPT:
SextanteLog.addToLog(SextanteLog.LOG_WARNING, "Geometry exception while computing difference")
Expand Down
4 changes: 2 additions & 2 deletions python/plugins/sextante/algs/ftools/Dissolve.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ class Dissolve(GeoAlgorithm):
# return QtGui.QIcon(os.path.dirname(__file__) + "/icons/dissolve.png")
#===========================================================================

def processAlgorithm(self, progress):
def processAlgorithm(self, progress):
useField = not self.getParameterValue(Dissolve.DISSOLVE_ALL)
fieldname = self.getParameterValue(Dissolve.FIELD)
vlayerA = QGisLayers.getObjectFromUri(self.getParameterValue(Dissolve.INPUT))
Expand Down Expand Up @@ -125,7 +125,7 @@ def processAlgorithm(self, progress):
def defineCharacteristics(self):
self.name = "Dissolve"
self.group = "Vector geometry tools"
self.addParameter(ParameterVector(Dissolve.INPUT, "Input layer", ParameterVector.VECTOR_TYPE_POLYGON))
self.addParameter(ParameterVector(Dissolve.INPUT, "Input layer", ParameterVector.VECTOR_TYPE_POLYGON))
self.addParameter(ParameterBoolean(Dissolve.DISSOLVE_ALL, "Dissolve all (do not use field)", True))
self.addParameter(ParameterTableField(Dissolve.FIELD, "Unique ID field",Dissolve.INPUT ))
self.addOutput(OutputVector(Dissolve.OUTPUT, "Dissolved"))
Expand Down
8 changes: 4 additions & 4 deletions python/plugins/sextante/algs/ftools/ExportGeometryInfo.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ def defineCharacteristics(self):

def processAlgorithm(self, progress):
layer = QGisLayers.getObjectFromUri(self.getParameterValue(self.INPUT))
method = self.getParameterValue(self.METHOD)
method = self.getParameterValue(self.METHOD)

provider = layer.dataProvider()
geometryType = layer.geometryType()
Expand Down Expand Up @@ -105,14 +105,14 @@ def processAlgorithm(self, progress):
mapCRS = QGisLayers.iface.mapCanvas().mapRenderer().destinationCrs()
layCRS = layer.crs()
coordTransform = QgsCoordinateTransform(layCRS, mapCRS)

outFeat = QgsFeature()
inGeom = QgsGeometry()

current = 0
current = 0
features = QGisLayers.features(layer)
total = 100.0 / float(len(features))
for inFeat in features:
for inFeat in features:
inGeom = inFeat.geometry()

if method == 1:
Expand Down
4 changes: 2 additions & 2 deletions python/plugins/sextante/algs/ftools/ExtentFromLayer.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,10 +120,10 @@ def featureExtent(self, layer, writer, progress):
outFeat = QgsFeature()

provider = layer.dataProvider()
provider.select()
provider.select()
features = QGisLayers.features(layer)
total = 100.0 / float(len(features))
for inFeat in features:
for inFeat in features:
rect = inFeat.geometry().boundingBox()
minx = rect.xMinimum()
miny = rect.yMinimum()
Expand Down
4 changes: 2 additions & 2 deletions python/plugins/sextante/algs/ftools/ExtractNodes.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ def defineCharacteristics(self):
self.addOutput(OutputVector(self.OUTPUT, "Output layer"))

def processAlgorithm(self, progress):
layer = QGisLayers.getObjectFromUri(self.getParameterValue(self.INPUT))
layer = QGisLayers.getObjectFromUri(self.getParameterValue(self.INPUT))

provider = layer.dataProvider()
layer.select(layer.pendingAllAttributesList())
Expand All @@ -66,7 +66,7 @@ def processAlgorithm(self, progress):
current = 0
features = QGisLayers.features(layer)
total = 100.0 / float(len(features))
for inFeat in features:
for inFeat in features:
inGeom = inFeat.geometry()
atMap = inFeat.attributeMap()

Expand Down
4 changes: 2 additions & 2 deletions python/plugins/sextante/algs/ftools/FToolsUtils.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@
from qgis.core import *

def createSpatialIndex(layer):
provider = layer.provider()
provider = layer.provider()
idx = QgsSpatialIndex()
provider.rewind()
provider.select()
features = QGisLayers.features(layer)
for ft in features:
for ft in features:
idx.insertFeature(ft)
return idx

Expand Down
4 changes: 2 additions & 2 deletions python/plugins/sextante/algs/ftools/Intersection.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ def processAlgorithm(self, progress):

else:
nFeat = vproviderA.featureCount()
vproviderA.rewind()
vproviderA.rewind()
while vproviderA.nextFeature( inFeatA ):
nElement += 1
progress.setPercentage(int(nElement/nFeat * 100))
Expand Down Expand Up @@ -139,7 +139,7 @@ def processAlgorithm(self, progress):
except:
GEOS_EXCEPT = False
break

del writer
if not GEOS_EXCEPT:
SextanteLog.addToLog(SextanteLog.LOG_WARNING, "Geometry exception while computing intersection")
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/sextante/algs/ftools/LinesIntersection.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ def processAlgorithm(self, progress):
layerB = QGisLayers.getObjectFromUri(self.getParameterValue(self.INPUT_B))
fieldA = self.getParameterValue(self.FIELD_A)
fieldB = self.getParameterValue(self.FIELD_B)

providerA = layerA.dataProvider()
providerB = layerB.dataProvider()

Expand Down
6 changes: 3 additions & 3 deletions python/plugins/sextante/algs/ftools/LinesToPolygons.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ def defineCharacteristics(self):
self.addOutput(OutputVector(self.OUTPUT, "Output layer"))

def processAlgorithm(self, progress):
layer = QGisLayers.getObjectFromUri(self.getParameterValue(self.INPUT))
layer = QGisLayers.getObjectFromUri(self.getParameterValue(self.INPUT))

provider = layer.dataProvider()
layer.select(layer.pendingAllAttributesList())
Expand All @@ -57,10 +57,10 @@ def processAlgorithm(self, progress):

outFeat = QgsFeature()

current = 0
current = 0
features = QGisLayers.features(layer)
total = 100.0 / float(len(features))
for inFeat in features:
for inFeat in features:
outGeomList = []
if inFeat.geometry().isMultipart():
outGeomList = inFeat.geometry().asMultiPolyline()
Expand Down
4 changes: 2 additions & 2 deletions python/plugins/sextante/algs/ftools/MultipartToSingleparts.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,14 +62,14 @@ def processAlgorithm(self, progress):

writer = self.getOutputFromName(self.OUTPUT).getVectorWriter(layer.pendingFields(),
geomType, provider.crs())

outFeat = QgsFeature()
inGeom = QgsGeometry()

current = 0
features = QGisLayers.features(layer)
total = 100.0 / float(len(features))
for inFeat in features:
for inFeat in features:
inGeom = inFeat.geometry()
atMap = inFeat.attributeMap()

Expand Down
6 changes: 3 additions & 3 deletions python/plugins/sextante/algs/ftools/NearestNeighbourAnalysis.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,18 +72,18 @@ def processAlgorithm(self, progress):
spatialIndex = utils.createSpatialIndex(layer)
provider.rewind()
provider.select()

neighbour = QgsFeature()
distance = QgsDistanceArea()

sumDist = 0.00
A = layer.extent()
A = float(A.width() * A.height())

current = 0
current = 0
features = QGisLayers.features(layer)
total = 100.0 / float(len(features))
for feat in features:
for feat in features:
neighbourID = spatialIndex.nearestNeighbor(feat.geometry().asPoint(), 2)[1]
provider.featureAtId(neighbourID, neighbour, True)
sumDist += distance.measureLine(neighbour.geometry().asPoint(), feat.geometry().asPoint())
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/sextante/algs/ftools/PointsInPolygon.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ def processAlgorithm(self, progress):

features = QGisLayers.features(polyLayer)
total = 100.0 / float(len(features))
for ftPoly in features:
for ftPoly in features:
geom = ftPoly.geometry()
atMap = ftPoly.attributeMap()

Expand Down
2 changes: 1 addition & 1 deletion python/plugins/sextante/algs/ftools/PointsInPolygonUnique.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ def processAlgorithm(self, progress):

features = QGisLayers.features(polyLayer)
total = 100.0 / float(len(features))
for ftPoly in features:
for ftPoly in features:
geom = ftPoly.geometry()
atMap = ftPoly.attributeMap()

Expand Down
2 changes: 1 addition & 1 deletion python/plugins/sextante/algs/ftools/PointsInPolygonWeighted.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ def processAlgorithm(self, progress):

features = QGisLayers.features(polyLayer)
total = 100.0 / float(len(features))
for ftPoly in features:
for ftPoly in features:
geom = ftPoly.geometry()
atMap = ftPoly.attributeMap()

Expand Down
2 changes: 1 addition & 1 deletion python/plugins/sextante/algs/ftools/PolygonsToLines.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ def processAlgorithm(self, progress):
current = 0
features = QGisLayers.features(layer)
total = 100.0 / float(len(features))
for inFeat in features:
for inFeat in features:
inGeom = inFeat.geometry()
atMap = inFeat.attributeMap()
lineList = self.extractAsLine(inGeom)
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/sextante/algs/ftools/RandomSelection.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,4 +85,4 @@ def processAlgorithm(self, progress):

layer.setSelectedFeatures(selran)
self.setOutputValue(self.OUTPUT, filename)

4 changes: 2 additions & 2 deletions python/plugins/sextante/algs/ftools/ReprojectLayer.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,12 +65,12 @@ def processAlgorithm(self, progress):

layerCrs = layer.crs()
crsTransform = QgsCoordinateTransform(layerCrs, targetCrs)

outFeat = QgsFeature()
current = 0
features = QGisLayers.features(layer)
total = 100.0 / float(len(features))
for f in features:
for f in features:
geom = f.geometry()
geom.transform(crsTransform)
outFeat.setGeometry(geom)
Expand Down
16 changes: 8 additions & 8 deletions python/plugins/sextante/algs/ftools/SimplifyGeometries.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,13 @@ def defineCharacteristics(self):
self.group = "Vector geometry tools"

self.addParameter(ParameterVector(self.INPUT, "Input layer", ParameterVector.VECTOR_TYPE_ANY))
self.addParameter(ParameterNumber(self.TOLERANCE, "Tolerance", 0.0, 10000000.0, 1.0))
self.addParameter(ParameterNumber(self.TOLERANCE, "Tolerance", 0.0, 10000000.0, 1.0))

self.addOutput(OutputVector(self.OUTPUT, "Simplified layer"))

def processAlgorithm(self, progress):
layer = QGisLayers.getObjectFromUri(self.getParameterValue(self.INPUT))
tolerance =self.getParameterValue(self.TOLERANCE)
layer = QGisLayers.getObjectFromUri(self.getParameterValue(self.INPUT))
tolerance =self.getParameterValue(self.TOLERANCE)

pointsBefore = 0
pointsAfter = 0
Expand All @@ -68,22 +68,22 @@ def processAlgorithm(self, progress):
writer = self.getOutputFromName(self.OUTPUT).getVectorWriter(layer.pendingFields(),
layer.wkbType(), provider.crs())

current = 0
current = 0
selection = QGisLayers.features(layer)
total = 100.0 / float(len(selection))
total = 100.0 / float(len(selection))
for f in selection:
featGeometry = QgsGeometry(f.geometry())
attrMap = f.attributeMap()
attrMap = f.attributeMap()
pointsBefore += self.geomVertexCount(featGeometry)
newGeometry = featGeometry.simplify(tolerance)
pointsAfter += self.geomVertexCount(newGeometry)
pointsAfter += self.geomVertexCount(newGeometry)
feature = QgsFeature()
feature.setGeometry(newGeometry)
feature.setAttributeMap(attrMap)
writer.addFeature(feature)
current += 1
progress.setPercentage(int(current * total))

del writer

SextanteLog.addToLog(SextanteLog.LOG_INFO, "Simplify: Input geometries have been simplified from"
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/sextante/algs/ftools/SumLines.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ def processAlgorithm(self, progress):
current = 0
features = QGisLayers.features(polyLayer)
total = 100.0 / float(len(features))
hasIntersections = False
hasIntersections = False
for ftPoly in features:
inGeom = QgsGeometry(ftPoly.geometry())
atMap = ftPoly.attributeMap()
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/sextante/algs/ftools/ftools_utils.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,7 @@ def getUniqueValuesCount( layer, fieldIndex):
allAttrs = vprovider.attributeIndexes()
vprovider.select( allAttrs )
count = 0
values = []
values = []
features = QGisLayers.features(layer)
for feat in features:
if feat.attributeMap()[ fieldIndex ].toString() not in values:
Expand Down
28 changes: 14 additions & 14 deletions python/plugins/sextante/algs/mmqgisx/MMQGISXAlgorithms.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,10 @@ def defineCharacteristics(self):
# return QtGui.QIcon(os.path.dirname(__file__) + "/icons/mmqgis_attribute_export.png")
#===========================================================================

def processAlgorithm(self, progress):
def processAlgorithm(self, progress):

outfilename = self.getOutputValue(self.OUTFILENAME)
layer = QGisLayers.getObjectFromUri(self.getParameterValue(self.LAYERNAME))
layer = QGisLayers.getObjectFromUri(self.getParameterValue(self.LAYERNAME))

if self.getParameterValue(self.FIELDDELIMITER) == 1:
field_delimiter = "|"
Expand Down Expand Up @@ -94,10 +94,10 @@ def defineCharacteristics(self):
self.addParameter(ParameterVector(self.LAYERNAME, "Input layer", ParameterVector.VECTOR_TYPE_ANY))
self.addParameter(ParameterTableField(self.JOINATTRIBUTE,
"Layer attribute field", mmqgisx_attribute_join_algorithm.LAYERNAME))

self.addParameter(ParameterTable(self.INFILENAME, "Table to join", False))
self.addParameter(ParameterTableField(self.JOINFIELD, "Table field", self.INFILENAME))


self.addOutput(OutputVector(self.OUTFILENAME, "Output"))
self.addOutput(OutputTable(self.NOTFOUNDNAME, "Not Found CSV Output List"))
Expand Down Expand Up @@ -148,7 +148,7 @@ def defineCharacteristics(self):

def processAlgorithm(self, progress):

layer = QGisLayers.getObjectFromUri(self.getParameterValue(self.LAYERNAME))
layer = QGisLayers.getObjectFromUri(self.getParameterValue(self.LAYERNAME))

column = self.getParameterValue(self.COLUMN)
savename = self.getOutputValue(self.SAVENAME)
Expand Down Expand Up @@ -181,7 +181,7 @@ def processAlgorithm(self, progress):
from sextante.core.Sextante import Sextante
qgis = Sextante.getInterface()

layer = QGisLayers.getObjectFromUri(self.getParameterValue(self.LAYERNAME))
layer = QGisLayers.getObjectFromUri(self.getParameterValue(self.LAYERNAME))

savename = self.getOutputValue(self.SAVENAME)

Expand Down Expand Up @@ -266,7 +266,7 @@ def defineCharacteristics(self):

def processAlgorithm(self, progress):

layer = QGisLayers.getObjectFromUri(self.getParameterValue(self.LAYERNAME))
layer = QGisLayers.getObjectFromUri(self.getParameterValue(self.LAYERNAME))
savename = self.getOutputValue(self.SAVENAME)

index = self.getParameterValue(self.NEWTYPE)
Expand Down Expand Up @@ -422,7 +422,7 @@ def defineCharacteristics(self):
self.addParameter(ParameterSelection(self.GRIDTYPE, "Grid type",
self.gridtype_options, default = 0))
self.addOutput(OutputVector(self.SAVENAME, "Output"))

#===========================================================================
# def getIcon(self):
# return QtGui.QIcon(os.path.dirname(__file__) + "/icons/mmqgis_grid.png")
Expand Down Expand Up @@ -469,7 +469,7 @@ def defineCharacteristics(self):

def processAlgorithm(self, progress):

layer = QGisLayers.getObjectFromUri(self.getParameterValue(self.LAYERNAME))
layer = QGisLayers.getObjectFromUri(self.getParameterValue(self.LAYERNAME))
hspacing = self.getParameterValue(self.HSPACING)
vspacing = self.getParameterValue(self.VSPACING)
savename = self.getOutputValue(self.SAVENAME)
Expand Down Expand Up @@ -581,7 +581,7 @@ def defineCharacteristics(self):
#===========================================================================

def processAlgorithm(self, progress):
layer = QGisLayers.getObjectFromUri(self.getParameterValue(self.LAYERNAME))
layer = QGisLayers.getObjectFromUri(self.getParameterValue(self.LAYERNAME))

labelattribute = self.getParameterValue(self.LABELATTRIBUTE)

Expand Down Expand Up @@ -648,12 +648,12 @@ def defineCharacteristics(self):
# return QtGui.QIcon(os.path.dirname(__file__) + "/icons/mmqgis_attribute_export.png")
#===========================================================================

def processAlgorithm(self, progress):
def processAlgorithm(self, progress):

layer = QGisLayers.getObjectFromUri(self.getParameterValue(self.LAYERNAME))
layer = QGisLayers.getObjectFromUri(self.getParameterValue(self.LAYERNAME))

attribute = self.getParameterValue(self.ATTRIBUTE)
comparison = self.comparisons [ self.getParameterValue(self.COMPARISON) ]
comparison = self.comparisons [ self.getParameterValue(self.COMPARISON) ]
comparisonvalue = self.getParameterValue(self.COMPARISONVALUE)
savename = self.getOutputValue(self.SAVENAME)

Expand Down Expand Up @@ -686,7 +686,7 @@ def defineCharacteristics(self):

def processAlgorithm(self, progress):

layer = QGisLayers.getObjectFromUri(self.getParameterValue(self.LAYERNAME))
layer = QGisLayers.getObjectFromUri(self.getParameterValue(self.LAYERNAME))

attribute = self.getParameterValue(self.ATTRIBUTE)
direction = self.directions [ self.getParameterValue(self.DIRECTION) ]
Expand Down
60 changes: 30 additions & 30 deletions python/plugins/sextante/algs/mmqgisx/mmqgisx_library.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -206,18 +206,18 @@ def mmqgisx_attribute_export(progress, outfilename, layer, attribute_names, fiel
i = 0
layer.dataProvider().select(layer.dataProvider().attributeIndexes())
layer.dataProvider().rewind()
while layer.dataProvider().nextFeature(feature):
while layer.dataProvider().nextFeature(feature):
progress.setPercentage(float(i) / feature_count * 100)
attributes = feature.attributeMap()

row = []
for column in attribute_indices:
row.append(unicode(attributes[column].toString()).encode("iso-8859-1"))
row.append(unicode(attributes[column].toString()).encode("iso-8859-1"))

writer.writerow(row)
i+=1

del writer
del writer

return None

Expand Down Expand Up @@ -421,7 +421,7 @@ def mmqgisx_delete_columns(progress, layer, columns, savename, addlayer):
return "Failure creating output shapefile: " + unicode(outfile.errorMessage())


# Write the features with modified attributes
# Write the features with modified attributes
featurecount = layer.dataProvider().featureCount();
layer.dataProvider().select(layer.dataProvider().attributeIndexes())
layer.dataProvider().rewind()
Expand Down Expand Up @@ -665,14 +665,14 @@ def mmqgisx_geometry_convert(progress, layer, newtype, splitnodes, savename, add

# Iterate through each feature in the source layer
feature_count = layer.dataProvider().featureCount()

layer.dataProvider().select(layer.dataProvider().attributeIndexes())
layer.dataProvider().rewind()
features = QGisLayers.features(layer)
i = 0
for feature in features:
i += 1
progress.setPercentage(float(i) / feature_count * 100)
i += 1
progress.setPercentage(float(i) / feature_count * 100)

if (feature.geometry().wkbType() == QGis.WKBPoint) or \
(feature.geometry().wkbType() == QGis.WKBPoint25D):
Expand Down Expand Up @@ -950,7 +950,7 @@ def mmqgisx_geometry_import_from_csv(progress, node_filename, long_colname, lat_

if reading and (len(row) > long_col) and (len(row) > lat_col) and (len(row) > shapeid_col) \
and mmqgisx_is_float(row[long_col]) and mmqgisx_is_float(row[lat_col]):
node_count += 1
node_count += 1
point = QgsPoint(float(row[long_col]), float(row[lat_col]))
else:
point = False
Expand Down Expand Up @@ -1213,8 +1213,8 @@ def mmqgisx_gridify_layer(progress, layer, hspacing, vspacing, savename, addlaye
layer.dataProvider().rewind()

features = QGisLayers.features(layer)
for feature in features:
progress.setPercentage(float(feature_number) / feature_count * 100)
for feature in features:
progress.setPercentage(float(feature_number) / feature_count * 100)
geometry = feature.geometry()

if geometry.wkbType() == QGis.WKBPoint:
Expand Down Expand Up @@ -1365,16 +1365,16 @@ def mmqgisx_hub_distance(progress, sourcelayer, hubslayer, nameattributename, un


# Create array of hubs in memory
hubs = []
hubs = []
hubslayer.dataProvider().select(hubslayer.dataProvider().attributeIndexes())
hubslayer.dataProvider().rewind()
features = QGisLayers.features(hubslayer)
for feature in features:
for feature in features:
hubs.append(mmqgisx_hub(feature.geometry().boundingBox().center(), \
feature.attributeMap()[nameindex].toString()))

del hubslayer

featureCount = sourcelayer.dataProvider().featureCount()

# Scan source points, find nearest hub, and write to output file
Expand Down Expand Up @@ -1430,10 +1430,10 @@ def mmqgisx_hub_distance(progress, sourcelayer, hubslayer, nameattributename, un
outfile.addFeature(outfeature)

writecount += 1
progress.setPercentage(float(writecount) / featureCount * 100)
progress.setPercentage(float(writecount) / featureCount * 100)

del outfile

return None

# --------------------------------------------------------
Expand Down Expand Up @@ -1491,14 +1491,14 @@ def mmqgisx_hub_lines(progress, hublayer, hubattr, spokelayer, spokeattr, savena
i += 1
spokex = spokepoint.geometry().boundingBox().center().x()
spokey = spokepoint.geometry().boundingBox().center().y()
spokeid = unicode(spokepoint.attributeMap()[spokeindex].toString())
spokeid = unicode(spokepoint.attributeMap()[spokeindex].toString())
progress.setPercentage(float(i) / len(spokepoints) * 100)
# Scan hub points to find first matching hub
hubpoint = QgsFeature()
hublayer.dataProvider().select(hublayer.dataProvider().attributeIndexes())
hublayer.dataProvider().rewind()
hubpoints = QGisLayers.features(hublayer)
for hubpoint in hubpoints:
for hubpoint in hubpoints:
hubid = unicode(hubpoint.attributeMap()[hubindex].toString())
if hubid == spokeid:
hubx = hubpoint.geometry().boundingBox().center().x()
Expand Down Expand Up @@ -1565,7 +1565,7 @@ def mmqgisx_label_point(progress, layer, labelattributename, savename, addlayer)
return "Failure creating output shapefile: " + unicode(outfile.errorMessage())

# Build dictionary of items, averaging center for multi-feature items
features = {}
features = {}
readcount = 0
feature_count = layer.featureCount()
layer.dataProvider().select(layer.dataProvider().attributeIndexes())
Expand Down Expand Up @@ -1605,7 +1605,7 @@ def mmqgisx_label_point(progress, layer, labelattributename, savename, addlayer)
return "Failure writing feature to shapefile"

writecount += 1
progress.setPercentage(float(writecount) / len(features) * 100)
progress.setPercentage(float(writecount) / len(features) * 100)

del outfile

Expand Down Expand Up @@ -1664,23 +1664,23 @@ def mmqgisx_merge(progress, layers, savename, addlayer):

# Copy layer features to output file
featurecount = 0
for layer in layers:
for layer in layers:
layer.dataProvider().select(layer.dataProvider().attributeIndexes())
layer.dataProvider().rewind()
idx = {}
for dindex, dfield in fields.iteritems():
for dindex, dfield in fields.iteritems():
for sindex, sfield in layer.dataProvider().fields().iteritems():
if (sfield.name() == dfield.name()) and (sfield.type() == dfield.type()):
idx[dindex] = sindex
features = QGisLayers.features(layer)
for feature in features:
sattributes = feature.attributeMap()
dattributes = {}
for dindex, dfield in fields.iteritems():
for dindex, dfield in fields.iteritems():
if (dindex in idx):
dattributes[dindex] = sattributes[idx[dindex]]
else:
dattributes[dindex] = QVariant(dfield.type())
dattributes[dindex] = QVariant(dfield.type())
feature.setAttributeMap(dattributes)
outfile.addFeature(feature)
featurecount += 1
Expand All @@ -1694,8 +1694,8 @@ def mmqgisx_merge(progress, layers, savename, addlayer):
# mmqgisx_select - Select features by attribute
# ----------------------------------------------------------

def mmqgisx_select(progress, layer, selectattributename, comparisonvalue, comparisonname, savename, addlayer):
def mmqgisx_select(progress, layer, selectattributename, comparisonvalue, comparisonname, savename, addlayer):

selectindex = layer.dataProvider().fieldNameIndex(selectattributename)
if selectindex < 0:
return "Invalid select field name: " + selectattributename
Expand Down Expand Up @@ -1756,11 +1756,11 @@ def mmqgisx_select(progress, layer, selectattributename, comparisonvalue, compar
if (match):
outfile.addFeature(feature)
writecount += 1

progress.setPercentage(float(readcount) / totalcount * 100)

del outfile

return None

# --------------------------------------------------------
Expand Down Expand Up @@ -1789,7 +1789,7 @@ def mmqgisx_sort(progress, layer, sortattributename, savename, direction, addlay
if (outfile.hasError() != QgsVectorFileWriter.NoError):
return "Failure creating output shapefile: " + unicode(outfile.errorMessage())

table = []
table = []
layer.dataProvider().select(layer.dataProvider().attributeIndexes())
layer.dataProvider().rewind()
features = QGisLayers.features(layer)
Expand Down Expand Up @@ -1817,7 +1817,7 @@ def mmqgisx_sort(progress, layer, sortattributename, savename, direction, addlay
progress.setPercentage(float(writecount)/len(table) * 100)

del outfile

return None

# --------------------------------------------------------
Expand All @@ -1827,7 +1827,7 @@ def mmqgisx_sort(progress, layer, sortattributename, savename, direction, addlay

def mmqgisx_geocode_street_layer(qgis, layername, csvname, addressfield, shapefilename, streetname,
fromx, fromy, tox, toy, leftfrom, rightfrom, leftto, rightto, setback, notfoundfile, addlayer):

if layer == None:
return "Address layer not found: " + layername

Expand Down
4 changes: 2 additions & 2 deletions python/plugins/sextante/core/QGisLayers.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,11 @@ def getAllLayers():
def getTables():
layers = QGisLayers.iface.legendInterface().layers()
tables = list()
for layer in layers:
for layer in layers:
if layer.type() == layer.VectorLayer :
uri = unicode(layer.source())
if uri.lower().endswith("csv") or uri.lower().endswith("dbf") or uri.lower().endswith("shp"):
tables.append(layer)
tables.append(layer)
return tables

@staticmethod
Expand Down
8 changes: 4 additions & 4 deletions python/plugins/sextante/core/SextanteTableWriter.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,21 +30,21 @@
class SextanteTableWriter:

def __init__(self, fileName, encoding, fields):
self.fileName = fileName
self.fileName = fileName
self.writer = None

if encoding is None:
settings = QSettings()
encoding = settings.value("/SextanteQGIS/encoding", "System").toString()

if fileName.endswith("csv"):
fileName += ".csv"
fileName += ".csv"
file = open(fileName, "w")
file.write(";".join(field.name() for field in fields))
file.write("\n")
file.close()

def addFeature(self, values):
def addFeature(self, values):
file = open(self.fileName, "a")
file.write(";".join([value.toString() for value in values]))
file.write("\n")
Expand Down
6 changes: 3 additions & 3 deletions python/plugins/sextante/gdal/translate.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ def defineCharacteristics(self):
self.addOutput(OutputRaster(translate.OUTPUT, "Output layer"))

def processAlgorithm(self, progress):

out = self.getOutputValue(translate.OUTPUT)
outsize = str(self.getParameterValue(translate.OUTSIZE))
outsizePerc = str(self.getParameterValue(translate.OUTSIZE_PERC))
Expand All @@ -78,15 +78,15 @@ def processAlgorithm(self, progress):
srs = str(self.getParameterValue(translate.SRS))
sds = str(self.getParameterValue(translate.SDS))
extra = str(self.getParameterValue(translate.EXTRA))

commands = ["gdal_translate"]
commands.append("-of")
commands.append(GdalUtils.getFormatShortNameFromFilename(out))
if outsizePerc == "True":
outsizeStr = "-outsize "+outsize+"% "+outsize+"%"
else:
outsizeStr = "-outsize "+outsize+" "+outsize
commands.append(outsizeStr)
commands.append(outsizeStr)
commands.append("-a_nodata "+noData)
if expand != "none":
commands.append("-expand "+expand)
Expand Down
44 changes: 22 additions & 22 deletions python/plugins/sextante/grass/GrassAlgorithm.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,10 +129,10 @@ def defineCharacteristicsFromFile(self):
param.isAdvanced = True
self.addParameter(param)
else:
output = OutputFactory.getFromString(line)
self.addOutput(output);
output = OutputFactory.getFromString(line)
self.addOutput(output);
if isinstance(output, OutputRaster):
hasRasterOutput = True
hasRasterOutput = True
line = lines.readline().strip("\n").strip()
except Exception,e:
SextanteLog.addToLog(SextanteLog.LOG_ERROR, "Could not open GRASS algorithm: " + self.descriptionFile + "\n" + line)
Expand Down Expand Up @@ -231,7 +231,7 @@ def processAlgorithm(self, progress):
commands.append(self.exportVectorLayer(layer))

self.setSessionProjectionFromProject(commands)

region = str(self.getParameterValue(self.GRASS_REGION_EXTENT_PARAMETER))
regionCoords = region.split(",")
command = "g.region"
Expand All @@ -241,10 +241,10 @@ def processAlgorithm(self, progress):
command +=" w=" + str(regionCoords[0])
cellsize = self.getParameterValue(self.GRASS_REGION_CELLSIZE_PARAMETER)
if cellsize:
command +=" res=" + str(cellsize);
command +=" res=" + str(cellsize);
else:
command +=" res=" + str(self.getDefaultCellsize())

commands.append(command)

#2: set parameters and outputs
Expand Down Expand Up @@ -273,7 +273,7 @@ def processAlgorithm(self, progress):
idx = int(param.value)
command+=(" " + param.name + "=" + str(param.options[idx]));
elif isinstance(param, ParameterSelection):
command+=(" " + param.name + "=" + str(param.value));
command+=(" " + param.name + "=" + str(param.value));
else:
command+=(" " + param.name + "=" + str(param.value));

Expand Down Expand Up @@ -323,24 +323,24 @@ def processAlgorithm(self, progress):
progress.setCommand(line)
loglines.append(line)
if SextanteConfig.getSetting(GrassUtils.GRASS_LOG_COMMANDS):
SextanteLog.addToLog(SextanteLog.LOG_INFO, loglines)
self.consoleOutput = GrassUtils.executeGrass(commands, progress, outputCommands);
self.postProcessResults();
SextanteLog.addToLog(SextanteLog.LOG_INFO, loglines)
self.consoleOutput = GrassUtils.executeGrass(commands, progress, outputCommands);
self.postProcessResults();
# if the session has been created outside of this algorithm, add the new GRASS layers to it
# otherwise finish the session
if existingSession:
GrassUtils.addSessionLayers(self.exportedLayers)
else:
GrassUtils.endGrassSession()

def postProcessResults(self):
def postProcessResults(self):
name = self.commandLineName().replace('.','_')[len('grass:'):]
try:
try:
module = importlib.import_module('sextante.grass.ext.' + name)
except ImportError:
except ImportError:
return
if hasattr(module, 'postProcessResults'):
func = getattr(module,'postProcessResults')
if hasattr(module, 'postProcessResults'):
func = getattr(module,'postProcessResults')
func(self)

def exportVectorLayer(self, orgFilename):
Expand Down Expand Up @@ -372,8 +372,8 @@ def exportVectorLayer(self, orgFilename):
return command

def setSessionProjectionFromProject(self, commands):
if not GrassUtils.projectionSet:
from sextante.core.Sextante import Sextante
if not GrassUtils.projectionSet:
from sextante.core.Sextante import Sextante
qgis = Sextante.getInterface()
proj4 = qgis.mapCanvas().mapRenderer().destinationCrs().toProj4()
command = "g.proj"
Expand Down Expand Up @@ -411,14 +411,14 @@ def getTempFilename(self):

def commandLineName(self):
return "grass:" + self.name[:self.name.find(" ")]

def checkParameterValuesBeforeExecuting(self):
name = self.commandLineName().replace('.','_')[len('grass:'):]
try:
try:
module = importlib.import_module('sextante.grass.ext.' + name)
except ImportError:
except ImportError:
return
if hasattr(module, 'checkParameterValuesBeforeExecuting'):
func = getattr(module,'checkParameterValuesBeforeExecuting')
if hasattr(module, 'checkParameterValuesBeforeExecuting'):
func = getattr(module,'checkParameterValuesBeforeExecuting')
return func(self)

9 changes: 4 additions & 5 deletions python/plugins/sextante/grass/ext/HtmlReportPostProcessor.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,15 @@
# This will get replaced with a git SHA1 when you do a git archive
__revision__ = '$Format:%H$'

def postProcessResults(alg):
def postProcessResults(alg):
htmlFile = alg.getOutputFromName('html').value
grassName = alg.grassName
grassName = alg.grassName
found = False
f = open(htmlFile, "w")
f.write("<h2>" + grassName + "</h2>\n")
f.write("<h2>" + grassName + "</h2>\n")
for line in alg.consoleOutput:
if found and not line.strip().endswith('exit'):
f.write(line + "<br>\n")
if grassName in line and not line.startswith("GRASS"):
found = True
found = True
f.close()

3 changes: 1 addition & 2 deletions python/plugins/sextante/grass/ext/r_coin.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,5 @@

from sextante.grass.ext import HtmlReportPostProcessor

def postProcessResults(alg):
def postProcessResults(alg):
HtmlReportPostProcessor.postProcessResults(alg)

5 changes: 2 additions & 3 deletions python/plugins/sextante/grass/ext/r_covar.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@

from sextante.grass.ext import HtmlReportPostProcessor

def postProcessResults(alg):
def postProcessResults(alg):
HtmlReportPostProcessor.postProcessResults(alg)



3 changes: 1 addition & 2 deletions python/plugins/sextante/grass/ext/r_describe.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,5 @@

from sextante.grass.ext import HtmlReportPostProcessor

def postProcessResults(alg):
def postProcessResults(alg):
HtmlReportPostProcessor.postProcessResults(alg)

4 changes: 2 additions & 2 deletions python/plugins/sextante/grass/ext/r_info.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@

from sextante.grass.ext import HtmlReportPostProcessor

def postProcessResults(alg):
def postProcessResults(alg):
HtmlReportPostProcessor.postProcessResults(alg)

4 changes: 2 additions & 2 deletions python/plugins/sextante/grass/ext/r_quantile.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@

from sextante.grass.ext import HtmlReportPostProcessor

def postProcessResults(alg):
def postProcessResults(alg):
HtmlReportPostProcessor.postProcessResults(alg)

5 changes: 2 additions & 3 deletions python/plugins/sextante/grass/ext/r_regression_line.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@

from sextante.grass.ext import HtmlReportPostProcessor

def postProcessResults(alg):
def postProcessResults(alg):
HtmlReportPostProcessor.postProcessResults(alg)



3 changes: 1 addition & 2 deletions python/plugins/sextante/grass/ext/v_class.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,5 @@

from sextante.grass.ext import HtmlReportPostProcessor

def postProcessResults(alg):
def postProcessResults(alg):
HtmlReportPostProcessor.postProcessResults(alg)

4 changes: 2 additions & 2 deletions python/plugins/sextante/grass/ext/v_info.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@

from sextante.grass.ext import HtmlReportPostProcessor

def postProcessResults(alg):
def postProcessResults(alg):
HtmlReportPostProcessor.postProcessResults(alg)

5 changes: 2 additions & 3 deletions python/plugins/sextante/grass/ext/v_normal.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@

from sextante.grass.ext import HtmlReportPostProcessor

def postProcessResults(alg):
def postProcessResults(alg):
HtmlReportPostProcessor.postProcessResults(alg)



3 changes: 1 addition & 2 deletions python/plugins/sextante/grass/ext/v_report.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,5 @@

from sextante.grass.ext import HtmlReportPostProcessor

def postProcessResults(alg):
def postProcessResults(alg):
HtmlReportPostProcessor.postProcessResults(alg)

2 changes: 1 addition & 1 deletion python/plugins/sextante/grass/ext/v_univar.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,5 @@

from sextante.grass.ext import HtmlReportPostProcessor

def postProcessResults(alg):
def postProcessResults(alg):
HtmlReportPostProcessor.postProcessResults(alg)
10 changes: 5 additions & 5 deletions python/plugins/sextante/grass/nviz.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,12 @@ def defineCharacteristics(self):
self.addParameter(ParameterMultipleInput(nviz.VECTOR, "Vector layers", ParameterMultipleInput.TYPE_VECTOR_ANY, True))
self.addParameter(ParameterExtent(nviz.GRASS_REGION_EXTENT_PARAMETER, "GRASS region extent"))
self.addParameter(ParameterNumber(self.GRASS_REGION_CELLSIZE_PARAMETER, "GRASS region cellsize (leave 0 for default)", 0, None, 0.0))

def processAlgorithm(self, progress):
commands = []
vector = self.getParameterValue(self.VECTOR);
elevation = self.getParameterValue(self.ELEVATION);

region = str(self.getParameterValue(self.GRASS_REGION_EXTENT_PARAMETER))
regionCoords = region.split(",")
command = "g.region "
Expand All @@ -68,11 +68,11 @@ def processAlgorithm(self, progress):
command +=" w=" + str(regionCoords[0])
cellsize = self.getParameterValue(self.GRASS_REGION_CELLSIZE_PARAMETER)
if cellsize:
command +=" res=" + str(cellsize);
command +=" res=" + str(cellsize);
else:
command +=" res=" + str(self.getDefaultCellsize())
commands.append(command)

command = "nviz"
if vector:
layers = vector.split(";")
Expand Down Expand Up @@ -116,7 +116,7 @@ def exportRasterLayer(self, layer):
command +=" out=" + destFilename;
command +=" --overwrite -o"
return command, destFilename

def getDefaultCellsize(self):
cellsize = 0
for param in self.parameters:
Expand Down
4 changes: 2 additions & 2 deletions python/plugins/sextante/gui/AlgorithmExecutionDialog.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ def setParamValue(self, param, widget):
value.append(options[index])
return param.setValue(value)
elif isinstance(param, (ParameterNumber, ParameterFile, ParameterCrs, ParameterExtent)):
return param.setValue(widget.getValue())
return param.setValue(widget.getValue())
elif isinstance(param, ParameterString):
if param.multiline:
return param.setValue(unicode(widget.toPlainText()))
Expand Down Expand Up @@ -301,7 +301,7 @@ def error(self, msg):
#self.algEx.finished.disconnect()
QApplication.restoreOverrideCursor()
keepOpen = SextanteConfig.getSetting(SextanteConfig.KEEP_DIALOG_OPEN)
self.setInfo(msg, True)
self.setInfo(msg, True)
if not keepOpen:
QMessageBox.critical(self, "Error", msg)
self.close()
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/sextante/gui/FileSelectionPanel.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ def showSelectionDialog(self):
path = str(settings.value( "/SextanteQGIS/LastInputPath",QtCore.QVariant( "" ) ).toString())
else:
path = ""

if self.isFolder:
folder = QtGui.QFileDialog.getExistingDirectory (self, "Select folder", path)
if folder:
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/sextante/gui/InputLayerSelectorPanel.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ def showSelectionDialog(self):
path = str(settings.value( "/SextanteQGIS/LastInputPath",QtCore.QVariant( "" ) ).toString())
else:
path = ""

filename = QtGui.QFileDialog.getOpenFileName(self, "All files", path, "*.*")
if filename:
self.text.addItem(filename, filename)
Expand Down
8 changes: 4 additions & 4 deletions python/plugins/sextante/modeler/ModelerAlgorithm.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,7 @@ def prepareAlgorithm(self, alg, iAlg):
aap = self.algParameters[iAlg][param.name]
if aap == None:
if isinstance(param, ParameterExtent):
value = self.getValueFromAlgorithmAndParameter(aap)
value = self.getValueFromAlgorithmAndParameter(aap)
if value is None:
value = self.getMinCoveringExtent()
if not param.setValue(value):
Expand All @@ -365,7 +365,7 @@ def prepareAlgorithm(self, alg, iAlg):
value = ";".join(layerslist)
if not param.setValue(value):
raise GeoAlgorithmExecutionException("Wrong value: " + str(value))

else:
value = self.getValueFromAlgorithmAndParameter(aap)
if not param.setValue(value):
Expand Down Expand Up @@ -417,14 +417,14 @@ def addToRegion(self, layer, first):
self.ymin = min(self.ymin, layer.extent().yMinimum())
self.ymax = max(self.ymax, layer.extent().yMaximum())


def getSafeNameForOutput(self, ialg, out):
return out.name +"_ALG" + str(ialg)


def getValueFromAlgorithmAndParameter(self, aap):
if aap is None:
return None
return None
if float(aap.alg) == float(AlgorithmAndParameter.PARENT_MODEL_ALGORITHM):
for key in self.paramValues.keys():
if aap.param == key:
Expand Down
30 changes: 15 additions & 15 deletions python/plugins/sextante/modeler/ModelerParameterDefinitionDialog.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,8 @@ def setupUi(self):
self.yesNoCombo = QtGui.QComboBox()
self.yesNoCombo.addItem("Yes")
self.yesNoCombo.addItem("No")
if self.param is not None:
self.yesNoCombo.setCurrentIndex(0 if self.param.value else 1)
if self.param is not None:
self.yesNoCombo.setCurrentIndex(0 if self.param.value else 1)
self.horizontalLayout2.addWidget(self.yesNoCombo)
self.verticalLayout.addLayout(self.horizontalLayout2)
elif self.paramType == ModelerParameterDefinitionDialog.PARAMETER_TABLE_FIELD \
Expand All @@ -110,7 +110,7 @@ def setupUi(self):
if self.param is not None:
if self.param.parent == param.name:
self.parentCombo.setCurrentIndex(idx)
idx += 1
idx += 1
self.horizontalLayout2.addWidget(self.parentCombo)
self.verticalLayout.addLayout(self.horizontalLayout2)
elif self.paramType == ModelerParameterDefinitionDialog.PARAMETER_RASTER \
Expand All @@ -119,8 +119,8 @@ def setupUi(self):
self.yesNoCombo = QtGui.QComboBox()
self.yesNoCombo.addItem("Yes")
self.yesNoCombo.addItem("No")
if self.param is not None:
self.yesNoCombo.setCurrentIndex(1 if self.param.optional else 0)
if self.param is not None:
self.yesNoCombo.setCurrentIndex(1 if self.param.optional else 0)
self.horizontalLayout2.addWidget(self.yesNoCombo)
self.verticalLayout.addLayout(self.horizontalLayout2)
elif self.paramType == ModelerParameterDefinitionDialog.PARAMETER_TABLE \
Expand All @@ -129,25 +129,25 @@ def setupUi(self):
self.yesNoCombo = QtGui.QComboBox()
self.yesNoCombo.addItem("Yes")
self.yesNoCombo.addItem("No")
if self.param is not None:
self.yesNoCombo.setCurrentIndex(1 if self.param.optional else 0)
if self.param is not None:
self.yesNoCombo.setCurrentIndex(1 if self.param.optional else 0)
self.horizontalLayout2.addWidget(self.yesNoCombo)
self.verticalLayout.addLayout(self.horizontalLayout2)
elif self.paramType == ModelerParameterDefinitionDialog.PARAMETER_VECTOR \
or isinstance(self.param, ParameterVector):
self.horizontalLayout2.addWidget(QtGui.QLabel("Required"))
self.yesNoCombo = QtGui.QComboBox()
self.yesNoCombo.addItem("Yes")
self.yesNoCombo.addItem("No")
self.yesNoCombo.addItem("No")
self.horizontalLayout2.addWidget(self.yesNoCombo)
self.horizontalLayout3.addWidget(QtGui.QLabel("Shape type"))
self.shapetypeCombo = QtGui.QComboBox()
self.shapetypeCombo.addItem("Any")
self.shapetypeCombo.addItem("Point")
self.shapetypeCombo.addItem("Line")
self.shapetypeCombo.addItem("Polygon")
if self.param is not None:
self.yesNoCombo.setCurrentIndex(1 if self.param.optional else 0)
if self.param is not None:
self.yesNoCombo.setCurrentIndex(1 if self.param.optional else 0)
self.shapetypeCombo.setCurrentIndex(self.param.shapetype + 1)
self.horizontalLayout3.addWidget(self.shapetypeCombo)
self.verticalLayout.addLayout(self.horizontalLayout3)
Expand All @@ -167,8 +167,8 @@ def setupUi(self):
self.datatypeCombo.addItem("Vector (polygon)")
self.datatypeCombo.addItem("Raster")
self.datatypeCombo.addItem("Table")
if self.param is not None:
self.yesNoCombo.setCurrentIndex(1 if self.param.optional else 0)
if self.param is not None:
self.yesNoCombo.setCurrentIndex(1 if self.param.optional else 0)
self.datatypeCombo.setCurrentIndex(self.param.datatype + 1)
self.horizontalLayout3.addWidget(self.datatypeCombo)
self.verticalLayout.addLayout(self.horizontalLayout3)
Expand All @@ -184,16 +184,16 @@ def setupUi(self):
self.horizontalLayout3.addWidget(QtGui.QLabel("Default value"))
self.defaultTextBox = QtGui.QLineEdit()
self.defaultTextBox.setText("0")
if self.param is not None:
if self.param is not None:
self.defaultTextBox.setText(self.param.default)
self.horizontalLayout3.addWidget(self.defaultTextBox)
self.verticalLayout.addLayout(self.horizontalLayout3)
elif self.paramType == ModelerParameterDefinitionDialog.PARAMETER_STRING \
or isinstance(self.param, ParameterString):
self.horizontalLayout2.addWidget(QtGui.QLabel("Default value"))
self.defaultTextBox = QtGui.QLineEdit()
if self.param is not None:
self.defaultTextBox.setText(self.param.default)
if self.param is not None:
self.defaultTextBox.setText(self.param.default)
self.minTextBox.setText(self.param.min if self.param.min is not None else "")
self.maxTextBox.setText(self.param.max if self.param.max is not None else "")
self.horizontalLayout2.addWidget(self.defaultTextBox)
Expand Down
8 changes: 4 additions & 4 deletions python/plugins/sextante/modeler/ModelerParametersDialog.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ def getExtents(self):
params = self.model.parameters
for param in params:
if isinstance(param, ParameterExtent):
extents.append(AlgorithmAndParameter(AlgorithmAndParameter.PARENT_MODEL_ALGORITHM, param.name, "", param.description))
extents.append(AlgorithmAndParameter(AlgorithmAndParameter.PARENT_MODEL_ALGORITHM, param.name, "", param.description))
return extents

def getNumbers(self):
Expand Down Expand Up @@ -412,10 +412,10 @@ def getWidgetFromParameter(self, param):
item = QtGui.QComboBox()
item.setEditable(True)
extents = self.getExtents()
if self.canUseAutoExtent():
if self.canUseAutoExtent():
item.addItem(self.USE_MIN_COVERING_EXTENT, None)
for ex in extents:
item.addItem(ex.name(), ex)
item.addItem(ex.name(), ex)
if not self.canUseAutoExtent():
item.setEditText(str(param.default))
elif isinstance(param, ParameterFile):
Expand All @@ -438,7 +438,7 @@ def canUseAutoExtent(self):
return True
if isinstance(param, ParameterMultipleInput):
return True

def setTableContent(self):
params = self.alg.parameters
outputs = self.alg.outputs
Expand Down
6 changes: 3 additions & 3 deletions python/plugins/sextante/outputs/OutputTable.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,19 +38,19 @@ def getFileFilter(self,alg):

def getDefaultFileExtension(self, alg):
return alg.provider.getSupportedOutputTableExtensions()[0]

def getTableWriter(self, fields):
'''Returns a suitable writer to which records can be added as a
result of the algorithm. Use this to transparently handle output
values instead of creating your own method.
@param fields a dict of int-QgsField
@return writer instance of the table writer class
'''

if self.encoding is None:
settings = QSettings()
self.encoding = settings.value("/SextanteQGIS/encoding", "System").toString()

return SextanteTableWriter(self.value, self.encoding, fields)
return SextanteTableWriter(self.value, self.encoding, fields)
2 changes: 1 addition & 1 deletion python/plugins/sextante/parameters/ParameterFile.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ def deserialize(self, s):
if len(tokens) == 4:
return ParameterFile(tokens[0], tokens[1], tokens[2] == str(True), tokens[3] == str(True))
else:
return ParameterFile(tokens[0], tokens[1], tokens[2] == str(True))
return ParameterFile(tokens[0], tokens[1], tokens[2] == str(True))

def getAsScriptCode(self):
if self.isFolder:
Expand Down
6 changes: 3 additions & 3 deletions python/plugins/sextante/parameters/ParameterNumber.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ def __init__(self, name="", description="", minValue = None, maxValue = None, de
except:
self.default = default
self.isInteger = False
self.min = minValue
self.min = minValue
self.max = maxValue
self.value = None

Expand All @@ -51,9 +51,9 @@ def setValue(self, n):
if (float(n) - int(float(n)) == 0):
value = int(float(n))
else:
value = float(n)
value = float(n)
if self.min is not None:
if value < self.min:
if value < self.min:
return False
if self.max is not None:
if value > self.max:
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/sextante/parameters/ParameterString.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
from sextante.parameters.Parameter import Parameter

class ParameterString(Parameter):

NEWLINE = "\n"
ESCAPED_NEWLINE = "\\n"

Expand Down
2 changes: 1 addition & 1 deletion python/plugins/sextante/saga/SagaAlgorithm.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ def processAlgorithm(self, progress):
if SextanteUtils.isWindows():
path = SagaUtils.sagaPath()
if path == "":
raise GeoAlgorithmExecutionException("SAGA folder is not configured.\nPlease configure it before running SAGA algorithms.")
raise GeoAlgorithmExecutionException("SAGA folder is not configured.\nPlease configure it before running SAGA algorithms.")
commands = list()
self.exportedLayers = {}

Expand Down
6 changes: 3 additions & 3 deletions scripts/context_help_id.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,17 @@

This script generates a unique context id based for use in the QGIS
context sensitive help system. It uses the SHA1 hash for the class name
and converts the first 12 characters to a unique integer.
and converts the first 12 characters to a unique integer.

To create a context id, pass the name of the QGIS class on the command line.
Example:
./context_help_id.py QgsAbout

This script requires Python 2.5 or higher (hashlib was introduced at 2.5).

NOTE: Due to a change in the way context ids are generated, ids
NOTE: Due to a change in the way context ids are generated, ids
generated by the old method (Java hashCode function) will be different than
the id generated by the new method for the same class.
the id generated by the new method for the same class.
"""
import hashlib
import sys
Expand Down
9 changes: 9 additions & 0 deletions scripts/prepare-commit.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,15 @@ for f in $MODIFIED; do
*.cpp|*.c|*.h|*.cxx|*.hxx|*.c++|*.h++|*.cc|*.hh|*.C|*.H)
;;

*.py)
perl -i.prepare -pe "s/[\t ]+$//;" $f
if diff -u $f.prepare $f >>$ASTYLEDIFF; then
# no difference found
rm $f.prepare
fi
continue
;;

*)
continue
;;
Expand Down
24 changes: 12 additions & 12 deletions src/plugins/grass/qgis_grass_test.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@
"""
***************************************************************************
GRASS Direct test - to be run in GRASS shell

- collects list of raster layers
- exports GRASS layers on low resolution to temporary GeoTIFFs
- exports GRASS layers on low resolution to temporary GeoTIFFs
- runs GRASS modules in standard and direct mode and compares results
- writes out report
***************************************************************************
Expand All @@ -52,7 +52,7 @@ def __init__(self):
print "QGIS_PREFIX_PATH environment variable not set."
sys.exit ( 1 )

self.size = 10
self.size = 10
self.reportStr = ""
pass

Expand Down Expand Up @@ -82,14 +82,14 @@ def test(self):
print "%s rasters found, using first %s" % ( len( rasters), max_rasters )
rasters = rasters[0:1]

print "Exporting rasters"
print "Exporting rasters"
for raster in rasters:
print raster
output = "%s/%s.tif" % ( files_dir, raster )
self.srun( ["g.region", "rast=%s" % raster, "cols=%s" % self.size, "rows=%s" % self.size ] )
self.srun( ["r.out.gdal", "input=%s" % raster, "output=%s" % output] )

# run modules
# run modules
count = 0
for module in self.modules():
for raster in rasters:
Expand All @@ -98,20 +98,20 @@ def test(self):
# --- native ---
self.srun( ["g.region", "rast=%s" % raster, "cols=%s" % self.size, "rows=%s" % self.size ] )
output = "qgistest1"
# clean old
# clean old
self.srun( ["g.remove", "-f", "rast=%s" % output ] )
# substitute rasters
native_args = module.replace("R1",raster).replace("RO1",output).split(" ");
(code, out, err) = self.run( native_args )
if code != 0:
self.report( "Native failed: %s" % " ".join(native_args) )
# export
# export
native_output_file = "%s/%s-%s-native.tif" % ( files_dir, module_name, raster )
self.srun( ["r.out.gdal", "input=%s" % output, "output=%s" % native_output_file] )
self.srun( ["g.remove", "-f", "rast=%s" % output ] )

# --- direct ---
direct_input_file = "%s/%s.tif" % ( files_dir, raster )
direct_input_file = "%s/%s.tif" % ( files_dir, raster )
direct_output_file = "%s/%s-%s-direct.tif" % ( files_dir, module_name, raster )

# substitute rasters
Expand Down Expand Up @@ -147,9 +147,9 @@ def test(self):
(code, out, err) = self.run( direct_args, env )
print "code = %s" % code
if code != 0:
self.report( "Direct failed: %s\n%s\n%s" % (" ".join(direct_args), out, err) )
# TODO: compare native x direct output
self.report( "Direct failed: %s\n%s\n%s" % (" ".join(direct_args), out, err) )
# TODO: compare native x direct output

def run( self, args, env=None, input = None, exit_on_error = False ):
cmd = " ".join(args)
print cmd
Expand All @@ -160,7 +160,7 @@ def run( self, args, env=None, input = None, exit_on_error = False ):
if p.returncode != 0 and exit_on_error:
msg = "Failed:\n" + str(com[0]) + "\n" + str(com[1])
raise Exception( msg )

return (p.returncode, com[0], com[1] ) # return stdout

# simple run
Expand Down