Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[FEATURE] Add saturation control for raster images
- Loading branch information
1 parent
4d0be59
commit 030960e
Showing
9 changed files
with
387 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,206 @@ | ||
| /*************************************************************************** | ||
| qgshuesaturationfilter.cpp | ||
| --------------------- | ||
| begin : February 2013 | ||
| copyright : (C) 2013 by Alexander Bruy, Nyall Dawson | ||
| email : alexander dot bruy at gmail dot com | ||
| ***************************************************************************/ | ||
|
|
||
| /*************************************************************************** | ||
| * * | ||
| * 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 * | ||
| * the Free Software Foundation; either version 2 of the License, or * | ||
| * (at your option) any later version. * | ||
| * * | ||
| ***************************************************************************/ | ||
|
|
||
| #include "qgsrasterdataprovider.h" | ||
| #include "qgshuesaturationfilter.h" | ||
|
|
||
| #include <QDomDocument> | ||
| #include <QDomElement> | ||
|
|
||
|
|
||
| QgsHueSaturationFilter::QgsHueSaturationFilter( QgsRasterInterface* input ) | ||
| : QgsRasterInterface( input ), | ||
| mSaturation( 0 ) | ||
| { | ||
| } | ||
|
|
||
| QgsHueSaturationFilter::~QgsHueSaturationFilter() | ||
| { | ||
| } | ||
|
|
||
| QgsRasterInterface * QgsHueSaturationFilter::clone() const | ||
| { | ||
| QgsDebugMsg( "Entered hue/saturation filter" ); | ||
| QgsHueSaturationFilter * filter = new QgsHueSaturationFilter( 0 ); | ||
| filter->setSaturation( mSaturation ); | ||
| return filter; | ||
| } | ||
|
|
||
| int QgsHueSaturationFilter::bandCount() const | ||
| { | ||
| if ( mOn ) | ||
| { | ||
| return 1; | ||
| } | ||
|
|
||
| if ( mInput ) | ||
| { | ||
| return mInput->bandCount(); | ||
| } | ||
|
|
||
| return 0; | ||
| } | ||
|
|
||
| QGis::DataType QgsHueSaturationFilter::dataType( int bandNo ) const | ||
| { | ||
| if ( mOn ) | ||
| { | ||
| return QGis::ARGB32_Premultiplied; | ||
| } | ||
|
|
||
| if ( mInput ) | ||
| { | ||
| return mInput->dataType( bandNo ); | ||
| } | ||
|
|
||
| return QGis::UnknownDataType; | ||
| } | ||
|
|
||
| bool QgsHueSaturationFilter::setInput( QgsRasterInterface* input ) | ||
| { | ||
| QgsDebugMsg( "Entered" ); | ||
|
|
||
| // Hue/saturation filter can only work with single band ARGB32_Premultiplied | ||
| if ( !input ) | ||
| { | ||
| QgsDebugMsg( "No input" ); | ||
| return false; | ||
| } | ||
|
|
||
| if ( !mOn ) | ||
| { | ||
| // In off mode we can connect to anything | ||
| QgsDebugMsg( "OK" ); | ||
| mInput = input; | ||
| return true; | ||
| } | ||
|
|
||
| if ( input->bandCount() < 1 ) | ||
| { | ||
| QgsDebugMsg( "No input band" ); | ||
| return false; | ||
| } | ||
|
|
||
| if ( input->dataType( 1 ) != QGis::ARGB32_Premultiplied && | ||
| input->dataType( 1 ) != QGis::ARGB32 ) | ||
| { | ||
| QgsDebugMsg( "Unknown input data type" ); | ||
| return false; | ||
| } | ||
|
|
||
| mInput = input; | ||
| QgsDebugMsg( "OK" ); | ||
| return true; | ||
| } | ||
|
|
||
| QgsRasterBlock * QgsHueSaturationFilter::block( int bandNo, QgsRectangle const & extent, int width, int height ) | ||
| { | ||
| Q_UNUSED( bandNo ); | ||
| QgsDebugMsg( "Entered hue/saturation filter block" ); | ||
|
|
||
| QgsRasterBlock *outputBlock = new QgsRasterBlock(); | ||
| if ( !mInput ) | ||
| { | ||
| return outputBlock; | ||
| } | ||
|
|
||
| // At this moment we know that we read rendered image | ||
| int bandNumber = 1; | ||
| QgsRasterBlock *inputBlock = mInput->block( bandNumber, extent, width, height ); | ||
| if ( !inputBlock || inputBlock->isEmpty() ) | ||
| { | ||
| QgsDebugMsg( "No raster data!" ); | ||
| delete inputBlock; | ||
| return outputBlock; | ||
| } | ||
|
|
||
| if ( mSaturation == 0 ) | ||
| { | ||
| QgsDebugMsg( "No saturation change." ); | ||
| delete outputBlock; | ||
| return inputBlock; | ||
| } | ||
|
|
||
| if ( !outputBlock->reset( QGis::ARGB32_Premultiplied, width, height ) ) | ||
| { | ||
| delete inputBlock; | ||
| return outputBlock; | ||
| } | ||
|
|
||
| // adjust image | ||
| QRgb myNoDataColor = qRgba( 0, 0, 0, 0 ); | ||
| QColor myColor; | ||
| int h, s, v; | ||
|
|
||
| // Scale saturation value to [0-2], where 0 = desaturated | ||
| double saturationScale = (( double ) mSaturation / 100 ) + 1; | ||
|
|
||
| for ( size_t i = 0; i < ( size_t )width*height; i++ ) | ||
| { | ||
| if ( inputBlock->color( i ) == myNoDataColor ) | ||
| { | ||
| outputBlock->setColor( i, myNoDataColor ); | ||
| continue; | ||
| } | ||
|
|
||
| // Get current color in hsv | ||
| myColor = QColor( inputBlock->color( i ) ); | ||
| myColor.getHsv( &h, &s, &v ); | ||
|
|
||
| if ( saturationScale < 1 ) | ||
| { | ||
| // Lowering the saturation. Use a simple linear relationship | ||
| s = qMin(( int )( s * saturationScale ), 255 ); | ||
| } | ||
| else | ||
| { | ||
| // Raising the saturation. Use a saturation curve to prevent | ||
| // clipping at maximum saturation with ugly results. | ||
| s = qMin(( int )( 255. * ( 1 - pow( 1 - (( double )s / 255. ) , saturationScale * 2 ) ) ), 255 ); | ||
| } | ||
|
|
||
| // Convert back to rgb | ||
| myColor = QColor::fromHsv( h, s, v ); | ||
| outputBlock->setColor( i, myColor.rgb() ); | ||
| } | ||
|
|
||
| delete inputBlock; | ||
| return outputBlock; | ||
| } | ||
|
|
||
| void QgsHueSaturationFilter::writeXML( QDomDocument& doc, QDomElement& parentElem ) | ||
| { | ||
| if ( parentElem.isNull() ) | ||
| { | ||
| return; | ||
| } | ||
|
|
||
| QDomElement filterElem = doc.createElement( "huesaturation" ); | ||
|
|
||
| filterElem.setAttribute( "saturation", QString::number( mSaturation ) ); | ||
| parentElem.appendChild( filterElem ); | ||
| } | ||
|
|
||
| void QgsHueSaturationFilter::readXML( const QDomElement& filterElem ) | ||
| { | ||
| if ( filterElem.isNull() ) | ||
| { | ||
| return; | ||
| } | ||
|
|
||
| mSaturation = filterElem.attribute( "saturation", "0" ).toInt(); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| /*************************************************************************** | ||
| qgshuesaturationfilter.h | ||
| ------------------- | ||
| begin : February 2013 | ||
| copyright : (C) 2013 by Alexander Bruy, Nyall Dawson | ||
| email : alexander dot bruy at gmail dot com | ||
| ***************************************************************************/ | ||
|
|
||
| /*************************************************************************** | ||
| * * | ||
| * 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 * | ||
| * the Free Software Foundation; either version 2 of the License, or * | ||
| * (at your option) any later version. * | ||
| * * | ||
| ***************************************************************************/ | ||
|
|
||
| #ifndef QGSHUESATURATIONFILTER_H | ||
| #define QGSHUESATURATIONFILTER_H | ||
|
|
||
| #include "qgsrasterdataprovider.h" | ||
| #include "qgsrasterinterface.h" | ||
|
|
||
| class QDomElement; | ||
|
|
||
| /** \ingroup core | ||
| * Color and saturation filter pipe for rasters. | ||
| */ | ||
| class CORE_EXPORT QgsHueSaturationFilter : public QgsRasterInterface | ||
| { | ||
| public: | ||
| QgsHueSaturationFilter( QgsRasterInterface *input = 0 ); | ||
| ~QgsHueSaturationFilter(); | ||
|
|
||
| QgsRasterInterface * clone() const; | ||
|
|
||
| int bandCount() const; | ||
|
|
||
| QGis::DataType dataType( int bandNo ) const; | ||
|
|
||
| bool setInput( QgsRasterInterface* input ); | ||
|
|
||
| QgsRasterBlock *block( int bandNo, const QgsRectangle &extent, int width, int height ); | ||
|
|
||
| void setSaturation( int saturation ) { mSaturation = qBound( -100, saturation, 100 ); } | ||
| int saturation() const { return mSaturation; } | ||
|
|
||
| void writeXML( QDomDocument& doc, QDomElement& parentElem ); | ||
|
|
||
| /**Sets base class members from xml. Usually called from create() methods of subclasses*/ | ||
| void readXML( const QDomElement& filterElem ); | ||
|
|
||
| private: | ||
| /**Current saturation value. Range: -100 (desaturated) ... 0 (no change) ... 100 (increased)*/ | ||
| int mSaturation; | ||
|
|
||
| }; | ||
|
|
||
| #endif // QGSHUESATURATIONFILTER_H |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.