Skip to content

Commit

Permalink
renamed "sextante" to "processing"
Browse files Browse the repository at this point in the history
  • Loading branch information
@volaya
volaya committed Aug 20, 2013
1 parent b429bcf commit 9bb3d6e
Show file tree
Hide file tree
Showing 1,168 changed files with 4,063 additions and 2,896 deletions.
6 changes: 3 additions & 3 deletions python/plugins/sextante/CMakeLists.txt → python/plugins/processing/CMakeLists.txt
View file
@@ -1,4 +1,4 @@
SET (SEXTANTE_PLUGIN_DIR ${QGIS_DATA_DIR}/python/plugins/sextante)
SET (PROCESSING_PLUGIN_DIR ${QGIS_DATA_DIR}/python/plugins/processing)

ADD_SUBDIRECTORY(admintools)
ADD_SUBDIRECTORY(algs)
Expand Down Expand Up @@ -29,5 +29,5 @@ FILE(GLOB PY_FILES *.py)

PYQT4_ADD_RESOURCES(PYRC_FILES resources.qrc)

PLUGIN_INSTALL(sextante . ${PY_FILES} ${OTHER_FILES} ${PYRC_FILES})
PLUGIN_INSTALL(sextante ui ${PYUI_FILES} ui/__init__.py)
PLUGIN_INSTALL(processing . ${PY_FILES} ${OTHER_FILES} ${PYRC_FILES})
PLUGIN_INSTALL(processing ui ${PYUI_FILES} ui/__init__.py)
64 changes: 32 additions & 32 deletions python/plugins/sextante/SextantePlugin.py → ...on/plugins/processing/ProcessingPlugin.py
View file
Expand Up @@ -2,7 +2,7 @@

"""
***************************************************************************
SextantePlugin.py
ProcessingPlugin.py
---------------------
Date : August 2012
Copyright : (C) 2012 by Victor Olaya
Expand Down Expand Up @@ -30,74 +30,74 @@
from PyQt4.QtGui import *
from qgis.core import *
from PyQt4 import QtGui
from sextante.commander.CommanderWindow import CommanderWindow
from sextante.core.Sextante import Sextante
from sextante.core.QGisLayers import QGisLayers
from sextante.core.SextanteUtils import SextanteUtils
from sextante.gui.SextanteToolbox import SextanteToolbox
from sextante.gui.HistoryDialog import HistoryDialog
from sextante.gui.ConfigDialog import ConfigDialog
from sextante.gui.ResultsDialog import ResultsDialog
from sextante.modeler.ModelerDialog import ModelerDialog
import sextante.resources_rc
from processing.commander.CommanderWindow import CommanderWindow
from processing.core.Processing import Processing
from processing.core.QGisLayers import QGisLayers
from processing.core.ProcessingUtils import ProcessingUtils
from processing.gui.ProcessingToolbox import ProcessingToolbox
from processing.gui.HistoryDialog import HistoryDialog
from processing.gui.ConfigDialog import ConfigDialog
from processing.gui.ResultsDialog import ResultsDialog
from processing.modeler.ModelerDialog import ModelerDialog
import processing.resources_rc

cmd_folder = os.path.split(inspect.getfile( inspect.currentframe() ))[0]
if cmd_folder not in sys.path:
sys.path.insert(0, cmd_folder)

class SextantePlugin:
class ProcessingPlugin:

def __init__(self, iface):
self.iface = iface
QGisLayers.setInterface(iface)
Sextante.initialize()
Sextante.setInterface(iface)
Sextante.setPlugin(self)
Processing.initialize()
Processing.setInterface(iface)
Processing.setPlugin(self)

def initGui(self):
self.commander = None
self.toolbox = SextanteToolbox(self.iface)
self.toolbox = ProcessingToolbox(self.iface)
self.iface.addDockWidget(Qt.RightDockWidgetArea, self.toolbox)
self.toolbox.hide()
Sextante.addAlgListListener(self.toolbox)
Processing.addAlgListListener(self.toolbox)

self.menu = QMenu(self.iface.mainWindow())
self.menu.setTitle(QCoreApplication.translate("SEXTANTE", "Analysis"))
self.menu.setTitle(QCoreApplication.translate("Processing", "Processing"))

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

self.modelerAction = QAction(QIcon(":/sextante/images/model.png"),
QCoreApplication.translate("SEXTANTE", "&SEXTANTE modeler"),
self.modelerAction = QAction(QIcon(":/processing/images/model.png"),
QCoreApplication.translate("Processing", "Graphical modeler"),
self.iface.mainWindow())
self.modelerAction.triggered.connect(self.openModeler)
self.menu.addAction(self.modelerAction)

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

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

self.resultsAction = QAction(QIcon(":/sextante/images/results.png"),
QCoreApplication.translate("SEXTANTE", "&SEXTANTE results viewer"),
self.resultsAction = QAction(QIcon(":/processing/images/results.png"),
QCoreApplication.translate("Processing", "&Results viewer"),
self.iface.mainWindow())
self.resultsAction.triggered.connect(self.openResults)
self.menu.addAction(self.resultsAction)

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

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

Expand All @@ -116,7 +116,7 @@ def unload(self):
def openCommander(self):
if self.commander is None:
self.commander = CommanderWindow(self.iface.mainWindow(), self.iface.mapCanvas())
Sextante.addAlgListListener(self.commander)
Processing.addAlgListListener(self.commander)
self.commander.prepareGui()
self.commander.show()
#dlg.exec_()
Expand Down
12 changes: 6 additions & 6 deletions python/plugins/sextante/__init__.py → python/plugins/processing/__init__.py
View file
Expand Up @@ -17,10 +17,10 @@
***************************************************************************
"""

