sipify core raster part 2

qgis · Jun 2, 2017 · 98f653e · 98f653e
1 parent d357bc5
commit 98f653e
Show file tree

Hide file tree

Showing 24 changed files with 1,912 additions and 881 deletions.
diff --git a/cmake_templates/Doxyfile.in b/cmake_templates/Doxyfile.in
@@ -2050,6 +2050,7 @@ PREDEFINED             =
 # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
 EXPAND_AS_DEFINED      = "SIP_ABSTRACT" \
+                         "SIP_ALLOWNONE" \
                          "SIP_ARRAY" \
                          "SIP_ARRAYSIZE" \
                          "SIP_CONSTRAINED" \
@@ -2067,7 +2068,7 @@ EXPAND_AS_DEFINED      = "SIP_ABSTRACT" \
                          "SIP_PYARGDEFAULT" \
                          "SIP_PYARGREMOVE" \
                          "SIP_PYNAME" \
-                         "SIP_PYTYPE" \
+                         "SIP_PYALTERNATIVETYPE" \
                          "SIP_SKIP" \
                          "SIP_TRANSFER" \
                          "SIP_TRANSFERBACK" \

diff --git a/python/auto_sip.blacklist b/python/auto_sip.blacklist
@@ -48,18 +48,6 @@ core/gps/qgsgpsdconnection.sip
 core/gps/qgsgpsdetector.sip
 core/gps/qgsnmeaconnection.sip
 core/gps/qgsqtlocationconnection.sip
-core/raster/qgsrasterbandstats.sip
-core/raster/qgsrasterblock.sip
-core/raster/qgsrasterchecker.sip
-core/raster/qgsrasterdataprovider.sip
-core/raster/qgsrasterdrawer.sip
-core/raster/qgsrasterhistogram.sip
-core/raster/qgsrasteridentifyresult.sip
-core/raster/qgsrasterinterface.sip
-core/raster/qgsrasteriterator.sip
-core/raster/qgsrasterlayer.sip
-core/raster/qgsrasterminmaxorigin.sip
-core/raster/qgsrasternuller.sip
 core/raster/qgsrasterpipe.sip
 core/raster/qgsrasterprojector.sip
 core/raster/qgsrasterpyramid.sip

diff --git a/python/core/raster/qgsrasterbandstats.sip b/python/core/raster/qgsrasterbandstats.sip
@@ -1,14 +1,26 @@
+/************************************************************************
+ * This file has been generated automatically from                      *
+ *                                                                      *
+ * src/core/raster/qgsrasterbandstats.h                                 *
+ *                                                                      *
+ * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
+ ************************************************************************/
+
+
+
+
+
 
-/** \ingroup core
- * The RasterBandStats struct is a container for statistics about a single
- * raster band.
- */
 class QgsRasterBandStats
 {
-%TypeHeaderCode
-#include <qgsrasterbandstats.h>
+%Docstring
+ The RasterBandStats struct is a container for statistics about a single
+ raster band.
 %End
 
+%TypeHeaderCode
+#include "qgsrasterbandstats.h"
+%End
   public:
     enum Stats
     {
@@ -25,48 +37,80 @@ class QgsRasterBandStats
 
     QgsRasterBandStats();
 
-    /** Compares region, size etc. not collected statistics */
     bool contains( const QgsRasterBandStats &s ) const;
+%Docstring
+Compares region, size etc. not collected statistics
+ :rtype: bool
+%End
 
-    /** \brief The gdal band number (starts at 1)*/
     int bandNumber;
+%Docstring
+ The gdal band number (starts at 1)
+%End
 
-    /** \brief The number of not no data cells in the band. */
-    // TODO: check if no data are excluded in stats calculation
     qgssize elementCount;
 
-    /** \brief The maximum cell value in the raster band. NO_DATA values
-     * are ignored. This does not use the gdal GetMaximmum function. */
     double maximumValue;
+%Docstring
+ The maximum cell value in the raster band. NO_DATA values
+ are ignored. This does not use the gdal GetMaximmum function. *
+%End
 
-    /** \brief The minimum cell value in the raster band. NO_DATA values
-     * are ignored. This does not use the gdal GetMinimum function. */
     double minimumValue;
+%Docstring
+ The minimum cell value in the raster band. NO_DATA values
+ are ignored. This does not use the gdal GetMinimum function. *
+%End
 
-    /** \brief The mean cell value for the band. NO_DATA values are excluded. */
     double mean;
+%Docstring
+ The mean cell value for the band. NO_DATA values are excluded.
+%End
 
-    /** \brief The range is the distance between min & max. */
     double range;
+%Docstring
+ The range is the distance between min & max.
+%End
 
-    /** \brief The standard deviation of the cell values. */
     double stdDev;
+%Docstring
+ The standard deviation of the cell values.
+%End
 
-    /** \brief Collected statistics */
     int statsGathered;
+%Docstring
+ Collected statistics
+%End
 
-    /** \brief The sum of all cells in the band. NO_DATA values are excluded. */
     double sum;
+%Docstring
+ The sum of all cells in the band. NO_DATA values are excluded.
+%End
 
-    /** \brief The sum of the squares. Used to calculate standard deviation. */
     double sumOfSquares;
+%Docstring
+ The sum of the squares. Used to calculate standard deviation.
+%End
 
-    /** \brief Number of columns used to calc statistics */
     int width;
+%Docstring
+ Number of columns used to calc statistics
+%End
 
-    /** \brief Number of rows used to calc statistics */
     int height;
+%Docstring
+ Number of rows used to calc statistics
+%End
 
-    /** \brief Extent used to calc statistics */
     QgsRectangle extent;
+%Docstring
+ Extent used to calc statistics
+%End
 };
+/************************************************************************
+ * This file has been generated automatically from                      *
+ *                                                                      *
+ * src/core/raster/qgsrasterbandstats.h                                 *
+ *                                                                      *
+ * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
+ ************************************************************************/