[sextante] updated to new sip api

Author: volaya

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)
 

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:

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

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

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

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

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

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)

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)

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))