from sextante.tools.general import runalg, runandload, alghelp, alglist, algoptions, load, extent, getobject
from sextante.tools.vector import getfeatures, spatialindex, values, uniquevalues
from sextante.tools.raster import scanraster
from sextante.tests.TestData import loadTestData
from processing.tools.general import runalg, runandload, alghelp, alglist, algoptions, load, extent, getobject
from processing.tools.vector import getfeatures, spatialindex, values, uniquevalues
from processing.tools.raster import scanraster
from processing.tests.TestData import loadTestData

__author__ = 'Victor Olaya'
__date__ = 'August 2012'
Expand All @@ -29,5 +29,5 @@
__revision__ = '$Format:%H$'

def classFactory(iface):
from sextante.SextantePlugin import SextantePlugin
return SextantePlugin(iface)
from processing.ProcessingPlugin import ProcessingPlugin
return ProcessingPlugin(iface)
18 changes: 9 additions & 9 deletions ...admintools/AdminToolsAlgorithmProvider.py → ...admintools/AdminToolsAlgorithmProvider.py
View file
Expand Up @@ -16,7 +16,7 @@
* *
***************************************************************************
"""
from sextante.admintools.PostGISExecuteSQL import PostGISExecuteSQL
from processing.admintools.PostGISExecuteSQL import PostGISExecuteSQL
import os
from PyQt4 import QtGui

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

from sextante.admintools.ImportIntoPostGIS import ImportIntoPostGIS
from sextante.admintools.ImportVectorIntoGeoServer import ImportVectorIntoGeoServer
from sextante.admintools.CreateWorkspace import CreateWorkspace
from sextante.admintools.ImportRasterIntoGeoServer import ImportRasterIntoGeoServer
from sextante.admintools.DeleteWorkspace import DeleteWorkspace
from sextante.admintools.DeleteDatastore import DeleteDatastore
from sextante.admintools.CreateStyleGeoServer import CreateStyleGeoServer
from sextante.core.AlgorithmProvider import AlgorithmProvider
from processing.admintools.ImportIntoPostGIS import ImportIntoPostGIS
from processing.admintools.ImportVectorIntoGeoServer import ImportVectorIntoGeoServer
from processing.admintools.CreateWorkspace import CreateWorkspace
from processing.admintools.ImportRasterIntoGeoServer import ImportRasterIntoGeoServer
from processing.admintools.DeleteWorkspace import DeleteWorkspace
from processing.admintools.DeleteDatastore import DeleteDatastore
from processing.admintools.CreateStyleGeoServer import CreateStyleGeoServer
from processing.core.AlgorithmProvider import AlgorithmProvider

class AdminToolsAlgorithmProvider(AlgorithmProvider):

Expand Down
2 changes: 1 addition & 1 deletion ...lugins/sextante/admintools/CMakeLists.txt → ...gins/processing/admintools/CMakeLists.txt
View file
Expand Up @@ -3,4 +3,4 @@ FILE(GLOB PY_FILES *.py)
ADD_SUBDIRECTORY(geoserver)
ADD_SUBDIRECTORY(httplib2)

PLUGIN_INSTALL(sextante ./admintools ${PY_FILES})
PLUGIN_INSTALL(processing ./admintools ${PY_FILES})
10 changes: 5 additions & 5 deletions ...tante/admintools/CreateMosaicDatastore.py → ...ssing/admintools/CreateMosaicDatastore.py
View file
Expand Up @@ -17,9 +17,9 @@
# * *
# ***************************************************************************
# """
# from sextante.core.LayerExporter import LayerExporter
# from sextante.parameters.ParameterString import ParameterString
# from sextante.servertools.GeoServerToolsAlgorithm import GeoServerToolsAlgorithm
# from processing.core.LayerExporter import LayerExporter
# from processing.parameters.ParameterString import ParameterString
# from processing.servertools.GeoServerToolsAlgorithm import GeoServerToolsAlgorithm
#
# __author__ = 'Victor Olaya'
# __date__ = 'October 2012'
Expand All @@ -28,8 +28,8 @@
# __revision__ = '$Format:%H$'
#
# from qgis.core import *
# from sextante.parameters.ParameterVector import ParameterVector
# from sextante.core.QGisLayers import QGisLayers
# from processing.parameters.ParameterVector import ParameterVector
# from processing.core.QGisLayers import QGisLayers
# import os
#
# class CreateMosaicDatastore(GeoServerToolsAlgorithm):
Expand Down
8 changes: 4 additions & 4 deletions ...xtante/admintools/CreateStyleGeoServer.py → ...essing/admintools/CreateStyleGeoServer.py
View file
Expand Up @@ -24,10 +24,10 @@
__revision__ = '$Format:%H$'

