Skip to content

Commit d6fbe93

Browse files
author
Médéric RIBREUX
committedJan 2, 2016
Fix indendation problems (as usual)...
·
ltr-3_40archive/master_2
1 parent af01652 commit d6fbe93

13 files changed

+41
-28
lines changed
 

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ def processAlgorithm(self, progress):
222222
raise GeoAlgorithmExecutionException(
223223
self.tr('GRASS GIS 7 folder is not configured. Please '
224224
'configure it before running GRASS GIS 7 algorithms.'))
225-
225+
226226
# Create brand new commands lists
227227
self.commands = []
228228
self.outputCommands = []
@@ -244,13 +244,13 @@ def processAlgorithm(self, progress):
244244
func(self)
245245
else:
246246
self.processInputs()
247-
247+
248248
if hasattr(self.module, 'processCommand'):
249249
func = getattr(self.module, 'processCommand')
250250
func(self)
251251
else:
252252
self.processCommand()
253-
253+
254254
if hasattr(self.module, 'processOutputs'):
255255
func = getattr(self.module, 'processOutputs')
256256
func(self)
@@ -389,7 +389,7 @@ def processCommand(self):
389389
command += ' ' + param.name + '="' + unicode(param.value) + '"'
390390
else:
391391
command += ' ' + param.name + '="' + unicode(param.value) + '"'
392-
392+
393393
for out in self.outputs:
394394
if isinstance(out, OutputFile):
395395
command += ' > ' + out.value
@@ -405,7 +405,7 @@ def processCommand(self):
405405

406406
command += ' --overwrite'
407407
self.commands.append(command)
408-
408+
409409
def processOutputs(self):
410410
"""Prepare the GRASS v.out.ogr commands"""
411411
for out in self.outputs:
@@ -416,7 +416,7 @@ def processOutputs(self):
416416
# exporting
417417
self.commands.append('g.region raster=' + out.name + self.uniqueSufix)
418418
self.outputCommands.append('g.region raster=' + out.name
419-
+ self.uniqueSufix)
419+
+ self.uniqueSufix)
420420

421421
if self.grass7Name == 'r.statistics':
422422
# r.statistics saves its results in a non-qgis compatible
@@ -477,7 +477,7 @@ def processOutputs(self):
477477
command += ' output_layer=' + os.path.basename(out.value)[:-4]
478478
self.commands.append(command)
479479
self.outputCommands.append(command)
480-
480+
481481
def exportVectorLayer(self, orgFilename):
482482

483483
# TODO: improve this. We are now exporting if it is not a shapefile,

‎python/plugins/processing/algs/grass7/ext/v_net_alloc.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,6 @@
2727

2828
from v_net import incorporatePoints
2929

30+
3031
def processCommand(alg):
3132
incorporatePoints(alg)

‎python/plugins/processing/algs/grass7/ext/v_net_allpairs.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,6 @@
2727

2828
from v_net import incorporatePoints
2929

30+
3031
def processCommand(alg):
3132
incorporatePoints(alg)

‎python/plugins/processing/algs/grass7/ext/v_net_bridge.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
from v_net import variableOutput
2929

30+
3031
def processOutputs(alg):
31-
outputParameter = { u"output": { u"method" : { 0: u"line", 1: u"point" } } }
32+
outputParameter = {u"output": {u"method": {0: u"line", 1: u"point"}}}
3233
variableOutput(alg, outputParameter)
33-

‎python/plugins/processing/algs/grass7/ext/v_net_components.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727

2828
from v_net import variableOutput
2929

30+
3031
def processCommand(alg):
3132
# remove the output for point
3233
outPoint = alg.getOutputFromName(u'output_point')
@@ -39,8 +40,8 @@ def processCommand(alg):
3940
# Re-add output for point
4041
alg.addOutput(outPoint)
4142

43+
4244
def processOutputs(alg):
43-
outputParameter = { u"output": u"line",
44-
u"output_point": u"point" }
45+
outputParameter = {u"output": u"line",
46+
u"output_point": u"point"}
4547
variableOutput(alg, outputParameter)
46-

‎python/plugins/processing/algs/grass7/ext/v_net_connectivity.py

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,23 +27,25 @@
2727

2828
from v_net import incorporatePoints, variableOutput
2929

30+
3031
def checkParameterValuesBeforeExecuting(alg):
3132
""" Verify if we have the right parameters """
3233
params = [u'where', u'cats']
3334
values = []
3435
for param in params:
35-
for i in range(1,3):
36-
values.append(alg.getParameterValue(u'set{}_{}'.format(i,param)))
36+
for i in range(1, 3):
37+
values.append(alg.getParameterValue(u'set{}_{}'.format(i, param)))
3738

3839
if (values[0] or values[2]) and (values[1] or values[3]):
3940
return None
4041

4142
return alg.tr("You need to set at least setX_where or setX_cats parameters for each set !")
4243

44+
4345
def processCommand(alg):
4446
incorporatePoints(alg)
45-
47+
48+
4649
def processOutputs(alg):
47-
outputParameter = { u"output": u"point" }
50+
outputParameter = {u"output": u"point"}
4851
variableOutput(alg, outputParameter)
49-

