Skip to content
Permalink
Browse files
fix rebase conflicts
  • Loading branch information
alexbruy committed Sep 15, 2013
1 parent d66fa2f commit 2d101c46559eaaa1e13895da46760f3042f5460a
@@ -283,7 +283,7 @@ def setOutputCRS(self):
if p is not None:
self.crs = p.crs()
return
qgis = dataobjects.iface
qgis = dataobjects.interface.iface
self.crs = qgis.mapCanvas().mapRenderer().destinationCrs()

def checkInputCRS(self):
@@ -31,6 +31,8 @@

from qgis.core import *

from processing import interface

from processing.core.QGisLayers import QGisLayers

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

canvas = QGisLayers.iface.mapCanvas()
canvas = interface.iface.mapCanvas()
prevMapTool = canvas.mapTool()

dlg.show()
@@ -36,12 +36,13 @@
from processing.gui.EditScriptAction import EditScriptAction
from processing.gui.DeleteScriptAction import DeleteScriptAction
from processing.gui.CreateNewScriptAction import CreateNewScriptAction
p

from processing.r.RUtils import RUtils
from processing.r.RAlgorithm import RAlgorithm

from processing.script.WrongScriptException import WrongScriptException
from processing.tools.system import *

import processing.resources_rc

class RAlgorithmProvider(AlgorithmProvider):

0 comments on commit 2d101c4

Please sign in to comment.