fix raster cumulative cut for byte bands (#9793) and make sure values…

… are rounded down/up for integer bands
qgis · Apr 17, 2014 · 3e4a915 · 3e4a915
1 parent 2d73751
commit 3e4a915
Showing 1 changed file with 21 additions and 1 deletion.
diff --git a/src/core/raster/qgsrasterinterface.cpp b/src/core/raster/qgsrasterinterface.cpp
@@ -515,7 +515,14 @@ void QgsRasterInterface::cumulativeCut( int theBandNo,
 {
   QgsDebugMsg( QString( "theBandNo = %1 theLowerCount = %2 theUpperCount = %3 theSampleSize = %4" ).arg( theBandNo ).arg( theLowerCount ).arg( theUpperCount ).arg( theSampleSize ) );
 
-  QgsRasterHistogram myHistogram = histogram( theBandNo, 0, std::numeric_limits<double>::quiet_NaN(), std::numeric_limits<double>::quiet_NaN(), theExtent, theSampleSize );
+  int mySrcDataType = srcDataType( theBandNo );
+
+  //get band stats to specify real histogram min/max (fix #9793 Byte bands)
+  QgsRasterBandStats stats =  bandStatistics( theBandNo, QgsRasterBandStats::Min, theExtent, theSampleSize );
+  // for byte bands make sure bin count == actual range
+  int myBinCount = ( mySrcDataType == QGis::Byte ) ? int( ceil( stats.maximumValue - stats.minimumValue + 1 ) ) : 0;
+  QgsRasterHistogram myHistogram = histogram( theBandNo, myBinCount, stats.minimumValue, stats.maximumValue, theExtent, theSampleSize );
+  //QgsRasterHistogram myHistogram = histogram( theBandNo, 0, std::numeric_limits<double>::quiet_NaN(), std::numeric_limits<double>::quiet_NaN(), theExtent, theSampleSize );
 
   // Init to NaN is better than histogram min/max to catch errors
   theLowerValue = std::numeric_limits<double>::quiet_NaN();
@@ -537,13 +544,26 @@ void QgsRasterInterface::cumulativeCut( int theBandNo,
     {
       theLowerValue = myHistogram.minimum + myBin * myBinXStep;
       myLowerFound = true;
+      QgsDebugMsg( QString( "found lowerValue %1 at bin %2" ).arg( theLowerValue ).arg( myBin ) );
     }
     if ( myCount >= myMaxCount )
     {
       theUpperValue = myHistogram.minimum + myBin * myBinXStep;
+      QgsDebugMsg( QString( "found upperValue %1 at bin %2" ).arg( theUpperValue ).arg( myBin ) );
       break;
     }
   }
+
+  // fix integer data - round down/up
+  if ( mySrcDataType == QGis::Byte ||
+       mySrcDataType == QGis::Int16 || mySrcDataType == QGis::Int32 ||
+       mySrcDataType == QGis::UInt16 || mySrcDataType == QGis::UInt32 )
+  {
+    if ( theLowerValue != std::numeric_limits<double>::quiet_NaN() )
+      theLowerValue = floor( theLowerValue );
+    if ( theUpperValue != std::numeric_limits<double>::quiet_NaN() )
+      theUpperValue = ceil( theUpperValue );
+  }
 }
 
 QString QgsRasterInterface::capabilitiesString() const