Skip to content

Commit df398a1

Browse files
committed
[sextante] fixed some minor bugs due to new SIP API
1 parent cfebe8f commit df398a1

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

python/plugins/sextante/algs/ftools/Dissolve.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ def processAlgorithm(self, progress):
9292
progress.setPercentage(int(nElement/nFeat * 100))
9393
atMap = inFeat.attributes()
9494
tempItem = atMap[ field ]
95-
if tempItem.strip() == item.strip():
95+
if unicode(tempItem).strip() == unicode(item).strip():
9696
if first:
9797
QgsGeometry( inFeat.geometry() )
9898
tmpInGeom = QgsGeometry( inFeat.geometry() )

python/plugins/sextante/algs/ftools/SinglePartsToMultiparts.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ def processAlgorithm(self, progress):
8484
for inFeat in features:
8585
atMap = inFeat.attributes()
8686
idVar = atMap[index]
87-
if idVar.strip() == i.strip():
87+
if unicode(idVar).strip() == unicode(i).strip():
8888
if first:
8989
attrs = atMap
9090
print attrs

python/plugins/sextante/gui/FileSelectionPanel.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,4 +75,4 @@ def getValue(self):
7575
return s
7676

7777
def setText(self, text):
78-
self.text.setText(text)
78+
self.text.setText(text)

python/plugins/sextante/modeler/ModelerParametersDialog.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -735,7 +735,7 @@ def setParamNumberValue(self, param, widget):
735735
except:
736736
return False
737737
else:
738-
value = widget.itemData(widget.currentIndex()).toPyObject()
738+
value = widget.itemData(widget.currentIndex())
739739
self.params[param.name] = value
740740
return True
741741

@@ -756,7 +756,7 @@ def setParamExtentValue(self, param, widget):
756756
return False
757757
self.values[name] = s
758758
else:
759-
value = widget.itemData(widget.currentIndex()).toPyObject()
759+
value = widget.itemData(widget.currentIndex())
760760
self.params[param.name] = value
761761
return True
762762

0 commit comments

Comments
 (0)