Skip to content

Commit 293ac60

Browse files
volayavolaya
committed
[processing] removed interface module
now all access to the interface is done through qgis.utils.iface
1 parent fcc24e9 commit 293ac60

16 files changed

+58
-72
lines changed

‎python/plugins/processing/ProcessingPlugin.py

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717
***************************************************************************
1818
"""
1919

20-
from processing import interface
21-
2220
__author__ = 'Victor Olaya'
2321
__date__ = 'August 2012'
2422
__copyright__ = '(C) 2012, Victor Olaya'
@@ -39,7 +37,6 @@
3937
from processing.gui.ResultsDialog import ResultsDialog
4038
from processing.modeler.ModelerDialog import ModelerDialog
4139
from processing.gui.CommanderWindow import CommanderWindow
42-
from processing.tools import dataobjects
4340
from processing.tools.system import *
4441
import processing.resources_rc
4542

@@ -51,17 +48,17 @@
5148
class ProcessingPlugin:
5249

5350
def __init__(self, iface):
54-
interface.iface = iface
51+
self.iface = iface
5552
Processing.initialize()
5653

5754
def initGui(self):
5855
self.commander = None
5956
self.toolbox = ProcessingToolbox()
60-
interface.iface.addDockWidget(Qt.RightDockWidgetArea, self.toolbox)
57+
self.iface.addDockWidget(Qt.RightDockWidgetArea, self.toolbox)
6158
self.toolbox.hide()
6259
#Processing.addAlgListListener(self.toolbox)
6360

64-
self.menu = QMenu(interface.iface.mainWindow().menuBar())
61+
self.menu = QMenu(self.iface.mainWindow().menuBar())
6562
self.menu.setObjectName( 'processing' )
6663
self.menu.setTitle(QCoreApplication.translate('Processing',
6764
'Processing'))
@@ -76,47 +73,47 @@ def initGui(self):
7673
self.modelerAction = QAction(QIcon(':/processing/images/model.png'),
7774
QCoreApplication.translate('Processing',
7875
'Graphical modeler'),
79-
interface.iface.mainWindow())
76+
self.iface.mainWindow())
8077
self.modelerAction.setObjectName( 'modelerAction' )
8178
self.modelerAction.triggered.connect(self.openModeler)
8279
self.menu.addAction(self.modelerAction)
8380

8481
self.historyAction = QAction(QIcon(':/processing/images/history.gif'),
8582
QCoreApplication.translate('Processing',
8683
'History and log'),
87-
interface.iface.mainWindow())
84+
self.iface.mainWindow())
8885
self.historyAction.setObjectName( 'historyAction' )
8986
self.historyAction.triggered.connect(self.openHistory)
9087
self.menu.addAction(self.historyAction)
9188

9289
self.configAction = QAction(QIcon(':/processing/images/config.png'),
9390
QCoreApplication.translate('Processing',
9491
'Options and configuration'),
95-
interface.iface.mainWindow())
92+
self.iface.mainWindow())
9693
self.configAction.setObjectName( 'configAction' )
9794
self.configAction.triggered.connect(self.openConfig)
9895
self.menu.addAction(self.configAction)
9996

10097
self.resultsAction = QAction(QIcon(':/processing/images/results.png'),
10198
QCoreApplication.translate('Processing',
10299
'&Results viewer'),
103-
interface.iface.mainWindow())
100+
self.iface.mainWindow())
104101
self.resultsAction.setObjectName( 'resultsAction' )
105102
self.resultsAction.triggered.connect(self.openResults)
106103
self.menu.addAction(self.resultsAction)
107104

108-
menuBar = interface.iface.mainWindow().menuBar()
105+
menuBar = self.iface.mainWindow().menuBar()
109106
menuBar.insertMenu(
110-
interface.iface.firstRightStandardMenu().menuAction(), self.menu)
107+
self.iface.firstRightStandardMenu().menuAction(), self.menu)
111108

112109
self.commanderAction = QAction(
113110
QIcon(':/processing/images/commander.png'),
114111
QCoreApplication.translate('Processing', '&Commander'),
115-
interface.iface.mainWindow())
112+
self.iface.mainWindow())
116113
self.commanderAction.setObjectName( 'commanderAction' )
117114
self.commanderAction.triggered.connect(self.openCommander)
118115
self.menu.addAction(self.commanderAction)
119-
interface.iface.registerMainWindowAction(self.commanderAction,
116+
self.iface.registerMainWindowAction(self.commanderAction,
120117
'Ctrl+Alt+M')
121118

122119
def unload(self):
@@ -128,12 +125,12 @@ def unload(self):
128125
if QDir(folder).exists():
129126
shutil.rmtree(folder, True)
130127

131-
interface.iface.unregisterMainWindowAction(self.commanderAction)
128+
self.iface.unregisterMainWindowAction(self.commanderAction)
132129

133130
def openCommander(self):
134131
if self.commander is None:
135-
self.commander = CommanderWindow(interface.iface.mainWindow(),
136-
interface.iface.mapCanvas())
132+
self.commander = CommanderWindow(self.iface.mainWindow(),
133+
self.iface.mapCanvas())
137134
Processing.addAlgListListener(self.commander)
138135
self.commander.prepareGui()
139136
self.commander.show()

‎python/plugins/processing/algs/grass/GrassAlgorithm.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
from qgis.core import *
3333
from PyQt4.QtCore import *
3434
from PyQt4.QtGui import *
35+
from qgis.utils import iface
3536

3637
from processing import interface
3738
from processing.core.GeoAlgorithm import GeoAlgorithm
@@ -469,7 +470,7 @@ def exportVectorLayer(self, orgFilename):
469470

470471
def setSessionProjectionFromProject(self, commands):
471472
if not GrassUtils.projectionSet:
472-
proj4 = interface.iface.mapCanvas().mapRenderer().destinationCrs().toProj4()
473+
proj4 = iface.mapCanvas().mapRenderer().destinationCrs().toProj4()
473474
command = 'g.proj'
474475
command += ' -c'
475476
command += ' proj4="' + proj4 + '"'

‎python/plugins/processing/algs/grass7/Grass7Algorithm.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232
from qgis.core import *
3333
from PyQt4.QtCore import *
3434
from PyQt4.QtGui import *
35+
from qgis.utils import iface
3536

36-
from processing import interface
3737
from processing.core.GeoAlgorithm import GeoAlgorithm
3838
from processing.core.ProcessingConfig import ProcessingConfig
3939
from processing.core.ProcessingLog import ProcessingLog
@@ -471,7 +471,7 @@ def exportVectorLayer(self, orgFilename):
471471

472472
def setSessionProjectionFromProject(self, commands):
473473
if not Grass7Utils.projectionSet:
474-
proj4 = interface.iface.mapCanvas().mapRenderer().destinationCrs().toProj4()
474+
proj4 = iface.mapCanvas().mapRenderer().destinationCrs().toProj4()
475475
command = 'g.proj'
476476
command += ' -c'
477477
command += ' proj4="' + proj4 + '"'

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
from PyQt4.QtCore import *
2929
from qgis.core import *
30-
from processing import interface
30+
from qgis.utils import iface
3131
from processing.core.GeoAlgorithm import GeoAlgorithm
3232
from processing.core.GeoAlgorithmExecutionException import \
3333
GeoAlgorithmExecutionException
@@ -101,7 +101,7 @@ def processAlgorithm(self, progress):
101101

102102
da = QgsDistanceArea()
103103
da.setSourceCrs(layer.crs().srsid())
104-
canvas = interface.iface.mapCanvas()
104+
canvas = iface.mapCanvas()
105105
da.setEllipsoidalMode(canvas.mapRenderer().hasCrsTransformEnabled())
106106
da.setEllipsoid(QgsProject.instance().readEntry('Measure',
107107
'/Ellipsoid',

‎python/plugins/processing/algs/qgis/ftools/ExportGeometryInfo.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
from PyQt4.QtCore import *
2929
from qgis.core import *
30-
from processing import interface
30+
from qgis.utils import iface
3131
from processing.core.GeoAlgorithm import GeoAlgorithm
3232
from processing.parameters.ParameterVector import ParameterVector
3333
from processing.parameters.ParameterSelection import ParameterSelection
@@ -103,7 +103,7 @@ def processAlgorithm(self, progress):
103103
'NONE')[0]
104104
crs = layer.crs().srsid()
105105
elif method == 1:
106-
mapCRS = interface.iface.mapCanvas().mapRenderer().destinationCrs()
106+
mapCRS = iface.mapCanvas().mapRenderer().destinationCrs()
107107
layCRS = layer.crs()
108108
coordTransform = QgsCoordinateTransform(layCRS, mapCRS)
109109

‎python/plugins/processing/core/GeoAlgorithm.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -358,10 +358,12 @@ def setOutputCRS(self):
358358
if p is not None:
359359
self.crs = p.crs()
360360
return
361-
qgis = dataobjects.interface.iface
362-
if qgis is None:
363-
return
364-
self.crs = qgis.mapCanvas().mapRenderer().destinationCrs()
361+
try:
362+
from qgis.utils import iface
363+
self.crs = iface.mapCanvas().mapRenderer().destinationCrs()
364+
except:
365+
pass
366+
365367

366368
def checkInputCRS(self):
367369
"""It checks that all input layers use the same CRS. If so,

