Skip to content

Commit 3ca9618

Browse files
nyalldawsonnyalldawson
committedJun 13, 2018
Formatting
·
ltr-3_40final-3_2_0
1 parent 059f343 commit 3ca9618

File tree

3 files changed

+32
-32
lines changed

3 files changed

+32
-32
lines changed
 

‎src/analysis/processing/qgsalgorithmreclassifybylayer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ QString QgsReclassifyAlgorithmBase::groupId() const
3737
return QStringLiteral( "rasteranalysis" );
3838
}
3939

40-
void QgsReclassifyAlgorithmBase::initAlgorithm( const QVariantMap &configuration )
40+
void QgsReclassifyAlgorithmBase::initAlgorithm( const QVariantMap & )
4141
{
4242
addParameter( new QgsProcessingParameterRasterLayer( QStringLiteral( "INPUT_RASTER" ),
4343
QObject::tr( "Raster layer" ) ) );

‎src/analysis/processing/qgsreclassifyutils.cpp

100755100644
Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@
2626

2727
///@cond PRIVATE
2828

29-
void QgsReclassifyUtils::reclassify(const QVector<QgsReclassifyUtils::RasterClass> &classes, QgsRasterInterface *sourceRaster, int band,
30-
const QgsRectangle &extent, int sourceWidthPixels, int sourceHeightPixels,
29+
void QgsReclassifyUtils::reclassify( const QVector<QgsReclassifyUtils::RasterClass> &classes, QgsRasterInterface *sourceRaster, int band,
30+
const QgsRectangle &extent, int sourceWidthPixels, int sourceHeightPixels,
3131
QgsRasterDataProvider *destinationRaster, double destNoDataValue, bool useNoDataForMissingValues,
32-
QgsProcessingFeedback *feedback )
32+
QgsProcessingFeedback *feedback )
3333
{
3434
int maxWidth = 4000;
3535
int maxHeight = 4000;
@@ -52,8 +52,8 @@ void QgsReclassifyUtils::reclassify(const QVector<QgsReclassifyUtils::RasterClas
5252
bool reclassed = false;
5353
while ( iter.readNextRasterPart( band, iterCols, iterRows, &rasterBlock, iterLeft, iterTop ) )
5454
{
55-
if ( feedback )
56-
feedback->setProgress( 100 * ( ( iterTop / maxHeight * nbBlocksWidth ) + iterLeft / maxWidth ) / nbBlocks );
55+
if ( feedback )
56+
feedback->setProgress( 100 * ( ( iterTop / maxHeight * nbBlocksWidth ) + iterLeft / maxWidth ) / nbBlocks );
5757
std::unique_ptr< QgsRasterBlock > reclassifiedBlock = qgis::make_unique< QgsRasterBlock >( Qgis::Float32, iterCols, iterRows );
5858

5959
for ( int row = 0; row < iterRows; row++ )
@@ -82,14 +82,14 @@ void QgsReclassifyUtils::reclassify(const QVector<QgsReclassifyUtils::RasterClas
8282
destinationRaster->setEditable( false );
8383
}
8484

85-
double QgsReclassifyUtils::reclassifyValue(const QVector<QgsReclassifyUtils::RasterClass> &classes, double input, bool &reclassified)
85+
double QgsReclassifyUtils::reclassifyValue( const QVector<QgsReclassifyUtils::RasterClass> &classes, double input, bool &reclassified )
8686
{
8787
reclassified = false;
8888
for ( const QgsReclassifyUtils::RasterClass &c : classes )
8989
{
9090
if ( c.contains( input ) )
9191
{
92-
reclassified = true;
92+
reclassified = true;
9393
return c.value;
9494
}
9595
}

‎src/analysis/processing/qgsreclassifyutils.h

100755100644
Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -46,22 +46,22 @@ class ANALYSIS_EXPORT QgsReclassifyUtils
4646
*/
4747
class RasterClass : public QgsRasterRange
4848
{
49-
public:
49+
public:
5050

5151
//! Default constructor for an empty class
52-
RasterClass() = default;
53-
54-
/**
55-
* Constructor for RasterClass, with the specified range of min to max values.
56-
* The \a value argument gives the desired output value for this raster class.
57-
*/
58-
RasterClass( double minValue, double maxValue, QgsRasterRange::BoundsType type, double value )
59-
: QgsRasterRange( minValue, maxValue, type )
60-
, value( value )
61-
{}
62-
63-
//! Desired output value for class
64-
double value = 0;
52+
RasterClass() = default;
53+
54+
/**
55+
* Constructor for RasterClass, with the specified range of min to max values.
56+
* The \a value argument gives the desired output value for this raster class.
57+
*/
58+
RasterClass( double minValue, double maxValue, QgsRasterRange::BoundsType type, double value )
59+
: QgsRasterRange( minValue, maxValue, type )
60+
, value( value )
61+
{}
62+
63+
//! Desired output value for class
64+
double value = 0;
6565
};
6666

6767
/**
@@ -85,15 +85,15 @@ class ANALYSIS_EXPORT QgsReclassifyUtils
8585
* The \a feedback argument gives an optional processing feedback, for progress reports
8686
* and cancelation.
8787
*/
88-
static void reclassify(const QVector< RasterClass > &classes,
89-
QgsRasterInterface *sourceRaster,
90-
int band,
91-
const QgsRectangle& extent,
92-
int sourceWidthPixels,
93-
int sourceHeightPixels,
94-
QgsRasterDataProvider *destinationRaster,
95-
double destNoDataValue, bool useNoDataForMissingValues,
96-
QgsProcessingFeedback *feedback = nullptr );
88+
static void reclassify( const QVector< RasterClass > &classes,
89+
QgsRasterInterface *sourceRaster,
90+
int band,
91+
const QgsRectangle &extent,
92+
int sourceWidthPixels,
93+
int sourceHeightPixels,
94+
QgsRasterDataProvider *destinationRaster,
95+
double destNoDataValue, bool useNoDataForMissingValues,
96+
QgsProcessingFeedback *feedback = nullptr );
9797

9898
/**
9999
* Reclassifies a single \a input value, using the specified list of \a classes.
@@ -104,7 +104,7 @@ class ANALYSIS_EXPORT QgsReclassifyUtils
104104
* If no matching class was found then \a reclassified will be set to false, and the
105105
* original \a input value returned unchanged.
106106
*/
107-
static double reclassifyValue( const QVector< RasterClass > &classes, double input, bool& reclassified );
107+
static double reclassifyValue( const QVector< RasterClass > &classes, double input, bool &reclassified );
108108

109109
};
110110

0 commit comments

Comments
 (0)
Please sign in to comment.