Skip to content

Commit 6ae2dda

Browse files
committed
Remove some unrequired iface usage from processing algs
Flip to context.project().crs() use instead
1 parent 2e8d940 commit 6ae2dda

File tree

7 files changed

+10
-17
lines changed

7 files changed

+10
-17
lines changed

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@
5353
QgsGraphBuilder,
5454
QgsGraphAnalyzer
5555
)
56-
from qgis.utils import iface
5756

5857
from processing.algs.qgis.QgisAlgorithm import QgisAlgorithm
5958

@@ -199,7 +198,7 @@ def processAlgorithm(self, parameters, context, feedback):
199198
bothValue,
200199
defaultDirection)
201200

202-
distUnit = iface.mapCanvas().mapSettings().destinationCrs().mapUnits()
201+
distUnit = context.project().crs().mapUnits()
203202
multiplier = QgsUnitTypes.fromUnitToUnitFactor(distUnit, QgsUnitTypes.DistanceMeters)
204203
if strategy == 0:
205204
strategy = QgsNetworkDistanceStrategy()
@@ -209,7 +208,7 @@ def processAlgorithm(self, parameters, context, feedback):
209208
multiplier * 1000.0 / 3600.0)
210209

211210
director.addStrategy(strategy)
212-
builder = QgsGraphBuilder(iface.mapCanvas().mapSettings().destinationCrs(),
211+
builder = QgsGraphBuilder(context.project().crs(),
213212
True,
214213
tolerance)
215214

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@
5353
QgsGraphBuilder,
5454
QgsGraphAnalyzer
5555
)
56-
from qgis.utils import iface
5756

5857
from processing.algs.qgis.QgisAlgorithm import QgisAlgorithm
5958

@@ -191,7 +190,7 @@ def processAlgorithm(self, parameters, context, feedback):
191190
bothValue,
192191
defaultDirection)
193192

194-
distUnit = iface.mapCanvas().mapSettings().destinationCrs().mapUnits()
193+
distUnit = context.project().crs().mapUnits()
195194
multiplier = QgsUnitTypes.fromUnitToUnitFactor(distUnit, QgsUnitTypes.DistanceMeters)
196195
if strategy == 0:
197196
strategy = QgsNetworkDistanceStrategy()
@@ -201,7 +200,7 @@ def processAlgorithm(self, parameters, context, feedback):
201200
multiplier * 1000.0 / 3600.0)
202201

203202
director.addStrategy(strategy)
204-
builder = QgsGraphBuilder(iface.mapCanvas().mapSettings().destinationCrs(),
203+
builder = QgsGraphBuilder(context.project().crs(),
205204
True,
206205
tolerance)
207206
feedback.pushInfo(self.tr('Building graph...'))

python/plugins/processing/algs/qgis/SetRasterStyle.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
from processing.core.parameters import ParameterRaster
3737
from processing.core.outputs import OutputRaster
3838
from processing.tools import dataobjects
39-
from qgis.utils import iface
4039

4140

4241
class SetRasterStyle(QgisAlgorithm):

python/plugins/processing/algs/qgis/SetVectorStyle.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
from processing.core.outputs import OutputVector
3434
from processing.core.parameters import ParameterFile
3535
from processing.tools import dataobjects
36-
from qgis.utils import iface
3736

3837

3938
class SetVectorStyle(QgisAlgorithm):

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@
5454
QgsGraphBuilder,
5555
QgsGraphAnalyzer
5656
)
57-
from qgis.utils import iface
5857

5958
from processing.algs.qgis.QgisAlgorithm import QgisAlgorithm
6059

@@ -196,7 +195,7 @@ def processAlgorithm(self, parameters, context, feedback):
196195
bothValue,
197196
defaultDirection)
198197

199-
distUnit = iface.mapCanvas().mapSettings().destinationCrs().mapUnits()
198+
distUnit = context.project().crs().mapUnits()
200199
multiplier = QgsUnitTypes.fromUnitToUnitFactor(distUnit, QgsUnitTypes.DistanceMeters)
201200
if strategy == 0:
202201
strategy = QgsNetworkDistanceStrategy()
@@ -207,7 +206,7 @@ def processAlgorithm(self, parameters, context, feedback):
207206
multiplier = 3600
208207

209208
director.addStrategy(strategy)
210-
builder = QgsGraphBuilder(iface.mapCanvas().mapSettings().destinationCrs(),
209+
builder = QgsGraphBuilder(context.project().crs(),
211210
True,
212211
tolerance)
213212

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@
5454
QgsGraphBuilder,
5555
QgsGraphAnalyzer
5656
)
57-
from qgis.utils import iface
5857

5958
from processing.algs.qgis.QgisAlgorithm import QgisAlgorithm
6059

@@ -196,7 +195,7 @@ def processAlgorithm(self, parameters, context, feedback):
196195
bothValue,
197196
defaultDirection)
198197

199-
distUnit = iface.mapCanvas().mapSettings().destinationCrs().mapUnits()
198+
distUnit = context.project().crs().mapUnits()
200199
multiplier = QgsUnitTypes.fromUnitToUnitFactor(distUnit, QgsUnitTypes.DistanceMeters)
201200
if strategy == 0:
202201
strategy = QgsNetworkDistanceStrategy()
@@ -207,7 +206,7 @@ def processAlgorithm(self, parameters, context, feedback):
207206
multiplier = 3600
208207

209208
director.addStrategy(strategy)
210-
builder = QgsGraphBuilder(iface.mapCanvas().mapSettings().destinationCrs(),
209+
builder = QgsGraphBuilder(context.project().crs(),
211210
True,
212211
tolerance)
213212

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@
5555
QgsGraphBuilder,
5656
QgsGraphAnalyzer
5757
)
58-
from qgis.utils import iface
5958

6059
from processing.algs.qgis.QgisAlgorithm import QgisAlgorithm
6160

@@ -196,7 +195,7 @@ def processAlgorithm(self, parameters, context, feedback):
196195
bothValue,
197196
defaultDirection)
198197

199-
distUnit = iface.mapCanvas().mapSettings().destinationCrs().mapUnits()
198+
distUnit = context.project().crs().mapUnits()
200199
multiplier = QgsUnitTypes.fromUnitToUnitFactor(distUnit, QgsUnitTypes.DistanceMeters)
201200
if strategy == 0:
202201
strategy = QgsNetworkDistanceStrategy()
@@ -207,7 +206,7 @@ def processAlgorithm(self, parameters, context, feedback):
207206
multiplier = 3600
208207

209208
director.addStrategy(strategy)
210-
builder = QgsGraphBuilder(iface.mapCanvas().mapSettings().destinationCrs(),
209+
builder = QgsGraphBuilder(context.project().crs(),
211210
True,
212211
tolerance)
213212
feedback.pushInfo(self.tr('Building graph...'))

0 commit comments

Comments
 (0)