Added missing cmake files

fixed bug in execution dialog when running iterative algorithms
qgis · Nov 6, 2012 · f410e38 · f410e38
1 parent d97d4a6
commit f410e38
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 1 deletion.
diff --git a/python/plugins/sextante/gui/AlgorithmExecutionDialog.py b/python/plugins/sextante/gui/AlgorithmExecutionDialog.py
@@ -252,7 +252,14 @@ def accept(self):
             else:
                 self.setInfo("<b>Algorithm %s starting...</b>" % self.alg.name)
                 if iterateParam:
-                    UnthreadedAlgorithmExecutor.runalgIterating(self.alg, iterateParam, self)
+                    if UnthreadedAlgorithmExecutor.runalgIterating(self.alg, iterateParam, self):   
+                        self.finish()
+                    else:
+                        QApplication.restoreOverrideCursor()
+                        if not keepOpen:
+                            self.close()
+                        else:
+                            self.resetGUI()
                 else:
                     command = self.alg.getAsCommand()
                     if command:

diff --git a/python/plugins/sextante/servertools/CMakeLists.txt b/python/plugins/sextante/servertools/CMakeLists.txt
@@ -0,0 +1,6 @@
+FILE(GLOB PY_FILES *.py)
+
+ADD_SUBDIRECTORY(geoserver)
+ADD_SUBDIRECTORY(httplib2)
+
+PLUGIN_INSTALL(sextante servertools ${PY_FILES})
diff --git a/python/plugins/sextante/servertools/geoserver/CMakeLists.txt b/python/plugins/sextante/servertools/geoserver/CMakeLists.txt
@@ -0,0 +1,3 @@
+FILE(GLOB PY_FILES *.py)
+
+PLUGIN_INSTALL(sextante servertools/geoserver ${PY_FILES})
diff --git a/python/plugins/sextante/servertools/httplib2/CMakeLists.txt b/python/plugins/sextante/servertools/httplib2/CMakeLists.txt
@@ -0,0 +1,3 @@
+FILE(GLOB PY_FILES *.py)
+
+PLUGIN_INSTALL(sextante servertools/httplib2 ${PY_FILES})