Skip to content

Commit 2d101c4

Browse files
committed
fix rebase conflicts
1 parent d66fa2f commit 2d101c4

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

python/plugins/processing/core/GeoAlgorithm.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ def setOutputCRS(self):
283283
if p is not None:
284284
self.crs = p.crs()
285285
return
286-
qgis = dataobjects.iface
286+
qgis = dataobjects.interface.iface
287287
self.crs = qgis.mapCanvas().mapRenderer().destinationCrs()
288288

289289
def checkInputCRS(self):

python/plugins/processing/gui/ScriptEditorDialog.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@
3131

3232
from qgis.core import *
3333

34+
from processing import interface
35+
3436
from processing.core.QGisLayers import QGisLayers
3537

3638
from processing.gui.ParametersDialog import ParametersDialog
@@ -178,7 +180,7 @@ def runAlgorithm(self):
178180
if not dlg:
179181
dlg = ParametersDialog(alg)
180182

181-
canvas = QGisLayers.iface.mapCanvas()
183+
canvas = interface.iface.mapCanvas()
182184
prevMapTool = canvas.mapTool()
183185

184186
dlg.show()

python/plugins/processing/r/RAlgorithmProvider.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,13 @@
3636
from processing.gui.EditScriptAction import EditScriptAction
3737
from processing.gui.DeleteScriptAction import DeleteScriptAction
3838
from processing.gui.CreateNewScriptAction import CreateNewScriptAction
39-
p
39+
4040
from processing.r.RUtils import RUtils
4141
from processing.r.RAlgorithm import RAlgorithm
4242

4343
from processing.script.WrongScriptException import WrongScriptException
4444
from processing.tools.system import *
45+
4546
import processing.resources_rc
4647

4748
class RAlgorithmProvider(AlgorithmProvider):

0 commit comments

Comments
 (0)