Skip to content

Commit 9bb3d6e

Browse files
volayavolaya
committed
renamed "sextante" to "processing"
1 parent b429bcf commit 9bb3d6e

File tree

1,168 files changed

+4063
-2896
lines changed

Some content is hidden

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

1,168 files changed

+4063
-2896
lines changed

‎python/plugins/sextante/CMakeLists.txt renamed to ‎python/plugins/processing/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
SET (SEXTANTE_PLUGIN_DIR ${QGIS_DATA_DIR}/python/plugins/sextante)
1+
SET (PROCESSING_PLUGIN_DIR ${QGIS_DATA_DIR}/python/plugins/processing)
22

33
ADD_SUBDIRECTORY(admintools)
44
ADD_SUBDIRECTORY(algs)
@@ -29,5 +29,5 @@ FILE(GLOB PY_FILES *.py)
2929

3030
PYQT4_ADD_RESOURCES(PYRC_FILES resources.qrc)
3131

32-
PLUGIN_INSTALL(sextante . ${PY_FILES} ${OTHER_FILES} ${PYRC_FILES})
33-
PLUGIN_INSTALL(sextante ui ${PYUI_FILES} ui/__init__.py)
32+
PLUGIN_INSTALL(processing . ${PY_FILES} ${OTHER_FILES} ${PYRC_FILES})
33+
PLUGIN_INSTALL(processing ui ${PYUI_FILES} ui/__init__.py)

‎python/plugins/sextante/SextantePlugin.py renamed to ‎python/plugins/processing/ProcessingPlugin.py

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

