Skip to content

Commit 8d8bbab

Browse files
jef-njef-n
committed
indentation update
1 parent 595ef7f commit 8d8bbab

11 files changed

+76
-75
lines changed

‎python/plugins/processing/algs/qgis/ServiceAreaFromLayer.py

+10-10
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
QgsNetworkSpeedStrategy,
3838
QgsGraphBuilder,
3939
QgsGraphAnalyzer
40-
)
40+
)
4141
from qgis.utils import iface
4242

4343
from processing.core.GeoAlgorithm import GeoAlgorithm
@@ -47,10 +47,10 @@
4747
ParameterString,
4848
ParameterTableField,
4949
ParameterSelection
50-
)
50+
)
5151
from processing.core.outputs import (OutputNumber,
5252
OutputVector
53-
)
53+
)
5454
from processing.tools import dataobjects, vector
5555

5656
pluginPath = os.path.split(os.path.split(os.path.dirname(__file__))[0])[0]
@@ -78,13 +78,13 @@ def getIcon(self):
7878

7979
def defineCharacteristics(self):
8080
self.DIRECTIONS = OrderedDict([
81-
(self.tr('Forward direction'), QgsVectorLayerDirector.DirectionForward),
82-
(self.tr('Backward direction'), QgsVectorLayerDirector.DirectionForward),
83-
(self.tr('Both directions'), QgsVectorLayerDirector.DirectionForward)])
81+
(self.tr('Forward direction'), QgsVectorLayerDirector.DirectionForward),
82+
(self.tr('Backward direction'), QgsVectorLayerDirector.DirectionForward),
83+
(self.tr('Both directions'), QgsVectorLayerDirector.DirectionForward)])
8484

8585
self.STRATEGIES = [self.tr('Shortest'),
8686
self.tr('Fastest')
87-
]
87+
]
8888

8989
self.name, self.i18n_name = self.trAlgorithm('Service area (from layer)')
9090
self.group, self.i18n_group = self.trAlgorithm('Network analysis')
@@ -148,9 +148,9 @@ def defineCharacteristics(self):
148148

149149
def processAlgorithm(self, progress):
150150
layer = dataobjects.getObjectFromUri(
151-
self.getParameterValue(self.INPUT_VECTOR))
151+
self.getParameterValue(self.INPUT_VECTOR))
152152
startPoints = dataobjects.getObjectFromUri(
153-
self.getParameterValue(self.START_POINTS))
153+
self.getParameterValue(self.START_POINTS))
154154
strategy = self.getParameterValue(self.STRATEGY)
155155
travelCost = self.getParameterValue(self.TRAVEL_COST)
156156

@@ -237,7 +237,7 @@ def processAlgorithm(self, progress):
237237
tree, cost = QgsGraphAnalyzer.dijkstra(graph, idxStart, 0)
238238
for j, v in enumerate(cost):
239239
if v > travelCost and tree[j] != -1:
240-
vertexId = graph.edge(tree [j]).outVertex()
240+
vertexId = graph.edge(tree[j]).outVertex()
241241
if cost[vertexId] <= travelCost:
242242
vertices.append(j)
243243

‎python/plugins/processing/algs/qgis/ServiceAreaFromPoint.py

+10-10
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
QgsNetworkSpeedStrategy,
3838
QgsGraphBuilder,
3939
QgsGraphAnalyzer
40-
)
40+
)
4141
from qgis.utils import iface
4242

4343
from processing.core.GeoAlgorithm import GeoAlgorithm
@@ -48,10 +48,10 @@
4848
ParameterString,
4949
ParameterTableField,
5050
ParameterSelection
51-
)
51+
)
5252
from processing.core.outputs import (OutputNumber,
5353
OutputVector
54-
)
54+
)
5555
from processing.tools import dataobjects
5656

5757
pluginPath = os.path.split(os.path.split(os.path.dirname(__file__))[0])[0]
@@ -79,13 +79,13 @@ def getIcon(self):
7979

