Merge linfiniti2:/tmp/sextante into sextante-import

Author: timlinux

python/plugins/sextante/about/about.htm

@@ -9,9 +9,11 @@ <h2>SEXTANTE for QGIS</h2>
 <p>A development by Victor Olaya (volayaf@gmail.com).</p>
 <p>Portions of this software contributed by:
 <ul>
-<li>Michael Nimm (mmqgis algorithms)</li>
+<li>Alexander Bruy</li>
 <li>Carson Farmer (fTools algorithms)</li>
 <li>Julien Malik (Orfeo Toolbox connectors)</li>
+<li>Evgeniy Nikulin (Original Field Pyculator code)</li>
+<li>Michael Nimm (mmqgis algorithms)</li>
 <li>Camilo Polymeris (Threading). Developed as part of Google Summer of Code 2012</li>
 </ul>
 </p>

python/plugins/sextante/algs/AddTableField.py

@@ -34,16 +34,14 @@ def defineCharacteristics(self):
     def processAlgorithm(self, progress):
         fieldtype = self.getParameterValue(self.FIELD_TYPE)
         fieldname = self.getParameterValue(self.FIELD_NAME)
-        settings = QSettings()
-        systemEncoding = settings.value( "/UI/encoding", "System" ).toString()
-        output = self.getOutputValue(self.OUTPUT_LAYER)
+        output = self.getOutputFromName(self.OUTPUT_LAYER)
         vlayer = QGisLayers.getObjectFromUri(self.getParameterValue(self.INPUT_LAYER))
         vprovider = vlayer.dataProvider()
         allAttrs = vprovider.attributeIndexes()
         vprovider.select( allAttrs )
         fields = vprovider.fields()
         fields[len(fields)] = QgsField(fieldname, self.TYPES[fieldtype])
-        writer = QgsVectorFileWriter( output, systemEncoding,fields, vprovider.geometryType(), vprovider.crs() )
+        writer = output.getVectorWriter(fields, vprovider.geometryType(), vprovider.crs() )
         inFeat = QgsFeature()
         outFeat = QgsFeature()
         inGeom = QgsGeometry()

python/plugins/sextante/algs/AutoincrementalField.py

@@ -16,16 +16,14 @@ def getIcon(self):
         return QtGui.QIcon(os.path.dirname(__file__) + "/../images/toolbox.png")
 
     def processAlgorithm(self, progress):
-        settings = QSettings()
-        systemEncoding = settings.value( "/UI/encoding", "System" ).toString()
-        output = self.getOutputValue(self.OUTPUT)
+        output = self.getOutputFromName(self.OUTPUT)
         vlayer = QGisLayers.getObjectFromUri(self.getParameterValue(self.INPUT))
         vprovider = vlayer.dataProvider()
         allAttrs = vprovider.attributeIndexes()
         vprovider.select( allAttrs )
         fields = vprovider.fields()
         fields[len(fields)] = QgsField("AUTO", QVariant.Int)
-        writer = QgsVectorFileWriter( output, systemEncoding,fields, vprovider.geometryType(), vprovider.crs() )
+        writer = output.getVectorWriter(fields, vprovider.geometryType(), vprovider.crs() )
         inFeat = QgsFeature()
         outFeat = QgsFeature()
         inGeom = QgsGeometry()

python/plugins/sextante/algs/EquivalentNumField.py

@@ -19,16 +19,14 @@ def getIcon(self):
 
     def processAlgorithm(self, progress):
         field_index = self.getParameterValue(self.FIELD)
-        settings = QSettings()
-        systemEncoding = settings.value( "/UI/encoding", "System" ).toString()
-        output = self.getOutputValue(self.OUTPUT)
+        output = self.getOutputFromName(self.OUTPUT)
         vlayer = QGisLayers.getObjectFromUri(self.getParameterValue(self.INPUT))
         vprovider = vlayer.dataProvider()
         allAttrs = vprovider.attributeIndexes()
         vprovider.select( allAttrs )
         fields = vprovider.fields()
         fields[len(fields)] = QgsField("NUM_FIELD", QVariant.Int)
