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

raster cleanup

Browse Source
This commit is contained in:
Radim Blazek 2013-04-19 21:10:38 +02:00
parent 1f872ce69d
commit 8b18577a67
14 changed files with 183 additions and 1763 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

166
python/core/raster/qgsrasterlayer.sip
View File

@ -99,23 +99,6 @@ class QgsRasterLayer : QgsMapLayer
ContrastEnhancementCumulativeCut
};
/** \brief A list containing on ContrastEnhancement object per raster band in this raster layer */
typedef QList<QgsContrastEnhancement> ContrastEnhancementList;
/** \brief A list containing one RasterPyramid struct per raster band in this raster layer.
* POTENTIAL pyramid layer. This works by dividing the height
* and width of the raster by an incrementing number. As soon as the result
* of the division is <=256 we stop allowing RasterPyramid structs
* to be added to the list. Each time a RasterPyramid is created
* we will check to see if a pyramid matching these dimensions already exists
* in the raster layer, and if so mark the exists flag as true */
/* typedef QList<QgsRasterPyramid> RasterPyramidList; */
/** \brief A list containing one RasterBandStats struct per raster band in this raster layer.
* Note that while every RasterBandStats element will have the name and number of its associated
* band populated, any additional stats are calculated on a need to know basis.*/
/* typedef QList<QgsRasterBandStats> RasterStatsList; */
//
// Static methods:
//
@ -128,48 +111,21 @@ class QgsRasterLayer : QgsMapLayer
*/
static bool isValidRasterFileName( const QString & theFileNameQString, QString &retError );
static bool isValidRasterFileName( const QString & theFileNameQString );
//static QStringList subLayers( GDALDatasetH dataset );
/** Return time stamp for given file name */
static QDateTime lastModified( const QString & name );
// Keep this for now, it is used by Python interface!!!
/** \brief ensures that GDAL drivers are registered, but only once */
static void registerGdalDrivers();
//
// Non Static inline methods
//
/** \brief Initialize default values */
void init();
/** [ data provider interface ] Set the data provider */
void setDataProvider( const QString & provider );
/** \brief Accessor for blue band name mapping */
QString blueBandName() const;
/** \brief Accessor for color shader algorithm */
QgsRasterLayer::ColorShadingAlgorithm colorShadingAlgorithm() const;
/** \brief Accessor for contrast enhancement algorithm */
QgsContrastEnhancement::ContrastEnhancementAlgorithm contrastEnhancementAlgorithm();
/** \brief Returns contrast enhancement algorithm as a string */
QString contrastEnhancementAlgorithmAsString() const;
/** \brief Accessor for drawing style */
DrawingStyle drawingStyle();
/** \brief Accessor for mHasPyramids (READ ONLY) */
/* bool hasPyramids(); */
/** \brief Accessor for mUserDefinedGrayMinimumMaximum */
bool hasUserDefinedGrayMinimumMaximum() const;
/** \brief Accessor for mUserDefinedRGBMinimumMaximum */
bool hasUserDefinedRGBMinimumMaximum() const;
/** \brief Accessor that returns the width of the (unclipped) raster */
int width();
/** \brief Accessor that returns the height of the (unclipped) raster */
int height();
@ -177,20 +133,8 @@ class QgsRasterLayer : QgsMapLayer
/** \brief Accessor for raster layer type (which is a read only property) */
LayerType rasterType();
/** \brief Mutator for drawing style */
void setDrawingStyle( const DrawingStyle & theDrawingStyle );
/**Sets corresponding renderer for style*/
void setRendererForDrawingStyle( const DrawingStyle & theDrawingStyle );
/** \brief Mutator to alter the number of standard deviations that should be plotted */
void setStandardDeviations( double theStandardDeviations );
/** \brief Mutator for mUserDefinedGrayMinimumMaximum */
void setUserDefinedGrayMinimumMaximum( bool theBool );
/** \brief Mutator for mUserDefinedRGBMinimumMaximum */
void setUserDefinedRGBMinimumMaximum( bool theBool );
/**Set raster renderer. Takes ownership of the renderer object*/
void setRenderer( QgsRasterRenderer* theRenderer /Transfer/ );
@ -203,12 +147,6 @@ class QgsRasterLayer : QgsMapLayer
/** Get raster pipe */
QgsRasterPipe * pipe();
/** \brief Accessor to find out how many standard deviations are being plotted */
double standardDeviations() const;
/** \brief Accessor that returns the width of the (unclipped) raster */
int width();
//
// Non Static methods
//
@ -218,33 +156,6 @@ class QgsRasterLayer : QgsMapLayer
/** \brief Get the name of a band given its number */
const QString bandName( int theBandNoInt );
/** \brief Get the number of a band given its name. The name is the rewritten name set
* up in the constructor, and will not necessarily be the same as the name retrieved directly from gdal!
* If no matching band is found zero will be returned! */
int bandNumber( const QString & theBandName ) const;
/** \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 pyramid layers
* ACTUALLY exists you need to look at the existsFlag member in each struct stored in the
* list.
*/
// RasterPyramidList buildPyramidList();
/** \brief Accessor for color shader algorithm */
QString colorShadingAlgorithmAsString() const;
/** \brief Compute the actual minimum maximum pixel values based on the current (last) display extent
\note added in v1.6 */
//void computeMinimumMaximumFromLastExtent( int theBand, double& theMin /Out/, double& theMax /Out/ );
/** \brief Get a pointer to the contrast enhancement for the selected band */
QgsContrastEnhancement* contrastEnhancement( unsigned int theBand );
const QgsContrastEnhancement* constContrastEnhancement( unsigned int theBand ) const;
/** \brief Get a pointer to the color table */
QList<QgsColorRampShader::ColorRampItem> colorTable( int theBandNoInt );
/** Returns the data provider */
QgsRasterDataProvider* dataProvider();
@ -266,33 +177,6 @@ class QgsRasterLayer : QgsMapLayer
QgsRasterViewPort * myRasterViewPort,
const QgsMapToPixel* theQgsMapToPixel = 0 );
/** \brief Returns a string representation of drawing style
*
* Implemented mainly for serialisation / deserialisation of settings to xml.
* NOTE: May be deprecated in the future!. DrawingStyle drawingStyle() instead.
* */
QString drawingStyleAsString() const;
/** \brief Identify raster value(s) found on the point position */
//bool identify( const QgsPoint & point, QMap<QString, QString>& results /Out/ );
/** \brief Identify raster value(s) found on the point position */
// bool identifyMap( const QgsPoint & point, QMap<int, QString>& results /Out/ );
//%MethodCode
// sipRes = sipCpp->identify( *a0, *a1 );
//%End
/** \brief Identify arbitrary details from the WMS server found on the point position */
//QString identifyAsText( const QgsPoint & point );
/** \brief Identify arbitrary details from the WMS server found on the point position
* @note added in 1.5
*/
//QString identifyAsHtml( const QgsPoint & point );
/** \brief Currently returns always false */
bool isEditable() const;
/** \brief [ data provider interface ] If an operation returns 0 (e.g. draw()), this function returns the text of the error associated with the failure */
QString lastError();
@ -303,21 +187,9 @@ class QgsRasterLayer : QgsMapLayer
@note this method was added in version 1.8*/
QList< QPair< QString, QColor > > legendSymbologyItems() const;
/** \brief Accessor for maximum value user for contrast enhancement */
double maximumValue( unsigned int theBand );
/** \brief Accessor for maximum value user for contrast enhancement */
double maximumValue( QString theBand );
/** \brief Obtain GDAL Metadata for this layer */
QString metadata();
/** \brief Accessor for minimum value user for contrast enhancement */
double minimumValue( unsigned int theBand );
/** \brief Accessor for minimum value user for contrast enhancement */
double minimumValue( QString theBand );
/** \brief Get an 100x100 pixmap of the color palette. If the layer has no palette a white pixmap will be returned */
QPixmap paletteAsPixmap( int theBandNumber = 1 );
@ -329,20 +201,9 @@ class QgsRasterLayer : QgsMapLayer
/** \brief Returns the number of raster units per each raster pixel. In a world file, this is normally the first row (without the sign) */
double rasterUnitsPerPixel();
/** \brief Read color table from GDAL raster band */
// bool readColorTable( int theBandNumber, QList<QgsColorRampShader::ColorRampItem>* theList );
/** \brief Simple reset function that set the noDataValue back to the value stored in the first raster band */
//void resetNoDataValue();
static QString contrastEnhancementLimitsAsString( QgsRasterLayer::ContrastEnhancementLimits theLimits );
static ContrastEnhancementLimits contrastEnhancementLimitsFromString( QString theLimits );
/** \brief Mutator for contrast enhancement algorithm using min/max */
// TODO: remove in 2.0, replaced by following
// void setContrastEnhancementAlgorithm( QgsContrastEnhancement::ContrastEnhancementAlgorithm theAlgorithm,
// bool theGenerateLookupTableFlag = true );
/** \brief Mutator for contrast enhancement algorithm
* @param theAlgorithm Contrast enhancement algorithm
* @param theLimits Limits
@ -357,30 +218,12 @@ class QgsRasterLayer : QgsMapLayer
int theSampleSize = QgsRasterLayer::SAMPLE_SIZE,
bool theGenerateLookupTableFlag = true );
/** \brief Mutator for contrast enhancement algorithm */
void setContrastEnhancementAlgorithm( QString theAlgorithm, bool theGenerateLookupTableFlag = true );
/** \brief Mutator for contrast enhancement function */
void setContrastEnhancementFunction( QgsContrastEnhancementFunction* theFunction );
/** \brief Set default contrast enhancement */
void setDefaultContrastEnhancement();
/** \brief Overloaded version of the above function for convenience when restoring from xml */
void setDrawingStyle( const QString & theDrawingStyleQString );
/** \brief Mutator for setting the maximum value for contrast enhancement */
void setMaximumValue( unsigned int theBand, double theValue, bool theGenerateLookupTableFlag = true );
/** \brief Sets the minimum and maximum values for the band(s) currently
* being displayed using the only pixel values from the last/current extent
* */
void setMinimumMaximumUsingLastExtent();
/** \brief Sets the minimum and maximum values for the band(s) currently
* being displayed using the only pixel values from the dataset min/max */
void setMinimumMaximumUsingDataset();
/** \brief [ data provider interface ] A wrapper function to emit a progress update signal */
void showProgress( int theValue );
@ -413,11 +256,6 @@ class QgsRasterLayer : QgsMapLayer
virtual QDateTime timestamp() const;
public slots:
/** \brief Create GDAL pyramid overviews */
// QString buildPyramids( const RasterPyramidList &,
// const QString & theResamplingMethod = "NEAREST",
// bool theTryInternalFlag = false );
void showStatusMessage( const QString & theMessage );
/** \brief Propagate progress updates from GDAL up to the parent app */

