minor fixes

git-svn-id: http://sextante.googlecode.com/svn/trunk/soft/bindings/qgis-plugin@197 881b9c09-3ef8-f3c2-ec3d-21d735c97f4d
qgis · May 30, 2012 · d2c7008 · d2c7008
1 parent fb00f67
commit d2c7008
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 27 deletions.
diff --git a/src/sextante/grass/description/v.buffer.angle.txt b/src/sextante/grass/description/v.buffer.angle.txt
diff --git a/src/sextante/grass/description/v.buffer.column.txt b/src/sextante/grass/description/v.buffer.column.txt
@@ -4,7 +4,7 @@ Vector (v.*)
 ParameterVector|input|input|-1|False
 ParameterTableField|bufcolumn|bufcolumn|input
 ParameterNumber|scale|scale|None|None|1.0
-ParameterString|tolerance|tolerance|0.01
+ParameterNumber|tolerance|tolerance|0|None|0.01
 ParameterBoolean|-s|-s|True
 ParameterBoolean|-c|-c|True
 OutputVector|output|output
diff --git a/src/sextante/grass/description/v.buffer.distance.txt b/src/sextante/grass/description/v.buffer.distance.txt
@@ -2,8 +2,10 @@ v.buffer
 v.buffer.distance
 Vector (v.*)
 ParameterVector|input|input|-1|False
-ParameterString|distance|distance|
-ParameterString|tolerance|tolerance|0.01
+ParameterNumber|distance|distance|0|None|1
+ParameterNumber|tolerance|tolerance|0|None|0.01
+ParameterNumber|minordistance|minordistance|0|None|0.0
+ParameterNumber|angle|angle|0|None|0.0
 ParameterBoolean|-s|-s|True
 ParameterBoolean|-c|-c|True
 OutputVector|output|output
diff --git a/src/sextante/grass/description/v.buffer.minordistance.txt b/src/sextante/grass/description/v.buffer.minordistance.txt
diff --git a/src/sextante/gui/ConfigDialog.py b/src/sextante/gui/ConfigDialog.py
@@ -4,6 +4,7 @@
 from sextante.core.SextanteConfig import SextanteConfig
 from sextante.core.Sextante import Sextante
 from sextante.core.SextanteUtils import SextanteUtils
+from sextante.gui.ExternalAppsConfigurer import ExternalAppsConfigurer
 
 
 class ConfigDialog(QtGui.QDialog):
@@ -44,6 +45,7 @@ def setupUi(self):
             self.externalAppsButton = QtGui.QPushButton()
             self.externalAppsButton.setText("Configure external apps")
             self.horizontalLayout.addWidget(self.externalAppsButton)
+            QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL("clicked()"), self.configureExternalApps)
         self.horizontalLayout.addSpacing(100)
         self.horizontalLayout.addWidget(self.buttonBox)
         self.verticalLayout.addLayout(self.horizontalLayout)
@@ -52,6 +54,9 @@ def setupUi(self):
         QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL("rejected()"), self.cancelPressed)
         QtCore.QMetaObject.connectSlotsByName(self)
 
+    def configureExternalApps(self):
+        ExternalAppsConfigurer.configure()
+        #TODO find a way to automate
 
     def fillTree(self):
         self.items = {}

diff --git a/src/sextante/gui/ExternalAppsConfigurer.py b/src/sextante/gui/ExternalAppsConfigurer.py
@@ -0,0 +1,10 @@
+class ExternalAppsConfigurer():
+
+    @staticmethod
+    def configure():
+        #TODO find a way of automating this, not having to add each provider here manually
+
+        pass
+
+    def folderFinder(self, s):
+        pass
diff --git a/src/sextante/modeler/ModelerAlgorithm.py b/src/sextante/modeler/ModelerAlgorithm.py
@@ -225,8 +225,9 @@ def getDependsOnAlgorithms(self, algIndex):
         '''This method returns a list with the indexes of algorithm a given one depends on'''
         algs = []
         for aap in self.algParameters[algIndex].values():
-            if aap.alg != AlgorithmAndParameter.PARENT_MODEL_ALGORITHM and aap.alg not in algs:
-                algs.append(aap.alg)
+            if aap is not None:
+                if aap.alg != AlgorithmAndParameter.PARENT_MODEL_ALGORITHM and aap.alg not in algs:
+                    algs.append(aap.alg)
         return algs
 
     def getDependentAlgorithms(self, algIndex):
@@ -236,9 +237,10 @@ def getDependentAlgorithms(self, algIndex):
         for alg in self.algParameters:
             index += 1
             for aap in alg.values():
-                if aap.alg == algIndex:
-                    dependent.append(index)
-                    break
+                if aap is not None:
+                    if aap.alg == algIndex:
+                        dependent.append(index)
+                        break
 
         return dependent
 

diff --git a/src/sextante/saga/SagaUtils.py b/src/sextante/saga/SagaUtils.py
@@ -75,7 +75,8 @@ def executeSaga(progress):
                 s = "".join([x for x in line if x.isdigit()])
                 progress.setPercentage(int(s))
             else:
-                loglines.append(line)
+                if line!="/" and line!="-" and line !="\\":
+                    loglines.append(line)
         SextanteLog.addToLog(SextanteLog.LOG_INFO, loglines)