[processing] refactoring to put all algorithm providers under a singl…

…e module
qgis · Apr 19, 2014 · 9b277cb · 9b277cb
1 parent 7ae6a63
commit 9b277cb
Show file tree

Hide file tree

Showing 1,187 changed files with 521 additions and 3,847 deletions.
diff --git a/python/plugins/processing/ProcessingPlugin.py b/python/plugins/processing/ProcessingPlugin.py
@@ -38,7 +38,7 @@
 from processing.gui.ConfigDialog import ConfigDialog
 from processing.gui.ResultsDialog import ResultsDialog
 from processing.modeler.ModelerDialog import ModelerDialog
-from processing.commander.CommanderWindow import CommanderWindow
+from processing.gui.CommanderWindow import CommanderWindow
 from processing.tools import dataobjects
 from processing.tools.system import *
 import processing.resources_rc

diff --git a/python/plugins/processing/algs/QGISAlgorithmProvider.py b/python/plugins/processing/algs/QGISAlgorithmProvider.py
diff --git a/...admintools/AdminToolsAlgorithmProvider.py → ...admintools/AdminToolsAlgorithmProvider.py b/...admintools/AdminToolsAlgorithmProvider.py → ...admintools/AdminToolsAlgorithmProvider.py
@@ -29,16 +29,14 @@
 from PyQt4 import QtGui
 
 from processing.core.AlgorithmProvider import AlgorithmProvider
-from processing.admintools.PostGISExecuteSQL import PostGISExecuteSQL
-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 PostGISExecuteSQL import PostGISExecuteSQL
+from ImportIntoPostGIS import ImportIntoPostGIS
+from ImportVectorIntoGeoServer import ImportVectorIntoGeoServer
+from CreateWorkspace import CreateWorkspace
+from ImportRasterIntoGeoServer import ImportRasterIntoGeoServer
+from DeleteWorkspace import DeleteWorkspace
+from DeleteDatastore import DeleteDatastore
+from CreateStyleGeoServer import CreateStyleGeoServer
 
 
 class AdminToolsAlgorithmProvider(AlgorithmProvider):
@@ -74,7 +72,7 @@ def getDescription(self):
 
     def getIcon(self):
         return QtGui.QIcon(os.path.dirname(__file__)
-                           + '/../images/database.png')
+                           + '/../../images/database.png')
 
     def _loadAlgorithms(self):
         self.algs = self.alglist

diff --git a/...gins/processing/admintools/CMakeLists.txt → ...processing/algs/admintools/CMakeLists.txt b/...gins/processing/admintools/CMakeLists.txt → ...processing/algs/admintools/CMakeLists.txt
diff --git a/...ssing/admintools/CreateMosaicDatastore.py → .../algs/admintools/CreateMosaicDatastore.py b/...ssing/admintools/CreateMosaicDatastore.py → .../algs/admintools/CreateMosaicDatastore.py
@@ -25,7 +25,7 @@
 
 import os
 from qgis.core import *
-from processing.admintools.GeoServerToolsAlgorithm import \
+from GeoServerToolsAlgorithm import \
         GeoServerToolsAlgorithm
 from processing.parameters.ParameterVector import ParameterVector
 from processing.parameters.ParameterString import ParameterString

diff --git a/...essing/admintools/CreateStyleGeoServer.py → ...g/algs/admintools/CreateStyleGeoServer.py b/...essing/admintools/CreateStyleGeoServer.py → ...g/algs/admintools/CreateStyleGeoServer.py
@@ -26,7 +26,7 @@
 __revision__ = '$Format:%H$'
 
 from qgis.core import *
-from processing.admintools.GeoServerToolsAlgorithm import \
+from GeoServerToolsAlgorithm import \
         GeoServerToolsAlgorithm
 from processing.parameters.ParameterString import ParameterString
 from processing.parameters.ParameterFile import ParameterFile

diff --git a/.../processing/admintools/CreateWorkspace.py → ...essing/algs/admintools/CreateWorkspace.py b/.../processing/admintools/CreateWorkspace.py → ...essing/algs/admintools/CreateWorkspace.py
@@ -26,7 +26,7 @@
 __revision__ = '$Format:%H$'
 
 from qgis.core import *
-from processing.admintools.GeoServerToolsAlgorithm import \
+from GeoServerToolsAlgorithm import \
         GeoServerToolsAlgorithm
 from processing.parameters.ParameterString import ParameterString
 from processing.outputs.OutputString import OutputString

