python/gui/symbology-ng/qgssymbollayerv2widget.sip

@@ -200,11 +200,6 @@ class QgsSVGFillSymbolLayerWidget : QgsSymbolLayerV2Widget
     // from base class
     virtual void setSymbolLayer( QgsSymbolLayerV2* layer );
     virtual QgsSymbolLayerV2* symbolLayer();
-
-  protected:
-    void insertIcons();
-    void updateOutlineIcon();
-    void updateParamGui();
 };
 
 //////////

python/plugins/sextante/ftools/Delaunay.py

@@ -57,9 +57,6 @@ def defineCharacteristics(self):
         self.addOutput(OutputVector(self.OUTPUT, "Delaunay triangulation"))
 
     def processAlgorithm(self, progress):
-        settings = QSettings()
-        encoding = settings.value( "/UI/encoding", "System" ).toString()
-
         layer = QGisLayers.getObjectFromUri(self.getParameterValue(self.INPUT))
         output = self.getOutputValue(self.OUTPUT)
 

python/plugins/sextante/ftools/DensifyGeometries.py

@@ -61,9 +61,6 @@ def defineCharacteristics(self):
         self.addOutput(OutputVector(self.OUTPUT, "Simplified layer"))
 
     def processAlgorithm(self, progress):
-        settings = QSettings()
-        encoding = settings.value( "/UI/encoding", "System" ).toString()
-
         layer = QGisLayers.getObjectFromUri(self.getParameterValue(self.INPUT))
         useSelection = self.getParameterValue(self.USE_SELECTION)
         vertices =self.getParameterValue(self.VERTICES)

python/plugins/sextante/ftools/ExtentFromLayer.py

@@ -60,8 +60,6 @@ def defineCharacteristics(self):
         self.addOutput(OutputVector(self.OUTPUT, "Output layer"))
 
     def processAlgorithm(self, progress):
-        settings = QSettings()
-
         layer = QGisLayers.getObjectFromUri(self.getParameterValue(self.INPUT_LAYER))
         useSelection = self.getParameterValue(self.USE_SELECTION)
         byFeature = self.getParameterValue(self.BY_FEATURE)

python/plugins/sextante/ftools/ExtractNodes.py

@@ -56,9 +56,6 @@ def defineCharacteristics(self):
         self.addOutput(OutputVector(self.OUTPUT, "Output layer"))
 
     def processAlgorithm(self, progress):
-        settings = QSettings()
-        encoding = settings.value("/UI/encoding", "System").toString()
-
         layer = QGisLayers.getObjectFromUri(self.getParameterValue(self.INPUT))
         output = self.getOutputValue(self.OUTPUT)
 

python/plugins/sextante/ftools/FToolsAlgorithmProvider.py

@@ -41,6 +41,7 @@
 from sextante.ftools.NearestNeighbourAnalysis import NearestNeighbourAnalysis
 
 # data management tools
+from sextante.ftools.ReprojectLayer import ReprojectLayer
 
 # geometry tools
 from sextante.ftools.Delaunay import Delaunay
@@ -79,6 +80,7 @@ def __init__(self):
                         BasicStatisticsNumbers(), NearestNeighbourAnalysis(),
                         MeanCoords(), LinesIntersection(), UniqueValues(), PointDistance(),
                         # data management
+                        ReprojectLayer(),
                         # geometry
                         ExportGeometryInfo(), Centroids(), Delaunay(), VoronoiPolygons(),
                         SimplifyGeometries(), DensifyGeometries(), MultipartToSingleparts(),

python/plugins/sextante/ftools/LinesIntersection.py

@@ -65,9 +65,6 @@ def defineCharacteristics(self):
         self.addOutput(OutputVector(self.OUTPUT, "Output layer"))
 
     def processAlgorithm(self, progress):
-        settings = QSettings()
-        encoding = settings.value( "/UI/encoding", "System" ).toString()
-
         layerA = QGisLayers.getObjectFromUri(self.getParameterValue(self.INPUT_A))
         layerB = QGisLayers.getObjectFromUri(self.getParameterValue(self.INPUT_B))
         fieldA = self.getParameterValue(self.FIELD_A)

