[processing] some file restructuring

qgis · Jun 10, 2014 · ae47c1a · ae47c1a
1 parent 0009040
commit ae47c1a
Show file tree

Hide file tree

Showing 12 changed files with 7 additions and 17 deletions.
diff --git a/python/plugins/processing/CMakeLists.txt b/python/plugins/processing/CMakeLists.txt
@@ -10,7 +10,6 @@ ADD_SUBDIRECTORY(parameters)
 ADD_SUBDIRECTORY(script)
 ADD_SUBDIRECTORY(tools)
 ADD_SUBDIRECTORY(tests)
-ADD_SUBDIRECTORY(exampleprovider)
 
 FILE(GLOB UI_FILES ui/*.ui)
 PYQT4_WRAP_UI(PYUI_FILES ${UI_FILES})

diff --git a/python/plugins/processing/algs/CMakeLists.txt b/python/plugins/processing/algs/CMakeLists.txt
@@ -9,5 +9,6 @@ ADD_SUBDIRECTORY(taudem)
 ADD_SUBDIRECTORY(lidar)
 ADD_SUBDIRECTORY(qgis)
 ADD_SUBDIRECTORY(r)
+ADD_SUBDIRECTORY(exampleprovider)
 
 PLUGIN_INSTALL(processing algs ${PY_FILES})
diff --git a/python/plugins/processing/algs/exampleprovider/CMakeLists.txt b/python/plugins/processing/algs/exampleprovider/CMakeLists.txt
@@ -0,0 +1,4 @@
+FILE(GLOB PY_FILES *.py)
+FILE(GLOB OTHER_FILES *.txt)
+
+PLUGIN_INSTALL(processing ./algs/exampleprovider ${PY_FILES} ${OTHER_FILES})
diff --git a/...ssing/exampleprovider/ExampleAlgorithm.py → .../algs/exampleprovider/ExampleAlgorithm.py b/...ssing/exampleprovider/ExampleAlgorithm.py → .../algs/exampleprovider/ExampleAlgorithm.py
diff --git a/...ampleprovider/ExampleAlgorithmProvider.py → ...ampleprovider/ExampleAlgorithmProvider.py b/...ampleprovider/ExampleAlgorithmProvider.py → ...ampleprovider/ExampleAlgorithmProvider.py
diff --git a/...ovider/ProcessingExampleProviderPlugin.py → ...ovider/ProcessingExampleProviderPlugin.py b/...ovider/ProcessingExampleProviderPlugin.py → ...ovider/ProcessingExampleProviderPlugin.py
diff --git a/...ns/processing/exampleprovider/__init__.py → ...ocessing/algs/exampleprovider/__init__.py b/...ns/processing/exampleprovider/__init__.py → ...ocessing/algs/exampleprovider/__init__.py
diff --git a/...s/processing/exampleprovider/metadata.txt → ...cessing/algs/exampleprovider/metadata.txt b/...s/processing/exampleprovider/metadata.txt → ...cessing/algs/exampleprovider/metadata.txt
diff --git a/python/plugins/processing/core/Processing.py b/python/plugins/processing/core/Processing.py
@@ -38,7 +38,7 @@
 from processing.gui.AlgorithmClassification import AlgorithmDecorator
 from processing.gui.MessageBarProgress import MessageBarProgress
 from processing.gui.RenderingStyles import RenderingStyles
-from processing.gui.Postprocessing import Postprocessing
+from processing.gui.Postprocessing import handleAlgorithmResults
 from processing.gui.UnthreadedAlgorithmExecutor import \
         UnthreadedAlgorithmExecutor
 from processing.modeler.Providers import Providers
@@ -275,8 +275,7 @@ def getObject(uri):
 
     @staticmethod
     def runandload(name, *args):
-        Processing.runAlgorithm(name, Postprocessing.handleAlgorithmResults,
-                                *args)
+        Processing.runAlgorithm(name, handleAlgorithmResults, *args)
 
     @staticmethod
     def runAlgorithm(algOrName, onFinish, *args):

diff --git a/python/plugins/processing/exampleprovider/CMakeLists.txt b/python/plugins/processing/exampleprovider/CMakeLists.txt
diff --git a/...rocessing/gui/help/algclasssification.txt → ...ins/processing/gui/algclasssification.txt b/...rocessing/gui/help/algclasssification.txt → ...ins/processing/gui/algclasssification.txt
diff --git a/python/plugins/processing/gui/help/help.css b/python/plugins/processing/gui/help/help.css