‎python/plugins/processing/core/Processing.py

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
from PyQt4.QtGui import *
3131
from qgis.core import *
3232
import processing
33-
from processing import interface
33+
from qgis.utils import iface
3434
from processing.core.ProcessingConfig import ProcessingConfig
3535
from processing.core.GeoAlgorithm import GeoAlgorithm
3636
from processing.core.ProcessingLog import ProcessingLog
@@ -128,13 +128,6 @@ def getProviderFromName(name):
128128
return provider
129129
return Processing.modeler
130130

131-
@staticmethod
132-
def getInterface():
133-
return interface.iface
134-
135-
@staticmethod
136-
def setInterface(iface):
137-
pass
138131

139132
@staticmethod
140133
def initialize():
@@ -351,8 +344,8 @@ def runAlgorithm(algOrName, onFinish, *args):
351344
QApplication.setOverrideCursor(QCursor(Qt.WaitCursor))
352345

353346
progress = SilentProgress()
354-
if interface.iface is not None :
355-
progress = MessageBarProgress()
347+
if iface is not None :
348+
progress = MessageBarProgress()
356349
ret = UnthreadedAlgorithmExecutor.runalg(alg, progress)
357350
if onFinish is not None and ret:
358351
onFinish(alg, progress)

‎python/plugins/processing/gui/AlgorithmExecutionDialog.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
from processing.outputs.OutputVector import OutputVector
5959
from processing.outputs.OutputTable import OutputTable
6060
from processing.tools import dataobjects
61-
61+
from qgis.utils import iface
6262

