Fix singlebandgrayrenderer

qgis · Jan 1, 2012 · 83f3d75 · 83f3d75
1 parent dec227f
commit 83f3d75
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/src/core/raster/qgsrasterlayer.cpp b/src/core/raster/qgsrasterlayer.cpp
@@ -835,15 +835,14 @@ void QgsRasterLayer::draw( QPainter * theQPainter,
           QgsRasterBandStats myGrayBandStats = bandStatistics( grayBand );
           setMaximumValue( grayBand, myGrayBandStats.mean + ( mStandardDeviations * myGrayBandStats.stdDev ) );
           setMinimumValue( grayBand, myGrayBandStats.mean - ( mStandardDeviations * myGrayBandStats.stdDev ) );
-          r.setContrastEnhancement( contrastEnhancement( grayBand ) );
         }
         else if ( QgsContrastEnhancement::NoEnhancement != contrastEnhancementAlgorithm() && !mUserDefinedGrayMinimumMaximum )
         {
           mGrayMinimumMaximumEstimated = true;
           setMaximumValue( grayBand, mDataProvider->maximumValue( grayBand ) );
-          setMinimumValue( grayBand, mDataProvider->minimumValue( grayBand ) );
-          r.setContrastEnhancement( contrastEnhancement( grayBand ) );
+          setMinimumValue( grayBand, mDataProvider->minimumValue( grayBand ) );     
         }
+        r.setContrastEnhancement( contrastEnhancement( grayBand ) );
         r.draw( theQPainter, theRasterViewPort, theQgsMapToPixel );
 
 #if 0

diff --git a/src/core/raster/qgssinglebandgrayrenderer.cpp b/src/core/raster/qgssinglebandgrayrenderer.cpp
@@ -46,6 +46,8 @@ void QgsSingleBandGrayRenderer::draw( QPainter* p, QgsRasterViewPort* viewPort,
   void* rasterData;
   //double currentOpacity = mOpacity;
   int grayVal;
+  QRgb myDefaultColor = qRgba( 0, 0, 0, 0 );
+
 
   while ( readNextRasterPart( mGrayBand, viewPort, nCols, nRows, &rasterData, topLeftCol, topLeftRow ) )
   {
@@ -60,8 +62,15 @@ void QgsSingleBandGrayRenderer::draw( QPainter* p, QgsRasterViewPort* viewPort,
       for ( int j = 0; j < nCols; ++j )
       {
         grayVal = readValue( rasterData, rasterType, currentRasterPos );
+
         if ( mContrastEnhancement )
         {
+          if ( !mContrastEnhancement->isValueInDisplayableRange( grayVal ) )
+          {
+            imageScanLine[ j ] = myDefaultColor;
+            ++currentRasterPos;
+            continue;
+          }
           grayVal = mContrastEnhancement->enhanceContrast( grayVal );
         }