-        writer = QgsVectorFileWriter( output, systemEncoding,fields, vprovider.geometryType(), vprovider.crs() )
+        writer = output.getVectorWriter(fields, vprovider.geometryType(), vprovider.crs() )
         inFeat = QgsFeature()
         outFeat = QgsFeature()
         inGeom = QgsGeometry()

python/plugins/sextante/algs/Explode.py

@@ -17,16 +17,13 @@ def getIcon(self):
         return QtGui.QIcon(os.path.dirname(__file__) + "/../images/toolbox.png")
 
     def processAlgorithm(self, progress):
-        settings = QSettings()
-        systemEncoding = settings.value( "/UI/encoding", "System" ).toString()
         vlayer = QGisLayers.getObjectFromUri(self.getParameterValue(self.INPUT))
-        output = self.getOutputValue(self.OUTPUT)
+        output = self.getOutputFromName(self.OUTPUT)
         vprovider = vlayer.dataProvider()
         allAttrs = vprovider.attributeIndexes()
         vprovider.select( allAttrs )
         fields = vprovider.fields()
-        writer = QgsVectorFileWriter( output, systemEncoding,
-            fields, QGis.WKBLineString, vprovider.crs() )
+        writer = output.getVectorWriter(fields, QGis.WKBLineString, vprovider.crs() )
         inFeat = QgsFeature()
         outFeat = QgsFeature()
         inGeom = QgsGeometry()

python/plugins/sextante/algs/FieldsCalculator.py

@@ -32,16 +32,14 @@ def defineCharacteristics(self):
     def processAlgorithm(self, progress):
         fieldname = self.getParameterValue(self.FIELD_NAME)
         formula = self.getParameterValue(self.FORMULA)
-        settings = QSettings()
-        systemEncoding = settings.value( "/UI/encoding", "System" ).toString()
-        output = self.getOutputValue(self.OUTPUT_LAYER)
+        output = self.getOutputFromName(self.OUTPUT_LAYER)
         vlayer = QGisLayers.getObjectFromUri(self.getParameterValue(self.INPUT_LAYER))
         vprovider = vlayer.dataProvider()
         allAttrs = vprovider.attributeIndexes()
         vprovider.select( allAttrs )
         fields = vprovider.fields()
         fields[len(fields)] = QgsField(fieldname, QVariant.Double)
-        writer = QgsVectorFileWriter( output, systemEncoding,fields, vprovider.geometryType(), vprovider.crs() )
+        writer = output.getVectorWriter(fields, vprovider.geometryType(), vprovider.crs() )
         inFeat = QgsFeature()
         outFeat = QgsFeature()
         inGeom = QgsGeometry()

python/plugins/sextante/algs/SaveSelectedFeatures.py

@@ -50,7 +50,7 @@ def processAlgorithm(self, progress):
         #the first thing to do is retrieve the values of the parameters
         #entered by the user
         inputFilename = self.getParameterValue(self.INPUT_LAYER)
-        output = self.getOutputValue(self.OUTPUT_LAYER)
+        output = self.getOutputFromName(self.OUTPUT_LAYER)
 
         #input layers values are always a string with its location.
         #That string can be converted into a QGIS object (a QgsVectorLayer in this case))
@@ -60,12 +60,10 @@ def processAlgorithm(self, progress):
         #And now we can process
 
         #First we create the output layer.
-        #The output value entered by the user is a string containing a filename,
-        #so we can use it directly
-        settings = QSettings()
-        systemEncoding = settings.value( "/UI/encoding", "System" ).toString()
+        #To do so, we call the getVectorWriter method in the Output object.
+        #That will give as a SextanteVectorWriter, that we can later use to add features.
         provider = vectorLayer.dataProvider()
-        writer = QgsVectorFileWriter( output, systemEncoding, provider.fields(), provider.geometryType(), provider.crs() )
+        writer = output.getVectorWriter( provider.fields(), provider.geometryType(), provider.crs() )
 
         #Now we take the selected features and add them to the output layer
         selection = vectorLayer.selectedFeatures()

python/plugins/sextante/algs/SextanteAlgorithmProvider.py

