Skip to content

Commit 98f653e

Browse files
3nids3nids
committedJun 2, 2017
sipify core raster part 2
1 parent d357bc5 commit 98f653e

24 files changed

+1912
-881
lines changed
 

‎cmake_templates/Doxyfile.in

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2050,6 +2050,7 @@ PREDEFINED =
20502050
# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
20512051

20522052
EXPAND_AS_DEFINED = "SIP_ABSTRACT" \
2053+
"SIP_ALLOWNONE" \
20532054
"SIP_ARRAY" \
20542055
"SIP_ARRAYSIZE" \
20552056
"SIP_CONSTRAINED" \
@@ -2067,7 +2068,7 @@ EXPAND_AS_DEFINED = "SIP_ABSTRACT" \
20672068
"SIP_PYARGDEFAULT" \
20682069
"SIP_PYARGREMOVE" \
20692070
"SIP_PYNAME" \
2070-
"SIP_PYTYPE" \
2071+
"SIP_PYALTERNATIVETYPE" \
20712072
"SIP_SKIP" \
20722073
"SIP_TRANSFER" \
20732074
"SIP_TRANSFERBACK" \

‎python/auto_sip.blacklist

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -48,18 +48,6 @@ core/gps/qgsgpsdconnection.sip
4848
core/gps/qgsgpsdetector.sip
4949
core/gps/qgsnmeaconnection.sip
5050
core/gps/qgsqtlocationconnection.sip
51-
core/raster/qgsrasterbandstats.sip
52-
core/raster/qgsrasterblock.sip
53-
core/raster/qgsrasterchecker.sip
54-
core/raster/qgsrasterdataprovider.sip
55-
core/raster/qgsrasterdrawer.sip
56-
core/raster/qgsrasterhistogram.sip
57-
core/raster/qgsrasteridentifyresult.sip
58-
core/raster/qgsrasterinterface.sip
59-
core/raster/qgsrasteriterator.sip
60-
core/raster/qgsrasterlayer.sip
61-
core/raster/qgsrasterminmaxorigin.sip
62-
core/raster/qgsrasternuller.sip
6351
core/raster/qgsrasterpipe.sip
6452
core/raster/qgsrasterprojector.sip
6553
core/raster/qgsrasterpyramid.sip

‎python/core/raster/qgsrasterbandstats.sip

Lines changed: 67 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,26 @@
1+
/************************************************************************
2+
* This file has been generated automatically from *
3+
* *
4+
* src/core/raster/qgsrasterbandstats.h *
5+
* *
6+
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
7+
************************************************************************/
8+
9+
10+
11+
12+
113

2-
/** \ingroup core
3-
* The RasterBandStats struct is a container for statistics about a single
4-
* raster band.
5-
*/
614
class QgsRasterBandStats
715
{
8-
%TypeHeaderCode
9-
#include <qgsrasterbandstats.h>
16+
%Docstring
17+
The RasterBandStats struct is a container for statistics about a single
18+
raster band.
1019
%End
1120

21+
%TypeHeaderCode
22+
#include "qgsrasterbandstats.h"
23+
%End
1224
public:
1325
enum Stats
1426
{
@@ -25,48 +37,80 @@ class QgsRasterBandStats
2537

2638
QgsRasterBandStats();
2739

28-
/** Compares region, size etc. not collected statistics */
2940
bool contains( const QgsRasterBandStats &s ) const;
41+
%Docstring
42+
Compares region, size etc. not collected statistics
43+
:rtype: bool
44+
%End
3045

31-
/** \brief The gdal band number (starts at 1)*/
3246
int bandNumber;
47+
%Docstring
48+
The gdal band number (starts at 1)
49+
%End
3350

34-
/** \brief The number of not no data cells in the band. */
35-
// TODO: check if no data are excluded in stats calculation
3651
qgssize elementCount;
3752

38-
/** \brief The maximum cell value in the raster band. NO_DATA values
39-
* are ignored. This does not use the gdal GetMaximmum function. */
4053
double maximumValue;
54+
%Docstring
55+
The maximum cell value in the raster band. NO_DATA values
56+
are ignored. This does not use the gdal GetMaximmum function. *
57+
%End
4158

42-
/** \brief The minimum cell value in the raster band. NO_DATA values
43-
* are ignored. This does not use the gdal GetMinimum function. */
4459
double minimumValue;
60+
%Docstring
61+
The minimum cell value in the raster band. NO_DATA values
62+
are ignored. This does not use the gdal GetMinimum function. *
63+
%End
4564

46-
/** \brief The mean cell value for the band. NO_DATA values are excluded. */
4765
double mean;
66+
%Docstring
67+
The mean cell value for the band. NO_DATA values are excluded.
68+
%End
4869

49-
/** \brief The range is the distance between min & max. */
5070
double range;
71+
%Docstring
72+
The range is the distance between min & max.
73+
%End
5174

52-
/** \brief The standard deviation of the cell values. */
5375
double stdDev;
76+
%Docstring
77+
The standard deviation of the cell values.
78+
%End
5479

55-
/** \brief Collected statistics */
5680
int statsGathered;
81+
%Docstring
82+
Collected statistics
83+
%End
5784

58-
/** \brief The sum of all cells in the band. NO_DATA values are excluded. */
5985
double sum;
86+
%Docstring
87+
The sum of all cells in the band. NO_DATA values are excluded.
88+
%End
6089

61-
/** \brief The sum of the squares. Used to calculate standard deviation. */
6290
double sumOfSquares;
91+
%Docstring
92+
The sum of the squares. Used to calculate standard deviation.
93+
%End
6394

64-
/** \brief Number of columns used to calc statistics */
6595
int width;
96+
%Docstring
97+
Number of columns used to calc statistics
98+
%End
6699

67-
/** \brief Number of rows used to calc statistics */
68100
int height;
101+
%Docstring
102+
Number of rows used to calc statistics
103+
%End
69104

70-
/** \brief Extent used to calc statistics */
71105
QgsRectangle extent;
106+
%Docstring
107+
Extent used to calc statistics
108+
%End
72109
};
110+
/************************************************************************
111+
* This file has been generated automatically from *
112+
* *
113+
* src/core/raster/qgsrasterbandstats.h *
114+
* *
115+
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
116+
************************************************************************/

0 commit comments

Comments
 (0)