8080
def defineCharacteristics(self):
8181
self.DIRECTIONS = OrderedDict([
82-
(self.tr('Forward direction'), QgsVectorLayerDirector.DirectionForward),
83-
(self.tr('Backward direction'), QgsVectorLayerDirector.DirectionForward),
84-
(self.tr('Both directions'), QgsVectorLayerDirector.DirectionForward)])
82+
(self.tr('Forward direction'), QgsVectorLayerDirector.DirectionForward),
83+
(self.tr('Backward direction'), QgsVectorLayerDirector.DirectionForward),
84+
(self.tr('Both directions'), QgsVectorLayerDirector.DirectionForward)])
8585

8686
self.STRATEGIES = [self.tr('Shortest'),
8787
self.tr('Fastest')
88-
]
88+
]
8989

9090
self.name, self.i18n_name = self.trAlgorithm('Service area (from point)')
9191
self.group, self.i18n_group = self.trAlgorithm('Network analysis')
@@ -94,7 +94,7 @@ def defineCharacteristics(self):
9494
self.tr('Vector layer representing network'),
9595
[dataobjects.TYPE_VECTOR_LINE]))
9696
self.addParameter(ParameterPoint(self.START_POINT,
97-
self.tr('Start point')))
97+
self.tr('Start point')))
9898
self.addParameter(ParameterSelection(self.STRATEGY,
9999
self.tr('Path type to calculate'),
100100
self.STRATEGIES,
@@ -148,7 +148,7 @@ def defineCharacteristics(self):
148148

149149
def processAlgorithm(self, progress):
150150
layer = dataobjects.getObjectFromUri(
151-
self.getParameterValue(self.INPUT_VECTOR))
151+
self.getParameterValue(self.INPUT_VECTOR))
152152
startPoint = self.getParameterValue(self.START_POINT)
153153
strategy = self.getParameterValue(self.STRATEGY)
154154
travelCost = self.getParameterValue(self.TRAVEL_COST)
@@ -205,7 +205,7 @@ def processAlgorithm(self, progress):
205205
vertices = []
206206
for i, v in enumerate(cost):
207207
if v > travelCost and tree[i] != -1:
208-
vertexId = graph.edge(tree [i]).outVertex()
208+
vertexId = graph.edge(tree[i]).outVertex()
209209
if cost[vertexId] <= travelCost:
210210
vertices.append(i)
211211

‎python/plugins/processing/algs/qgis/ShortestPathLayerToPoint.py

+10-10
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
QgsNetworkSpeedStrategy,
3838
QgsGraphBuilder,
3939
QgsGraphAnalyzer
40-
)
40+
)
4141
from qgis.utils import iface
4242

4343
from processing.core.GeoAlgorithm import GeoAlgorithm
@@ -49,7 +49,7 @@
4949
ParameterString,
5050
ParameterTableField,
5151
ParameterSelection
52-
)
52+
)
5353
from processing.core.outputs import OutputVector
5454
from processing.tools import dataobjects, vector
5555

@@ -77,13 +77,13 @@ def getIcon(self):
7777

7878
def defineCharacteristics(self):
7979
self.DIRECTIONS = OrderedDict([
80-
(self.tr('Forward direction'), QgsVectorLayerDirector.DirectionForward),
81-
(self.tr('Backward direction'), QgsVectorLayerDirector.DirectionForward),
82-
(self.tr('Both directions'), QgsVectorLayerDirector.DirectionForward)])
80+
(self.tr('Forward direction'), QgsVectorLayerDirector.DirectionForward),
81+
(self.tr('Backward direction'), QgsVectorLayerDirector.DirectionForward),
82+
(self.tr('Both directions'), QgsVectorLayerDirector.DirectionForward)])
8383

8484
self.STRATEGIES = [self.tr('Shortest'),
8585
self.tr('Fastest')
86-
]
86+
]
8787

8888
self.name, self.i18n_name = self.trAlgorithm('Shortest path (layer to point)')
8989
self.group, self.i18n_group = self.trAlgorithm('Network analysis')
@@ -95,7 +95,7 @@ def defineCharacteristics(self):
9595
self.tr('Vector layer with start points'),
9696
[dataobjects.TYPE_VECTOR_POINT]))
9797
self.addParameter(ParameterPoint(self.END_POINT,
98-
self.tr('End point')))
98+
self.tr('End point')))
9999
self.addParameter(ParameterSelection(self.STRATEGY,
100100
self.tr('Path type to calculate'),
101101
self.STRATEGIES,
@@ -143,9 +143,9 @@ def defineCharacteristics(self):
143143

144144
def processAlgorithm(self, progress):
145145
layer = dataobjects.getObjectFromUri(
146-
self.getParameterValue(self.INPUT_VECTOR))
146+
self.getParameterValue(self.INPUT_VECTOR))
147147
startPoints = dataobjects.getObjectFromUri(
148-
self.getParameterValue(self.START_POINTS))
148+
self.getParameterValue(self.START_POINTS))
149149
endPoint = self.getParameterValue(self.END_POINT)
150150
strategy = self.getParameterValue(self.STRATEGY)
151151

