sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-18 00:03:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

use constant for raster iterator default (followup baa5d90, f924578)

Browse Source
This commit is contained in:
Juergen E. Fischer 2017-02-21 13:44:40 +01:00
parent f107a03e60
commit 72342557c3
5 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
python/core/raster/qgsrasteriterator.sip
View File

@ -39,4 +39,7 @@ class QgsRasterIterator
void setMaximumTileHeight( int h );
int maximumTileHeight() const;
static const int DEFAULT_MAXIMUM_TILE_WIDTH;
static const int DEFAULT_MAXIMUM_TILE_HEIGHT;
};

5
src/core/raster/qgsrasterdataprovider.h
View File

@ -38,6 +38,7 @@
#include "qgsrasterpyramid.h"
#include "qgsrasterrange.h"
#include "qgsrectangle.h"
#include "qgsrasteriterator.h"
class QImage;
class QByteArray;
@ -446,14 +447,14 @@ class CORE_EXPORT QgsRasterDataProvider : public QgsDataProvider, public QgsRast
* @see stepHeight()
* @note added in QGIS 3.0
*/
virtual int stepWidth() const { return 2000; }
virtual int stepWidth() const { return QgsRasterIterator::DEFAULT_MAXIMUM_TILE_WIDTH; }
/**
* Step height for raster iterations.
* @see stepWidth()
* @note added in QGIS 3.0
*/
virtual int stepHeight() const { return 2000; }
virtual int stepHeight() const { return QgsRasterIterator::DEFAULT_MAXIMUM_TILE_HEIGHT; }
signals:

4
src/core/raster/qgsrasteriterator.cpp
View File

@ -21,8 +21,8 @@
QgsRasterIterator::QgsRasterIterator( QgsRasterInterface* input )
: mInput( input )
, mFeedback( nullptr )
, mMaximumTileWidth( 2000 )
, mMaximumTileHeight( 2000 )
, mMaximumTileWidth( DEFAULT_MAXIMUM_TILE_WIDTH )
, mMaximumTileHeight( DEFAULT_MAXIMUM_TILE_HEIGHT )
{
for ( QgsRasterInterface *ri = input; ri; ri = ri->input() )
{

3
src/core/raster/qgsrasteriterator.h
View File

@ -68,6 +68,9 @@ class CORE_EXPORT QgsRasterIterator
void setMaximumTileHeight( int h ) { mMaximumTileHeight = h; }
int maximumTileHeight() const { return mMaximumTileHeight; }
static const int DEFAULT_MAXIMUM_TILE_WIDTH = 2000;
static const int DEFAULT_MAXIMUM_TILE_HEIGHT = 2000;
private:
//Stores information about reading of a raster band. Columns and rows are in unsampled coordinates
struct RasterPartInfo

5
src/providers/wms/qgswmscapabilities.h
View File

@ -24,6 +24,7 @@
#include "qgsauthmanager.h"
#include "qgsraster.h"
#include "qgsrectangle.h"
#include "qgsrasteriterator.h"
class QNetworkReply;
@ -569,8 +570,8 @@ class QgsWmsSettings
/**
* Step size when iterating the layer
*/
int mStepWidth = 2000;
int mStepHeight = 2000;
int mStepWidth = QgsRasterIterator::DEFAULT_MAXIMUM_TILE_WIDTH;
int mStepHeight = QgsRasterIterator::DEFAULT_MAXIMUM_TILE_HEIGHT;
//! Data source URI of the WMS for this layer
QString mHttpUri;