Skip to content

Commit 7ac1baf

Browse files
jef-njef-n
committedMay 18, 2013
indentation update
·
ltr-3_40archive/master_2
1 parent 350f224 commit 7ac1baf

28 files changed

+304
-302
lines changed
 

‎python/plugins/fTools/tools/doEliminate.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ def eliminate(self, inLayer, boundary, progressBar, outFileName):
167167
mergeWithFid = None
168168
mergeWithGeom = None
169169
max = 0
170-
170+
171171
selFeat = QgsFeature()
172172
while fit.nextFeature(selFeat):
173173
selGeom = selFeat.geometry()

‎python/plugins/sextante/grass/GrassAlgorithm.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,13 @@
5656

5757
class GrassAlgorithm(GeoAlgorithm):
5858

59-
GRASS_OUTPUT_TYPE_PARAMETER = "GRASS_OUTPUT_TYPE_PARAMETER"
59+
GRASS_OUTPUT_TYPE_PARAMETER = "GRASS_OUTPUT_TYPE_PARAMETER"
6060
GRASS_MIN_AREA_PARAMETER = "GRASS_MIN_AREA_PARAMETER"
6161
GRASS_SNAP_TOLERANCE_PARAMETER = "GRASS_SNAP_TOLERANCE_PARAMETER"
6262
GRASS_REGION_EXTENT_PARAMETER = "GRASS_REGION_PARAMETER"
6363
GRASS_REGION_CELLSIZE_PARAMETER = "GRASS_REGION_CELLSIZE_PARAMETER"
6464
GRASS_REGION_ALIGN_TO_RESOLUTION = "-a_r.region"
65-
65+
6666
OUTPUT_TYPES = ["auto", "point", "line", "area"]
6767

6868
def __init__(self, descriptionfile):
@@ -156,12 +156,12 @@ def defineCharacteristicsFromFile(self):
156156
param = ParameterNumber(self.GRASS_MIN_AREA_PARAMETER, "v.in.ogr min area", 0, None, 0.0001)
157157
param.isAdvanced = True
158158
self.addParameter(param)
159-
if vectorOutputs == 1:
159+
if vectorOutputs == 1:
160160
param = ParameterSelection(self.GRASS_OUTPUT_TYPE_PARAMETER, "v.out.ogr output type", self.OUTPUT_TYPES)
161161
param.isAdvanced = True
162162
self.addParameter(param)
163-
164-
163+
164+
165165
def getDefaultCellsize(self):
166166
cellsize = 0
167167
for param in self.parameters:
@@ -340,7 +340,7 @@ def processAlgorithm(self, progress):
340340
command += " format=ESRI_Shapefile"
341341
command += " olayer=" + os.path.basename(out.value)[:-4]
342342
typeidx = self.getParameterValue(self.GRASS_OUTPUT_TYPE_PARAMETER);
343-
outtype = "auto" if typeidx is None else self.OUTPUT_TYPES[typeidx]
343+
outtype = "auto" if typeidx is None else self.OUTPUT_TYPES[typeidx]
344344
command += " type=" + outtype
345345
commands.append(command)
346346
outputCommands.append(command)

‎python/plugins/sextante/modeler/ModelerAlgorithm.py

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ def __init__(self):
9292

9393
#position of items in canvas
9494
self.algPos = []
95-
self.paramPos = []
95+
self.paramPos = []
9696
self.outputPos = [] #same structure as algOutputs
9797

9898
#deactivated algorithms that should not be executed
@@ -162,15 +162,15 @@ def openModel(self, filename):
162162
else:
163163
tokens = line.split("|")
164164
algParams[param.name] = AlgorithmAndParameter(int(tokens[0]), tokens[1])
165-
outputPos = {}
165+
outputPos = {}
166166
for out in alg.outputs:
167167
line = lines.readline().strip("\n").strip("\r")
168168
if str(None)!=line:
169169
if "|" in line:
170170
tokens = line.split("|")
171171
name = tokens[0]
172172
tokens = tokens[1].split(",")
173-
outputPos[out.name] = QtCore.QPointF(float(tokens[0]), float(tokens[1]))
173+
outputPos[out.name] = QtCore.QPointF(float(tokens[0]), float(tokens[1]))
174174
else:
175175
name = line
176176
outputPos[out.name] = None
@@ -183,7 +183,7 @@ def openModel(self, filename):
183183
self.addOutput(output)
184184
else:
185185
algOutputs[out.name] = None
186-
self.outputPos.append(outputPos)
186+
self.outputPos.append(outputPos)
187187
self.algOutputs.append(algOutputs)
188188
self.algParameters.append(algParams)
189189
self.dependencies.append(dependencies)
@@ -217,9 +217,9 @@ def addAlgorithm(self, alg, parametersMap, valuesMap, outputsMap, dependencies):
217217
pos = {}
218218
i = 0
219219
from sextante.modeler.ModelerGraphicItem import ModelerGraphicItem
220-
for out in outputsMap:
220+
for out in outputsMap:
221221
pos[out] = algPos + QtCore.QPointF(ModelerGraphicItem.BOX_WIDTH, i * ModelerGraphicItem.BOX_HEIGHT)
222-
i+=1
222+
i+=1
223223
self.outputPos.append(pos)
224224

