[sextante] fixed some minor bugs due to new SIP API

qgis · Jul 1, 2013 · df398a1 · df398a1
1 parent cfebe8f
commit df398a1
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/python/plugins/sextante/algs/ftools/Dissolve.py b/python/plugins/sextante/algs/ftools/Dissolve.py
@@ -92,7 +92,7 @@ def processAlgorithm(self, progress):
                     progress.setPercentage(int(nElement/nFeat * 100))
                     atMap = inFeat.attributes()
                     tempItem = atMap[ field ]
-                    if tempItem.strip() == item.strip():
+                    if unicode(tempItem).strip() == unicode(item).strip():
                         if first:
                             QgsGeometry( inFeat.geometry() )
                             tmpInGeom = QgsGeometry( inFeat.geometry() )

diff --git a/python/plugins/sextante/algs/ftools/SinglePartsToMultiparts.py b/python/plugins/sextante/algs/ftools/SinglePartsToMultiparts.py
@@ -84,7 +84,7 @@ def processAlgorithm(self, progress):
                 for inFeat in features:
                     atMap = inFeat.attributes()
                     idVar = atMap[index]
-                    if idVar.strip() == i.strip():
+                    if unicode(idVar).strip() == unicode(i).strip():
                         if first:
                             attrs = atMap
                             print attrs

diff --git a/python/plugins/sextante/gui/FileSelectionPanel.py b/python/plugins/sextante/gui/FileSelectionPanel.py
@@ -75,4 +75,4 @@ def getValue(self):
         return s
 
     def setText(self, text):
-        self.text.setText(text)
+        self.text.setText(text)
diff --git a/python/plugins/sextante/modeler/ModelerParametersDialog.py b/python/plugins/sextante/modeler/ModelerParametersDialog.py
@@ -735,7 +735,7 @@ def setParamNumberValue(self, param, widget):
             except:
                 return False
         else:
-            value = widget.itemData(widget.currentIndex()).toPyObject()
+            value = widget.itemData(widget.currentIndex())
             self.params[param.name] = value
         return True
 
@@ -756,7 +756,7 @@ def setParamExtentValue(self, param, widget):
                 return False
             self.values[name] = s
         else:
-            value = widget.itemData(widget.currentIndex()).toPyObject()
+            value = widget.itemData(widget.currentIndex())
             self.params[param.name] = value
         return True