python/plugins/sextante/ftools/LinesToPolygons.py

@@ -53,9 +53,6 @@ def defineCharacteristics(self):
         self.addOutput(OutputVector(self.OUTPUT, "Output layer"))
 
     def processAlgorithm(self, progress):
-        settings = QSettings()
-        encoding = settings.value("/UI/encoding", "System").toString()
-
         layer = QGisLayers.getObjectFromUri(self.getParameterValue(self.INPUT))
         output = self.getOutputValue(self.OUTPUT)
 

python/plugins/sextante/ftools/MeanCoords.py

@@ -63,9 +63,6 @@ def defineCharacteristics(self):
         self.addOutput(OutputVector(MeanCoords.OUTPUT, "Result"))
 
     def processAlgorithm(self, progress):
-        settings = QSettings()
-        encoding = settings.value( "/UI/encoding", "System" ).toString()
-
         layer = QGisLayers.getObjectFromUri(self.getParameterValue(self.POINTS))
         weightField = self.getParameterValue(self.WEIGHT)
         uniqueField = self.getParameterValue(self.UID)

python/plugins/sextante/ftools/MultipartToSingleparts.py

@@ -54,9 +54,6 @@ def defineCharacteristics(self):
         self.addOutput(OutputVector(self.OUTPUT, "Output layer"))
 
     def processAlgorithm(self, progress):
-        settings = QSettings()
-        encoding = settings.value( "/UI/encoding", "System" ).toString()
-
         layer = QGisLayers.getObjectFromUri(self.getParameterValue(self.INPUT))
         output = self.getOutputValue(self.OUTPUT)
 

python/plugins/sextante/ftools/PolygonsToLines.py

@@ -54,9 +54,6 @@ def defineCharacteristics(self):
         self.addOutput(OutputVector(self.OUTPUT, "Output layer"))
 
     def processAlgorithm(self, progress):
-        settings = QSettings()
-        encoding = settings.value("/UI/encoding", "System").toString()
-
         layer = QGisLayers.getObjectFromUri(self.getParameterValue(self.INPUT))
         output = self.getOutputValue(self.OUTPUT)
 

python/plugins/sextante/ftools/ReprojectLayer.py

@@ -0,0 +1,90 @@
+# -*- coding: utf-8 -*-
+
+"""
+***************************************************************************
+    ReprojectLayer.py
+    ---------------------
+    Date                 : October 2012
+    Copyright            : (C) 2012 by Alexander Bruy
+    Email                : alexander dot bruy at gmail dot com
+***************************************************************************
+*                                                                         *
+*   This program is free software; you can redistribute it and/or modify  *
+*   it under the terms of the GNU General Public License as published by  *
+*   the Free Software Foundation; either version 2 of the License, or     *
+*   (at your option) any later version.                                   *
+*                                                                         *
+***************************************************************************
+"""
+
+__author__ = 'Alexander Bruy'
+__date__ = 'October 2012'
+__copyright__ = '(C) 2012, Alexander Bruy'
+# This will get replaced with a git SHA1 when you do a git archive
+__revision__ = '$Format:%H$'
+
+import os.path
+
+from PyQt4 import QtGui
+from PyQt4.QtCore import *
+
+from qgis.core import *
+
+from sextante.core.GeoAlgorithm import GeoAlgorithm
+from sextante.core.QGisLayers import QGisLayers
+from sextante.core.SextanteLog import SextanteLog
+
+from sextante.parameters.ParameterVector import ParameterVector
+from sextante.parameters.ParameterCrs import ParameterCrs
+
+from sextante.outputs.OutputVector import OutputVector
+
+class ReprojectLayer(GeoAlgorithm):
+
+    INPUT = "INPUT"
+    TARGET_CRS = "TARGET_CRS"
+    OUTPUT = "OUTPUT"
+
+    def getIcon(self):
+        return QtGui.QIcon(os.path.dirname(__file__) + "/icons/reproject.png")
+
+    def defineCharacteristics(self):
+        self.name = "Reproject layer"
+        self.group = "Data management tools"
+
+        self.addParameter(ParameterVector(self.INPUT, "Input layer", ParameterVector.VECTOR_TYPE_ANY))
+        self.addParameter(ParameterCrs(self.TARGET_CRS, "Target CRS", "4326"))
+
+        self.addOutput(OutputVector(self.OUTPUT, "Reprojected layer"))
+
+    def processAlgorithm(self, progress):
+        layer = QGisLayers.getObjectFromUri(self.getParameterValue(self.INPUT))
+        crsId = self.getParameterValue(self.TARGET_CRS)
+        targetCrs = QgsCoordinateReferenceSystem(int(crsId))
+
+        output = self.getOutputValue(self.OUTPUT)
+
+        writer = self.getOutputFromName(self.OUTPUT).getVectorWriter(layer.pendingFields(),
+                     layer.wkbType(), targetCrs)
+
+        layer.select(layer.pendingAllAttributesList())
+
+        current = 0
+        total = 100.0 / float(layer.featureCount())
+
+        layerCrs = layer.crs()
+        crsTransform = QgsCoordinateTransform(layerCrs, targetCrs)
+
+        f = QgsFeature()
+        outFeat = QgsFeature()
+        while layer.nextFeature(f):
+            geom = f.geometry()
+            geom.transform(crsTransform)
+            outFeat.setGeometry(geom)
+            outFeat.setAttributeMap(f.attributeMap())
+            writer.addFeature(outFeat)
+
+            current += 1
+            progress.setPercentage(int(current * total))
+
+        del writer