from qgis.core import *
from sextante.parameters.ParameterString import ParameterString
from sextante.admintools.GeoServerToolsAlgorithm import GeoServerToolsAlgorithm
from sextante.parameters.ParameterFile import ParameterFile
from sextante.parameters.ParameterBoolean import ParameterBoolean
from processing.parameters.ParameterString import ParameterString
from processing.admintools.GeoServerToolsAlgorithm import GeoServerToolsAlgorithm
from processing.parameters.ParameterFile import ParameterFile
from processing.parameters.ParameterBoolean import ParameterBoolean


class CreateStyleGeoServer(GeoServerToolsAlgorithm):
Expand Down
6 changes: 3 additions & 3 deletions ...ns/sextante/admintools/CreateWorkspace.py → .../processing/admintools/CreateWorkspace.py
View file
Expand Up @@ -24,9 +24,9 @@
__revision__ = '$Format:%H$'

from qgis.core import *
from sextante.parameters.ParameterString import ParameterString
from sextante.admintools.GeoServerToolsAlgorithm import GeoServerToolsAlgorithm
from sextante.outputs.OutputString import OutputString
from processing.parameters.ParameterString import ParameterString
from processing.admintools.GeoServerToolsAlgorithm import GeoServerToolsAlgorithm
from processing.outputs.OutputString import OutputString

class CreateWorkspace(GeoServerToolsAlgorithm):

Expand Down
4 changes: 2 additions & 2 deletions ...ns/sextante/admintools/DeleteDatastore.py → .../processing/admintools/DeleteDatastore.py
View file
Expand Up @@ -24,8 +24,8 @@
__revision__ = '$Format:%H$'

from qgis.core import *
from sextante.parameters.ParameterString import ParameterString
from sextante.admintools.GeoServerToolsAlgorithm import GeoServerToolsAlgorithm
from processing.parameters.ParameterString import ParameterString
from processing.admintools.GeoServerToolsAlgorithm import GeoServerToolsAlgorithm

class DeleteDatastore(GeoServerToolsAlgorithm):

Expand Down
4 changes: 2 additions & 2 deletions ...ns/sextante/admintools/DeleteWorkspace.py → .../processing/admintools/DeleteWorkspace.py
View file
Expand Up @@ -24,8 +24,8 @@
__revision__ = '$Format:%H$'

from qgis.core import *
from sextante.parameters.ParameterString import ParameterString
from sextante.admintools.GeoServerToolsAlgorithm import GeoServerToolsAlgorithm
from processing.parameters.ParameterString import ParameterString
from processing.admintools.GeoServerToolsAlgorithm import GeoServerToolsAlgorithm

class DeleteWorkspace(GeoServerToolsAlgorithm):

Expand Down
6 changes: 3 additions & 3 deletions ...nte/admintools/GeoServerToolsAlgorithm.py → ...ing/admintools/GeoServerToolsAlgorithm.py
View file
Expand Up @@ -16,8 +16,8 @@
* *
***************************************************************************
"""
from sextante.parameters.ParameterString import ParameterString
from sextante.admintools.geoserver.catalog import Catalog
from processing.parameters.ParameterString import ParameterString
from processing.admintools.geoserver.catalog import Catalog

__author__ = 'Victor Olaya'
__date__ = 'October 2012'
Expand All @@ -27,7 +27,7 @@

import os
from PyQt4 import QtGui
from sextante.core.GeoAlgorithm import GeoAlgorithm
from processing.core.GeoAlgorithm import GeoAlgorithm

class GeoServerToolsAlgorithm(GeoAlgorithm):

Expand Down
14 changes: 7 additions & 7 deletions .../sextante/admintools/ImportIntoPostGIS.py → ...rocessing/admintools/ImportIntoPostGIS.py
View file
Expand Up @@ -16,8 +16,8 @@
* *
***************************************************************************
"""
from sextante.core.QGisLayers import QGisLayers
from sextante.parameters.ParameterBoolean import ParameterBoolean
from processing.core.QGisLayers import QGisLayers
from processing.parameters.ParameterBoolean import ParameterBoolean