33
"""
44
***************************************************************************
5-
SextantePlugin.py
5+
ProcessingPlugin.py
66
---------------------
77
Date : August 2012
88
Copyright : (C) 2012 by Victor Olaya
@@ -30,74 +30,74 @@
3030
from PyQt4.QtGui import *
3131
from qgis.core import *
3232
from PyQt4 import QtGui
33-
from sextante.commander.CommanderWindow import CommanderWindow
34-
from sextante.core.Sextante import Sextante
35-
from sextante.core.QGisLayers import QGisLayers
36-
from sextante.core.SextanteUtils import SextanteUtils
37-
from sextante.gui.SextanteToolbox import SextanteToolbox
38-
from sextante.gui.HistoryDialog import HistoryDialog
39-
from sextante.gui.ConfigDialog import ConfigDialog
40-
from sextante.gui.ResultsDialog import ResultsDialog
41-
from sextante.modeler.ModelerDialog import ModelerDialog
42-
import sextante.resources_rc
33+
from processing.commander.CommanderWindow import CommanderWindow
34+
from processing.core.Processing import Processing
35+
from processing.core.QGisLayers import QGisLayers
36+
from processing.core.ProcessingUtils import ProcessingUtils
37+
from processing.gui.ProcessingToolbox import ProcessingToolbox
38+
from processing.gui.HistoryDialog import HistoryDialog
39+
from processing.gui.ConfigDialog import ConfigDialog
40+
from processing.gui.ResultsDialog import ResultsDialog
41+
from processing.modeler.ModelerDialog import ModelerDialog
42+
import processing.resources_rc
4343

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

48-
class SextantePlugin:
48+
class ProcessingPlugin:
4949

5050
def __init__(self, iface):
5151
self.iface = iface
5252
QGisLayers.setInterface(iface)
53-
Sextante.initialize()
54-
Sextante.setInterface(iface)
55-
Sextante.setPlugin(self)
53+
Processing.initialize()
54+
Processing.setInterface(iface)
55+
Processing.setPlugin(self)
5656

5757
def initGui(self):
5858
self.commander = None
59-
self.toolbox = SextanteToolbox(self.iface)
59+
self.toolbox = ProcessingToolbox(self.iface)
6060
self.iface.addDockWidget(Qt.RightDockWidgetArea, self.toolbox)
6161
self.toolbox.hide()
62-
Sextante.addAlgListListener(self.toolbox)
62+
Processing.addAlgListListener(self.toolbox)
6363

6464
self.menu = QMenu(self.iface.mainWindow())
65-
self.menu.setTitle(QCoreApplication.translate("SEXTANTE", "Analysis"))
65+
self.menu.setTitle(QCoreApplication.translate("Processing", "Processing"))
6666

6767
self.toolboxAction = self.toolbox.toggleViewAction()
68-
self.toolboxAction.setIcon(QIcon(":/sextante/images/toolbox.png"))
69-
self.toolboxAction.setText(QCoreApplication.translate("SEXTANTE", "&SEXTANTE toolbox"))
68+
self.toolboxAction.setIcon(QIcon(":/processing/images/alg.png"))
69+
self.toolboxAction.setText(QCoreApplication.translate("Processing", "Toolbox"))
7070
self.menu.addAction(self.toolboxAction)
7171

72-
self.modelerAction = QAction(QIcon(":/sextante/images/model.png"),
73-
QCoreApplication.translate("SEXTANTE", "&SEXTANTE modeler"),
72+
self.modelerAction = QAction(QIcon(":/processing/images/model.png"),
73+
QCoreApplication.translate("Processing", "Graphical modeler"),
7474
self.iface.mainWindow())
7575
self.modelerAction.triggered.connect(self.openModeler)
7676
self.menu.addAction(self.modelerAction)
7777

78-
self.historyAction = QAction(QIcon(":/sextante/images/history.gif"),
79-
QCoreApplication.translate("SEXTANTE", "&SEXTANTE history and log"),
78+
self.historyAction = QAction(QIcon(":/processing/images/history.gif"),
79+
QCoreApplication.translate("Processing", "History and log"),
8080
self.iface.mainWindow())
8181
self.historyAction.triggered.connect(self.openHistory)
8282
self.menu.addAction(self.historyAction)
8383

84-
self.configAction = QAction(QIcon(":/sextante/images/config.png"),
85-
QCoreApplication.translate("SEXTANTE", "&SEXTANTE options and configuration"),
84+
self.configAction = QAction(QIcon(":/processing/images/config.png"),
85+
QCoreApplication.translate("Processing", "Options and configuration"),
8686
self.iface.mainWindow())
8787
self.configAction.triggered.connect(self.openConfig)
8888
self.menu.addAction(self.configAction)
8989

90-
self.resultsAction = QAction(QIcon(":/sextante/images/results.png"),
91-
QCoreApplication.translate("SEXTANTE", "&SEXTANTE results viewer"),
90+
self.resultsAction = QAction(QIcon(":/processing/images/results.png"),
91+
QCoreApplication.translate("Processing", "&Results viewer"),
9292
self.iface.mainWindow())
9393
self.resultsAction.triggered.connect(self.openResults)
9494
self.menu.addAction(self.resultsAction)
9595

9696
menuBar = self.iface.mainWindow().menuBar()
9797
menuBar.insertMenu(self.iface.firstRightStandardMenu().menuAction(), self.menu)
9898

99-
self.commanderAction = QAction(QIcon(":/sextante/images/toolbox.png"),
100-
QCoreApplication.translate("SEXTANTE", "&SEXTANTE commander"),
99+
self.commanderAction = QAction(QIcon(":/processing/images/commander.png"),
100+
QCoreApplication.translate("Processing", "&Commander"),
101101
self.iface.mainWindow())
102102
self.commanderAction.triggered.connect(self.openCommander)
103103
self.menu.addAction(self.commanderAction)
@@ -107,7 +107,7 @@ def unload(self):
107107
self.toolbox.setVisible(False)
108108
self.menu.deleteLater()
109109
#delete temporary output files
110-
folder = SextanteUtils.tempFolder()
110+
folder = ProcessingUtils.tempFolder()
111111
if QDir(folder).exists():
112112
shutil.rmtree(folder, True)
113113

@@ -116,7 +116,7 @@ def unload(self):
116116
def openCommander(self):
117117
if self.commander is None:
118118
self.commander = CommanderWindow(self.iface.mainWindow(), self.iface.mapCanvas())
119-
Sextante.addAlgListListener(self.commander)
119+
Processing.addAlgListListener(self.commander)
120120
self.commander.prepareGui()
121121
self.commander.show()
122122
#dlg.exec_()

‎python/plugins/sextante/__init__.py renamed to ‎python/plugins/processing/__init__.py

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

20-
from sextante.tools.general import runalg, runandload, alghelp, alglist, algoptions, load, extent, getobject
21-
from sextante.tools.vector import getfeatures, spatialindex, values, uniquevalues
22-
from sextante.tools.raster import scanraster
23-
from sextante.tests.TestData import loadTestData
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
2424

2525
__author__ = 'Victor Olaya'
2626
__date__ = 'August 2012'
@@ -29,5 +29,5 @@
2929
__revision__ = '$Format:%H$'
3030

3131
def classFactory(iface):
32-
from sextante.SextantePlugin import SextantePlugin
33-
return SextantePlugin(iface)
32+
from processing.ProcessingPlugin import ProcessingPlugin
33+
return ProcessingPlugin(iface)

‎python/plugins/sextante/admintools/AdminToolsAlgorithmProvider.py renamed to ‎python/plugins/processing/admintools/AdminToolsAlgorithmProvider.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* *
1717
***************************************************************************
1818
"""
19-
from sextante.admintools.PostGISExecuteSQL import PostGISExecuteSQL
19+
from processing.admintools.PostGISExecuteSQL import PostGISExecuteSQL
2020
import os
2121
from PyQt4 import QtGui
2222