diff --git a/.../processing/admintools/DeleteDatastore.py → ...essing/algs/admintools/DeleteDatastore.py b/.../processing/admintools/DeleteDatastore.py → ...essing/algs/admintools/DeleteDatastore.py
@@ -26,7 +26,7 @@
 __revision__ = '$Format:%H$'
 
 from qgis.core import *
-from processing.admintools.GeoServerToolsAlgorithm import \
+from GeoServerToolsAlgorithm import \
         GeoServerToolsAlgorithm
 from processing.parameters.ParameterString import ParameterString
 

diff --git a/.../processing/admintools/DeleteWorkspace.py → ...essing/algs/admintools/DeleteWorkspace.py b/.../processing/admintools/DeleteWorkspace.py → ...essing/algs/admintools/DeleteWorkspace.py
@@ -26,7 +26,7 @@
 __revision__ = '$Format:%H$'
 
 from qgis.core import *
-from processing.admintools.GeoServerToolsAlgorithm import \
+from GeoServerToolsAlgorithm import \
         GeoServerToolsAlgorithm
 from processing.parameters.ParameterString import ParameterString
 

diff --git a/...ing/admintools/GeoServerToolsAlgorithm.py → ...lgs/admintools/GeoServerToolsAlgorithm.py b/...ing/admintools/GeoServerToolsAlgorithm.py → ...lgs/admintools/GeoServerToolsAlgorithm.py
@@ -29,7 +29,7 @@
 from PyQt4 import QtGui
 from processing.core.GeoAlgorithm import GeoAlgorithm
 from processing.parameters.ParameterString import ParameterString
-from processing.admintools.geoserver.catalog import Catalog
+from geoserver.catalog import Catalog
 
 
 class GeoServerToolsAlgorithm(GeoAlgorithm):
