diff --git a/python/plugins/sextante/admintools/ImportIntoPostGIS.py b/python/plugins/sextante/admintools/ImportIntoPostGIS.py index 4696dd17f662..bfafa5a59c61 100644 --- a/python/plugins/sextante/admintools/ImportIntoPostGIS.py +++ b/python/plugins/sextante/admintools/ImportIntoPostGIS.py @@ -54,11 +54,11 @@ def processAlgorithm(self, progress): settings = QSettings() mySettings = "/PostgreSQL/connections/"+ connection try: - database = settings.value(mySettings+"/database").toString() - username = settings.value(mySettings+"/username").toString() - host = settings.value(mySettings+"/host").toString() - port = int(settings.value(mySettings+"/port").toString()) - password = settings.value(mySettings+"/password").toString() + database = settings.value(mySettings+"/database") + username = settings.value(mySettings+"/username") + host = settings.value(mySettings+"/host") + port = settings.value(mySettings+"/port", type = int) + password = settings.value(mySettings+"/password") except Exception, e: raise GeoAlgorithmExecutionException("Wrong database connection name: " + connection) diff --git a/python/plugins/sextante/admintools/PostGISExecuteSQL.py b/python/plugins/sextante/admintools/PostGISExecuteSQL.py index 7bd7912d2ce7..d2ab89361e15 100644 --- a/python/plugins/sextante/admintools/PostGISExecuteSQL.py +++ b/python/plugins/sextante/admintools/PostGISExecuteSQL.py @@ -46,11 +46,11 @@ def processAlgorithm(self, progress): settings = QSettings() mySettings = "/PostgreSQL/connections/"+ connection try: - database = settings.value(mySettings+"/database").toString() - username = settings.value(mySettings+"/username").toString() - host = settings.value(mySettings+"/host").toString() - port = int(settings.value(mySettings+"/port").toString()) - password = settings.value(mySettings+"/password").toString() + database = settings.value(mySettings+"/database") + username = settings.value(mySettings+"/username") + host = settings.value(mySettings+"/host") + port = settings.value(mySettings+"/port", type = int) + password = settings.value(mySettings+"/password") except Exception, e: raise GeoAlgorithmExecutionException("Wrong database connection name: " + connection) try: diff --git a/python/plugins/sextante/algs/AddTableField.py b/python/plugins/sextante/algs/AddTableField.py index 050b6f68a143..f15936ed81ea 100644 --- a/python/plugins/sextante/algs/AddTableField.py +++ b/python/plugins/sextante/algs/AddTableField.py @@ -89,7 +89,7 @@ def processAlgorithm(self, progress): inGeom = inFeat.geometry() outFeat.setGeometry( inGeom ) atMap = inFeat.attributes() - atMap.append(QVariant()) + atMap.append(None) outFeat.setAttributes(atMap) writer.addFeature( outFeat ) del writer diff --git a/python/plugins/sextante/algs/AutoincrementalField.py b/python/plugins/sextante/algs/AutoincrementalField.py index 22a027c3b1e4..7e6adf3342a1 100644 --- a/python/plugins/sextante/algs/AutoincrementalField.py +++ b/python/plugins/sextante/algs/AutoincrementalField.py @@ -59,7 +59,7 @@ def processAlgorithm(self, progress): inGeom = inFeat.geometry() outFeat.setGeometry( inGeom ) attrs = inFeat.attributes() - attrs.append(QVariant(nElement)) + attrs.append(nElement) outFeat.setAttributes(attrs) writer.addFeature(outFeat) del writer diff --git a/python/plugins/sextante/algs/EquivalentNumField.py b/python/plugins/sextante/algs/EquivalentNumField.py index a067a97e7616..ef8582ce270d 100644 --- a/python/plugins/sextante/algs/EquivalentNumField.py +++ b/python/plugins/sextante/algs/EquivalentNumField.py @@ -63,10 +63,10 @@ def processAlgorithm(self, progress): inGeom = feature.geometry() outFeat.setGeometry( inGeom ) atMap = feature.attributes() - clazz = atMap[fieldindex].toString() + clazz = atMap[fieldindex] if clazz not in classes: classes[clazz] = len(classes.keys()) - atMap.append(QVariant(classes[clazz])) + atMap.append(classes[clazz]) outFeat.setAttributes(atMap) writer.addFeature( outFeat ) del writer diff --git a/python/plugins/sextante/algs/FieldPyculator.py b/python/plugins/sextante/algs/FieldPyculator.py index c743a1501a13..912623f8ee9c 100644 --- a/python/plugins/sextante/algs/FieldPyculator.py +++ b/python/plugins/sextante/algs/FieldPyculator.py @@ -142,7 +142,7 @@ def processAlgorithm(self, progress): new_ns['__geom'] = geom if need_attrs: - pyattrs = [self.Qvar2py(a) for a in attrs] + pyattrs = [a for a in attrs] new_ns['__attr'] = pyattrs #clear old result @@ -161,20 +161,12 @@ def processAlgorithm(self, progress): #write feature nElement += 1 outFeat.setGeometry( feat.geometry() ) - attrs.append(QVariant(new_ns[self.RESULT_VAR_NAME])) + attrs.append(new_ns[self.RESULT_VAR_NAME]) outFeat.setAttributes(attrs) writer.addFeature(outFeat) del writer - def Qvar2py(self,qv): - if qv.type() == 2: - return qv.toInt()[0] - if qv.type() == 10: - return unicode(qv.toString()) - if qv.type() == 6: - return qv.toDouble()[0] - return None def checkParameterValuesBeforeExecuting(self): ##TODO check that formula is correct and fields exist diff --git a/python/plugins/sextante/algs/FieldsCalculator.py b/python/plugins/sextante/algs/FieldsCalculator.py index ec5ab3bda5ea..0108ef0ceaf5 100644 --- a/python/plugins/sextante/algs/FieldsCalculator.py +++ b/python/plugins/sextante/algs/FieldsCalculator.py @@ -91,7 +91,7 @@ def processAlgorithm(self, progress): expression = formula k = 0 for attr in attrs: - expression = expression.replace(unicode(fields[k].name()), unicode(attr.toString())) + expression = expression.replace(unicode(fields[k].name()), unicode(attr)) k += 1 try: result = eval(expression) @@ -102,7 +102,7 @@ def processAlgorithm(self, progress): inGeom = inFeat.geometry() outFeat.setGeometry(inGeom) attrs = inFeat.attributes() - attrs.append(QVariant(result)) + attrs.append(result) outFeat.setAttributes(attrs) writer.addFeature(outFeat) del writer diff --git a/python/plugins/sextante/algs/JoinAttributes.py b/python/plugins/sextante/algs/JoinAttributes.py index 920c0670b7a9..0dc59645abad 100644 --- a/python/plugins/sextante/algs/JoinAttributes.py +++ b/python/plugins/sextante/algs/JoinAttributes.py @@ -83,12 +83,12 @@ def processAlgorithm(self, progress): for inFeat in features: inGeom = inFeat.geometry() attrs = inFeat.attributes() - joinValue1 = attrs[joinField1Index].toString() + joinValue1 = attrs[joinField1Index] features2 = QGisLayers.features(layer2); for inFeat2 in features2: ## Maybe it should cache this entries... attrs2 = inFeat2.attributes() - joinValue2 = attrs2[joinField2Index].toString() + joinValue2 = attrs2[joinField2Index] if joinValue1 == joinValue2: # create the new feature outFeat.setGeometry(inGeom) diff --git a/python/plugins/sextante/algs/PointsLayerFromTable.py b/python/plugins/sextante/algs/PointsLayerFromTable.py index e9d0af333512..cc1b16935275 100644 --- a/python/plugins/sextante/algs/PointsLayerFromTable.py +++ b/python/plugins/sextante/algs/PointsLayerFromTable.py @@ -58,8 +58,8 @@ def processAlgorithm(self, progress): progress.setPercentage((nElement*100)/nFeat) attrs = feature.attributes() try: - x = float(attrs[xfieldindex].toString()) - y = float(attrs[yfieldindex].toString()) + x = float(attrs[xfieldindex]) + y = float(attrs[yfieldindex]) except: continue pt = QgsPoint(x, y) diff --git a/python/plugins/sextante/algs/Polygonize.py b/python/plugins/sextante/algs/Polygonize.py index 1089a59916eb..f76cd5ea7838 100644 --- a/python/plugins/sextante/algs/Polygonize.py +++ b/python/plugins/sextante/algs/Polygonize.py @@ -80,7 +80,7 @@ def processAlgorithm(self, progress): for polygon in polygons: outFeat.setGeometry(QgsGeometry.fromWkt( polygon.wkt )) if self.getParameterValue(self.GEOMETRY): - outFeat.setAttributes([None]*fieldsCount + [ QVariant(polygon.area), QVariant(polygon.length)]) + outFeat.setAttributes([None]*fieldsCount + [ polygon.area, polygon.length]) writer.addFeature(outFeat) current += 1 progress.setPercentage(50+int(current * total)) diff --git a/python/plugins/sextante/algs/StatisticsByCategories.py b/python/plugins/sextante/algs/StatisticsByCategories.py index 76e878129236..e80a33ba9010 100644 --- a/python/plugins/sextante/algs/StatisticsByCategories.py +++ b/python/plugins/sextante/algs/StatisticsByCategories.py @@ -69,8 +69,8 @@ def processAlgorithm(self, progress): progress.setPercentage(int((100 * nFeats) / nFeat)) attrs = feat.attributes() try: - value = float(attrs[valuesField].toDouble()[0]) - cat = unicode(attrs[categoriesField].toString()) + value = float(attrs[valuesField]) + cat = unicode(attrs[categoriesField]) if cat not in values: values[cat] = [] values[cat].append(value) @@ -108,7 +108,7 @@ def calculateStats(values): maxvalue = max(v, maxvalue) if n > 1: - variance = M2/(n - 1) + variance = M2/(n - 1) else: variance = 0; stddev = math.sqrt(variance) diff --git a/python/plugins/sextante/algs/ftools/BasicStatisticsNumbers.py b/python/plugins/sextante/algs/ftools/BasicStatisticsNumbers.py index aa26ad8c102a..62db5a92de0f 100644 --- a/python/plugins/sextante/algs/ftools/BasicStatisticsNumbers.py +++ b/python/plugins/sextante/algs/ftools/BasicStatisticsNumbers.py @@ -108,7 +108,7 @@ def processAlgorithm(self, progress): total = 100.0 / float(count) current = 0 for ft in features: - value = float(ft.attributes()[index].toDouble()[0]) + value = float(ft.attributes()[index]) if isFirst: minValue = value maxValue = value diff --git a/python/plugins/sextante/algs/ftools/BasicStatisticsStrings.py b/python/plugins/sextante/algs/ftools/BasicStatisticsStrings.py index 3aae61a25303..3439ed3e515f 100644 --- a/python/plugins/sextante/algs/ftools/BasicStatisticsStrings.py +++ b/python/plugins/sextante/algs/ftools/BasicStatisticsStrings.py @@ -100,7 +100,7 @@ def processAlgorithm(self, progress): total = 100.0 / float(count) current = 0 for ft in features: - length = float(len(ft.attributes()[index].toString())) + length = float(len(ft.attributes()[index])) if isFirst: minValue = length diff --git a/python/plugins/sextante/algs/ftools/Buffer.py b/python/plugins/sextante/algs/ftools/Buffer.py index 881bc125f43b..b8354426be77 100644 --- a/python/plugins/sextante/algs/ftools/Buffer.py +++ b/python/plugins/sextante/algs/ftools/Buffer.py @@ -53,7 +53,7 @@ def buffering(progress, writer, distance, field, useField, layer, dissolve, segm for inFeat in features: attrs = inFeat.attributes() if useField: - value = attrs[field].toDouble()[0] + value = attrs[field] else: value = distance @@ -86,7 +86,7 @@ def buffering(progress, writer, distance, field, useField, layer, dissolve, segm for inFeat in features: attrs = inFeat.attributes() if useField: - value = attrs[field].toDouble()[0] + value = attrs[field] else: value = distance diff --git a/python/plugins/sextante/algs/ftools/ConvexHull.py b/python/plugins/sextante/algs/ftools/ConvexHull.py index 635146dba620..460f7ccabab3 100644 --- a/python/plugins/sextante/algs/ftools/ConvexHull.py +++ b/python/plugins/sextante/algs/ftools/ConvexHull.py @@ -115,7 +115,7 @@ def processAlgorithm(self, progress): features = QGisLayers.features(layer) for f in features: idVar = f[fieldName] - if idVar.toString().trimmed() == i.toString().trimmed(): + if unicode(idVar).strip() == unicode(i).strip: if first: val = idVar first = False @@ -131,11 +131,7 @@ def processAlgorithm(self, progress): outGeom = tmpGeom.convexHull() (area, perim) = utils.simpleMeasure(outGeom) outFeat.setGeometry(outGeom) - outFeat.setAttributes([QVariant(fid), - QVariant(val), - QVariant(area), - QVariant(perim) - ]) + outFeat.setAttributes([fid,val,area,perim]) writer.addFeature(outFeat) except: GEOS_EXCEPT = False @@ -157,11 +153,7 @@ def processAlgorithm(self, progress): outGeom = tmpGeom.convexHull() (area, perim) = utils.simpleMeasure(outGeom) outFeat.setGeometry(outGeom) - outFeat.setAttributes([QVariant(0), - QVariant("all"), - QVariant(area), - QVariant(perim) - ]) + outFeat.setAttributes([0, "all", area, perim]) writer.addFeature(outFeat) except: GEOS_EXCEPT = False diff --git a/python/plugins/sextante/algs/ftools/Dissolve.py b/python/plugins/sextante/algs/ftools/Dissolve.py index feca3850acdb..86954a0693fa 100644 --- 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.toString().trimmed() == item.toString().trimmed(): + if tempItem.strip() == item.strip(): if first: QgsGeometry( inFeat.geometry() ) tmpInGeom = QgsGeometry( inFeat.geometry() ) diff --git a/python/plugins/sextante/algs/ftools/ExportGeometryInfo.py b/python/plugins/sextante/algs/ftools/ExportGeometryInfo.py index d59078fbb912..6b81d9f43497 100644 --- a/python/plugins/sextante/algs/ftools/ExportGeometryInfo.py +++ b/python/plugins/sextante/algs/ftools/ExportGeometryInfo.py @@ -95,8 +95,7 @@ def processAlgorithm(self, progress): # 0 - layer CRS # 1 - project CRS # 2 - ellipsoidal - if method == 2: - settings = QSettings() + if method == 2: ellips = QgsProject.instance().readEntry("Measure", "/Ellipsoid", GEO_NONE)[0] crs = layer.crs().srsid() elif method == 1: @@ -123,9 +122,9 @@ def processAlgorithm(self, progress): outFeat.setGeometry(inGeom) attrs = f.attributes() - attrs.insert(idx1, QVariant(attr1)) + attrs.insert(idx1, attr1) if attr2 is not None: - attrs.insert(idx2, QVariant(attr2)) + attrs.insert(idx2, attr2) outFeat.setAttributes(attrs) writer.addFeature(outFeat) diff --git a/python/plugins/sextante/algs/ftools/ExtentFromLayer.py b/python/plugins/sextante/algs/ftools/ExtentFromLayer.py index 44f1e1251bbd..b1a03eaf33e4 100644 --- a/python/plugins/sextante/algs/ftools/ExtentFromLayer.py +++ b/python/plugins/sextante/algs/ftools/ExtentFromLayer.py @@ -104,17 +104,7 @@ def layerExtent(self, layer, writer, progress): geometry = QgsGeometry().fromPolygon([rect]) feat = QgsFeature() feat.setGeometry(geometry) - attrs = [QVariant(minx), - QVariant(miny), - QVariant(maxx), - QVariant(maxy), - QVariant(cntx), - QVariant(cnty), - QVariant(area), - QVariant(perim), - QVariant(height), - QVariant(width) - ] + attrs = [minx,miny,maxx,maxy,cntx,cnty,area,perim,height,width] feat.setAttributes(attrs) writer.addFeature(feat) @@ -144,17 +134,7 @@ def featureExtent(self, layer, writer, progress): geometry = QgsGeometry().fromPolygon([rect]) feat.setGeometry(geometry) - attrs = [QVariant(minx), - QVariant(miny), - QVariant(maxx), - QVariant(maxy), - QVariant(cntx), - QVariant(cnty), - QVariant(area), - QVariant(perim), - QVariant(height), - QVariant(width) - ] + attrs = [minx,miny,maxx,maxy,cntx,cnty,area,perim,height,width] feat.setAttributes(attrs) writer.addFeature(feat) diff --git a/python/plugins/sextante/algs/ftools/FToolsUtils.py b/python/plugins/sextante/algs/ftools/FToolsUtils.py index 74645da2debc..186961a2a9c7 100644 --- a/python/plugins/sextante/algs/ftools/FToolsUtils.py +++ b/python/plugins/sextante/algs/ftools/FToolsUtils.py @@ -158,20 +158,3 @@ def combineVectorFields(layerA, layerB): return fields -# Create a unique field name based on input field name -def createUniqueFieldNameFromName(field): - check = field.name().right(2) - shortName = field.name().left(8) - if check.startsWith("_"): - (val, test) = check.right(1).toInt() - if test: - if val < 2: - val = 2 - else: - val = val + 1 - field.setName(shortName.left(len(shortName) - 1) + unicode(val)) - else: - field.setName(shortName + "_2") - else: - field.setName(shortName + "_2") - return field diff --git a/python/plugins/sextante/algs/ftools/MeanCoords.py b/python/plugins/sextante/algs/ftools/MeanCoords.py index 4c72a55266e1..779068f906b2 100644 --- a/python/plugins/sextante/algs/ftools/MeanCoords.py +++ b/python/plugins/sextante/algs/ftools/MeanCoords.py @@ -79,12 +79,12 @@ def processAlgorithm(self, progress): for feat in features: current += 1 progress.setPercentage(current * total) - clazz = feat.attributes()[uniqueIndex].toString().trimmed() + clazz = feat.attributes()[uniqueIndex].strip() if weightIndex == -1: weight = 1.00 else: try: - weight = float(feat.attributes()[weightIndex].toDouble()[0]) + weight = float(feat.attributes()[weightIndex]) except: weight = 1.00 if clazz not in means: @@ -106,7 +106,7 @@ def processAlgorithm(self, progress): meanPoint = QgsPoint(cx, cy) outFeat.setGeometry(QgsGeometry.fromPoint(meanPoint)) - outFeat.setAttributes([QVariant(cx), QVariant(cy), clazz]) + outFeat.setAttributes([cx, cy, clazz]) writer.addFeature(outFeat) diff --git a/python/plugins/sextante/algs/ftools/PointDistance.py b/python/plugins/sextante/algs/ftools/PointDistance.py index 7e85ce0fda78..d57e08f5f4f4 100644 --- a/python/plugins/sextante/algs/ftools/PointDistance.py +++ b/python/plugins/sextante/algs/ftools/PointDistance.py @@ -124,14 +124,14 @@ def linearMatrix(self, inLayer, inField, targetLayer, targetField, matType, nPoi total = 100.0 / float(len(features)) for inFeat in features: inGeom = inFeat.geometry() - inID = inFeat.attributes()[inIdx].toString() + inID = inFeat.attributes()[inIdx] featList = index.nearestNeighbor(inGeom.asPoint(), nPoints) distList = [] vari = 0.0 for i in featList: request = QgsFeatureRequest().setFilterFid(i) outFeat = targetLayer.getFeatures(request).next() - outID = outFeat.attributes()[outIdx].toString() + outID = outFeat.attributes()[outIdx] outGeom = outFeat.geometry() dist = distArea.measureLine(inGeom.asPoint(), outGeom.asPoint()) if matType == 0: @@ -167,7 +167,7 @@ def regularMatrix(self, inLayer, inField, targetLayer, targetField, nPoints, pro for inFeat in features: inGeom = inFeat.geometry() - inID = inFeat.attributes()[inIdx].toString() + inID = inFeat.attributes()[inIdx] if first: featList = index.nearestNeighbor(inGeom.asPoint(), nPoints) first = False @@ -175,7 +175,7 @@ def regularMatrix(self, inLayer, inField, targetLayer, targetField, nPoints, pro for i in featList: request = QgsFeatureRequest().setFilterFid(i) outFeat = targetLayer.getFeatures(request).next() - data.append(unicode(outFeat.attributes[outIdx].toString())) + data.append(unicode(outFeat.attributes[outIdx])) self.writer.writerow(data) data = [unicode(inID)] diff --git a/python/plugins/sextante/algs/ftools/PointsInPolygon.py b/python/plugins/sextante/algs/ftools/PointsInPolygon.py index dddd2a5e30bb..eed3175b4491 100644 --- a/python/plugins/sextante/algs/ftools/PointsInPolygon.py +++ b/python/plugins/sextante/algs/ftools/PointsInPolygon.py @@ -103,9 +103,9 @@ def processAlgorithm(self, progress): outFeat.setGeometry(geom) if idxCount == len(attrs): - attrs.append(QVariant(count)) + attrs.append(count) else: - attrs[idxCount] = QVariant(count) + attrs[idxCount] = count outFeat.setAttributes(attrs) writer.addFeature(outFeat) diff --git a/python/plugins/sextante/algs/ftools/PointsInPolygonUnique.py b/python/plugins/sextante/algs/ftools/PointsInPolygonUnique.py index e953b2ae3ee6..d259f296cd85 100644 --- a/python/plugins/sextante/algs/ftools/PointsInPolygonUnique.py +++ b/python/plugins/sextante/algs/ftools/PointsInPolygonUnique.py @@ -102,15 +102,15 @@ def processAlgorithm(self, progress): ftPoint = pointLayer.getFeatures(request).next() tmpGeom = QgsGeometry(ftPoint.geometry()) if geom.contains(tmpGeom): - clazz = ftPoint.attributes()[classFieldIndex].toString() + clazz = ftPoint.attributes()[classFieldIndex] if not clazz in classes: classes.append(clazz) outFeat.setGeometry(geom) if idxCount == len(attrs): - attrs.append(QVariant(len(classes))) + attrs.append(len(classes)) else: - attrs[idxCount] = QVariant(len(classes)) + attrs[idxCount] = len(classes) outFeat.setAttributes(attrs) writer.addFeature(outFeat) diff --git a/python/plugins/sextante/algs/ftools/PointsInPolygonWeighted.py b/python/plugins/sextante/algs/ftools/PointsInPolygonWeighted.py index 1f9db7b4a305..97571afd6d5c 100644 --- a/python/plugins/sextante/algs/ftools/PointsInPolygonWeighted.py +++ b/python/plugins/sextante/algs/ftools/PointsInPolygonWeighted.py @@ -104,15 +104,17 @@ def processAlgorithm(self, progress): ftPoint = pointLayer.getFeatures(request).next() tmpGeom = QgsGeometry(ftPoint.geometry()) if geom.contains(tmpGeom): - weight, ok = ftPoint.attributes()[fieldIdx].toDouble() - if ok: - count += weight + weight = str(ftPoint.attributes()[fieldIdx]) + try: + count += float(weight) + except: + pass #ignore fields with non-numeric values outFeat.setGeometry(geom) if idxCount == len(attrs): - attrs.append(QVariant(count)) + attrs.append(count) else: - attrs[idxCount] = QVariant(count) + attrs[idxCount] = count outFeat.setAttributes(attrs) writer.addFeature(outFeat) diff --git a/python/plugins/sextante/algs/ftools/RandomSelectionWithinSubsets.py b/python/plugins/sextante/algs/ftools/RandomSelectionWithinSubsets.py index 40d10067ed3e..095ca0ccff22 100644 --- a/python/plugins/sextante/algs/ftools/RandomSelectionWithinSubsets.py +++ b/python/plugins/sextante/algs/ftools/RandomSelectionWithinSubsets.py @@ -100,7 +100,7 @@ def processAlgorithm(self, progress): FIDs= [] for inFeat in features: attrs = inFeat.attributes() - if attrs[index] == QVariant(i): + if attrs[index] == i: FIDs.append(inFeat.id()) current += 1 progress.setPercentage(int(current * total)) diff --git a/python/plugins/sextante/algs/ftools/SinglePartsToMultiparts.py b/python/plugins/sextante/algs/ftools/SinglePartsToMultiparts.py index b3e4a1a7e6cb..4fd82deb70a3 100644 --- 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.toString().trimmed() == i.toString().trimmed(): + if idVar.strip() == i.strip(): if first: attrs = atMap print attrs diff --git a/python/plugins/sextante/algs/ftools/SumLines.py b/python/plugins/sextante/algs/ftools/SumLines.py index 97bf94eef0b3..4b2ea6e0d011 100644 --- a/python/plugins/sextante/algs/ftools/SumLines.py +++ b/python/plugins/sextante/algs/ftools/SumLines.py @@ -113,13 +113,13 @@ def processAlgorithm(self, progress): outFeat.setGeometry(inGeom) if idxLength == len(attrs): - attrs.append(QVariant(length)) + attrs.append(length) else: - attrs[idxLength] = QVariant(length) + attrs[idxLength] = length if idxCount == len(attrs): - attrs.append(QVariant(count)) + attrs.append(count) else: - attrs[idxCount] = QVariant(count) + attrs[idxCount] = count outFeat.setAttributes(attrs) writer.addFeature(outFeat) diff --git a/python/plugins/sextante/algs/ftools/UniqueValues.py b/python/plugins/sextante/algs/ftools/UniqueValues.py index e3378fa2e132..06ba366002e7 100644 --- a/python/plugins/sextante/algs/ftools/UniqueValues.py +++ b/python/plugins/sextante/algs/ftools/UniqueValues.py @@ -66,7 +66,7 @@ def processAlgorithm(self, progress): values = utils.getUniqueValues(layer, layer.fieldNameIndex(fieldName)) self.createHTML(outputFile, values) self.setOutputValue(self.TOTAL_VALUES, len(values)) - self.setOutputValue(self.UNIQUE_VALUES, ";".join([unicode(v.toString()) for v in values])) + self.setOutputValue(self.UNIQUE_VALUES, ";".join([unicode(v) for v in values])) def createHTML(self, outputFile, algData): f = codecs.open(outputFile, "w", encoding="utf-8") @@ -76,6 +76,6 @@ def createHTML(self, outputFile, algData): f.write("
Unique values:
") f.write("