6363
class AlgorithmExecutionDialog(QtGui.QDialog):
6464

@@ -68,7 +68,7 @@ def __init__(self, param, widget):
6868
(self.parameter, self.widget) = (param, widget)
6969

7070
def __init__(self, alg, mainWidget):
71-
QtGui.QDialog.__init__(self, None, QtCore.Qt.WindowSystemMenuHint
71+
QtGui.QDialog.__init__(self, iface.mainWindow(), QtCore.Qt.WindowSystemMenuHint
7272
| QtCore.Qt.WindowTitleHint)
7373
self.executed = False
7474
self.mainWidget = mainWidget

‎python/plugins/processing/gui/CommanderWindow.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
from PyQt4 import QtCore, QtGui
3030
from PyQt4.QtCore import *
3131
from PyQt4.QtGui import *
32-
from processing import interface
32+
from qgis.utils import iface
3333
from processing.core.Processing import Processing
3434
from processing.gui.MissingDependencyDialog import MissingDependencyDialog
3535
from processing.gui.ParametersDialog import ParametersDialog
@@ -112,7 +112,7 @@ def fillCombo(self):
112112

113113
#Add menu entries
114114
menuActions = []
115-
actions = Processing.getInterface().mainWindow().menuBar().actions()
115+
actions = iface.mainWindow().menuBar().actions()
116116
for action in actions:
117117
menuActions.extend(self.getActions(action))
118118
for action in menuActions:
@@ -170,8 +170,7 @@ def run(self):
170170
elif s.startswith('Menu action: '):
171171
actionName = s[len('Menu action: '):]
172172
menuActions = []
173-
actions = \
174-
Processing.getInterface().mainWindow().menuBar().actions()
173+
actions = iface.mainWindow().menuBar().actions()
175174
for action in actions:
176175
menuActions.extend(self.getActions(action))
177176
for action in menuActions:
@@ -212,7 +211,7 @@ def runAlgorithm(self, alg):
212211
dlg = alg.getCustomParametersDialog()
213212
if not dlg:
214213
dlg = ParametersDialog(alg)
215-
canvas = interface.iface.mapCanvas()
214+
canvas = iface.mapCanvas()
216215
prevMapTool = canvas.mapTool()
217216
dlg.show()
218217
dlg.exec_()

‎python/plugins/processing/gui/ExtentSelectionPanel.py

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,12 @@
2929
from PyQt4 import QtGui, QtCore
3030
from PyQt4.QtCore import *
3131
from PyQt4.QtGui import *
32-
from processing import interface
3332
from processing.gui.RectangleMapTool import RectangleMapTool
3433
from processing.parameters.ParameterRaster import ParameterRaster
3534
from processing.parameters.ParameterVector import ParameterVector
3635
from processing.parameters.ParameterMultipleInput import ParameterMultipleInput
3736
from processing.tools import dataobjects
38-
37+
from qgis.utils import iface
3938

4039
class ExtentSelectionPanel(QtGui.QWidget):
4140

@@ -59,7 +58,7 @@ def __init__(self, dialog, alg, default):
5958
self.pushButton.clicked.connect(self.buttonPushed)
6059
self.horizontalLayout.addWidget(self.pushButton)
6160
self.setLayout(self.horizontalLayout)
62-
canvas = interface.iface.mapCanvas()
61+
canvas = iface.mapCanvas()
6362
self.prevMapTool = canvas.mapTool()
6463
self.tool = RectangleMapTool(canvas)
6564
self.connect(self.tool, SIGNAL('rectangleCreated()'), self.fillCoords)
@@ -143,7 +142,7 @@ def addToRegion(self, layer, first):
143142
def useLayerExtent(self):
144143
CANVAS_KEY = 'Use canvas extent'
145144
extentsDict = {}
146-
extentsDict[CANVAS_KEY] = interface.iface.mapCanvas().extent()
145+
extentsDict[CANVAS_KEY] = iface.mapCanvas().extent()
147146
extents = [CANVAS_KEY]
148147
layers = dataobjects.getAllLayers()
149148
for layer in layers:
@@ -155,7 +154,7 @@ def useLayerExtent(self):
155154
self.setValueFromRect(extentsDict[item])
156155

157156
def selectOnCanvas(self):
158-
canvas = interface.iface.mapCanvas()
157+
canvas = iface.mapCanvas()
159158
canvas.setMapTool(self.tool)
160159
self.dialog.showMinimized()
161160

@@ -168,7 +167,7 @@ def setValueFromRect(self, r):
168167
+ str(r.yMinimum()) + ',' + str(r.yMaximum())
169168
self.text.setText(s)
170169
self.tool.reset()
171-
canvas = interface.iface.mapCanvas()
170+
canvas = iface.mapCanvas()
172171
canvas.setMapTool(self.prevMapTool)
173172
self.dialog.showNormal()
174173
self.dialog.raise_()

‎python/plugins/processing/gui/MessageBarProgress.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,25 +27,25 @@
2727

2828
from PyQt4.QtCore import *
2929
from PyQt4 import QtGui
30-
from processing import interface
30+
from qgis.utils import iface
3131
from qgis.gui import *
3232

3333

3434
class MessageBarProgress:
3535

3636
def __init__(self):
3737
self.progressMessageBar = \
38-
interface.iface.messageBar().createMessage('Executing algorithm')
38+
iface.messageBar().createMessage('Executing algorithm')
3939
self.progress = QtGui.QProgressBar()
4040
self.progress.setMaximum(100)
4141
self.progress.setAlignment(Qt.AlignLeft | Qt.AlignVCenter)
4242
self.progressMessageBar.layout().addWidget(self.progress)
43-
interface.iface.messageBar().pushWidget(self.progressMessageBar,
44-
interface.iface.messageBar().INFO)
43+
iface.messageBar().pushWidget(self.progressMessageBar,
44+
iface.messageBar().INFO)
4545

4646
def error(self, msg):
47-
interface.iface.messageBar().clearWidgets()
48-
interface.iface.messageBar().pushMessage("Error", msg,
47+
iface.messageBar().clearWidgets()
48+
iface.messageBar().pushMessage("Error", msg,
4949
level = QgsMessageBar.CRITICAL,
5050
duration = 3)
5151

@@ -68,4 +68,4 @@ def setConsoleInfo(self, _):
6868
pass
6969

7070
def close(self):
71-
interface.iface.messageBar().clearWidgets()
71+
iface.messageBar().clearWidgets()

0 commit comments

Comments
 (0)