‎python/plugins/processing/algs/grass7/ext/v_net_distance.py

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828

2929
from processing.core.parameters import getParameterFromString, ParameterVector, ParameterNumber, ParameterBoolean, ParameterString
3030

31+
3132
def processCommand(alg):
3233
""" Handle data preparation for v.net.distance:
3334
* Integrate point layers into network vector map.
@@ -51,15 +52,15 @@ def processCommand(alg):
5152
for i, layer in enumerate([u'from', u'to']):
5253
# Get a temp layer name
5354
intLayer = alg.getTempFilename()
54-
55+
5556
# Grab the from point layer and delete this parameter (not used by v.net.distance)
5657
point_layer = alg.getParameterValue(layer + u'_points')
5758
if point_layer:
5859
point_layer = alg.exportedLayers[point_layer]
5960
paramsToDelete.append(alg.getParameterFromName(layer + u'_points'))
6061

6162
# Create the v.net connect command for point layer integration
62-
command = u"v.net -s input={} points={} out={} op=connect threshold={} arc_layer=1 node_layer={}".format( line_layer, point_layer, intLayer, threshold, i+2 )
63+
command = u"v.net -s input={} points={} out={} op=connect threshold={} arc_layer=1 node_layer={}".format(line_layer, point_layer, intLayer, threshold, i + 2)
6364
alg.commands.append(command)
6465
line_layer = intLayer
6566

@@ -68,20 +69,20 @@ def processCommand(alg):
6869
if not parameter:
6970
parameter = getParameterFromString(u'ParameterNumber|{0}_layer|{0} layer number|1|3|2|False'.format(layer))
7071
alg.addParameter(parameter)
71-
parameter.setValue(i+2)
72+
parameter.setValue(i + 2)
7273

7374
# Make the connection with attribute table
74-
command = u"v.db.connect -o map={} table={} layer={}".format(line_layer, point_layer, i+2)
75+
command = u"v.db.connect -o map={} table={} layer={}".format(line_layer, point_layer, i + 2)
7576
alg.commands.append(command)
76-
77+
7778
alg.setParameterValue(u'input', line_layer)
7879

7980
# Delete some unnecessary parameters
8081
for param in paramsToDelete:
8182
alg.parameters.remove(param)
8283

8384
alg.processCommand()
84-
85+
8586
# Bring back the parameters:
8687
for param in paramsToDelete:
8788
alg.parameters.append(param)

‎python/plugins/processing/algs/grass7/ext/v_net_flow.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,23 +28,26 @@
2828

2929
from v_net import incorporatePoints, processOutputs
3030

31+
3132
def checkParameterValuesBeforeExecuting(alg):
3233
""" Verify if we have the right parameters """
3334
params = [u'where', u'cats']
3435
values = []
3536
for param in params:
3637
for i in [u'source', u'sink']:
37-
values.append(alg.getParameterValue(u'{}_{}'.format(i,param)))
38+
values.append(alg.getParameterValue(u'{}_{}'.format(i, param)))
3839

3940
if (values[0] or values[2]) and (values[1] or values[3]):
4041
return None
4142

4243
return alg.tr("You need to set at least source/sink_where or source/sink_cats parameters for each set !")
4344

45+
4446
def processCommand(alg):
4547
incorporatePoints(alg)
4648

49+
4750
def processOutputs(alg):
48-
outputParameter = { u"output": u"line",
49-
u"cut": u"line" }
51+
outputParameter = {u"output": u"line",
52+
u"cut": u"line"}
5053
variableOutput(alg, outputParameter)

‎python/plugins/processing/algs/grass7/ext/v_net_iso.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,6 @@
2727

2828
from v_net import incorporatePoints
2929

30+
3031
def processCommand(alg):
3132
incorporatePoints(alg)

‎python/plugins/processing/algs/grass7/ext/v_net_path.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,6 @@
2727

2828
from v_net import incorporatePoints
2929

30+
3031
def processCommand(alg):
3132
incorporatePoints(alg)

‎python/plugins/processing/algs/grass7/ext/v_net_salesman.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
from processing.core.parameters import getParameterFromString
2929
from v_net import incorporatePoints
3030

31+
3132
def processCommand(alg):
3233
# We temporary remove the output 'sequence'
3334
sequence = alg.getOutputFromName(u'sequence')
@@ -46,4 +47,3 @@ def processCommand(alg):
4647
# then we delete the input parameter and add the old output
4748
alg.parameters.remove(param)
4849
alg.addOutput(sequence)
49-

‎python/plugins/processing/algs/grass7/ext/v_net_steiner.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,6 @@
2727

2828
from v_net import incorporatePoints
2929

30+
3031
def processCommand(alg):
3132
incorporatePoints(alg)

‎python/plugins/processing/algs/grass7/ext/v_net_visibility.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727

2828
from v_net import variableOutput
2929

30+
3031
def processOutputs(alg):
31-
outputParameter = { u"output": u"line" }
32+
outputParameter = {u"output": u"line"}
3233
variableOutput(alg, outputParameter, False)

0 commit comments

Comments
 (0)
Please sign in to comment.