@@ -6,13 +6,14 @@
 from sextante.algs.SaveSelectedFeatures import SaveSelectedFeatures
 from sextante.algs.Explode import Explode
 from sextante.algs.AutoincrementalField import AutoincrementalField
+from sextante.algs.FieldPyculator import FieldsPyculator
 
 class SextanteAlgorithmProvider(AlgorithmProvider):
 
     def __init__(self):
         AlgorithmProvider.__init__(self)
         self.alglist = [AddTableField(), FieldsCalculator(), SaveSelectedFeatures(),
-                        AutoincrementalField(), Explode()]
+                        AutoincrementalField(), Explode(), FieldsPyculator()]
 
     def initializeSettings(self):
         AlgorithmProvider.initializeSettings(self)
@@ -33,3 +34,6 @@ def getIcon(self):
 
     def _loadAlgorithms(self):
         self.algs = self.alglist
+
+    def supportsNonFileBasedOutput(self):
+        return True

python/plugins/sextante/core/AlgorithmProvider.py

@@ -1,6 +1,7 @@
 from sextante.core.SextanteConfig import Setting, SextanteConfig
 import os
 from PyQt4 import QtGui
+from qgis.core import *
 
 class AlgorithmProvider():
     '''this is the base class for algorithms providers.
@@ -67,7 +68,19 @@ def getSupportedOutputRasterLayerExtensions(self):
         return ["tif"]
 
     def getSupportedOutputVectorLayerExtensions(self):
-        return ["shp"]
+        formats = QgsVectorFileWriter.supportedFiltersAndFormats()
+        extensions = ["shp"]#shp is the default, should be the first
+        for extension in formats.keys():
+            extension = str(extension)
+            extension = extension[extension.find('*.') + 2:]
+            extension = extension[:extension.find(" ")]
+            if extension.lower() != "shp":
+                extensions.append(extension)
+        return extensions
+        #return ["shp"]
 
     def getSupportedOutputTableExtensions(self):
-        return ["dbf"]
+        return ["dbf"]
+
+    def supportsNonFileBasedOutput(self):
+        return False

python/plugins/sextante/core/GeoAlgorithm.py

@@ -4,6 +4,8 @@
 from sextante.parameters.ParameterRaster import ParameterRaster
 from sextante.parameters.ParameterVector import ParameterVector
 from PyQt4 import QtGui
+from PyQt4.QtCore import *
+from qgis.core import *
 import os.path
 from sextante.core.SextanteUtils import SextanteUtils
 from sextante.parameters.ParameterMultipleInput import ParameterMultipleInput
@@ -117,20 +119,27 @@ def execute(self, progress):
         except GeoAlgorithmExecutionException, gaee:
             SextanteLog.addToLog(SextanteLog.LOG_ERROR, gaee.msg)
             raise gaee
-        except Exception, e:
+        except:
             #if something goes wrong and is not caught in the algorithm,
             #we catch it here and wrap it
-            lines = []
-            lines.append(str(e))
-            lines.append(traceback.format_exc().replace("\n", "|"))
+            lines = ["Uncaught error while executing algorithm"]
+            errstring = traceback.format_exc()
+            newline = errstring.find("\n")
+            if newline != -1:
+                lines.append(errstring[:newline])
+            else:
+                lines.append(errstring)
+            lines.append(errstring.replace("\n", "|"))
             SextanteLog.addToLog(SextanteLog.LOG_ERROR, lines)
-            raise GeoAlgorithmExecutionException(str(e))
+            raise GeoAlgorithmExecutionException(errstring)
 
     def checkOutputFileExtensions(self):
         '''Checks if the values of outputs are correct and have one of the supported output extensions.
         If not, it adds the first one of the supported extensions, which is assumed to be the default one'''
         for out in self.outputs:
             if (not out.hidden) and out.value != None:
+                if not os.path.isabs(out.value):
+                    continue
                 if isinstance(out, OutputRaster):
                     exts = self.provider.getSupportedOutputRasterLayerExtensions()
                 elif isinstance(out, OutputVector):
@@ -263,3 +272,5 @@ def getAsCommand(self):
                 s+=out.getValueAsCommandLineParameter() + ","
         s= s[:-1] + ")"
         return s
+
+