@@ -26,14 +26,14 @@
2626
# This will get replaced with a git SHA1 when you do a git archive
2727
__revision__ = '$Format:%H$'
2828

29-
from sextante.admintools.ImportIntoPostGIS import ImportIntoPostGIS
30-
from sextante.admintools.ImportVectorIntoGeoServer import ImportVectorIntoGeoServer
31-
from sextante.admintools.CreateWorkspace import CreateWorkspace
32-
from sextante.admintools.ImportRasterIntoGeoServer import ImportRasterIntoGeoServer
33-
from sextante.admintools.DeleteWorkspace import DeleteWorkspace
34-
from sextante.admintools.DeleteDatastore import DeleteDatastore
35-
from sextante.admintools.CreateStyleGeoServer import CreateStyleGeoServer
36-
from sextante.core.AlgorithmProvider import AlgorithmProvider
29+
from processing.admintools.ImportIntoPostGIS import ImportIntoPostGIS
30+
from processing.admintools.ImportVectorIntoGeoServer import ImportVectorIntoGeoServer
31+
from processing.admintools.CreateWorkspace import CreateWorkspace
32+
from processing.admintools.ImportRasterIntoGeoServer import ImportRasterIntoGeoServer
33+
from processing.admintools.DeleteWorkspace import DeleteWorkspace
34+
from processing.admintools.DeleteDatastore import DeleteDatastore
35+
from processing.admintools.CreateStyleGeoServer import CreateStyleGeoServer
36+
from processing.core.AlgorithmProvider import AlgorithmProvider
3737

3838
class AdminToolsAlgorithmProvider(AlgorithmProvider):
3939

‎python/plugins/sextante/admintools/CMakeLists.txt renamed to ‎python/plugins/processing/admintools/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ FILE(GLOB PY_FILES *.py)
33
ADD_SUBDIRECTORY(geoserver)
44
ADD_SUBDIRECTORY(httplib2)
55

6-
PLUGIN_INSTALL(sextante ./admintools ${PY_FILES})
6+
PLUGIN_INSTALL(processing ./admintools ${PY_FILES})

‎python/plugins/sextante/admintools/CreateMosaicDatastore.py renamed to ‎python/plugins/processing/admintools/CreateMosaicDatastore.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
# * *
1818
# ***************************************************************************
1919
# """
20-
# from sextante.core.LayerExporter import LayerExporter
21-
# from sextante.parameters.ParameterString import ParameterString
22-
# from sextante.servertools.GeoServerToolsAlgorithm import GeoServerToolsAlgorithm
20+
# from processing.core.LayerExporter import LayerExporter
21+
# from processing.parameters.ParameterString import ParameterString
22+
# from processing.servertools.GeoServerToolsAlgorithm import GeoServerToolsAlgorithm
2323
#
2424
# __author__ = 'Victor Olaya'
2525
# __date__ = 'October 2012'
@@ -28,8 +28,8 @@
2828
# __revision__ = '$Format:%H$'
2929
#
3030
# from qgis.core import *
31-
# from sextante.parameters.ParameterVector import ParameterVector
32-
# from sextante.core.QGisLayers import QGisLayers
31+
# from processing.parameters.ParameterVector import ParameterVector
32+
# from processing.core.QGisLayers import QGisLayers
3333
# import os
3434
#
3535
# class CreateMosaicDatastore(GeoServerToolsAlgorithm):

‎python/plugins/sextante/admintools/CreateStyleGeoServer.py renamed to ‎python/plugins/processing/admintools/CreateStyleGeoServer.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@
2424
__revision__ = '$Format:%H$'
2525