225225
def updateAlgorithm(self, algIndex, parametersMap, valuesMap, outputsMap, dependencies):
@@ -229,13 +229,13 @@ def updateAlgorithm(self, algIndex, parametersMap, valuesMap, outputsMap, depend
229229
for value in valuesMap.keys():
230230
self.paramValues[value] = valuesMap[value]
231231
self.updateModelerView()
232-
algPos = self.algPos[algIndex]
232+
algPos = self.algPos[algIndex]
233233
pos = {}
234234
i = 0
235235
from sextante.modeler.ModelerGraphicItem import ModelerGraphicItem
236236
for out in outputsMap:
237237
pos[out] = algPos + QtCore.QPointF(ModelerGraphicItem.BOX_WIDTH, i * ModelerGraphicItem.BOX_HEIGHT)
238-
i+=1
238+
i+=1
239239
self.outputPos[algIndex] = pos
240240

241241

@@ -252,7 +252,7 @@ def removeAlgorithm(self, index):
252252
del self.algParameters[index]
253253
del self.algOutputs[index]
254254
del self.algPos[index]
255-
del self.outputPos[index]
255+
del self.outputPos[index]
256256

257257
i = -1
258258
for paramValues in self.algParameters:
@@ -423,14 +423,14 @@ def serialize(self):
423423
s+=value.serialize() + "\n"
424424
else:
425425
s+=str(None) + "\n"
426-
for out in alg.outputs:
426+
for out in alg.outputs:
427427
value = self.algOutputs[i][out.name]
428428
s+=unicode(value)
429429
if value is not None:
430430
pt = self.outputPos[i][out.name]
431431
s += "|" + str(pt.x()) + "," + str(pt.y())
432432
s += "\n"
433-
433+
434434
return s
435435

436436

‎python/plugins/sextante/modeler/ModelerArrowItem.py

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ def __init__(self, startItem, outputIndex, endItem, paramIndex ,parent=None, sce
5959
self.setPen(QtGui.QPen(self.myColor, 1, QtCore.Qt.SolidLine,
6060
QtCore.Qt.RoundCap, QtCore.Qt.RoundJoin))
6161
self.setZValue(0)
62-
63-
62+
63+
6464
def startItem(self):
6565
return self.myStartItem
6666

@@ -78,28 +78,28 @@ def paint(self, painter, option, widget=None):
7878
controlPoints = []
7979
endPt = self.endItem().getLinkPointForParameter(self.paramIndex)
8080
startPt = self.startItem().getLinkPointForOutput(self.outputIndex)
81-
if isinstance(self.startItem().element, GeoAlgorithm):
82-
if self.startItem().element.outputs:
83-
controlPoints.append(startItem.pos() + startPt)
84-
controlPoints.append(startItem.pos() + startPt + QtCore.QPointF(ModelerGraphicItem.BOX_WIDTH /2,0))
81+
if isinstance(self.startItem().element, GeoAlgorithm):
82+
if self.startItem().element.outputs:
83+
controlPoints.append(startItem.pos() + startPt)
84+
controlPoints.append(startItem.pos() + startPt + QtCore.QPointF(ModelerGraphicItem.BOX_WIDTH /2,0))
8585
controlPoints.append(endItem.pos() + endPt - QtCore.QPointF(ModelerGraphicItem.BOX_WIDTH /2, 0))
86-
controlPoints.append(endItem.pos() + endPt)
86+
controlPoints.append(endItem.pos() + endPt)
8787
pt = QtCore.QPointF(startItem.pos() + startPt + QtCore.QPointF(-3, -3))
8888
painter.drawEllipse(pt.x(), pt.y(), 6, 6)
8989
pt = QtCore.QPointF(endItem.pos() + endPt + QtCore.QPointF(-3, -3))
90-
painter.drawEllipse(pt.x(), pt.y(), 6, 6)
90+
painter.drawEllipse(pt.x(), pt.y(), 6, 6)
9191
else: # case where there is a dependency on an algorithm not on an output
92-
controlPoints.append(startItem.pos() + startPt)
92+
controlPoints.append(startItem.pos() + startPt)
9393
controlPoints.append(startItem.pos() + startPt + QtCore.QPointF(ModelerGraphicItem.BOX_WIDTH /2,0))
9494
controlPoints.append(endItem.pos() + endPt - QtCore.QPointF(ModelerGraphicItem.BOX_WIDTH /2, 0))
95-
controlPoints.append(endItem.pos() + endPt)
96-
else:
95+
controlPoints.append(endItem.pos() + endPt)
96+
else:
9797
controlPoints.append(startItem.pos())
9898
controlPoints.append(startItem.pos() + QtCore.QPointF(ModelerGraphicItem.BOX_WIDTH /2,0))
9999
controlPoints.append(endItem.pos() + endPt - QtCore.QPointF(ModelerGraphicItem.BOX_WIDTH /2, 0))
100-
controlPoints.append(endItem.pos() + endPt)
100+
controlPoints.append(endItem.pos() + endPt)
101101
pt = QtCore.QPointF(endItem.pos() + endPt + QtCore.QPointF(-3, -3))
102-
painter.drawEllipse(pt.x(), pt.y(), 6, 6)
102+
painter.drawEllipse(pt.x(), pt.y(), 6, 6)
103103

104104
path = QtGui.QPainterPath()
105105
path.moveTo(controlPoints[0])

0 commit comments

Comments
 (0)
Please sign in to comment.