Skip to content

Commit 14a6115

Browse files
author
Médéric RIBREUX
committed
Fix indentation (one more time)
1 parent d6fbe93 commit 14a6115

File tree

2 files changed

+17
-14
lines changed

2 files changed

+17
-14
lines changed

python/plugins/processing/algs/grass7/Grass7Algorithm.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ def getDefaultCellsize(self):
197197
else:
198198
layer = dataobjects.getObjectFromUri(param.value)
199199
cellsize = max(cellsize, (layer.extent().xMaximum()
200-
- layer.extent().xMinimum())
200+
- layer.extent().xMinimum())
201201
/ layer.width())
202202
elif isinstance(param, ParameterMultipleInput):
203203

python/plugins/processing/algs/grass7/ext/v_net.py

+16-13
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,13 @@
3636
import os
3737
from processing.core.parameters import getParameterFromString, ParameterVector, ParameterNumber, ParameterBoolean, ParameterString
3838

39+
3940
def incorporatePoints(alg, pointLayerName=u'points', networkLayerName=u'input'):
4041
"""
4142
incorporate points with lines to form a GRASS network
4243
"""
4344
paramsToDelete = []
44-
45+
4546
# Create an intermediate GRASS layer which is the combination of network + centers
4647
intLayer = alg.getTempFilename()
4748

@@ -62,23 +63,24 @@ def incorporatePoints(alg, pointLayerName=u'points', networkLayerName=u'input'):
6263

6364
# Create the v.net connect command for point layer integration
6465
command = u"v.net -s input={} points={} out={} op=connect threshold={}".format(
65-
lineLayer, pointLayer, intLayer, threshold )
66+
lineLayer, pointLayer, intLayer, threshold)
6667
alg.commands.append(command)
6768

6869
# Connect the point layer database to the layer 2 of the network
6970
command = u"v.db.connect -o map={} table={} layer=2".format(intLayer, pointLayer)
7071
alg.commands.append(command)
71-
72+
7273
# Delete some unnecessary parameters
7374
for param in paramsToDelete:
7475
alg.parameters.remove(param)
75-
76+
7677
alg.processCommand()
7778

7879
# Bring back the parameters:
7980
for param in paramsToDelete:
8081
alg.parameters.append(param)
8182

83+
8284
def variableOutput(alg, params, nocats=True):
8385
""" Handle variable data output for v.net modules:
8486
parameters:
@@ -106,9 +108,9 @@ def variableOutput(alg, params, nocats=True):
106108
u"" if geomType == u"line" and nocats else u"-c",
107109
geomType,
108110
alg.exportedLayers[out],
109-
os.path.dirname( out ),
110-
os.path.basename( out)[:-4]
111-
)
111+
os.path.dirname(out),
112+
os.path.basename(out)[:-4]
113+
)
112114
alg.commands.append(command)
113115
alg.outputCommands.append(command)
114116

@@ -129,6 +131,7 @@ def checkParameterValuesBeforeExecuting(alg):
129131

130132
return None
131133

134+
132135
def processCommand(alg):
133136
""" Handle data preparation for v.net:
134137
* Integrate point layers into network vector map.
@@ -144,7 +147,7 @@ def processCommand(alg):
144147
paramsToDelete.append(alg.getParameterFromName(u'file'))
145148
elif operation == 2:
146149
paramsToDelete.append(alg.getParameterFromName(u'threshold'))
147-
elif operation in [3,4]:
150+
elif operation in [3, 4]:
148151
paramsToDelete.append(alg.getParameterFromName(u'threshold'))
149152
paramsToDelete.append(alg.getParameterFromName(u'points'))
150153
paramsToDelete.append(alg.getParameterFromName(u'file'))
@@ -159,7 +162,7 @@ def processCommand(alg):
159162
alg.parameters.remove(param)
160163

161164
alg.processCommand()
162-
165+
163166
# Bring back the parameters:
164167
for param in paramsToDelete:
165168
alg.parameters.append(param)
@@ -170,7 +173,7 @@ def processOutputs(alg):
170173
* use v.out.ogr with type=line on node operation.
171174
* use v.out.ogr with type=point on articulation method.
172175
"""
173-
176+
174177
# Find the method used
175178
operation = alg.getParameterValue(u'operation')
176179

@@ -182,7 +185,7 @@ def processOutputs(alg):
182185
u"point" if operation == 0 else "line",
183186
u"2" if operation == 0 else u"1",
184187
alg.exportedLayers[out],
185-
os.path.dirname( out ),
186-
os.path.basename( out )[:-4]
187-
)
188+
os.path.dirname(out),
189+
os.path.basename(out)[:-4]
190+
)
188191
alg.commands.append(command)

0 commit comments

Comments
 (0)