python/plugins/sextante/ftools/SimplifyGeometries.py

@@ -61,9 +61,6 @@ def defineCharacteristics(self):
         self.addOutput(OutputVector(self.OUTPUT, "Simplified layer"))
 
     def processAlgorithm(self, progress):
-        settings = QSettings()
-        encoding = settings.value( "/UI/encoding", "System" ).toString()
-
         layer = QGisLayers.getObjectFromUri(self.getParameterValue(self.INPUT))
         useSelection = self.getParameterValue(self.USE_SELECTION)
         tolerance =self.getParameterValue(self.TOLERANCE)

python/plugins/sextante/ftools/SinglePartsToMultiparts.py

@@ -58,9 +58,6 @@ def defineCharacteristics(self):
         self.addOutput(OutputVector(self.OUTPUT, "Output layer"))
 
     def processAlgorithm(self, progress):
-        settings = QSettings()
-        encoding = settings.value( "/UI/encoding", "System" ).toString()
-
         layer = QGisLayers.getObjectFromUri(self.getParameterValue(self.INPUT))
         output = self.getOutputValue(self.OUTPUT)
         fieldName = self.getParameterValue(self.FIELD)

python/plugins/sextante/ftools/SumLines.py

@@ -63,9 +63,6 @@ def defineCharacteristics(self):
         self.addOutput(OutputVector(self.OUTPUT, "Result"))
 
     def processAlgorithm(self, progress):
-        settings = QSettings()
-        encoding = settings.value( "/UI/encoding", "System" ).toString()
-
         lineLayer = QGisLayers.getObjectFromUri(self.getParameterValue(self.LINES))
         polyLayer = QGisLayers.getObjectFromUri(self.getParameterValue(self.POLYGONS))
         lengthFieldName = self.getParameterValue(self.LEN_FIELD)

python/plugins/sextante/ftools/VoronoiPolygons.py

@@ -57,9 +57,6 @@ def defineCharacteristics(self):
         self.addOutput(OutputVector(self.OUTPUT, "Voronoi polygons"))
 
     def processAlgorithm(self, progress):
-        settings = QSettings()
-        encoding = settings.value( "/UI/encoding", "System" ).toString()
-
         layer = QGisLayers.getObjectFromUri(self.getParameterValue(self.INPUT))
 
         output = self.getOutputValue(self.OUTPUT)

src/core/raster/qgsrasterblock.h

