use standard deviations only when requested (fix #4917)

qgis · Apr 15, 2012 · 67b698e · 67b698e
1 parent f74f70e
commit 67b698e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/src/app/qgsrasterlayerproperties.cpp b/src/app/qgsrasterlayerproperties.cpp
@@ -620,6 +620,8 @@ void QgsRasterLayerProperties::sync()
     }
   }
 
+  mDefaultStandardDeviation = myQSettings.value( "/Raster/defaultStandardDeviation", 2.0 ).toDouble();
+
   if ( mRasterLayer->dataProvider()->dataType( 1 ) != QgsRasterDataProvider::ARGBDataType )
   {
     if ( rbtnThreeBand->isChecked() )
@@ -763,8 +765,8 @@ void QgsRasterLayerProperties::sync()
     {
       labelDefaultContrastEnhancementAlgorithm->setText( tr( "No Stretch" ) );
     }
-    mDefaultStandardDeviation = myQSettings.value( "/Raster/defaultStandardDeviation", 2.0 ).toDouble();
-    sboxThreeBandStdDev->setValue( mDefaultStandardDeviation );
+    //mDefaultStandardDeviation = myQSettings.value( "/Raster/defaultStandardDeviation", 2.0 ).toDouble();
+    //sboxThreeBandStdDev->setValue( mDefaultStandardDeviation );
   }
 
   QgsDebugMsg( "populate transparency tab" );

diff --git a/src/core/raster/qgsrasterlayer.cpp b/src/core/raster/qgsrasterlayer.cpp
@@ -2443,9 +2443,10 @@ void QgsRasterLayer::setDataProvider( QString const & provider,
     mDrawingStyle = MultiBandColor;  //sensible default
 
     // read standard deviations
-    if ( mContrastEnhancementAlgorithm == QgsContrastEnhancement::StretchToMinimumMaximum )
+    if ( mContrastEnhancementAlgorithm == QgsContrastEnhancement::StretchToMinimumMaximum &&
+         myQSettings.value( "/Raster/useStandardDeviation", false ).toBool() )
     {
-      setStandardDeviations( myQSettings.value( "/Raster/defaultStandardDeviation", 2.0 ).toInt() );
+      setStandardDeviations( myQSettings.value( "/Raster/defaultStandardDeviation", 2.0 ).toDouble() );
     }
   }
   else                        //GrayOrUndefined
@@ -2466,9 +2467,10 @@ void QgsRasterLayer::setDataProvider( QString const & provider,
     }
 
     // read standard deviations
-    if ( mContrastEnhancementAlgorithm == QgsContrastEnhancement::StretchToMinimumMaximum )
+    if ( mContrastEnhancementAlgorithm == QgsContrastEnhancement::StretchToMinimumMaximum &&
+         myQSettings.value( "/Raster/useStandardDeviation", false ).toBool() )
     {
-      setStandardDeviations( myQSettings.value( "/Raster/defaultStandardDeviation", 2.0 ).toInt() );
+      setStandardDeviations( myQSettings.value( "/Raster/defaultStandardDeviation", 2.0 ).toDouble() );
     }
   }
   // Debug