@@ -40,7 +40,7 @@ class GeoServerToolsAlgorithm(GeoAlgorithm):
 
     def getIcon(self):
         return QtGui.QIcon(os.path.dirname(__file__)
-                           + '/../images/geoserver.png')
+                           + '/../../images/geoserver.png')
 
     def addBaseParameters(self):
         self.addParameter(ParameterString(self.URL, 'URL',

diff --git a/...rocessing/admintools/ImportIntoPostGIS.py → ...sing/algs/admintools/ImportIntoPostGIS.py b/...rocessing/admintools/ImportIntoPostGIS.py → ...sing/algs/admintools/ImportIntoPostGIS.py
@@ -37,8 +37,7 @@
 from processing.parameters.ParameterString import ParameterString
 from processing.parameters.ParameterSelection import ParameterSelection
 from processing.tools import dataobjects
-
-from processing.admintools import postgis_utils
+import postgis_utils
 
 
 class ImportIntoPostGIS(GeoAlgorithm):
@@ -53,7 +52,7 @@ class ImportIntoPostGIS(GeoAlgorithm):
     LOWERCASE_NAMES = 'LOWERCASE_NAMES'
 
     def getIcon(self):
-        return QIcon(os.path.dirname(__file__) + '/../images/postgis.png')
+        return QIcon(os.path.dirname(__file__) + '/../../images/postgis.png')
 
     def processAlgorithm(self, progress):
         connection = self.DB_CONNECTIONS[self.getParameterValue(self.DATABASE)]

diff --git a/...g/admintools/ImportRasterIntoGeoServer.py → ...s/admintools/ImportRasterIntoGeoServer.py b/...g/admintools/ImportRasterIntoGeoServer.py → ...s/admintools/ImportRasterIntoGeoServer.py
@@ -26,7 +26,7 @@
 __revision__ = '$Format:%H$'
 
 from qgis.core import *
-from processing.admintools.GeoServerToolsAlgorithm import \
+from GeoServerToolsAlgorithm import \
         GeoServerToolsAlgorithm
 from processing.parameters.ParameterString import ParameterString
 from processing.parameters.ParameterRaster import ParameterRaster

diff --git a/...g/admintools/ImportVectorIntoGeoServer.py → ...s/admintools/ImportVectorIntoGeoServer.py b/...g/admintools/ImportVectorIntoGeoServer.py → ...s/admintools/ImportVectorIntoGeoServer.py
@@ -27,7 +27,7 @@
 
 import os
 from qgis.core import *
-from processing.admintools.GeoServerToolsAlgorithm import \
+from GeoServerToolsAlgorithm import \
         GeoServerToolsAlgorithm
 from processing.parameters.ParameterVector import ParameterVector
 from processing.parameters.ParameterString import ParameterString

diff --git a/...rocessing/admintools/PostGISExecuteSQL.py → ...sing/algs/admintools/PostGISExecuteSQL.py b/...rocessing/admintools/PostGISExecuteSQL.py → ...sing/algs/admintools/PostGISExecuteSQL.py
@@ -33,7 +33,7 @@
 from processing.core.GeoAlgorithmExecutionException import \
         GeoAlgorithmExecutionException
 from processing.parameters.ParameterString import ParameterString
-from processing.admintools import postgis_utils
+import postgis_utils
 
 
 class PostGISExecuteSQL(GeoAlgorithm):
@@ -42,7 +42,7 @@ class PostGISExecuteSQL(GeoAlgorithm):
     SQL = 'SQL'
 
     def getIcon(self):
-        return QIcon(os.path.dirname(__file__) + '/../images/postgis.png')
+        return QIcon(os.path.dirname(__file__) + '/../../images/postgis.png')
 
     def processAlgorithm(self, progress):
 

diff --git a/...plugins/processing/admintools/__init__.py → ...ns/processing/algs/admintools/__init__.py b/...plugins/processing/admintools/__init__.py → ...ns/processing/algs/admintools/__init__.py
diff --git a/...ssing/admintools/geoserver/CMakeLists.txt → .../algs/admintools/geoserver/CMakeLists.txt b/...ssing/admintools/geoserver/CMakeLists.txt → .../algs/admintools/geoserver/CMakeLists.txt
diff --git a/...ocessing/admintools/geoserver/__init__.py → ...ing/algs/admintools/geoserver/__init__.py b/...ocessing/admintools/geoserver/__init__.py → ...ing/algs/admintools/geoserver/__init__.py
diff --git a/...rocessing/admintools/geoserver/catalog.py → ...sing/algs/admintools/geoserver/catalog.py b/...rocessing/admintools/geoserver/catalog.py → ...sing/algs/admintools/geoserver/catalog.py
@@ -32,19 +32,16 @@
 from xml.parsers.expat import ExpatError
 from urlparse import urlparse
 
-from processing.admintools.geoserver.layer import Layer
-from processing.admintools.geoserver.style import Style
-from processing.admintools.geoserver.store import coveragestore_from_index, \
+from layer import Layer
+from style import Style
+from store import coveragestore_from_index, \
     datastore_from_index, UnsavedDataStore, UnsavedCoverageStore
-from processing.admintools.geoserver.support import prepare_upload_bundle, url
-from processing.admintools.geoserver.layergroup import LayerGroup, \
+from support import prepare_upload_bundle, url
+from layergroup import LayerGroup, \
     UnsavedLayerGroup
-from processing.admintools.geoserver.workspace import workspace_from_index, \
+from workspace import workspace_from_index, \
     Workspace
-try:
-  from processing.admintools import httplib2
-except ImportError:
-  import httplib2
+from processing.algs.admintools import httplib2
 
 
 logger = logging.getLogger('gsconfig.catalog')

diff --git a/.../processing/admintools/geoserver/layer.py → ...essing/algs/admintools/geoserver/layer.py b/.../processing/admintools/geoserver/layer.py → ...essing/algs/admintools/geoserver/layer.py
@@ -25,8 +25,8 @@
 
 __revision__ = '$Format:%H$'
 
-from processing.admintools.geoserver.style import Style
-from processing.admintools.geoserver.support import ResourceInfo, \
+from style import Style
+from support import ResourceInfo, \
     xml_property, write_bool, url
 
 

diff --git a/...essing/admintools/geoserver/layergroup.py → ...g/algs/admintools/geoserver/layergroup.py b/...essing/admintools/geoserver/layergroup.py → ...g/algs/admintools/geoserver/layergroup.py
@@ -25,7 +25,7 @@
 
 __revision__ = '$Format:%H$'
 
-from processing.admintools.geoserver.support import ResourceInfo, bbox, \
+from support import ResourceInfo, bbox, \
     write_bbox, write_string, xml_property, url
 
 

diff --git a/...cessing/admintools/geoserver/namespace.py → ...ng/algs/admintools/geoserver/namespace.py b/...cessing/admintools/geoserver/namespace.py → ...ng/algs/admintools/geoserver/namespace.py