@@ -226,7 +226,7 @@ def processAlgorithm(self, progress):
226226
route = []
227227

228228
total = 100.0 / count
229-
for i in range(1, count +1):
229+
for i in range(1, count + 1):
230230
idxStart = graph.findVertex(snappedPoints[i])
231231
tree, cost = QgsGraphAnalyzer.dijkstra(graph, idxStart, 0)
232232

‎python/plugins/processing/algs/qgis/ShortestPathPointToLayer.py

+10-10
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
QgsNetworkSpeedStrategy,
3838
QgsGraphBuilder,
3939
QgsGraphAnalyzer
40-
)
40+
)
4141
from qgis.utils import iface
4242

4343
from processing.core.GeoAlgorithm import GeoAlgorithm
@@ -49,7 +49,7 @@
4949
ParameterString,
5050
ParameterTableField,
5151
ParameterSelection
52-
)
52+
)
5353
from processing.core.outputs import OutputVector
5454
from processing.tools import dataobjects, vector
5555

@@ -77,13 +77,13 @@ def getIcon(self):
7777

7878
def defineCharacteristics(self):
7979
self.DIRECTIONS = OrderedDict([
80-
(self.tr('Forward direction'), QgsVectorLayerDirector.DirectionForward),
81-
(self.tr('Backward direction'), QgsVectorLayerDirector.DirectionForward),
82-
(self.tr('Both directions'), QgsVectorLayerDirector.DirectionForward)])
80+
(self.tr('Forward direction'), QgsVectorLayerDirector.DirectionForward),
81+
(self.tr('Backward direction'), QgsVectorLayerDirector.DirectionForward),
82+
(self.tr('Both directions'), QgsVectorLayerDirector.DirectionForward)])
8383

8484
self.STRATEGIES = [self.tr('Shortest'),
8585
self.tr('Fastest')
86-
]
86+
]
8787

8888
self.name, self.i18n_name = self.trAlgorithm('Shortest path (point to layer)')
8989
self.group, self.i18n_group = self.trAlgorithm('Network analysis')
@@ -92,7 +92,7 @@ def defineCharacteristics(self):
9292
self.tr('Vector layer representing network'),
9393
[dataobjects.TYPE_VECTOR_LINE]))
9494
self.addParameter(ParameterPoint(self.START_POINT,
95-
self.tr('Start point')))
95+
self.tr('Start point')))
9696
self.addParameter(ParameterVector(self.END_POINTS,
9797
self.tr('Vector layer with end points'),
9898
[dataobjects.TYPE_VECTOR_POINT]))
@@ -143,10 +143,10 @@ def defineCharacteristics(self):
143143

144144
def processAlgorithm(self, progress):
145145
layer = dataobjects.getObjectFromUri(
146-
self.getParameterValue(self.INPUT_VECTOR))
146+
self.getParameterValue(self.INPUT_VECTOR))
147147
startPoint = self.getParameterValue(self.START_POINT)
148148
endPoints = dataobjects.getObjectFromUri(
149-
self.getParameterValue(self.END_POINTS))
149+
self.getParameterValue(self.END_POINTS))
150150
strategy = self.getParameterValue(self.STRATEGY)
151151

152152
directionFieldName = self.getParameterValue(self.DIRECTION_FIELD)
@@ -227,7 +227,7 @@ def processAlgorithm(self, progress):
227227
route = []
228228

229229
total = 100.0 / count
230-
for i in range(1, count +1):
230+
for i in range(1, count + 1):
231231
idxEnd = graph.findVertex(snappedPoints[i])
232232

233233
if tree[idxEnd] == -1:

‎python/plugins/processing/algs/qgis/ShortestPathPointToPoint.py

