Skip to content

Commit

Permalink
Remove some unrequired iface usage from processing algs
Browse files Browse the repository at this point in the history 
Flip to context.project().crs() use instead
  • Loading branch information
@nyalldawson
nyalldawson committed Jul 27, 2017
1 parent 2e8d940 commit 6ae2dda
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 17 deletions.
5 changes: 2 additions & 3 deletions python/plugins/processing/algs/qgis/ServiceAreaFromLayer.py
View file
Expand Up @@ -53,7 +53,6 @@
QgsGraphBuilder,
QgsGraphAnalyzer
)
from qgis.utils import iface

from processing.algs.qgis.QgisAlgorithm import QgisAlgorithm

Expand Down Expand Up @@ -199,7 +198,7 @@ def processAlgorithm(self, parameters, context, feedback):
bothValue,
defaultDirection)

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

director.addStrategy(strategy)
builder = QgsGraphBuilder(iface.mapCanvas().mapSettings().destinationCrs(),
builder = QgsGraphBuilder(context.project().crs(),
True,
tolerance)

Expand Down
5 changes: 2 additions & 3 deletions python/plugins/processing/algs/qgis/ServiceAreaFromPoint.py
View file
Expand Up @@ -53,7 +53,6 @@
QgsGraphBuilder,
QgsGraphAnalyzer
)
from qgis.utils import iface

from processing.algs.qgis.QgisAlgorithm import QgisAlgorithm

Expand Down Expand Up @@ -191,7 +190,7 @@ def processAlgorithm(self, parameters, context, feedback):
bothValue,
defaultDirection)

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

director.addStrategy(strategy)
builder = QgsGraphBuilder(iface.mapCanvas().mapSettings().destinationCrs(),
builder = QgsGraphBuilder(context.project().crs(),
True,
tolerance)
feedback.pushInfo(self.tr('Building graph...'))
Expand Down
1 change: 0 additions & 1 deletion python/plugins/processing/algs/qgis/SetRasterStyle.py
View file
Expand Up @@ -36,7 +36,6 @@
from processing.core.parameters import ParameterRaster
from processing.core.outputs import OutputRaster
from processing.tools import dataobjects
from qgis.utils import iface


class SetRasterStyle(QgisAlgorithm):
Expand Down
1 change: 0 additions & 1 deletion python/plugins/processing/algs/qgis/SetVectorStyle.py
View file
Expand Up @@ -33,7 +33,6 @@
from processing.core.outputs import OutputVector
from processing.core.parameters import ParameterFile
from processing.tools import dataobjects
from qgis.utils import iface


class SetVectorStyle(QgisAlgorithm):
Expand Down
5 changes: 2 additions & 3 deletions python/plugins/processing/algs/qgis/ShortestPathLayerToPoint.py
View file
Expand Up @@ -54,7 +54,6 @@
QgsGraphBuilder,
QgsGraphAnalyzer
)
from qgis.utils import iface

from processing.algs.qgis.QgisAlgorithm import QgisAlgorithm

Expand Down Expand Up @@ -196,7 +195,7 @@ def processAlgorithm(self, parameters, context, feedback):
bothValue,
defaultDirection)

distUnit = iface.mapCanvas().mapSettings().destinationCrs().mapUnits()
distUnit = context.project().crs().mapUnits()
multiplier = QgsUnitTypes.fromUnitToUnitFactor(distUnit, QgsUnitTypes.DistanceMeters)
if strategy == 0:
strategy = QgsNetworkDistanceStrategy()
Expand All @@ -207,7 +206,7 @@ def processAlgorithm(self, parameters, context, feedback):
multiplier = 3600

director.addStrategy(strategy)
builder = QgsGraphBuilder(iface.mapCanvas().mapSettings().destinationCrs(),
builder = QgsGraphBuilder(context.project().crs(),
True,
tolerance)

Expand Down
5 changes: 2 additions & 3 deletions python/plugins/processing/algs/qgis/ShortestPathPointToLayer.py
View file
Expand Up @@ -54,7 +54,6 @@
QgsGraphBuilder,
QgsGraphAnalyzer
)
from qgis.utils import iface

from processing.algs.qgis.QgisAlgorithm import QgisAlgorithm

Expand Down Expand Up @@ -196,7 +195,7 @@ def processAlgorithm(self, parameters, context, feedback):
bothValue,
defaultDirection)

distUnit = iface.mapCanvas().mapSettings().destinationCrs().mapUnits()
distUnit = context.project().crs().mapUnits()
multiplier = QgsUnitTypes.fromUnitToUnitFactor(distUnit, QgsUnitTypes.DistanceMeters)
if strategy == 0:
strategy = QgsNetworkDistanceStrategy()
Expand All @@ -207,7 +206,7 @@ def processAlgorithm(self, parameters, context, feedback):
multiplier = 3600

director.addStrategy(strategy)
builder = QgsGraphBuilder(iface.mapCanvas().mapSettings().destinationCrs(),
builder = QgsGraphBuilder(context.project().crs(),
True,
tolerance)

Expand Down
5 changes: 2 additions & 3 deletions python/plugins/processing/algs/qgis/ShortestPathPointToPoint.py
View file
Expand Up @@ -55,7 +55,6 @@
QgsGraphBuilder,
QgsGraphAnalyzer
)
from qgis.utils import iface

from processing.algs.qgis.QgisAlgorithm import QgisAlgorithm

Expand Down Expand Up @@ -196,7 +195,7 @@ def processAlgorithm(self, parameters, context, feedback):
bothValue,
defaultDirection)

distUnit = iface.mapCanvas().mapSettings().destinationCrs().mapUnits()
distUnit = context.project().crs().mapUnits()
multiplier = QgsUnitTypes.fromUnitToUnitFactor(distUnit, QgsUnitTypes.DistanceMeters)
if strategy == 0:
strategy = QgsNetworkDistanceStrategy()
Expand All @@ -207,7 +206,7 @@ def processAlgorithm(self, parameters, context, feedback):
multiplier = 3600

director.addStrategy(strategy)
builder = QgsGraphBuilder(iface.mapCanvas().mapSettings().destinationCrs(),
builder = QgsGraphBuilder(context.project().crs(),
True,
tolerance)
feedback.pushInfo(self.tr('Building graph...'))
Expand Down

0 comments on commit 6ae2dda

Please sign in to comment.