2626
from qgis.core import *
27-
from sextante.parameters.ParameterString import ParameterString
28-
from sextante.admintools.GeoServerToolsAlgorithm import GeoServerToolsAlgorithm
29-
from sextante.parameters.ParameterFile import ParameterFile
30-
from sextante.parameters.ParameterBoolean import ParameterBoolean
27+
from processing.parameters.ParameterString import ParameterString
28+
from processing.admintools.GeoServerToolsAlgorithm import GeoServerToolsAlgorithm
29+
from processing.parameters.ParameterFile import ParameterFile
30+
from processing.parameters.ParameterBoolean import ParameterBoolean
3131

3232

3333
class CreateStyleGeoServer(GeoServerToolsAlgorithm):

‎python/plugins/sextante/admintools/CreateWorkspace.py renamed to ‎python/plugins/processing/admintools/CreateWorkspace.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
__revision__ = '$Format:%H$'
2525

2626
from qgis.core import *
27-
from sextante.parameters.ParameterString import ParameterString
28-
from sextante.admintools.GeoServerToolsAlgorithm import GeoServerToolsAlgorithm
29-
from sextante.outputs.OutputString import OutputString
27+
from processing.parameters.ParameterString import ParameterString
28+
from processing.admintools.GeoServerToolsAlgorithm import GeoServerToolsAlgorithm
29+
from processing.outputs.OutputString import OutputString
3030

3131
class CreateWorkspace(GeoServerToolsAlgorithm):
3232

‎python/plugins/sextante/admintools/DeleteDatastore.py renamed to ‎python/plugins/processing/admintools/DeleteDatastore.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
__revision__ = '$Format:%H$'
2525

2626
from qgis.core import *
27-
from sextante.parameters.ParameterString import ParameterString
28-
from sextante.admintools.GeoServerToolsAlgorithm import GeoServerToolsAlgorithm
27+
from processing.parameters.ParameterString import ParameterString
28+
from processing.admintools.GeoServerToolsAlgorithm import GeoServerToolsAlgorithm
2929

3030
class DeleteDatastore(GeoServerToolsAlgorithm):
3131

‎python/plugins/sextante/admintools/DeleteWorkspace.py renamed to ‎python/plugins/processing/admintools/DeleteWorkspace.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
__revision__ = '$Format:%H$'
2525

2626
from qgis.core import *
27-
from sextante.parameters.ParameterString import ParameterString
28-
from sextante.admintools.GeoServerToolsAlgorithm import GeoServerToolsAlgorithm
27+
from processing.parameters.ParameterString import ParameterString
28+
from processing.admintools.GeoServerToolsAlgorithm import GeoServerToolsAlgorithm
2929

3030
class DeleteWorkspace(GeoServerToolsAlgorithm):
3131

‎python/plugins/sextante/admintools/GeoServerToolsAlgorithm.py renamed to ‎python/plugins/processing/admintools/GeoServerToolsAlgorithm.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
* *
1717
***************************************************************************
1818
"""
19-
from sextante.parameters.ParameterString import ParameterString
20-
from sextante.admintools.geoserver.catalog import Catalog
19+
from processing.parameters.ParameterString import ParameterString
20+
from processing.admintools.geoserver.catalog import Catalog
2121

2222
__author__ = 'Victor Olaya'
2323
__date__ = 'October 2012'
@@ -27,7 +27,7 @@
2727

2828
import os
2929
from PyQt4 import QtGui
30-
from sextante.core.GeoAlgorithm import GeoAlgorithm
30+
from processing.core.GeoAlgorithm import GeoAlgorithm
3131

3232
class GeoServerToolsAlgorithm(GeoAlgorithm):
3333

‎python/plugins/sextante/admintools/ImportIntoPostGIS.py renamed to ‎python/plugins/processing/admintools/ImportIntoPostGIS.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
* *
1717
***************************************************************************
1818
"""
19-
from sextante.core.QGisLayers import QGisLayers
20-
from sextante.parameters.ParameterBoolean import ParameterBoolean
19+
from processing.core.QGisLayers import QGisLayers
20+
from processing.parameters.ParameterBoolean import ParameterBoolean
2121

2222

2323
__author__ = 'Victor Olaya'
@@ -27,14 +27,14 @@
2727
__revision__ = '$Format:%H$'
2828

