Skip to content

Commit f0aca15

Browse files
committedOct 11, 2012
debug output
1 parent 7cb523a commit f0aca15

File tree

1 file changed

+11
-3
lines changed

1 file changed

+11
-3
lines changed
 

‎src/providers/gdal/qgsgdalprovider.cpp

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2032,7 +2032,7 @@ bool QgsGdalProvider::hasStatistics( int theBandNo,
20322032
if ( !( theStats & QgsRasterBandStats::StdDev ) ) pdfStdDev = NULL;
20332033

20342034
// try to fetch the cached stats (bForce=FALSE)
2035-
CPLErr myerval = GDALGetRasterStatistics( myGdalBand, bApproxOK, FALSE, pdfMin, pdfMax, pdfMean, pdfStdDev );
2035+
CPLErr myerval = GDALGetRasterStatistics( myGdalBand, bApproxOK, false, pdfMin, pdfMax, pdfMean, pdfStdDev );
20362036

20372037
if ( CE_None == myerval ) // CE_Warning if cached not found
20382038
{
@@ -2095,6 +2095,8 @@ QgsRasterBandStats QgsGdalProvider::bandStatistics( int theBandNo, int theStats,
20952095
}
20962096
}
20972097

2098+
QgsDebugMsg( QString( "bApproxOK = %1" ).arg( bApproxOK ) );
2099+
20982100
double pdfMin;
20992101
double pdfMax;
21002102
double pdfMean;
@@ -2105,15 +2107,21 @@ QgsRasterBandStats QgsGdalProvider::bandStatistics( int theBandNo, int theStats,
21052107

21062108
// try to fetch the cached stats (bForce=FALSE)
21072109
CPLErr myerval =
2108-
GDALGetRasterStatistics( myGdalBand, bApproxOK, FALSE, &pdfMin, &pdfMax, &pdfMean, &pdfStdDev );
2110+
GDALGetRasterStatistics( myGdalBand, bApproxOK, false, &pdfMin, &pdfMax, &pdfMean, &pdfStdDev );
21092111

2112+
QgsDebugMsg( QString( "myerval = %1" ).arg( myerval ) );
21102113
// if cached stats are not found, compute them
2111-
if ( CE_Warning == myerval )
2114+
if ( CE_None != myerval )
21122115
{
2116+
QgsDebugMsg( "Calculating statistics by GDAL" );
21132117
myerval = GDALComputeRasterStatistics( myGdalBand, bApproxOK,
21142118
&pdfMin, &pdfMax, &pdfMean, &pdfStdDev,
21152119
progressCallback, &myProg ) ;
21162120
}
2121+
else
2122+
{
2123+
QgsDebugMsg( "Using GDAL cached statistics" );
2124+
}
21172125

21182126
// if stats are found populate the QgsRasterBandStats object
21192127
if ( CE_None == myerval )

0 commit comments

Comments
 (0)