__author__ = 'Victor Olaya'
Expand All @@ -27,14 +27,14 @@
__revision__ = '$Format:%H$'

import os
from sextante.parameters.ParameterVector import ParameterVector
from sextante.core.GeoAlgorithm import GeoAlgorithm
from sextante.core.GeoAlgorithmExecutionException import GeoAlgorithmExecutionException
from processing.parameters.ParameterVector import ParameterVector
from processing.core.GeoAlgorithm import GeoAlgorithm
from processing.core.GeoAlgorithmExecutionException import GeoAlgorithmExecutionException
from qgis.core import *
from PyQt4.QtCore import *
from PyQt4.QtGui import *
from sextante.parameters.ParameterString import ParameterString
from sextante.admintools import postgis_utils
from processing.parameters.ParameterString import ParameterString
from processing.admintools import postgis_utils

class ImportIntoPostGIS(GeoAlgorithm):

Expand Down
6 changes: 3 additions & 3 deletions ...e/admintools/ImportRasterIntoGeoServer.py → ...g/admintools/ImportRasterIntoGeoServer.py
View file
Expand Up @@ -24,9 +24,9 @@
__revision__ = '$Format:%H$'

from qgis.core import *
from sextante.parameters.ParameterString import ParameterString
from sextante.admintools.GeoServerToolsAlgorithm import GeoServerToolsAlgorithm
from sextante.parameters.ParameterRaster import ParameterRaster
from processing.parameters.ParameterString import ParameterString
from processing.admintools.GeoServerToolsAlgorithm import GeoServerToolsAlgorithm
from processing.parameters.ParameterRaster import ParameterRaster


class ImportRasterIntoGeoServer(GeoServerToolsAlgorithm):
Expand Down
10 changes: 5 additions & 5 deletions ...e/admintools/ImportVectorIntoGeoServer.py → ...g/admintools/ImportVectorIntoGeoServer.py
View file
Expand Up @@ -25,11 +25,11 @@

import os
from qgis.core import *
from sextante.parameters.ParameterVector import ParameterVector
from sextante.core.QGisLayers import QGisLayers
from sextante.core.LayerExporter import LayerExporter
from sextante.parameters.ParameterString import ParameterString
from sextante.admintools.GeoServerToolsAlgorithm import GeoServerToolsAlgorithm
from processing.parameters.ParameterVector import ParameterVector
from processing.core.QGisLayers import QGisLayers
from processing.core.LayerExporter import LayerExporter
from processing.parameters.ParameterString import ParameterString
from processing.admintools.GeoServerToolsAlgorithm import GeoServerToolsAlgorithm

class ImportVectorIntoGeoServer(GeoServerToolsAlgorithm):

Expand Down
8 changes: 4 additions & 4 deletions .../sextante/admintools/PostGISExecuteSQL.py → ...rocessing/admintools/PostGISExecuteSQL.py
View file
Expand Up @@ -16,7 +16,7 @@
* *
***************************************************************************
"""
from sextante.core.GeoAlgorithm import GeoAlgorithm
from processing.core.GeoAlgorithm import GeoAlgorithm

__author__ = 'Victor Olaya, Carterix Geomatics'
__date__ = 'October 2012'
Expand All @@ -28,9 +28,9 @@
from qgis.core import *
from PyQt4.QtCore import *
from PyQt4.QtGui import *
from sextante.parameters.ParameterString import ParameterString
from sextante.admintools import postgis_utils
from sextante.core.GeoAlgorithmExecutionException import GeoAlgorithmExecutionException
from processing.parameters.ParameterString import ParameterString
from processing.admintools import postgis_utils
from processing.core.GeoAlgorithmExecutionException import GeoAlgorithmExecutionException

class PostGISExecuteSQL(GeoAlgorithm):

Expand Down
0 ...n/plugins/sextante/admintools/__init__.py → ...plugins/processing/admintools/__init__.py
View file
File renamed without changes.
3 changes: 3 additions & 0 deletions python/plugins/processing/admintools/geoserver/CMakeLists.txt
View file
@@ -0,0 +1,3 @@
FILE(GLOB PY_FILES *.py)

PLUGIN_INSTALL(processing ./admintools/geoserver ${PY_FILES})
0 ...sextante/admintools/geoserver/__init__.py → ...ocessing/admintools/geoserver/__init__.py
View file
File renamed without changes.

0 comments on commit 9bb3d6e

Please sign in to comment.