@@ -72,7 +72,7 @@ class CORE_EXPORT QgsRasterBlock
      *  @param theDataType raster data type
      *  @param theWidth width of data matrix
      *  @param theHeight height of data matrix
-     *  @param theNoDataValue the value representing no data (NULL) 
+     *  @param theNoDataValue the value representing no data (NULL)
      */
     QgsRasterBlock( DataType theDataType, int theWidth, int theHeight, double theNoDataValue = std::numeric_limits<double>::quiet_NaN() );
 
@@ -82,7 +82,7 @@ class CORE_EXPORT QgsRasterBlock
      *  @param theDataType raster data type
      *  @param theWidth width of data matrix
      *  @param theHeight height of data matrix
-     *  @param theNoDataValue the value representing no data (NULL) 
+     *  @param theNoDataValue the value representing no data (NULL)
      *  @return true on success
      */
     bool reset( DataType theDataType, int theWidth, int theHeight, double theNoDataValue = std::numeric_limits<double>::quiet_NaN() );
@@ -129,6 +129,7 @@ class CORE_EXPORT QgsRasterBlock
 
     int dataTypeSize( int bandNo ) const
     {
+      Q_UNUSED( bandNo );
       return typeSize( mDataType );
     }
 
@@ -153,7 +154,7 @@ class CORE_EXPORT QgsRasterBlock
      */
     void setNoDataValue( double noDataValue ) { mNoDataValue = noDataValue; }
 
-    /** Test if value is nodata comparing to noDataValue 
+    /** Test if value is nodata comparing to noDataValue
      * @param value tested value
      * @param noDataValue no data value
      * @return true if value is nodata */
@@ -173,7 +174,7 @@ class CORE_EXPORT QgsRasterBlock
     /** \brief Read a single value
      *  @param index data matrix index
      *  @return value */
-    double value( size_t index) const;
+    double value( size_t index ) const;
 
     /** \brief Read a single color
      *  @param row row index
@@ -184,7 +185,7 @@ class CORE_EXPORT QgsRasterBlock
     /** \brief Read a single value
      *  @param index data matrix index
      *  @return color */
-    QRgb color( size_t index) const;
+    QRgb color( size_t index ) const;
 
     /** \brief Check if value at position is no data
      *  @param row row index
@@ -223,14 +224,14 @@ class CORE_EXPORT QgsRasterBlock
      *  @return true on success */
     bool setColor( size_t index, QRgb color );
 
-    /** \brief Get pointer to data 
+    /** \brief Get pointer to data
      *  @param row row index
      *  @param column column index
      *  @retun pointer to data
      */
     char * bits( int row, int column );
 
-    /** \brief Get pointer to data 
+    /** \brief Get pointer to data
      *  @param index data matrix index
      *  @retun pointer to data
      */
@@ -244,12 +245,12 @@ class CORE_EXPORT QgsRasterBlock
 
     /** \brief Convert data to different type.
      *  @param destDataType dest data type
-     *  @return true on success 
+     *  @return true on success
      */
     bool convert( QgsRasterBlock::DataType destDataType );
 
-    QImage image() const; 
-    bool setImage( const QImage * image ); 
+    QImage image() const;
+    bool setImage( const QImage * image );
 
     /** \brief Test if value is within the list of ranges
      *  @param value value
@@ -285,11 +286,11 @@ class CORE_EXPORT QgsRasterBlock
 
   private:
 
-    static QImage::Format imageFormat ( QgsRasterBlock::DataType theDataType );
-    static DataType dataType ( QImage::Format theFormat );
+    static QImage::Format imageFormat( QgsRasterBlock::DataType theDataType );
+    static DataType dataType( QImage::Format theFormat );
 
 
-    // Valid 
+    // Valid
     //bool isValid;
 
     // Data type
@@ -298,11 +299,11 @@ class CORE_EXPORT QgsRasterBlock
     // Data type size in bytes, to make bits() fast
     int mTypeSize;
 
-    // Width 
+    // Width
     int mWidth;
 
-    // Height 
-    int mHeight;  
+    // Height
+    int mHeight;
 
     // No data value
     double mNoDataValue;