replaced mmqgis by new improved version, compatible with standalone p…

…lugin git-svn-id: http://sextante.googlecode.com/svn/trunk/soft/bindings/qgis-plugin@186 881b9c09-3ef8-f3c2-ec3d-21d735c97f4d
qgis · May 20, 2012 · f97a6b5 · f97a6b5
1 parent 7f4e371
commit f97a6b5
Show file tree

Hide file tree

Showing 39 changed files with 2,161 additions and 713 deletions.
diff --git a/src/sextante/core/Sextante.py b/src/sextante/core/Sextante.py
@@ -2,13 +2,11 @@
 from PyQt4.QtGui import *
 from sextante.saga.SagaAlgorithmProvider import SagaAlgorithmProvider
 from sextante.script.ScriptAlgorithmProvider import ScriptAlgorithmProvider
-import copy
 from sextante.core.QGisLayers import QGisLayers
 from sextante.gui.AlgorithmExecutor import AlgorithmExecutor, SilentProgress
 from sextante.core.SextanteConfig import SextanteConfig
 from sextante.core.SextanteLog import SextanteLog
 from sextante.modeler.ModelerAlgorithmProvider import ModelerAlgorithmProvider
-from sextante.mmqgis.MMQGISAlgorithmProvider import MMQGISAlgorithmProvider
 from sextante.ftools.FToolsAlgorithmProvider import FToolsAlgorithmProvider
 from sextante.gui.SextantePostprocessing import SextantePostprocessing
 from sextante.modeler.Providers import Providers
@@ -24,6 +22,7 @@
 from sextante.algs.SextanteAlgorithmProvider import SextanteAlgorithmProvider
 from sextante.fusion.FusionAlgorithmProvider import FusionAlgorithmProvider
 from sextante.pymorph.PymorphAlgorithmProvider import PymorphAlgorithmProvider
+from sextante.mmqgisx.MMQGISXAlgorithmProvider import MMQGISXAlgorithmProvider
 
 class Sextante:
 
@@ -83,7 +82,7 @@ def setInterface(iface):
     def initialize():
         #add the basic providers
         Sextante.addProvider(SextanteAlgorithmProvider())
-        Sextante.addProvider(MMQGISAlgorithmProvider())
+        Sextante.addProvider(MMQGISXAlgorithmProvider())
         Sextante.addProvider(FToolsAlgorithmProvider())
         Sextante.addProvider(ModelerOnlyAlgorithmProvider())
         Sextante.addProvider(GdalAlgorithmProvider())

diff --git a/src/sextante/gui/ParametersDialog.py b/src/sextante/gui/ParametersDialog.py
@@ -150,6 +150,9 @@ def accept(self):
                     if button.isChecked():
                         iterateParam = buttons.keys()[i]
                         break
+
+
+                self.progress.setMaximum(0)
                 self.progressLabel.setText("Processing algorithm...")
                 if iterateParam:
                     QApplication.setOverrideCursor(QCursor(Qt.WaitCursor))
@@ -192,6 +195,8 @@ def reject(self):
         self.dialog.close()
 
     def setPercentage(self, i):
+        if self.progress.maximum() == 0:
+            self.progress.setMaximum(100)
         self.progress.setValue(i)
 
     def setText(self, text):

diff --git a/src/sextante/mmqgis/DummyInterface.py b/src/sextante/mmqgis/DummyInterface.py
diff --git a/src/sextante/mmqgis/MMQGISAlgorithm.py b/src/sextante/mmqgis/MMQGISAlgorithm.py
diff --git a/src/sextante/mmqgis/MMQGISAlgorithmProvider.py b/src/sextante/mmqgis/MMQGISAlgorithmProvider.py
diff --git a/src/sextante/mmqgis/copyright.txt b/src/sextante/mmqgis/copyright.txt
diff --git a/src/sextante/mmqgis/scripts/Create_Grid_Layer.py b/src/sextante/mmqgis/scripts/Create_Grid_Layer.py
diff --git a/src/sextante/mmqgis/scripts/Distance_to_nearest_hub.py b/src/sextante/mmqgis/scripts/Distance_to_nearest_hub.py
diff --git a/src/sextante/mmqgis/scripts/Export_geometries_to_CSV.py b/src/sextante/mmqgis/scripts/Export_geometries_to_CSV.py
diff --git a/src/sextante/mmqgis/scripts/Merge_layers.py b/src/sextante/mmqgis/scripts/Merge_layers.py
diff --git a/src/sextante/mmqgis/scripts/Snap_vertices_to_grid.py b/src/sextante/mmqgis/scripts/Snap_vertices_to_grid.py
diff --git a/src/sextante/mmqgis/scripts/Sort_vector_layer.py b/src/sextante/mmqgis/scripts/Sort_vector_layer.py
diff --git a/src/sextante/mmqgis/scripts/Text_to_float.py b/src/sextante/mmqgis/scripts/Text_to_float.py