Skip to content

Commit 807ffaa

Browse files
committedSep 14, 2013
[processing] refactoring to move common functions to tools package
1 parent 4d9832c commit 807ffaa

File tree

154 files changed

+1177
-1345
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

154 files changed

+1177
-1345
lines changed
 

‎python/plugins/processing/ProcessingPlugin.py

Lines changed: 20 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
* *
1717
***************************************************************************
1818
"""
19+
from processing import interface
1920

2021
__author__ = 'Victor Olaya'
2122
__date__ = 'August 2012'
@@ -24,44 +25,40 @@
2425
__revision__ = '$Format:%H$'
2526

2627
import shutil
27-
import os, sys
2828
import inspect
2929
from PyQt4.QtCore import *
3030
from PyQt4.QtGui import *
3131
from qgis.core import *
32-
from PyQt4 import QtGui
3332
from processing.commander.CommanderWindow import CommanderWindow
3433
from processing.core.Processing import Processing
35-
from processing.core.QGisLayers import QGisLayers
36-
from processing.core.ProcessingUtils import ProcessingUtils
34+
from processing.tools import dataobjects
35+
from processing.tools.system import *
3736
from processing.gui.ProcessingToolbox import ProcessingToolbox
3837
from processing.gui.HistoryDialog import HistoryDialog
3938
from processing.gui.ConfigDialog import ConfigDialog
4039
from processing.gui.ResultsDialog import ResultsDialog
4140
from processing.modeler.ModelerDialog import ModelerDialog
4241
import processing.resources_rc
4342

43+
4444
cmd_folder = os.path.split(inspect.getfile( inspect.currentframe() ))[0]
4545
if cmd_folder not in sys.path:
4646
sys.path.insert(0, cmd_folder)
4747

4848
class ProcessingPlugin:
4949

5050
def __init__(self, iface):
51-
self.iface = iface
52-
QGisLayers.setInterface(iface)
53-
Processing.initialize()
54-
Processing.setInterface(iface)
55-
Processing.setPlugin(self)
51+
interface.iface = iface
52+
Processing.initialize()
5653

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

64-
self.menu = QMenu(self.iface.mainWindow())
61+
self.menu = QMenu(interface.iface.mainWindow())
6562
self.menu.setTitle(QCoreApplication.translate("Processing", "Processing"))
6663

6764
self.toolboxAction = self.toolbox.toggleViewAction()
@@ -71,51 +68,51 @@ def initGui(self):
7168

7269
self.modelerAction = QAction(QIcon(":/processing/images/model.png"),
7370
QCoreApplication.translate("Processing", "Graphical modeler"),
74-
self.iface.mainWindow())
71+
interface.iface.mainWindow())
7572
self.modelerAction.triggered.connect(self.openModeler)
7673
self.menu.addAction(self.modelerAction)
7774

7875
self.historyAction = QAction(QIcon(":/processing/images/history.gif"),
7976
QCoreApplication.translate("Processing", "History and log"),
80-
self.iface.mainWindow())
77+
interface.iface.mainWindow())
8178
self.historyAction.triggered.connect(self.openHistory)
8279
self.menu.addAction(self.historyAction)
8380

8481
self.configAction = QAction(QIcon(":/processing/images/config.png"),
8582
QCoreApplication.translate("Processing", "Options and configuration"),
86-
self.iface.mainWindow())
83+
interface.iface.mainWindow())
8784
self.configAction.triggered.connect(self.openConfig)
8885
self.menu.addAction(self.configAction)
8986

9087
self.resultsAction = QAction(QIcon(":/processing/images/results.png"),
9188
QCoreApplication.translate("Processing", "&Results viewer"),
92-
self.iface.mainWindow())
89+
interface.iface.mainWindow())
9390
self.resultsAction.triggered.connect(self.openResults)
9491
self.menu.addAction(self.resultsAction)
9592

96-
menuBar = self.iface.mainWindow().menuBar()
97-
menuBar.insertMenu(self.iface.firstRightStandardMenu().menuAction(), self.menu)
93+
menuBar = interface.iface.mainWindow().menuBar()
94+
menuBar.insertMenu(interface.iface.firstRightStandardMenu().menuAction(), self.menu)
9895

9996
self.commanderAction = QAction(QIcon(":/processing/images/commander.png"),
10097
QCoreApplication.translate("Processing", "&Commander"),
101-
self.iface.mainWindow())
98+
interface.iface.mainWindow())
10299
self.commanderAction.triggered.connect(self.openCommander)
103100
self.menu.addAction(self.commanderAction)
104-
self.iface.registerMainWindowAction(self.commanderAction, "Ctrl+Alt+M")
101+
interface.iface.registerMainWindowAction(self.commanderAction, "Ctrl+Alt+M")
105102

106103
def unload(self):
107104
self.toolbox.setVisible(False)
108105
self.menu.deleteLater()
109106
#delete temporary output files
110-
folder = ProcessingUtils.tempFolder()
107+
folder = tempFolder()
111108
if QDir(folder).exists():
112109
shutil.rmtree(folder, True)
113110

114-
self.iface.unregisterMainWindowAction(self.commanderAction)
111+
interface.iface.unregisterMainWindowAction(self.commanderAction)
115112

116113
def openCommander(self):
117114
if self.commander is None:
118-
self.commander = CommanderWindow(self.iface.mainWindow(), self.iface.mapCanvas())
115+
self.commander = CommanderWindow(interface.iface.mainWindow(), interface.iface.mapCanvas())
119116
Processing.addAlgListListener(self.commander)
120117
self.commander.prepareGui()
121118
self.commander.show()

‎python/plugins/processing/__init__.py

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,19 @@
1717
***************************************************************************
1818
"""
1919

20-
from processing.tools.general import runalg, runandload, alghelp, alglist, algoptions, load, extent, getobject
21-
from processing.tools.vector import getfeatures, spatialindex, values, uniquevalues
22-
from processing.tools.raster import scanraster
23-
from processing.tests.TestData import loadTestData
24-
2520
__author__ = 'Victor Olaya'
2621
__date__ = 'August 2012'
2722
__copyright__ = '(C) 2012, Victor Olaya'
2823
# This will get replaced with a git SHA1 when you do a git archive
2924
__revision__ = '$Format:%H$'
3025

26+
from processing.tools.dataobjects import *
27+
from processing.tools.general import *
28+
from processing.tools.vector import *
29+
from processing.tools.raster import *
30+
from processing.tools.system import *
31+
from processing.tests.TestData import loadTestData
32+
3133
def classFactory(iface):
3234
from processing.ProcessingPlugin import ProcessingPlugin
3335
return ProcessingPlugin(iface)

0 commit comments

Comments
 (0)
Please sign in to comment.