18
src/app/legend/qgslegend.cpp
View File

@ -2753,25 +2753,11 @@ void QgsLegend::legendLayerStretchUsingCurrentExtent()
QgsRasterLayer *layer = qobject_cast<QgsRasterLayer *>( currentLayer->layer() );
if ( layer )
{
// Note: Do we really want to do these next clauses? The user will get a surprise when the
// drawing style they are using suddenly changes....! TS
if ( layer->drawingStyle() == QgsRasterLayer::SingleBandPseudoColor )
{
layer->setDrawingStyle( QgsRasterLayer::SingleBandGray );
}
else if ( layer->drawingStyle() == QgsRasterLayer::MultiBandSingleBandPseudoColor )
{
layer->setDrawingStyle( QgsRasterLayer::MultiBandSingleBandGray );
}
if ( layer->contrastEnhancementAlgorithmAsString() == "NoEnhancement" )
{
layer->setContrastEnhancementAlgorithm( "StretchToMinimumMaximum" );
}
QgsContrastEnhancement::ContrastEnhancementAlgorithm contrastEnhancementAlgorithm = QgsContrastEnhancement::StretchToMinimumMaximum;
QgsRectangle myRectangle;
myRectangle = mMapCanvas->mapRenderer()->outputExtentToLayerExtent( layer, mMapCanvas->extent() );
layer->setContrastEnhancementAlgorithm( layer->contrastEnhancementAlgorithm(), QgsRasterLayer::ContrastEnhancementMinMax, myRectangle );
layer->setContrastEnhancementAlgorithm( contrastEnhancementAlgorithm, QgsRasterLayer::ContrastEnhancementMinMax, myRectangle );
layer->setCacheImage( NULL );
refreshLayerSymbology( layer->id() );

2
src/app/qgsrastercalcdialog.cpp
View File

@ -125,7 +125,7 @@ void QgsRasterCalcDialog::insertAvailableRasterBands()
firstLayer = false;
}
//get number of bands
for ( unsigned int i = 0; i < rlayer->bandCount(); ++i )
for ( int i = 0; i < rlayer->bandCount(); ++i )
{
QgsRasterCalculatorEntry entry;
entry.raster = rlayer;

9
src/core/qgsprojectfiletransform.cpp
View File

@ -816,10 +816,13 @@ int QgsProjectFileTransform::rasterBandNumber( const QDomElement& rasterProperti
QDomElement rasterBandElem = rasterPropertiesElem.firstChildElement( bandName );
if ( !rasterBandElem.isNull() )
{
band = rlayer->bandNumber( rasterBandElem.text() );
if ( band == 0 )
for ( int i = 1; i <= rlayer->bandCount(); i++ )
{
band = -1;
if ( rlayer->bandName( i ) == rasterBandElem.text() )
{
band = i;
break;
}
}
}
return band;

54
src/core/raster/qgscontrastenhancement.cpp
View File

@ -395,7 +395,7 @@ void QgsContrastEnhancement::writeXML( QDomDocument& doc, QDomElement& parentEle
//algorithm
QDomElement algorithmElem = doc.createElement( "algorithm" );
QDomText algorithmText = doc.createTextNode( QString::number( mContrastEnhancementAlgorithm ) );
QDomText algorithmText = doc.createTextNode( contrastEnhancementAlgorithmString( mContrastEnhancementAlgorithm ) );
algorithmElem.appendChild( algorithmText );
parentElem.appendChild( algorithmElem );
}
@ -415,10 +415,56 @@ void QgsContrastEnhancement::readXML( const QDomElement& elem )
QDomElement algorithmElem = elem.firstChildElement( "algorithm" );
if ( !algorithmElem.isNull() )
{
setContrastEnhancementAlgorithm(( ContrastEnhancementAlgorithm )( algorithmElem.text().toInt() ) );
QString algorithmString = algorithmElem.text();
ContrastEnhancementAlgorithm algorithm = NoEnhancement;
// old version ( < 19 Apr 2013) was using enum directly -> for backward compatibility
if ( algorithmString == "0" )
{
algorithm = NoEnhancement;
}
else if ( algorithmString == "1" )
{
algorithm = StretchToMinimumMaximum;
}
else if ( algorithmString == "2" )
{
algorithm = StretchAndClipToMinimumMaximum;
}
else if ( algorithmString == "3" )
{
algorithm = ClipToMinimumMaximum;
}
else if ( algorithmString == "4" )
{
algorithm = UserDefinedEnhancement;
}
else
{
algorithm = contrastEnhancementAlgorithmFromString( algorithmString );
}
setContrastEnhancementAlgorithm( algorithm );
}
}
QString QgsContrastEnhancement::contrastEnhancementAlgorithmString( ContrastEnhancementAlgorithm algorithm )
{
switch ( algorithm )
{
case NoEnhancement:
return "NoEnhancement";
case StretchToMinimumMaximum:
return "StretchToMinimumMaximum";
case StretchAndClipToMinimumMaximum:
return "StretchAndClipToMinimumMaximum";
case ClipToMinimumMaximum:
return "ClipToMinimumMaximum";
case UserDefinedEnhancement:
return "UserDefinedEnhancement";
}
return "NoEnhancement";
}
QgsContrastEnhancement::ContrastEnhancementAlgorithm QgsContrastEnhancement::contrastEnhancementAlgorithmFromString( const QString& contrastEnhancementString )
{
if ( contrastEnhancementString == "StretchToMinimumMaximum" )
@ -433,6 +479,10 @@ QgsContrastEnhancement::ContrastEnhancementAlgorithm QgsContrastEnhancement::con
{
return ClipToMinimumMaximum;
}
else if ( contrastEnhancementString == "UserDefinedEnhancement" )
{
return UserDefinedEnhancement;
}
else
{
return NoEnhancement;

2
src/core/raster/qgscontrastenhancement.h
View File

@ -100,6 +100,8 @@ class CORE_EXPORT QgsContrastEnhancement
ContrastEnhancementAlgorithm contrastEnhancementAlgorithm() const { return mContrastEnhancementAlgorithm; }
static QString contrastEnhancementAlgorithmString( ContrastEnhancementAlgorithm algorithm );
static ContrastEnhancementAlgorithm contrastEnhancementAlgorithmFromString( const QString& contrastEnhancementString );
/*

1253
src/core/raster/qgsrasterlayer.cpp
View File

File diff suppressed because it is too large Load Diff

381
src/core/raster/qgsrasterlayer.h
View File

@ -21,43 +21,36 @@
#ifndef QGSRASTERLAYER_H
#define QGSRASTERLAYER_H
//
// Includes
//
#include <QColor>
#include <QDateTime>
#include <QVector>
#include <QList>
#include <QMap>
#include <QPair>
#include <QVector>
#include "qgis.h"
#include "qgspoint.h"
#include "qgsmaplayer.h"
#include "qgsrasterviewport.h"
#include "qgscontrastenhancement.h"
#include "qgsrastertransparency.h"
#include "qgsrastershader.h"
#include "qgscolorrampshader.h"
#include "qgsrastershaderfunction.h"
#include "qgsrasterinterface.h"
#include "qgsrasterresamplefilter.h"
#include "qgsbrightnesscontrastfilter.h"
#include "qgscolorrampshader.h"
#include "qgscontrastenhancement.h"
#include "qgshuesaturationfilter.h"
#include "qgsmaplayer.h"
#include "qgspoint.h"
#include "qgsrasterdataprovider.h"
#include "qgsrasterinterface.h"
#include "qgsrasterpipe.h"
#include "qgsrasterresamplefilter.h"
#include "qgsrastershaderfunction.h"
#include "qgsrastershader.h"
#include "qgsrastertransparency.h"
#include "qgsrasterviewport.h"
//
// Forward declarations
//
class QgsMapToPixel;
class QgsRectangle;
class QgsRasterRenderer;
class QgsRectangle;
class QImage;
class QLibrary;
class QPixmap;
class QSlider;
class QLibrary;
/** \ingroup core
* This class provides qgis with the ability to render raster datasets
@ -215,10 +208,6 @@ class CORE_EXPORT QgsRasterLayer : public QgsMapLayer
/** \brief The destructor */
~QgsRasterLayer();
//
// Enums, structs and typedefs
//
/** \brief This enumerator describes the types of shading that can be used */
enum ColorShadingAlgorithm
{
@ -263,26 +252,6 @@ class CORE_EXPORT QgsRasterLayer : public QgsMapLayer
ContrastEnhancementCumulativeCut
};
/** \brief A list containing on ContrastEnhancement object per raster band in this raster layer */
typedef QList<QgsContrastEnhancement> ContrastEnhancementList;
/** \brief A list containing one RasterPyramid struct per raster band in this raster layer.
* POTENTIAL pyramid layer. This works by dividing the height
* and width of the raster by an incrementing number. As soon as the result
* of the division is <=256 we stop allowing RasterPyramid structs
* to be added to the list. Each time a RasterPyramid is created
* we will check to see if a pyramid matching these dimensions already exists
* in the raster layer, and if so mark the exists flag as true */
/* typedef QList<QgsRasterPyramid> RasterPyramidList; */
/** \brief A list containing one RasterBandStats struct per raster band in this raster layer.
* Note that while every RasterBandStats element will have the name and number of its associated
* band populated, any additional stats are calculated on a need to know basis.*/
/* typedef QList<QgsRasterBandStats> RasterStatsList; */
//
// Static methods:
//
static void buildSupportedRasterFileFilter( QString & fileFilters );
/** This helper checks to see whether the file name appears to be a valid
@ -292,76 +261,27 @@ class CORE_EXPORT QgsRasterLayer : public QgsMapLayer
*/
static bool isValidRasterFileName( const QString & theFileNameQString, QString &retError );
static bool isValidRasterFileName( const QString & theFileNameQString );
//static QStringList subLayers( GDALDatasetH dataset );
/** Return time stamp for given file name */
static QDateTime lastModified( const QString & name );
// Keep this for now, it is used by Python interface!!!
/** \brief ensures that GDAL drivers are registered, but only once */
static void registerGdalDrivers();
//
// Non Static inline methods
//
/** \brief Initialize default values */
void init();
/** [ data provider interface ] Set the data provider */
void setDataProvider( const QString & provider );
/** \brief Accessor for blue band name mapping */
QString blueBandName() const { return mBlueBandName; }
/** \brief Accessor for color shader algorithm */
QgsRasterLayer::ColorShadingAlgorithm colorShadingAlgorithm() const { return mColorShadingAlgorithm; }
/** \brief Accessor for contrast enhancement algorithm */
QgsContrastEnhancement::ContrastEnhancementAlgorithm contrastEnhancementAlgorithm() { return mContrastEnhancementAlgorithm; }
/** \brief Returns contrast enhancement algorithm as a string */
QString contrastEnhancementAlgorithmAsString() const;
/** \brief Accessor for drawing style */
DrawingStyle drawingStyle() { return mDrawingStyle; }
/** \brief Accessor for mHasPyramids (READ ONLY) */
/* bool hasPyramids() { return dataProvider() != NULL ? dataProvider()->hasPyramids() : false ; } */
/** \brief Accessor for mUserDefinedGrayMinimumMaximum */
bool hasUserDefinedGrayMinimumMaximum() const { return mUserDefinedGrayMinimumMaximum; }
/** \brief Accessor for mUserDefinedRGBMinimumMaximum */
bool hasUserDefinedRGBMinimumMaximum() const { return mUserDefinedRGBMinimumMaximum; }
/** \brief Accessor that returns the height of the (unclipped) raster */
int height() { return mHeight; }
/** \brief Accessor for raster layer type (which is a read only property) */
LayerType rasterType() { return mRasterType; }
/** \brief Mutator for drawing style */
void setDrawingStyle( const DrawingStyle & theDrawingStyle ) { mDrawingStyle = theDrawingStyle; setRendererForDrawingStyle( theDrawingStyle ); }
/**Sets corresponding renderer for style*/
void setRendererForDrawingStyle( const DrawingStyle & theDrawingStyle );
/** \brief Mutator to alter the number of standard deviations that should be plotted */
void setStandardDeviations( double theStandardDeviations ) { mStandardDeviations = theStandardDeviations; }
/** \brief Mutator for mUserDefinedGrayMinimumMaximum */
void setUserDefinedGrayMinimumMaximum( bool theBool ) { mUserDefinedGrayMinimumMaximum = theBool; }
/** \brief Mutator for mUserDefinedRGBMinimumMaximum */
void setUserDefinedRGBMinimumMaximum( bool theBool ) { mUserDefinedRGBMinimumMaximum = theBool; }
/**Set raster renderer. Takes ownership of the renderer object*/
void setRenderer( QgsRasterRenderer* theRenderer );
QgsRasterRenderer* renderer() const { return mPipe.renderer(); }
/**Set raster resample filter. Takes ownership of the resample filter object*/
//void setResampleFilter( QgsRasterResampleFilter* resampleFilter );
QgsRasterResampleFilter * resampleFilter() const { return mPipe.resampleFilter(); }
QgsBrightnessContrastFilter * brightnessFilter() const { return mPipe.brightnessFilter(); }
@ -370,48 +290,18 @@ class CORE_EXPORT QgsRasterLayer : public QgsMapLayer
/** Get raster pipe */
QgsRasterPipe * pipe() { return &mPipe; }
/** \brief Accessor to find out how many standard deviations are being plotted */
double standardDeviations() const { return mStandardDeviations; }
/** \brief Accessor that returns the width of the (unclipped) raster */
int width() { return mWidth; }
int width() const;
/** \brief Accessor that returns the height of the (unclipped) raster */
int height() const;
//
// Non Static methods
//
/** \brief Get the number of bands in this layer */
unsigned int bandCount() const;
int bandCount() const;
/** \brief Get the name of a band given its number */
const QString bandName( int theBandNoInt );
/** \brief Get the number of a band given its name. The name is the rewritten name set
* up in the constructor, and will not necessarily be the same as the name retrieved directly from gdal!
* If no matching band is found zero will be returned! */
int bandNumber( const QString & theBandName ) const;
/** \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 pyramid layers
* ACTUALLY exists you need to look at the existsFlag member in each struct stored in the
* list.
*/
// RasterPyramidList buildPyramidList();
/** \brief Accessor for color shader algorithm */
QString colorShadingAlgorithmAsString() const;
/** \brief Compute the actual minimum maximum pixel values based on the current (last) display extent
\note added in v1.6 */
//void computeMinimumMaximumFromLastExtent( int theBand, double& theMin, double& theMax );
/** \brief Get a pointer to the contrast enhancement for the selected band */
QgsContrastEnhancement* contrastEnhancement( unsigned int theBand );
const QgsContrastEnhancement* constContrastEnhancement( unsigned int theBand ) const;
/** \brief Get a pointer to the color table */
QList<QgsColorRampShader::ColorRampItem> colorTable( int theBandNoInt );
/** Returns the data provider */
QgsRasterDataProvider* dataProvider();
@ -432,32 +322,6 @@ class CORE_EXPORT QgsRasterLayer : public QgsMapLayer
QgsRasterViewPort * myRasterViewPort,
const QgsMapToPixel* theQgsMapToPixel = 0 );
/** \brief Returns a string representation of drawing style
*
* Implemented mainly for serialisation / deserialisation of settings to xml.
* NOTE: May be deprecated in the future!. DrawingStyle drawingStyle() instead.
* */
QString drawingStyleAsString() const;
/** \brief Identify raster value(s) found on the point position */
//bool identify( const QgsPoint & point, QMap<QString, QString>& results );
/** \brief Identify raster value(s) found on the point position
* @note available in python bindings as identifyMap
*/
//bool identify( const QgsPoint & point, QMap<int, QString>& results );
/** \brief Identify arbitrary details from the WMS server found on the point position */
//QString identifyAsText( const QgsPoint & point );
/** \brief Identify arbitrary details from the WMS server found on the point position
* @note added in 1.5
*/
//QString identifyAsHtml( const QgsPoint & point );
/** \brief Currently returns always false */
bool isEditable() const;
/** \brief [ data provider interface ] If an operation returns 0 (e.g. draw()), this function returns the text of the error associated with the failure */
QString lastError();
@ -468,21 +332,9 @@ class CORE_EXPORT QgsRasterLayer : public QgsMapLayer
@note this method was added in version 1.8*/
QList< QPair< QString, QColor > > legendSymbologyItems() const;
/** \brief Accessor for maximum value user for contrast enhancement */
double maximumValue( unsigned int theBand );
/** \brief Accessor for maximum value user for contrast enhancement */
double maximumValue( QString theBand );
/** \brief Obtain GDAL Metadata for this layer */
QString metadata();
/** \brief Accessor for minimum value user for contrast enhancement */
double minimumValue( unsigned int theBand );
/** \brief Accessor for minimum value user for contrast enhancement */
double minimumValue( QString theBand );
/** \brief Get an 100x100 pixmap of the color palette. If the layer has no palette a white pixmap will be returned */
QPixmap paletteAsPixmap( int theBandNumber = 1 );
@ -494,24 +346,10 @@ class CORE_EXPORT QgsRasterLayer : public QgsMapLayer
/** \brief Returns the number of raster units per each raster pixel. In a world file, this is normally the first row (without the sign) */
double rasterUnitsPerPixel();
/** \brief Read color table from GDAL raster band */
// Keep this for QgsRasterLayerProperties
// @note not available in python bindings
bool readColorTable( int theBandNumber, QList<QgsColorRampShader::ColorRampItem>* theList );
/** \brief Simple reset function that set the noDataValue back to the value stored in the first raster band */
//void resetNoDataValue();
static QString contrastEnhancementLimitsAsString( QgsRasterLayer::ContrastEnhancementLimits theLimits );
static ContrastEnhancementLimits contrastEnhancementLimitsFromString( QString theLimits );
/** \brief Mutator for contrast enhancement algorithm using min/max */
// TODO: remove in 2.0, replaced by following
// @note not available in python bindings
void setContrastEnhancementAlgorithm( QgsContrastEnhancement::ContrastEnhancementAlgorithm theAlgorithm,
bool theGenerateLookupTableFlag = true );
/** \brief Mutator for contrast enhancement algorithm
/** \brief Set contrast enhancement algorithm
* @param theAlgorithm Contrast enhancement algorithm
* @param theLimits Limits
* @param theExtent Extent used to calculate limits, if empty, use full layer extent
@ -525,30 +363,12 @@ class CORE_EXPORT QgsRasterLayer : public QgsMapLayer
int theSampleSize = SAMPLE_SIZE,
bool theGenerateLookupTableFlag = true );
/** \brief Mutator for contrast enhancement algorithm */
void setContrastEnhancementAlgorithm( QString theAlgorithm, bool theGenerateLookupTableFlag = true );
/** \brief Mutator for contrast enhancement function */
void setContrastEnhancementFunction( QgsContrastEnhancementFunction* theFunction );
/** \brief Set default contrast enhancement */
void setDefaultContrastEnhancement();
/** \brief Overloaded version of the above function for convenience when restoring from xml */
void setDrawingStyle( const QString & theDrawingStyleQString );
/** \brief Mutator for setting the maximum value for contrast enhancement */
void setMaximumValue( unsigned int theBand, double theValue, bool theGenerateLookupTableFlag = true );
/** \brief Sets the minimum and maximum values for the band(s) currently
* being displayed using the only pixel values from the last/current extent
* */
void setMinimumMaximumUsingLastExtent();
/** \brief Sets the minimum and maximum values for the band(s) currently
* being displayed using the only pixel values from the dataset min/max */
void setMinimumMaximumUsingDataset();
/** \brief [ data provider interface ] A wrapper function to emit a progress update signal */
void showProgress( int theValue );
@ -561,9 +381,6 @@ class CORE_EXPORT QgsRasterLayer : public QgsMapLayer
/** \brief Emit a signal asking for a repaint. (inherited from maplayer) */
void triggerRepaint();
//
// Virtual methods
//
/**
* Reorders the *previously selected* sublayers of this layer from bottom to top
*
@ -581,11 +398,6 @@ class CORE_EXPORT QgsRasterLayer : public QgsMapLayer
virtual QDateTime timestamp() const { return mDataProvider->timestamp() ; }
public slots:
/** \brief Create GDAL pyramid overviews */
// QString buildPyramids( const RasterPyramidList &,
// const QString & theResamplingMethod = "NEAREST",
// bool theTryInternalFlag = false );
void showStatusMessage( const QString & theMessage );
/** \brief Propagate progress updates from GDAL up to the parent app */
@ -605,7 +417,6 @@ class CORE_EXPORT QgsRasterLayer : public QgsMapLayer
void dataChanged();
protected:
/** \brief Read the symbology for the current layer from the Dom node supplied */
bool readSymbology( const QDomNode& node, QString& errorMessage );
@ -619,187 +430,43 @@ class CORE_EXPORT QgsRasterLayer : public QgsMapLayer
bool writeXml( QDomNode & layer_node, QDomDocument & doc );
private:
//
// Private methods
//
/** \brief Drawing routine for color type data */
void drawSingleBandColorData( QPainter * theQPainter,
QgsRasterViewPort * theRasterViewPort,
const QgsMapToPixel* theQgsMapToPixel,
int theBandNoInt );
/** \brief Drawing routine for multiband image */
void drawMultiBandColor( QPainter * theQPainter,
QgsRasterViewPort * theRasterViewPort,
const QgsMapToPixel* theQgsMapToPixel );
/** \brief Drawing routine for multiband image, rendered as a single band image in grayscale */
void drawMultiBandSingleBandGray( QPainter * theQPainter,
QgsRasterViewPort * theRasterViewPort,
const QgsMapToPixel* theQgsMapToPixel,
int theBandNoInt );
/** \brief Drawing routine for multiband image, rendered as a single band image in pseudocolor */
void drawMultiBandSingleBandPseudoColor( QPainter * theQPainter,
QgsRasterViewPort * theRasterViewPort,
const QgsMapToPixel* theQgsMapToPixel,
int theBandNoInt );
/** \brief Drawing routine for single band with a color map */
void drawPalettedSingleBandColor( QPainter * theQPainter,
QgsRasterViewPort * theRasterViewPort,
const QgsMapToPixel* theQgsMapToPixel,
int theBandNoInt );
/** \brief Drawing routine for paletted image, rendered as a single band image in grayscale */
void drawPalettedSingleBandGray( QPainter * theQPainter,
QgsRasterViewPort * theRasterViewPort,
const QgsMapToPixel* theQgsMapToPixel,
int theBandNoInt );
/** \brief Drawing routine for paletted image, rendered as a single band image in pseudocolor */
void drawPalettedSingleBandPseudoColor( QPainter * theQPainter,
QgsRasterViewPort * theRasterViewPort,
const QgsMapToPixel* theQgsMapToPixel,
int theBandNoInt );
/** \brief Drawing routine for paletted multiband image */
void drawPalettedMultiBandColor( QPainter * theQPainter,
QgsRasterViewPort * theRasterViewPort,
const QgsMapToPixel* theQgsMapToPixel,
int theBandNoInt );
/** \brief Drawing routine for single band grayscale image */
void drawSingleBandGray( QPainter * theQPainter,
QgsRasterViewPort * theRasterViewPort,
const QgsMapToPixel* theQgsMapToPixel,
int theBandNoInt );
/** \brief Drawing routine for single band grayscale image, rendered in pseudocolor */
void drawSingleBandPseudoColor( QPainter * theQPainter,
QgsRasterViewPort * theRasterViewPort,
const QgsMapToPixel* theQgsMapToPixel,
int theBandNoInt );
/** \brief Initialize default values */
void init();
/** \brief Close data provider and clear related members */
void closeDataProvider();
/** \brief helper function to create zero padded band names */
QString generateBandName( int );
/** \brief Find out whether a given band exists. */
bool hasBand( const QString & theBandName );
/** \brief Query GDAL to find out the Wkt projection string for this layer.*/
QString projectionWkt();
/** \brief Allocate memory and load data to that allocated memory */
//void* readData( GDALRasterBandH gdalBand, QgsRasterViewPort *viewPort );
//void* readData( int bandNo, QgsRasterViewPort *viewPort );
/** \brief Load the given raster file */
bool readFile( const QString & fileName );
/** \brief Read a raster value given position from memory block created by readData() */
//inline double readValue( void *data, GDALDataType type, int index );
//inline double readValue( void *data, int type, int index );
/** \brief Update the layer if it is outdated */
bool update();
/** \brief Verify and transform band name for internal consistency. Return 'Not Set' on any type of failure */
QString validateBandName( const QString & theBandName );
/**Sets corresponding renderer for style*/
void setRendererForDrawingStyle( const DrawingStyle & theDrawingStyle );
//
// Private member vars
//
/** \brief Constant defining flag for XML and a constant that signals property not used */
const QString QSTRING_NOT_SET;
const QString TRSTRING_NOT_SET;
/** \brief The number of bands in the dataset */
int mBandCount;
/** \brief The band to be associated with the color blue - usually 3 */
QString mBlueBandName;
/** \brief The raster shading algorithm being used */
ColorShadingAlgorithm mColorShadingAlgorithm;
/** \brief The contrast enhancement algorithm being used */
QgsContrastEnhancement::ContrastEnhancementAlgorithm mContrastEnhancementAlgorithm;
/** \brief List containing the contrast enhancements for each band */
ContrastEnhancementList mContrastEnhancementList;
/** \brief Number of stddev to plot (0) to ignore. Not applicable to all layer types */
double mStandardDeviations;
/** [ data provider interface ] Pointer to data provider derived from the abstract base class QgsDataProvider */
/** Pointer to data provider */
QgsRasterDataProvider* mDataProvider;
DrawingStyle mDrawingStyle;
/** [ data provider interface ] Flag indicating whether the layer is in editing mode or not*/
bool mEditable;
/** [ data provider interface ]The error message associated with the last error */
QString mError;
/** [ data provider interface ] The error caption associated with the last error */
QString mErrorCaption;
/** \brief Pointer to the gdaldataset */
//GDALDatasetH mGdalBaseDataset;
/** \brief Pointer to the gdaldataset (possibly warped vrt) */
//GDALDatasetH mGdalDataset;
/** \brief Values for mapping pixel to world coordinates. Contents of this array are the same as the GDAL adfGeoTransform */
double mGeoTransform[6];
/** \brief Raster width */
int mWidth;
/** \brief Raster height */
int mHeight;
/** [ data provider interface ] Timestamp, the last modified time of the data source when the layer was created */
QDateTime mLastModified;
QgsRasterViewPort mLastViewPort;
/** [ data provider interface ] pointer for loading the provider library */
//QLibrary* mLib;
/** [ data provider interface ] Flag indicating whether the layer has been modified since the last commit*/
bool mModified;
/** \brief Cell value representing no data. e.g. -9999 */
//double mNoDataValue;
/** [ data provider interface ] Data provider key */
QString mProviderKey;
/** \brief This list holds a series of RasterPyramid structs which store information for each potential pyramid level */
/* RasterPyramidList mPyramidList; */
/** \brief A collection of stats - one for each band in the layer */
//RasterStatsList mRasterStatsList;
LayerType mRasterType;
/** \brief Flag to indicate if the user entered custom min max values */
bool mUserDefinedGrayMinimumMaximum;
/** \brief Flag to indicate if the user entered custom min max values */
bool mUserDefinedRGBMinimumMaximum;
/** \brief Flag indicating if the nodatavalue is valid*/
//bool mValidNoDataValue;
//QgsRasterRenderer* mRenderer;
//QgsRasterResampleFilter *mResampleFilter;
QgsRasterPipe mPipe;
};

6
src/core/raster/qgsrasterpipe.cpp
View File

@ -17,11 +17,11 @@
#include <typeinfo>
#include "qgsrasterpipe.h"
#include "qgslogger.h"
#include <QByteArray>
#include "qgslogger.h"
#include "qgsrasterpipe.h"
QgsRasterPipe::QgsRasterPipe()
{
}

13
src/core/raster/qgsrasterpipe.h
View File

@ -18,18 +18,18 @@
#ifndef QGSRASTERPIPE_H
#define QGSRASTERPIPE_H
#include <QObject>
#include <QImage>
#include <QObject>
#include "qgsrectangle.h"
#include "qgsrasterinterface.h"
#include "qgsrasterresamplefilter.h"
#include "qgsbrightnesscontrastfilter.h"
#include "qgshuesaturationfilter.h"
#include "qgsrasterdataprovider.h"
#include "qgsrasterinterface.h"
#include "qgsrasternuller.h"
#include "qgsrasterrenderer.h"
#include "qgsrasterprojector.h"
#include "qgsrasterrenderer.h"
#include "qgsrasterresamplefilter.h"
#include "qgsrectangle.h"
#if defined(Q_OS_WIN)
#undef interface
@ -101,9 +101,6 @@ class CORE_EXPORT QgsRasterPipe
QgsRasterProjector * projector() const;
QgsRasterNuller * nuller() const;
/** Set on/off collection of statistics */
//void setStatsOn( bool on ) { if ( last() ) last()->setStatsOn( on ); }
private:
/** Get known parent type_info of interface parent */
Role interfaceRole( QgsRasterInterface * iface ) const;

21
src/gui/raster/qgspalettedrendererwidget.cpp
View File

@ -91,16 +91,19 @@ void QgsPalettedRendererWidget::setFromRenderer( const QgsRasterRenderer* r )
else
{
//read default palette settings from layer
QList<QgsColorRampShader::ColorRampItem> itemList =
mRasterLayer->colorTable( mBandComboBox->itemData( mBandComboBox->currentIndex() ).toInt() );
QList<QgsColorRampShader::ColorRampItem>::const_iterator itemIt = itemList.constBegin();
int index = 0;
for ( ; itemIt != itemList.constEnd(); ++itemIt )
QgsRasterDataProvider *provider = mRasterLayer->dataProvider();
if ( provider )
{
QTreeWidgetItem* item = new QTreeWidgetItem( mTreeWidget );
item->setText( 0, QString::number( index ) );
item->setBackground( 1, QBrush( itemIt->color ) );
++index;
QList<QgsColorRampShader::ColorRampItem> itemList = provider->colorTable( mBandComboBox->itemData( mBandComboBox->currentIndex() ).toInt() );
QList<QgsColorRampShader::ColorRampItem>::const_iterator itemIt = itemList.constBegin();
int index = 0;
for ( ; itemIt != itemList.constEnd(); ++itemIt )
{
QTreeWidgetItem* item = new QTreeWidgetItem( mTreeWidget );
item->setText( 0, QString::number( index ) );
item->setBackground( 1, QBrush( itemIt->color ) );
++index;
}
}
}
}

