python/plugins/sextante/algs/AutoincrementalField.py

@@ -45,7 +45,7 @@ def processAlgorithm(self, progress):
         vlayer = QGisLayers.getObjectFromUri(self.getParameterValue(self.INPUT))
         vprovider = vlayer.dataProvider()
         fields = vprovider.fields()
-        fields[len(fields)] = QgsField("AUTO", QVariant.Int)
+        fields.append(QgsField("AUTO", QVariant.Int))
         writer = output.getVectorWriter(fields, vprovider.geometryType(), vlayer.crs() )
         inFeat = QgsFeature()
         outFeat = QgsFeature()
@@ -58,10 +58,10 @@ def processAlgorithm(self, progress):
             nElement += 1
             inGeom = inFeat.geometry()
             outFeat.setGeometry( inGeom )
-            atMap = inFeat.attributeMap()
-            atMap.append(QVariant(nElement))
-            outFeat.setAttributeMap( atMap )
-            writer.addFeature( outFeat )
+            attrs = inFeat.attributes()
+            attrs.append(QVariant(nElement))
+            outFeat.setAttributes(attrs)
+            writer.addFeature(outFeat)
         del writer
 
     def defineCharacteristics(self):

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

@@ -56,7 +56,6 @@ def processAlgorithm(self, progress):
         vproviderA = vlayerA.dataProvider()
         fields = vproviderA.fields()
         writer = self.getOutputFromName(Dissolve.OUTPUT).getVectorWriter(fields, vproviderA.geometryType(), vproviderA.crs() )
-        #inFeat = QgsFeature()
         outFeat = QgsFeature()
         nElement = 0
         nFeat = vproviderA.featureCount()

python/plugins/sextante/metadata.txt

@@ -2,8 +2,8 @@
 name=SEXTANTE
 description=SEXTANTE Geoprocessing Platform for QGIS
 category=Analysis
-version=1.0.9
-qgisMinimumVersion=1.8
+version=1.1
+qgisMinimumVersion=1.9
 
 author=Victor Olaya
 email=volayaf@gmail.com

python/plugins/sextante/saga/SagaAlgorithm.py

@@ -348,9 +348,8 @@ def exportRasterLayer(self, layer):
             return "libio_gdal 0 -GRIDS \"" + destFilename + "\" -FILES \"" + layer + "\""
 
 
-    def checkBeforeOpeningParametersDialog(self):
-        pass
-        #return SagaUtils.checkSagaIsInstalled()
+    def checkBeforeOpeningParametersDialog(self):        
+        return SagaUtils.checkSagaIsInstalled()
 
 
     def checkParameterValuesBeforeExecuting(self):

python/plugins/sextante/saga/SagaUtils.py

@@ -16,6 +16,7 @@
 *                                                                         *
 ***************************************************************************
 """
+from sextante.tests.TestData import points
 
 __author__ = 'Victor Olaya'
 __date__ = 'August 2012'
@@ -132,25 +133,27 @@ def checkSagaIsInstalled(cls):
             return
 
         try:
-            qgis = QGisLayers.iface
-            crs = qgis.mapCanvas().mapRenderer().destinationCrs()
-            fields = []
-            fields.append(QgsField("NUM_FIELD", QVariant.Int))
-            filename = SextanteUtils.getTempFilename("shp")
-            writer = SextanteVectorWriter(filename, None, fields, QGis.WKBPoint, crs)
-            for x in range(5):
-                for y in range(5):
-                    attrs = []
-                    attrs.append(QVariant(x))
-                    outFeat = QgsFeature()
-                    pt = QgsPoint(x, y)
-                    outFeat.setGeometry(QgsGeometry.fromPoint(pt))
-                    outFeat.setAttributes(attrs)
-                    writer.addFeature(outFeat)
-            del writer.writer
-            del writer
+            #===================================================================
+            # qgis = QGisLayers.iface
+            # crs = qgis.mapCanvas().mapRenderer().destinationCrs()
+            # fields = []
+            # fields.append(QgsField("NUM_FIELD", QVariant.Int))
+            # filename = SextanteUtils.getTempFilename("shp")
+            # writer = SextanteVectorWriter(filename, None, fields, QGis.WKBPoint, crs)
+            # for x in range(5):
+            #    for y in range(5):
+            #        attrs = []
+            #        attrs.append(QVariant(x))
+            #        outFeat = QgsFeature()
+            #        pt = QgsPoint(x, y)
+            #        outFeat.setGeometry(QgsGeometry.fromPoint(pt))
+            #        outFeat.setAttributes(attrs)
+            #        writer.addFeature(outFeat)
+            # del writer.writer
+            # del writer
+            #===================================================================
             from sextante.core.Sextante import runalg
-            result = runalg("saga:thiessenpolygons", filename, None)
+            result = runalg("saga:thiessenpolygons", points(), None)
             if not os.path.exists(result['POLYGONS']):
                 return "It seems that SAGA is not correctly installed in your system.\nPlease install it before running SAGA algorithms."
         except:

python/plugins/sextante/script/ScriptAlgorithm.py

@@ -204,12 +204,10 @@ def processAlgorithm(self, progress):
         ns['progress'] = progress
 
         for param in self.parameters:
-            #script += param.name + "=" + param.getValueAsCommandLineParameter() + "\n"
             ns[param.name] = param.value
 
         for out in self.outputs:
             ns[out.name] = out.value
-            #script += out.name + "=" + out.getValueAsCommandLineParameter() + "\n"
 
         script+=self.script
         exec(script) in ns