qgis.h   qgis.h 
skipping to change at line 17 skipping to change at line 17
************************************************************************** */ ************************************************************************** */
/************************************************************************** * /************************************************************************** *
* * * *
* This program is free software; you can redistribute it and/or modify * * 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 * * it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or * * the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. * * (at your option) any later version. *
* * * *
************************************************************************** */ ************************************************************************** */
/* $Id$ */
#ifndef QGIS_H #ifndef QGIS_H
#define QGIS_H #define QGIS_H
#include <QEvent> #include <QEvent>
#include <QString> #include <QString>
#include <cfloat> #include <cfloat>
#include <cmath> #include <cmath>
#include <qnumeric.h> #include <qnumeric.h>
skipping to change at line 42 skipping to change at line 41
{ {
public: public:
// Version constants // Version constants
// //
// Version string // Version string
static const char* QGIS_VERSION; static const char* QGIS_VERSION;
// Version number used for comparing versions using the "Check QGIS Ver sion" function // Version number used for comparing versions using the "Check QGIS Ver sion" function
static const int QGIS_VERSION_INT; static const int QGIS_VERSION_INT;
// Release name // Release name
static const char* QGIS_RELEASE_NAME; static const char* QGIS_RELEASE_NAME;
// The subversion version // The development version
static const char* QGIS_SVN_VERSION; static const char* QGIS_DEV_VERSION;
// Enumerations // Enumerations
// //
//! Used for symbology operations //! Used for symbology operations
// Feature types // Feature types
enum WkbType enum WkbType
{ {
WKBUnknown = 0, WKBUnknown = 0,
WKBPoint = 1, WKBPoint = 1,
 End of changes. 2 change blocks. 
3 lines changed or deleted 2 lines changed or added


 qgscategorizedsymbolrendererv2widget.h   qgscategorizedsymbolrendererv2widget.h 
#ifndef QGSCATEGORIZEDSYMBOLRENDERERV2WIDGET_H #ifndef QGSCATEGORIZEDSYMBOLRENDERERV2WIDGET_H
#define QGSCATEGORIZEDSYMBOLRENDERERV2WIDGET_H #define QGSCATEGORIZEDSYMBOLRENDERERV2WIDGET_H
#include "qgscategorizedsymbolrendererv2.h"
#include "qgsrendererv2widget.h" #include "qgsrendererv2widget.h"
#include <QStandardItem> #include <QStandardItem>
class QgsCategorizedSymbolRendererV2; class QgsCategorizedSymbolRendererV2;
class QgsRendererCategoryV2; class QgsRendererCategoryV2;
#include "ui_qgscategorizedsymbolrendererv2widget.h" #include "ui_qgscategorizedsymbolrendererv2widget.h"
class GUI_EXPORT QgsCategorizedSymbolRendererV2Widget : public QgsRendererV 2Widget, private Ui::QgsCategorizedSymbolRendererV2Widget class GUI_EXPORT QgsCategorizedSymbolRendererV2Widget : public QgsRendererV 2Widget, private Ui::QgsCategorizedSymbolRendererV2Widget
{ {
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 lines changed or added


 qgscomposerlegend.h   qgscomposerlegend.h 
skipping to change at line 28 skipping to change at line 28
#ifndef QGSCOMPOSERLEGEND_H #ifndef QGSCOMPOSERLEGEND_H
#define QGSCOMPOSERLEGEND_H #define QGSCOMPOSERLEGEND_H
#include "qgscomposeritem.h" #include "qgscomposeritem.h"
#include "qgslegendmodel.h" #include "qgslegendmodel.h"
class QgsSymbol; class QgsSymbol;
class QgsSymbolV2; class QgsSymbolV2;
class QgsComposerGroupItem; class QgsComposerGroupItem;
class QgsComposerLayerItem; class QgsComposerLayerItem;
class QgsComposerMap;
/** \ingroup MapComposer /** \ingroup MapComposer
* A legend that can be placed onto a map composition * A legend that can be placed onto a map composition
*/ */
class CORE_EXPORT QgsComposerLegend: public QgsComposerItem class CORE_EXPORT QgsComposerLegend: public QgsComposerItem
{ {
Q_OBJECT Q_OBJECT
public: public:
QgsComposerLegend( QgsComposition* composition ); QgsComposerLegend( QgsComposition* composition );
skipping to change at line 89 skipping to change at line 90
double iconLabelSpace() const {return mIconLabelSpace;} double iconLabelSpace() const {return mIconLabelSpace;}
void setIconLabelSpace( double s ) {mIconLabelSpace = s;} void setIconLabelSpace( double s ) {mIconLabelSpace = s;}
double symbolWidth() const {return mSymbolWidth;} double symbolWidth() const {return mSymbolWidth;}
void setSymbolWidth( double w ) {mSymbolWidth = w;} void setSymbolWidth( double w ) {mSymbolWidth = w;}
double symbolHeight() const {return mSymbolHeight;} double symbolHeight() const {return mSymbolHeight;}
void setSymbolHeight( double h ) {mSymbolHeight = h;} void setSymbolHeight( double h ) {mSymbolHeight = h;}
void setComposerMap( const QgsComposerMap* map );
const QgsComposerMap* composerMap() const { return mComposerMap; }
/**Updates the model and all legend entries*/ /**Updates the model and all legend entries*/
void updateLegend(); void updateLegend();
/** stores state in Dom node /** stores state in Dom node
* @param elem is Dom element corresponding to 'Composer' tag * @param elem is Dom element corresponding to 'Composer' tag
* @param doc Dom document * @param doc Dom document
*/ */
bool writeXML( QDomElement& elem, QDomDocument & doc ) const; bool writeXML( QDomElement& elem, QDomDocument & doc ) const;
/** sets state from Dom document /** sets state from Dom document
* @param itemElem is Dom node corresponding to item tag * @param itemElem is Dom node corresponding to item tag
* @param doc is Dom document * @param doc is Dom document
*/ */
bool readXML( const QDomElement& itemElem, const QDomDocument& doc ); bool readXML( const QDomElement& itemElem, const QDomDocument& doc );
public slots: public slots:
/**Data changed*/ /**Data changed*/
void synchronizeWithModel(); void synchronizeWithModel();
/**Sets mCompositionMap to 0 if the map is deleted*/
void invalidateCurrentMap();
protected: protected:
QString mTitle; QString mTitle;
//different fonts for entries //different fonts for entries
QFont mTitleFont; QFont mTitleFont;
QFont mGroupFont; QFont mGroupFont;
QFont mLayerFont; QFont mLayerFont;
QFont mItemFont; QFont mItemFont;
skipping to change at line 132 skipping to change at line 138
double mSymbolSpace; double mSymbolSpace;
/**Horizontal space between item icon and label*/ /**Horizontal space between item icon and label*/
double mIconLabelSpace; double mIconLabelSpace;
/**Width of symbol icon*/ /**Width of symbol icon*/
double mSymbolWidth; double mSymbolWidth;
/**Height of symbol icon*/ /**Height of symbol icon*/
double mSymbolHeight; double mSymbolHeight;
QgsLegendModel mLegendModel; QgsLegendModel mLegendModel;
/**Reference to map (because symbols are sometimes in map units)*/
const QgsComposerMap* mComposerMap;
private: private:
QgsComposerLegend(); //forbidden QgsComposerLegend(); //forbidden
/**Draws a group item and all subitems*/ /**Draws a group item and all subitems*/
void drawGroupItem( QPainter* p, QgsComposerGroupItem* groupItem, doubl e& currentYCoord, double& maxXCoord ); void drawGroupItem( QPainter* p, QgsComposerGroupItem* groupItem, doubl e& currentYCoord, double& maxXCoord );
/**Draws a layer item and all subitems*/ /**Draws a layer item and all subitems*/
void drawLayerItem( QPainter* p, QgsComposerLayerItem* layerItem, doubl e& currentYCoord, double& maxXCoord ); void drawLayerItem( QPainter* p, QgsComposerLayerItem* layerItem, doubl e& currentYCoord, double& maxXCoord );
/**Draws child items of a layer item /**Draws child items of a layer item
@param p painter @param p painter
 End of changes. 4 change blocks. 
0 lines changed or deleted 9 lines changed or added


 qgscomposerlegenditem.h   qgscomposerlegenditem.h 
skipping to change at line 128 skipping to change at line 128
virtual QStandardItem* clone() const; virtual QStandardItem* clone() const;
virtual void writeXML( QDomElement& elem, QDomDocument& doc ) const; virtual void writeXML( QDomElement& elem, QDomDocument& doc ) const;
virtual void readXML( const QDomElement& itemElem, bool xServerAvailabl e = true ); virtual void readXML( const QDomElement& itemElem, bool xServerAvailabl e = true );
void setLayerID( const QString& id ) { mLayerID = id; } void setLayerID( const QString& id ) { mLayerID = id; }
QString layerID() const { return mLayerID; } QString layerID() const { return mLayerID; }
ItemType itemType() const { return RasterSymbolItem; } ItemType itemType() const { return RasterSymbolItem; }
void setColor( const QColor& c ){ mColor = c; }
QColor color() const { return mColor; }
private: private:
QString mLayerID; QString mLayerID;
QColor mColor;
}; };
class CORE_EXPORT QgsComposerLayerItem: public QgsComposerLegendItem class CORE_EXPORT QgsComposerLayerItem: public QgsComposerLegendItem
{ {
public: public:
QgsComposerLayerItem(); QgsComposerLayerItem();
QgsComposerLayerItem( const QString& text ); QgsComposerLayerItem( const QString& text );
virtual ~QgsComposerLayerItem(); virtual ~QgsComposerLayerItem();
virtual QStandardItem* clone() const; virtual QStandardItem* clone() const;
 End of changes. 2 change blocks. 
0 lines changed or deleted 4 lines changed or added


 qgscomposermap.h   qgscomposermap.h 
skipping to change at line 263 skipping to change at line 263
double crossLength() {return mCrossLength;} double crossLength() {return mCrossLength;}
void setMapRotation( double r ); void setMapRotation( double r );
/**Sets canvas pointer (necessary to query and draw map canvas items)*/ /**Sets canvas pointer (necessary to query and draw map canvas items)*/
void setMapCanvas( QGraphicsView* canvas ) { mMapCanvas = canvas; } void setMapCanvas( QGraphicsView* canvas ) { mMapCanvas = canvas; }
void setDrawCanvasItems( bool b ) { mDrawCanvasItems = b; } void setDrawCanvasItems( bool b ) { mDrawCanvasItems = b; }
bool drawCanvasItems() const { return mDrawCanvasItems; } bool drawCanvasItems() const { return mDrawCanvasItems; }
/**Returns the conversion factor map units -> mm*/
double mapUnitsToMM() const;
signals: signals:
void extentChanged(); void extentChanged();
public slots: public slots:
/**Called if map canvas has changed*/ /**Called if map canvas has changed*/
void updateCachedImage( ); void updateCachedImage( );
/**Call updateCachedImage if item is in render mode*/ /**Call updateCachedImage if item is in render mode*/
void renderModeUpdateCachedImage(); void renderModeUpdateCachedImage();
skipping to change at line 393 skipping to change at line 396
QgsRectangle transformedExtent() const; QgsRectangle transformedExtent() const;
/**Returns extent that considers rotation and shift with mOffsetX / mOf fsetY*/ /**Returns extent that considers rotation and shift with mOffsetX / mOf fsetY*/
QPolygonF transformedMapPolygon() const; QPolygonF transformedMapPolygon() const;
double maxExtension() const; double maxExtension() const;
/**Returns the polygon of the map extent. If rotation == 0, the result is the same as mExtent /**Returns the polygon of the map extent. If rotation == 0, the result is the same as mExtent
@param poly out: the result polygon with the four corner points. The po ints are clockwise, starting at the top-left point @param poly out: the result polygon with the four corner points. The po ints are clockwise, starting at the top-left point
@return true in case of success*/ @return true in case of success*/
void mapPolygon( QPolygonF& poly ) const; void mapPolygon( QPolygonF& poly ) const;
/**Calculates the extent to request and the yShift of the top-left poin t in case of rotation.*/ /**Calculates the extent to request and the yShift of the top-left poin t in case of rotation.*/
void requestedExtent( QgsRectangle& extent ) const; void requestedExtent( QgsRectangle& extent ) const;
/**Returns the conversion factor map units -> mm*/
double mapUnitsToMM() const;
/**Scales a composer map shift (in MM) and rotates it by mRotation /**Scales a composer map shift (in MM) and rotates it by mRotation
@param xShift in: shift in x direction (in item units), out: xShift in map units @param xShift in: shift in x direction (in item units), out: xShift in map units
@param yShift in: shift in y direction (in item units), out: yShift in map units*/ @param yShift in: shift in y direction (in item units), out: yShift in map units*/
void transformShift( double& xShift, double& yShift ) const; void transformShift( double& xShift, double& yShift ) const;
/**Transforms map coordinates to item coordinates (considering rotation and move offset)*/ /**Transforms map coordinates to item coordinates (considering rotation and move offset)*/
QPointF mapToItemCoords( const QPointF& mapCoords ) const; QPointF mapToItemCoords( const QPointF& mapCoords ) const;
/**Returns the item border of a point (in item coordinates)*/ /**Returns the item border of a point (in item coordinates)*/
Border borderForLineCoord( const QPointF& p ) const; Border borderForLineCoord( const QPointF& p ) const;
void drawCanvasItems( QPainter* painter, const QStyleOptionGraphicsItem * itemStyle ); void drawCanvasItems( QPainter* painter, const QStyleOptionGraphicsItem * itemStyle );
 End of changes. 2 change blocks. 
2 lines changed or deleted 3 lines changed or added


 qgsconfig.h   qgsconfig.h 
// QGSCONFIG.H // QGSCONFIG.H
#ifndef QGSCONFIG_H #ifndef QGSCONFIG_H
#define QGSCONFIG_H #define QGSCONFIG_H
// Version must be specified according to // Version must be specified according to
// <int>.<int>.<int>-<any text>. // <int>.<int>.<int>-<any text>.
// or else upgrading old project file will not work // or else upgrading old project file will not work
// reliably. // reliably.
#define VERSION "1.7.0-Wroclaw" #define VERSION "1.7.1-Wroclaw"
//used in vim src/core/qgis.cpp //used in vim src/core/qgis.cpp
//The way below should work but it resolves to a number like 0110 which the compiler treats as octal I think //The way below should work but it resolves to a number like 0110 which the compiler treats as octal I think
//because debuggin it out shows the decimal number 72 which results in inco rrect version status. //because debuggin it out shows the decimal number 72 which results in inco rrect version status.
//As a short term fix I (Tim) am defining the version in top level cmake. I t would be good to //As a short term fix I (Tim) am defining the version in top level cmake. I t would be good to
//reinstate this more generic approach below at some point though //reinstate this more generic approach below at some point though
//#define VERSION_INT 170 //#define VERSION_INT 171
#define VERSION_INT 10700 #define VERSION_INT 10701
//used in main.cpp and anywhere else where the release name is needed //used in main.cpp and anywhere else where the release name is needed
#define RELEASE_NAME "Wroclaw" #define RELEASE_NAME "Wroclaw"
#define QGIS_PLUGIN_SUBDIR "lib/qgis/plugins" #define QGIS_PLUGIN_SUBDIR "lib/qgis/plugins"
#define QGIS_DATA_SUBDIR "share/qgis" #define QGIS_DATA_SUBDIR "share/qgis"
#define QGIS_LIBEXEC_SUBDIR "lib/qgis" #define QGIS_LIBEXEC_SUBDIR "lib/qgis"
#define QGIS_LIB_SUBDIR "lib" #define QGIS_LIB_SUBDIR "lib"
#define CMAKE_INSTALL_PREFIX "/home/andrey/upstream-tracker/testing/qgis/1. 7.0" #define CMAKE_INSTALL_PREFIX "/home/andrey/upstream-tracker/testing/qgis/1. 7.1"
/* #undef HAVE_POSTGRESQL */ #define HAVE_POSTGRESQL
#define HAVE_SPATIALITE #define HAVE_SPATIALITE
/* #undef HAVE_PYTHON */ /* #undef HAVE_PYTHON */
#endif #endif
 End of changes. 4 change blocks. 
5 lines changed or deleted 5 lines changed or added


 qgsrasterbandstats.h   qgsrasterbandstats.h 
skipping to change at line 49 skipping to change at line 49
bandName = ""; bandName = "";
statsGathered = false; statsGathered = false;
minimumValue = std::numeric_limits<double>::max(); minimumValue = std::numeric_limits<double>::max();
maximumValue = std::numeric_limits<double>::min(); maximumValue = std::numeric_limits<double>::min();
range = 0.0; range = 0.0;
mean = 0.0; mean = 0.0;
sumOfSquares = 0.0; sumOfSquares = 0.0;
stdDev = 0.0; stdDev = 0.0;
sum = 0.0; sum = 0.0;
elementCount = 0; elementCount = 0;
histogramVector = new HistogramVector();
isHistogramEstimated = false; isHistogramEstimated = false;
isHistogramOutOfRange = false; isHistogramOutOfRange = false;
} }
/** \brief The name of the band that these stats belong to. */ /** \brief The name of the band that these stats belong to. */
QString bandName; QString bandName;
/** \brief The gdal band number (starts at 1)*/ /** \brief The gdal band number (starts at 1)*/
int bandNumber; int bandNumber;
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 lines changed or added


 qgsrasterdataprovider.h   qgsrasterdataprovider.h 
skipping to change at line 17 skipping to change at line 17
************************************************************************** */ ************************************************************************** */
/************************************************************************** * /************************************************************************** *
* * * *
* This program is free software; you can redistribute it and/or modify * * 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 * * it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or * * the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. * * (at your option) any later version. *
* * * *
************************************************************************** */ ************************************************************************** */
/* $Id$ */
/* Thank you to Marco Hugentobler for the original vector DataProvider */ /* Thank you to Marco Hugentobler for the original vector DataProvider */
#ifndef QGSRASTERDATAPROVIDER_H #ifndef QGSRASTERDATAPROVIDER_H
#define QGSRASTERDATAPROVIDER_H #define QGSRASTERDATAPROVIDER_H
#include <QDateTime> #include <QDateTime>
#include "qgslogger.h" #include "qgslogger.h"
#include "qgsrectangle.h" #include "qgsrectangle.h"
#include "qgsdataprovider.h" #include "qgsdataprovider.h"
#include "qgscolorrampshader.h" #include "qgscolorrampshader.h"
#include "qgsrasterpyramid.h" #include "qgsrasterpyramid.h"
#include "qgscoordinatereferencesystem.h" #include "qgscoordinatereferencesystem.h"
#include "qgsrasterbandstats.h"
#include "cpl_conv.h"
#include <cmath> #include <cmath>
class QImage; class QImage;
class QgsPoint; class QgsPoint;
class QgsRasterBandStats;
class QByteArray; class QByteArray;
#define TINY_VALUE std::numeric_limits<double>::epsilon() * 20 #define TINY_VALUE std::numeric_limits<double>::epsilon() * 20
/** \ingroup core /** \ingroup core
* Base class for raster data providers. * Base class for raster data providers.
* *
* \note This class has been copied and pasted from * \note This class has been copied and pasted from
* QgsVectorDataProvider, and does not yet make * QgsVectorDataProvider, and does not yet make
* sense for Raster layers. * sense for Raster layers.
skipping to change at line 112 skipping to change at line 111
/*! Magenta band of CMYK image */ MagentaBand = 1 1, /*! Magenta band of CMYK image */ MagentaBand = 1 1,
/*! Yellow band of CMYK image */ YellowBand = 12 , /*! Yellow band of CMYK image */ YellowBand = 12 ,
/*! Black band of CMLY image */ BlackBand = 13, /*! Black band of CMLY image */ BlackBand = 13,
/*! Y Luminance */ YCbCr_YBand = 1 4, /*! Y Luminance */ YCbCr_YBand = 1 4,
/*! Cb Chroma */ YCbCr_CbBand = 15, /*! Cb Chroma */ YCbCr_CbBand = 15,
/*! Cr Chroma */ YCbCr_CrBand = 16, /*! Cr Chroma */ YCbCr_CrBand = 16,
/*! Max current value */ ColorInterpreta tionMax = 16 /*! Max current value */ ColorInterpreta tionMax = 16
}; };
// Progress types // Progress types
enum Progress enum RasterProgressType
{ {
ProgressHistogram = 0, ProgressHistogram = 0,
ProgressPyramids = 1 ProgressPyramids = 1,
ProgressStatistics = 2
}; };
QgsRasterDataProvider(); QgsRasterDataProvider();
QgsRasterDataProvider( QString const & uri ); QgsRasterDataProvider( QString const & uri );
virtual ~QgsRasterDataProvider() {}; virtual ~QgsRasterDataProvider() {};
/** /**
* Add the list of WMS layer names to be rendered by this server * Add the list of WMS layer names to be rendered by this server
skipping to change at line 183 skipping to change at line 183
virtual int dataType( int bandNo ) const virtual int dataType( int bandNo ) const
{ {
return srcDataType( bandNo ); return srcDataType( bandNo );
} }
/** Returns source data type for the band specified by number, /** Returns source data type for the band specified by number,
* source data type may be shorter than dataType * source data type may be shorter than dataType
*/ */
virtual int srcDataType( int bandNo ) const virtual int srcDataType( int bandNo ) const
{ {
Q_UNUSED( bandNo );
return QgsRasterDataProvider::UnknownDataType; return QgsRasterDataProvider::UnknownDataType;
} }
int typeSize( int dataType ) const int typeSize( int dataType ) const
{ {
// modified copy from GDAL // modified copy from GDAL
switch ( dataType ) switch ( dataType )
{ {
case Byte: case Byte:
return 8; return 8;
skipping to change at line 233 skipping to change at line 234
/** Get numbur of bands */ /** Get numbur of bands */
virtual int bandCount() const virtual int bandCount() const
{ {
return 1; return 1;
} }
/** Returns data type for the band specified by number */ /** Returns data type for the band specified by number */
virtual int colorInterpretation( int theBandNo ) const virtual int colorInterpretation( int theBandNo ) const
{ {
Q_UNUSED( theBandNo );
return QgsRasterDataProvider::UndefinedColorInterpretation; return QgsRasterDataProvider::UndefinedColorInterpretation;
} }
QString colorName( int colorInterpretation ) const QString colorName( int colorInterpretation ) const
{ {
// Modified copy from GDAL // Modified copy from GDAL
switch ( colorInterpretation ) switch ( colorInterpretation )
{ {
case UndefinedColorInterpretation: case UndefinedColorInterpretation:
return "Undefined"; return "Undefined";
skipping to change at line 314 skipping to change at line 316
/** Get block size */ /** Get block size */
virtual int xBlockSize() const { return 0; } virtual int xBlockSize() const { return 0; }
virtual int yBlockSize() const { return 0; } virtual int yBlockSize() const { return 0; }
/** Get raster size */ /** Get raster size */
virtual int xSize() const { return 0; } virtual int xSize() const { return 0; }
virtual int ySize() const { return 0; } virtual int ySize() const { return 0; }
/** read block of data */ /** read block of data */
// TODO clarify what happens on the last block (the part outside raster ) // TODO clarify what happens on the last block (the part outside raster )
virtual void readBlock( int bandNo, int xBlock, int yBlock, void *data virtual void readBlock( int bandNo, int xBlock, int yBlock, void *data
) {} )
{ Q_UNUSED( bandNo ); Q_UNUSED( xBlock ); Q_UNUSED( yBlock ); Q_UNUSED(
data ); }
/** read block of data using give extent and size */ /** read block of data using give extent and size */
virtual void readBlock( int bandNo, QgsRectangle const & viewExtent, i virtual void readBlock( int bandNo, QgsRectangle const & viewExtent, i
nt width, int height, void *data ) {}; nt width, int height, void *data )
{ Q_UNUSED( bandNo ); Q_UNUSED( viewExtent ); Q_UNUSED( width ); Q_UNUS
ED( height ); Q_UNUSED( data ); }
/** read block of data using give extent and size */ /** read block of data using give extent and size */
virtual void readBlock( int bandNo, QgsRectangle const & viewExtent, i nt width, int height, QgsCoordinateReferenceSystem theSrcCRS, QgsCoordinate ReferenceSystem theDestCRS, void *data ); virtual void readBlock( int bandNo, QgsRectangle const & viewExtent, i nt width, int height, QgsCoordinateReferenceSystem theSrcCRS, QgsCoordinate ReferenceSystem theDestCRS, void *data );
/* Read a value from a data block at a given index. */
virtual double readValue( void *data, int type, int index );
/** value representing null data */ /** value representing null data */
virtual double noDataValue() const { return 0; } virtual double noDataValue() const { return 0; }
virtual double minimumValue( int bandNo )const { return 0; } virtual double minimumValue( int bandNo ) const { Q_UNUSED( bandNo ); r
virtual double maximumValue( int bandNo )const { return 0; } eturn 0; }
virtual double maximumValue( int bandNo ) const { Q_UNUSED( bandNo ); r
eturn 0; }
virtual QList<QgsColorRampShader::ColorRampItem> colorTable( int bandNo virtual QList<QgsColorRampShader::ColorRampItem> colorTable( int bandNo
)const { return QList<QgsColorRampShader::ColorRampItem>(); } ) const
{ Q_UNUSED( bandNo ); return QList<QgsColorRampShader::ColorRampItem>()
; }
// Defined in parent // Defined in parent
/** \brief Returns the sublayers of this layer - Useful for providers t hat manage their own layers, such as WMS */ /** \brief Returns the sublayers of this layer - Useful for providers t hat manage their own layers, such as WMS */
virtual QStringList subLayers() const virtual QStringList subLayers() const
{ {
return QStringList(); return QStringList();
} }
/** \brief Populate the histogram vector for a given band */ /** \brief Populate the histogram vector for a given band */
virtual void populateHistogram( int theBandNoInt, virtual void populateHistogram( int theBandNoInt,
QgsRasterBandStats & theBandStats, QgsRasterBandStats & theBandStats,
int theBinCountInt = 256, int theBinCountInt = 256,
bool theIgnoreOutOfRangeFlag = true, bool theIgnoreOutOfRangeFlag = true,
bool theThoroughBandScanFlag = false bool theThoroughBandScanFlag = false
) {}; )
{ Q_UNUSED( theBandNoInt ); Q_UNUSED( theBandStats ); Q_UNUSED( theBinC
ountInt ); Q_UNUSED( theIgnoreOutOfRangeFlag ); Q_UNUSED( theThoroughBandSc
anFlag ); }
/** \brief Create pyramid overviews */ /** \brief Create pyramid overviews */
virtual QString buildPyramids( const QList<QgsRasterPyramid> & thePyra midList, virtual QString buildPyramids( const QList<QgsRasterPyramid> & thePyra midList,
const QString & theResamplingMethod = " NEAREST", const QString & theResamplingMethod = " NEAREST",
bool theTryInternalFlag = false ) { retu bool theTryInternalFlag = false )
rn "FAILED_NOT_SUPPORTED"; }; { Q_UNUSED( thePyramidList ); Q_UNUSED( theResamplingMethod ); Q_UNUSED
( theTryInternalFlag ); return "FAILED_NOT_SUPPORTED"; };
/** \brief Accessor for ths raster layers pyramid list. A pyramid list defines the /** \brief Accessor for ths raster layers pyramid list. A pyramid list defines the
* POTENTIAL pyramids that can be in a raster. To know which of the pyr amid layers * POTENTIAL pyramids that can be in a raster. To know which of the pyr amid layers
* ACTUALLY exists you need to look at the existsFlag member in each st ruct stored in the * ACTUALLY exists you need to look at the existsFlag member in each st ruct stored in the
* list. * list.
*/ */
virtual QList<QgsRasterPyramid> buildPyramidList() { return QList<QgsRa sterPyramid>(); }; virtual QList<QgsRasterPyramid> buildPyramidList() { return QList<QgsRa sterPyramid>(); };
/** If the provider supports it, return band stats for the
given band. Default behaviour is to blockwise read the data
and generate the stats unless the provider overloads this function.
*/
virtual QgsRasterBandStats bandStatistics( int theBandNo );
/** \brief helper function to create zero padded band names */ /** \brief helper function to create zero padded band names */
QString generateBandName( int theBandNumber ) QString generateBandName( int theBandNumber )
{ {
return tr( "Band" ) + QString( " %1" ) .arg( theBandNumber, 1 + ( in t ) log10(( float ) bandCount() ), 10, QChar( '0' ) ); return tr( "Band" ) + QString( " %1" ) .arg( theBandNumber, 1 + ( in t ) log10(( float ) bandCount() ), 10, QChar( '0' ) );
} };
/** /**
* Get metadata in a format suitable for feeding directly * Get metadata in a format suitable for feeding directly
* into a subset of the GUI raster properties "Metadata" tab. * into a subset of the GUI raster properties "Metadata" tab.
*/ */
virtual QString metadata() = 0; virtual QString metadata() = 0;
/** \brief Identify raster value(s) found on the point position */ /** \brief Identify raster value(s) found on the point position */
virtual bool identify( const QgsPoint & point, QMap<QString, QString>& results ); virtual bool identify( const QgsPoint & point, QMap<QString, QString>& results );
 End of changes. 16 change blocks. 
17 lines changed or deleted 40 lines changed or added


 qgsrasterlayer.h   qgsrasterlayer.h 
skipping to change at line 46 skipping to change at line 46
#include "qgspoint.h" #include "qgspoint.h"
#include "qgsmaplayer.h" #include "qgsmaplayer.h"
#include "qgsrasterviewport.h" #include "qgsrasterviewport.h"
#include "qgscontrastenhancement.h" #include "qgscontrastenhancement.h"
#include "qgsrastertransparency.h" #include "qgsrastertransparency.h"
#include "qgsrastershader.h" #include "qgsrastershader.h"
#include "qgscolorrampshader.h" #include "qgscolorrampshader.h"
#include "qgsrastershaderfunction.h" #include "qgsrastershaderfunction.h"
#include "qgsrasterdataprovider.h" #include "qgsrasterdataprovider.h"
#define CPL_SUPRESS_CPLUSPLUS
#include <gdal.h>
/** \ingroup core
* A call back function for showing progress of gdal operations.
*/
int CPL_STDCALL progressCallback( double dfComplete,
const char *pszMessage,
void * pProgressArg );
// //
// Forward declarations // Forward declarations
// //
class QgsMapToPixel; class QgsMapToPixel;
class QgsRectangle; class QgsRectangle;
class QgsRasterBandStats; class QgsRasterBandStats;
class QgsRasterPyramid; class QgsRasterPyramid;
class QImage; class QImage;
class QPixmap; class QPixmap;
class QSlider; class QSlider;
 End of changes. 1 change blocks. 
9 lines changed or deleted 0 lines changed or added


 qgssymbollayerv2utils.h   qgssymbollayerv2utils.h 
#ifndef QGSSYMBOLLAYERV2UTILS_H #ifndef QGSSYMBOLLAYERV2UTILS_H
#define QGSSYMBOLLAYERV2UTILS_H #define QGSSYMBOLLAYERV2UTILS_H
#include <QMap> #include <QMap>
#include <Qt> #include <Qt>
#include <QtCore>
#include "qgssymbolv2.h" #include "qgssymbolv2.h"
class QgsSymbolV2; class QgsSymbolV2;
class QgsSymbolLayerV2; class QgsSymbolLayerV2;
class QgsVectorColorRampV2; class QgsVectorColorRampV2;
typedef QMap<QString, QString> QgsStringMap; typedef QMap<QString, QString> QgsStringMap;
typedef QMap<QString, QgsSymbolV2* > QgsSymbolV2Map; typedef QMap<QString, QgsSymbolV2* > QgsSymbolV2Map;
class QColor; class QColor;
skipping to change at line 83 skipping to change at line 84
/**Returns the line width scale factor depending on the unit and the pa int device*/ /**Returns the line width scale factor depending on the unit and the pa int device*/
static double lineWidthScaleFactor( QgsRenderContext& c, QgsSymbolV2::O utputUnit u ); static double lineWidthScaleFactor( QgsRenderContext& c, QgsSymbolV2::O utputUnit u );
/**Returns scale factor painter units -> pixel dimensions*/ /**Returns scale factor painter units -> pixel dimensions*/
static double pixelSizeScaleFactor( QgsRenderContext& c, QgsSymbolV2::O utputUnit u ); static double pixelSizeScaleFactor( QgsRenderContext& c, QgsSymbolV2::O utputUnit u );
/**Creates a render context for a pixel based device*/ /**Creates a render context for a pixel based device*/
static QgsRenderContext createRenderContext( QPainter* p ); static QgsRenderContext createRenderContext( QPainter* p );
/**Multiplies opacity of image pixel values with a (global) transparenc y value*/ /**Multiplies opacity of image pixel values with a (global) transparenc y value*/
static void multiplyImageOpacity( QImage* image, qreal alpha ); static void multiplyImageOpacity( QImage* image, qreal alpha );
/**Sorts the passed list in requested order*/
static void sortVariantList( QList<QVariant>& list, Qt::SortOrder or
der );
}; };
class QPolygonF; class QPolygonF;
//! calculate line shifted by a specified distance //! calculate line shifted by a specified distance
QPolygonF offsetLine( QPolygonF polyline, double dist ); QPolygonF offsetLine( QPolygonF polyline, double dist );
#endif #endif
 End of changes. 2 change blocks. 
0 lines changed or deleted 5 lines changed or added


 ui_qgscredentialdialog.h   ui_qgscredentialdialog.h 
/************************************************************************** ****** /************************************************************************** ******
** Form generated from reading UI file 'qgscredentialdialog.ui' ** Form generated from reading UI file 'qgscredentialdialog.ui'
** **
** Created ** Created: Fri Dec 9 19:21:26 2011
** by: Qt User Interface Compiler version 4.7.1 ** by: Qt User Interface Compiler version 4.7.4
** **
** WARNING! All changes made in this file will be lost when recompiling UI file! ** WARNING! All changes made in this file will be lost when recompiling UI file!
*************************************************************************** *****/ *************************************************************************** *****/
#ifndef UI_QGSCREDENTIALDIALOG_H #ifndef UI_QGSCREDENTIALDIALOG_H
#define UI_QGSCREDENTIALDIALOG_H #define UI_QGSCREDENTIALDIALOG_H
#include <QtCore/QVariant> #include <QtCore/QVariant>
#include <QtGui/QAction> #include <QtGui/QAction>
#include <QtGui/QApplication> #include <QtGui/QApplication>
 End of changes. 1 change blocks. 
2 lines changed or deleted 2 lines changed or added


 ui_qgsdetaileditemwidgetbase.h   ui_qgsdetaileditemwidgetbase.h 
/************************************************************************** ****** /************************************************************************** ******
** Form generated from reading UI file 'qgsdetaileditemwidgetbase.ui' ** Form generated from reading UI file 'qgsdetaileditemwidgetbase.ui'
** **
** Created ** Created: Fri Dec 9 19:21:25 2011
** by: Qt User Interface Compiler version 4.7.1 ** by: Qt User Interface Compiler version 4.7.4
** **
** WARNING! All changes made in this file will be lost when recompiling UI file! ** WARNING! All changes made in this file will be lost when recompiling UI file!
*************************************************************************** *****/ *************************************************************************** *****/
#ifndef UI_QGSDETAILEDITEMWIDGETBASE_H #ifndef UI_QGSDETAILEDITEMWIDGETBASE_H
#define UI_QGSDETAILEDITEMWIDGETBASE_H #define UI_QGSDETAILEDITEMWIDGETBASE_H
#include <QtCore/QVariant> #include <QtCore/QVariant>
#include <QtGui/QAction> #include <QtGui/QAction>
#include <QtGui/QApplication> #include <QtGui/QApplication>
 End of changes. 1 change blocks. 
2 lines changed or deleted 2 lines changed or added


 ui_qgsgenericprojectionselectorbase.h   ui_qgsgenericprojectionselectorbase.h 
/************************************************************************** ****** /************************************************************************** ******
** Form generated from reading UI file 'qgsgenericprojectionselectorbase.ui ' ** Form generated from reading UI file 'qgsgenericprojectionselectorbase.ui '
** **
** Created ** Created: Fri Dec 9 19:21:27 2011
** by: Qt User Interface Compiler version 4.7.1 ** by: Qt User Interface Compiler version 4.7.4
** **
** WARNING! All changes made in this file will be lost when recompiling UI file! ** WARNING! All changes made in this file will be lost when recompiling UI file!
*************************************************************************** *****/ *************************************************************************** *****/
#ifndef UI_QGSGENERICPROJECTIONSELECTORBASE_H #ifndef UI_QGSGENERICPROJECTIONSELECTORBASE_H
#define UI_QGSGENERICPROJECTIONSELECTORBASE_H #define UI_QGSGENERICPROJECTIONSELECTORBASE_H
#include <QtCore/QVariant> #include <QtCore/QVariant>
#include <QtGui/QAction> #include <QtGui/QAction>
#include <QtGui/QApplication> #include <QtGui/QApplication>
 End of changes. 1 change blocks. 
2 lines changed or deleted 2 lines changed or added


 ui_qgsmessageviewer.h   ui_qgsmessageviewer.h 
/************************************************************************** ****** /************************************************************************** ******
** Form generated from reading UI file 'qgsmessageviewer.ui' ** Form generated from reading UI file 'qgsmessageviewer.ui'
** **
** Created ** Created: Fri Dec 9 19:21:25 2011
** by: Qt User Interface Compiler version 4.7.1 ** by: Qt User Interface Compiler version 4.7.4
** **
** WARNING! All changes made in this file will be lost when recompiling UI file! ** WARNING! All changes made in this file will be lost when recompiling UI file!
*************************************************************************** *****/ *************************************************************************** *****/
#ifndef UI_QGSMESSAGEVIEWER_H #ifndef UI_QGSMESSAGEVIEWER_H
#define UI_QGSMESSAGEVIEWER_H #define UI_QGSMESSAGEVIEWER_H
#include <QtCore/QVariant> #include <QtCore/QVariant>
#include <QtGui/QAction> #include <QtGui/QAction>
#include <QtGui/QApplication> #include <QtGui/QApplication>
 End of changes. 1 change blocks. 
2 lines changed or deleted 2 lines changed or added


 ui_qgsprojectionselectorbase.h   ui_qgsprojectionselectorbase.h 
/************************************************************************** ****** /************************************************************************** ******
** Form generated from reading UI file 'qgsprojectionselectorbase.ui' ** Form generated from reading UI file 'qgsprojectionselectorbase.ui'
** **
** Created ** Created: Fri Dec 9 19:21:26 2011
** by: Qt User Interface Compiler version 4.7.1 ** by: Qt User Interface Compiler version 4.7.4
** **
** WARNING! All changes made in this file will be lost when recompiling UI file! ** WARNING! All changes made in this file will be lost when recompiling UI file!
*************************************************************************** *****/ *************************************************************************** *****/
#ifndef UI_QGSPROJECTIONSELECTORBASE_H #ifndef UI_QGSPROJECTIONSELECTORBASE_H
#define UI_QGSPROJECTIONSELECTORBASE_H #define UI_QGSPROJECTIONSELECTORBASE_H
#include <QtCore/QVariant> #include <QtCore/QVariant>
#include <QtGui/QAction> #include <QtGui/QAction>
#include <QtGui/QApplication> #include <QtGui/QApplication>
 End of changes. 1 change blocks. 
2 lines changed or deleted 2 lines changed or added


 ui_qgsquerybuilderbase.h   ui_qgsquerybuilderbase.h 
/* /*
Query builder for vector layers Query builder for vector layers
*/ */
/************************************************************************** ****** /************************************************************************** ******
** Form generated from reading UI file 'qgsquerybuilderbase.ui' ** Form generated from reading UI file 'qgsquerybuilderbase.ui'
** **
** Created ** Created: Fri Dec 9 19:21:26 2011
** by: Qt User Interface Compiler version 4.7.1 ** by: Qt User Interface Compiler version 4.7.4
** **
** WARNING! All changes made in this file will be lost when recompiling UI file! ** WARNING! All changes made in this file will be lost when recompiling UI file!
*************************************************************************** *****/ *************************************************************************** *****/
#ifndef UI_QGSQUERYBUILDERBASE_H #ifndef UI_QGSQUERYBUILDERBASE_H
#define UI_QGSQUERYBUILDERBASE_H #define UI_QGSQUERYBUILDERBASE_H
#include <QtCore/QVariant> #include <QtCore/QVariant>
#include <QtGui/QAction> #include <QtGui/QAction>
#include <QtGui/QApplication> #include <QtGui/QApplication>
 End of changes. 1 change blocks. 
2 lines changed or deleted 2 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/