2929
import os
30-
from sextante.parameters.ParameterVector import ParameterVector
31-
from sextante.core.GeoAlgorithm import GeoAlgorithm
32-
from sextante.core.GeoAlgorithmExecutionException import GeoAlgorithmExecutionException
30+
from processing.parameters.ParameterVector import ParameterVector
31+
from processing.core.GeoAlgorithm import GeoAlgorithm
32+
from processing.core.GeoAlgorithmExecutionException import GeoAlgorithmExecutionException
3333
from qgis.core import *
3434
from PyQt4.QtCore import *
3535
from PyQt4.QtGui import *
36-
from sextante.parameters.ParameterString import ParameterString
37-
from sextante.admintools import postgis_utils
36+
from processing.parameters.ParameterString import ParameterString
37+
from processing.admintools import postgis_utils
3838

3939
class ImportIntoPostGIS(GeoAlgorithm):
4040

‎python/plugins/sextante/admintools/ImportRasterIntoGeoServer.py renamed to ‎python/plugins/processing/admintools/ImportRasterIntoGeoServer.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
__revision__ = '$Format:%H$'
2525

2626
from qgis.core import *
27-
from sextante.parameters.ParameterString import ParameterString
28-
from sextante.admintools.GeoServerToolsAlgorithm import GeoServerToolsAlgorithm
29-
from sextante.parameters.ParameterRaster import ParameterRaster
27+
from processing.parameters.ParameterString import ParameterString
28+
from processing.admintools.GeoServerToolsAlgorithm import GeoServerToolsAlgorithm
29+
from processing.parameters.ParameterRaster import ParameterRaster
3030

3131

3232
class ImportRasterIntoGeoServer(GeoServerToolsAlgorithm):

‎python/plugins/sextante/admintools/ImportVectorIntoGeoServer.py renamed to ‎python/plugins/processing/admintools/ImportVectorIntoGeoServer.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@
2525

2626
import os
2727
from qgis.core import *
28-
from sextante.parameters.ParameterVector import ParameterVector
29-
from sextante.core.QGisLayers import QGisLayers
30-
from sextante.core.LayerExporter import LayerExporter
31-
from sextante.parameters.ParameterString import ParameterString
32-
from sextante.admintools.GeoServerToolsAlgorithm import GeoServerToolsAlgorithm
28+
from processing.parameters.ParameterVector import ParameterVector
29+
from processing.core.QGisLayers import QGisLayers
30+
from processing.core.LayerExporter import LayerExporter
31+
from processing.parameters.ParameterString import ParameterString
32+
from processing.admintools.GeoServerToolsAlgorithm import GeoServerToolsAlgorithm
3333

3434
class ImportVectorIntoGeoServer(GeoServerToolsAlgorithm):
3535

‎python/plugins/sextante/admintools/PostGISExecuteSQL.py renamed to ‎python/plugins/processing/admintools/PostGISExecuteSQL.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* *
1717
***************************************************************************
1818
"""
19-
from sextante.core.GeoAlgorithm import GeoAlgorithm
19+
from processing.core.GeoAlgorithm import GeoAlgorithm
2020

2121
__author__ = 'Victor Olaya, Carterix Geomatics'
2222
__date__ = 'October 2012'
@@ -28,9 +28,9 @@
2828
from qgis.core import *
2929
from PyQt4.QtCore import *
3030
from PyQt4.QtGui import *
31-
from sextante.parameters.ParameterString import ParameterString
32-
from sextante.admintools import postgis_utils
33-
from sextante.core.GeoAlgorithmExecutionException import GeoAlgorithmExecutionException
31+
from processing.parameters.ParameterString import ParameterString
32+
from processing.admintools import postgis_utils
33+
from processing.core.GeoAlgorithmExecutionException import GeoAlgorithmExecutionException
3434

3535
class PostGISExecuteSQL(GeoAlgorithm):
3636

‎python/plugins/sextante/admintools/__init__.py renamed to ‎python/plugins/processing/admintools/__init__.py

File renamed without changes.

‎python/plugins/processing/admintools/geoserver/CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
FILE(GLOB PY_FILES *.py)
2+
3+
PLUGIN_INSTALL(processing ./admintools/geoserver ${PY_FILES})

‎python/plugins/sextante/admintools/geoserver/__init__.py renamed to ‎python/plugins/processing/admintools/geoserver/__init__.py

File renamed without changes.

0 commit comments

Comments
 (0)