+10-10
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
QgsNetworkSpeedStrategy,
3838
QgsGraphBuilder,
3939
QgsGraphAnalyzer
40-
)
40+
)
4141
from qgis.utils import iface
4242

4343
from processing.core.GeoAlgorithm import GeoAlgorithm
@@ -48,10 +48,10 @@
4848
ParameterString,
4949
ParameterTableField,
5050
ParameterSelection
51-
)
51+
)
5252
from processing.core.outputs import (OutputNumber,
5353
OutputVector
54-
)
54+
)
5555
from processing.tools import dataobjects
5656

5757
pluginPath = os.path.split(os.path.split(os.path.dirname(__file__))[0])[0]
@@ -79,13 +79,13 @@ def getIcon(self):
7979

8080
def defineCharacteristics(self):
8181
self.DIRECTIONS = OrderedDict([
82-
(self.tr('Forward direction'), QgsVectorLayerDirector.DirectionForward),
83-
(self.tr('Backward direction'), QgsVectorLayerDirector.DirectionForward),
84-
(self.tr('Both directions'), QgsVectorLayerDirector.DirectionForward)])
82+
(self.tr('Forward direction'), QgsVectorLayerDirector.DirectionForward),
83+
(self.tr('Backward direction'), QgsVectorLayerDirector.DirectionForward),
84+
(self.tr('Both directions'), QgsVectorLayerDirector.DirectionForward)])
8585

8686
self.STRATEGIES = [self.tr('Shortest'),
8787
self.tr('Fastest')
88-
]
88+
]
8989

9090
self.name, self.i18n_name = self.trAlgorithm('Shortest path (point to point)')
9191
self.group, self.i18n_group = self.trAlgorithm('Network analysis')
@@ -94,9 +94,9 @@ def defineCharacteristics(self):
9494
self.tr('Vector layer representing network'),
9595
[dataobjects.TYPE_VECTOR_LINE]))
9696
self.addParameter(ParameterPoint(self.START_POINT,
97-
self.tr('Start point')))
97+
self.tr('Start point')))
9898
self.addParameter(ParameterPoint(self.END_POINT,
99-
self.tr('End point')))
99+
self.tr('End point')))
100100
self.addParameter(ParameterSelection(self.STRATEGY,
101101
self.tr('Path type to calculate'),
102102
self.STRATEGIES,
@@ -146,7 +146,7 @@ def defineCharacteristics(self):
146146

147147
def processAlgorithm(self, progress):
148148
layer = dataobjects.getObjectFromUri(
149-
self.getParameterValue(self.INPUT_VECTOR))
149+
self.getParameterValue(self.INPUT_VECTOR))
150150
startPoint = self.getParameterValue(self.START_POINT)
151151
endPoint = self.getParameterValue(self.END_POINT)
152152
strategy = self.getParameterValue(self.STRATEGY)

‎python/plugins/processing/algs/qgis/SpatialJoin.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ def processAlgorithm(self, progress):
180180

181181
res = False
182182
for predicate in predicates:
183-
res= getattr(inGeom, predicate)(inGeomB)
183+
res = getattr(inGeom, predicate)(inGeomB)
184184
if res:
185185
break
186186

‎python/plugins/processing/algs/qgis/SplitWithLines.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ def processAlgorithm(self, progress):
6161
fieldList = layerA.fields()
6262

6363
writer = self.getOutputFromName(self.OUTPUT).getVectorWriter(fieldList,
64-
QgsWkbTypes.multiType(layerA.wkbType()), layerA.crs())
64+
QgsWkbTypes.multiType(layerA.wkbType()), layerA.crs())
6565

6666
spatialIndex = QgsSpatialIndex()
6767
splitGeoms = {}
@@ -166,7 +166,7 @@ def processAlgorithm(self, progress):
166166
for aGeom in inGeoms:
167167
passed = True
168168

169-
if QgsWkbTypes.geometryType( aGeom.wkbType() ) == QgsWkbTypes.LineGeometry:
169+
if QgsWkbTypes.geometryType(aGeom.wkbType()) == QgsWkbTypes.LineGeometry:
170170
numPoints = aGeom.geometry().numPoints()
171171

172172
if numPoints <= 2:

0 commit comments

Comments
 (0)