9
src/gui/raster/qgssinglebandpseudocolorrendererwidget.cpp
View File

@ -365,22 +365,23 @@ void QgsSingleBandPseudoColorRendererWidget::populateColormapTreeWidget( const Q
void QgsSingleBandPseudoColorRendererWidget::on_mLoadFromBandButton_clicked()
{
if ( !mRasterLayer )
if ( !mRasterLayer || !mRasterLayer->dataProvider() )
{
return;
}
QList<QgsColorRampShader::ColorRampItem> colorRampList;
int bandIndex = mBandComboBox->itemData( mBandComboBox->currentIndex() ).toInt();
if ( mRasterLayer->readColorTable( bandIndex, &colorRampList ) )
QList<QgsColorRampShader::ColorRampItem> colorRampList = mRasterLayer->dataProvider()->colorTable( bandIndex );
if ( colorRampList.size() > 0 )
{
populateColormapTreeWidget( colorRampList );
mColorInterpolationComboBox->setCurrentIndex( mColorInterpolationComboBox->findText( tr( "Linear" ) ) );
}
else
{
QMessageBox::warning( this, tr( "Load Color Map" ), tr( "The color map for band %1 failed to load" ).arg( bandIndex ) );
QMessageBox::warning( this, tr( "Load Color Map" ), tr( "The color map for band %1 has no entries" ).arg( bandIndex ) );
}
}

8
src/plugins/georeferencer/qgsgeorefplugingui.cpp
View File

@ -632,16 +632,16 @@ void QgsGeorefPluginGui::showGeorefConfigDialog()
// Histogram stretch slots
void QgsGeorefPluginGui::fullHistogramStretch()
{
mLayer->setContrastEnhancementAlgorithm( "StretchToMinimumMaximum" );
mLayer->setMinimumMaximumUsingDataset();
mLayer->setContrastEnhancementAlgorithm( QgsContrastEnhancement::StretchToMinimumMaximum );
mLayer->setCacheImage( NULL );
mCanvas->refresh();
}
void QgsGeorefPluginGui::localHistogramStretch()
{
mLayer->setContrastEnhancementAlgorithm( "StretchToMinimumMaximum" );
mLayer->setMinimumMaximumUsingLastExtent();
QgsRectangle rectangle = mIface->mapCanvas()->mapRenderer()->outputExtentToLayerExtent( mLayer, mIface->mapCanvas()->extent() );
mLayer->setContrastEnhancementAlgorithm( QgsContrastEnhancement::StretchToMinimumMaximum, QgsRasterLayer::ContrastEnhancementMinMax, rectangle );
mLayer->setCacheImage( NULL );
mCanvas->refresh();
}

4
tests/src/core/testqgsrasterlayer.cpp
View File

@ -151,7 +151,7 @@ void TestQgsRasterLayer::cleanupTestCase()
void TestQgsRasterLayer::isValid()
{
QVERIFY( mpRasterLayer->isValid() );
mpRasterLayer->setContrastEnhancementAlgorithm( QgsContrastEnhancement::StretchToMinimumMaximum, false );
mpRasterLayer->setContrastEnhancementAlgorithm( QgsContrastEnhancement::StretchToMinimumMaximum, QgsRasterLayer::ContrastEnhancementMinMax );
mpMapRenderer->setExtent( mpRasterLayer->extent() );
QVERIFY( render( "raster" ) );
}
@ -289,7 +289,7 @@ void TestQgsRasterLayer::colorRamp4()
void TestQgsRasterLayer::landsatBasic()
{
mpLandsatRasterLayer->setContrastEnhancementAlgorithm( QgsContrastEnhancement::StretchToMinimumMaximum, false );
mpLandsatRasterLayer->setContrastEnhancementAlgorithm( QgsContrastEnhancement::StretchToMinimumMaximum, QgsRasterLayer::ContrastEnhancementMinMax );
QStringList myLayers;
myLayers << mpLandsatRasterLayer->id();
mpMapRenderer->setLayerSet( myLayers );