Skip to content

Commit 558dcf2

Browse files
committed
fix QgsPalettedRasterRenderer sip binding
1 parent ae42a90 commit 558dcf2

File tree

3 files changed

+16
-9
lines changed

3 files changed

+16
-9
lines changed

python/core/core.sip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@
158158
%Include raster/qgssinglebandcolordatarenderer.sip
159159
%Include raster/qgssinglebandpseudocolorrenderer.sip
160160
%Include raster/qgssinglebandgrayrenderer.sip
161-
%Include raster/qgspaletterasterrenderer.sip
161+
%Include raster/qgspalettedrasterrenderer.sip
162162
%Include raster/qgscubicrasterresampler.sip
163163
%Include raster/qgsmultibandcolorrenderer.sip
164164

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
1-
class QgsPalettedRasterRenderer: QgsRasterRenderer
1+
class QgsPalettedRasterRenderer : QgsRasterRenderer
22
{
33
%TypeHeaderCode
44
#include "qgspalettedrasterrenderer.h"
55
%End
66
public:
77
/**Renderer owns color array*/
8-
QgsPalettedRasterRenderer( QgsRasterDataProvider* provider, int bandNumber, QColor* colorArray /Array,Transfer/, int nColors /ArraySize/ );
8+
QgsPalettedRasterRenderer( QgsRasterInterface* input, int bandNumber, QColor* colorArray /Array,Transfer/, int nColors /ArraySize/ );
99
~QgsPalettedRasterRenderer();
10-
QgsRasterInterface * clone() /Factory/;
11-
static QgsRasterRenderer* create( const QDomElement& elem, QgsRasterDataProvider* provider ) /Factory/;
10+
QgsRasterInterface * clone() const /Factory/;
11+
static QgsRasterRenderer* create( const QDomElement& elem, QgsRasterInterface* input ) /Factory/;
1212

13-
QgsRasterBlock * block( int bandNo, const QgsRectangle & extent, int width, int height ) / Factory /;
13+
// void draw( QPainter* p, QgsRasterViewPort* viewPort, const QgsMapToPixel* theQgsMapToPixel );
14+
15+
QgsRasterBlock *block( int bandNo, const QgsRectangle & extent, int width, int height ) /Factory/;
1416

1517
/**Returns number of colors*/
1618
int nColors() const;
@@ -20,4 +22,6 @@ class QgsPalettedRasterRenderer: QgsRasterRenderer
2022
void writeXML( QDomDocument& doc, QDomElement& parentElem ) const;
2123

2224
void legendSymbologyItems( QList< QPair< QString, QColor > >& symbolItems ) const;
23-
};
25+
26+
QList<int> usesBands() const;
27+
};

src/core/raster/qgspalettedrasterrenderer.h

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,16 @@ class CORE_EXPORT QgsPalettedRasterRenderer: public QgsRasterRenderer
3838

3939
void draw( QPainter* p, QgsRasterViewPort* viewPort, const QgsMapToPixel* theQgsMapToPixel );
4040

41-
QgsRasterBlock * block( int bandNo, QgsRectangle const & extent, int width, int height );
41+
QgsRasterBlock *block( int bandNo, const QgsRectangle & extent, int width, int height );
4242

4343
/**Returns number of colors*/
4444
int nColors() const { return mNColors; }
4545
/**Returns copy of color array (caller takes ownership)*/
4646
QColor* colors() const;
47-
/**Returns copy of rgb array (caller takes ownership)*/
47+
48+
/**Returns copy of rgb array (caller takes ownership)
49+
@note not available in python bindings
50+
*/
4851
QRgb* rgbArray() const;
4952

5053
void writeXML( QDomDocument& doc, QDomElement& parentElem ) const;

0 commit comments

Comments
 (0)