[QGIS Commit] r14033 - trunk/qgis/src/app
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Sun Aug 8 23:12:19 EDT 2010
Author: ersts
Date: 2010-08-09 03:12:19 +0000 (Mon, 09 Aug 2010)
New Revision: 14033
Modified:
trunk/qgis/src/app/qgsrasterlayerproperties.cpp
Log:
-Fix for bugs introduced by patch attached to ticket #1683
-Closes ticket #2885
Modified: trunk/qgis/src/app/qgsrasterlayerproperties.cpp
===================================================================
--- trunk/qgis/src/app/qgsrasterlayerproperties.cpp 2010-08-09 02:27:24 UTC (rev 14032)
+++ trunk/qgis/src/app/qgsrasterlayerproperties.cpp 2010-08-09 03:12:19 UTC (rev 14033)
@@ -467,7 +467,7 @@
*/
void QgsRasterLayerProperties::sync()
{
- QgsDebugMsg( "called." );
+ QSettings myQSettings;
QgsDebugMsg( "sync populate symbology tab" );
/*
* Symbology Tab
@@ -656,19 +656,28 @@
cboGray->setCurrentIndex( cboGray->findText( mRasterLayer->grayBandName() ) );
//set the stdDevs and min max values
+ mDefaultStandardDeviation = myQSettings.value( "/Raster/defaultStandardDeviation", 2.0 ).toDouble();
if ( mRasterLayerIsGdal && rbtnThreeBand->isChecked() )
{
mRGBMinimumMaximumEstimated = mRasterLayer->isRGBMinimumMaximumEstimated();
if ( mRasterLayer->hasUserDefinedRGBMinimumMaximum() )
{
- sboxThreeBandStdDev->setValue( 0.0 );
+ sboxThreeBandStdDev->setValue( mDefaultStandardDeviation );
rbtnThreeBandStdDev->setChecked( false );
rbtnThreeBandMinMax->setChecked( true );
}
else
{
sboxThreeBandStdDev->setValue( mRasterLayer->standardDeviations() );
- rbtnThreeBandStdDev->setChecked( true );
+ if ( mRasterLayer->standardDeviations() == 0.0 )
+ {
+ sboxThreeBandStdDev->setValue( mDefaultStandardDeviation );
+ rbtnThreeBandStdDev->setChecked( false );
+ }
+ else
+ {
+ rbtnThreeBandStdDev->setChecked( true );
+ }
rbtnThreeBandMinMax->setChecked( false );
}
@@ -700,14 +709,22 @@
mGrayMinimumMaximumEstimated = mRasterLayer->isGrayMinimumMaximumEstimated();
if ( mRasterLayer->hasUserDefinedGrayMinimumMaximum() )
{
- sboxSingleBandStdDev->setValue( 0.0 );
+ sboxSingleBandStdDev->setValue( mDefaultStandardDeviation );
rbtnSingleBandStdDev->setChecked( false );
rbtnSingleBandMinMax->setChecked( true );
}
else
{
sboxSingleBandStdDev->setValue( mRasterLayer->standardDeviations() );
- rbtnSingleBandStdDev->setChecked( true );
+ if ( mRasterLayer->standardDeviations() == 0.0 )
+ {
+ sboxSingleBandStdDev->setValue( mDefaultStandardDeviation );
+ rbtnSingleBandStdDev->setChecked( false );
+ }
+ else
+ {
+ rbtnSingleBandStdDev->setChecked( true );
+ }
rbtnSingleBandMinMax->setChecked( false );
}
@@ -748,7 +765,6 @@
}
//Display the current default contrast enhancement algorithm
- QSettings myQSettings;
mDefaultRedBand = myQSettings.value( "/Raster/defaultRedBand", 1 ).toInt();
mDefaultGreenBand = myQSettings.value( "/Raster/defaultGreenBand", 2 ).toInt();
mDefaultBlueBand = myQSettings.value( "/Raster/defaultBlueBand", 3 ).toInt();
@@ -776,10 +792,6 @@
labelDefaultContrastEnhancementAlgorithm->setText( tr( "No Stretch" ) );
}
- mDefaultStandardDeviation = myQSettings.value( "/Raster/defaultStandardDeviation", 1.0 ).toDouble();
- sboxThreeBandStdDev->setValue( mDefaultStandardDeviation );
-
-
QgsDebugMsg( "populate transparency tab" );
/*
* Transparent Pixel Tab
@@ -2404,7 +2416,7 @@
if ( mRasterLayer->hasUserDefinedGrayMinimumMaximum() )
{
- sboxSingleBandStdDev->setValue( 0.0 );
+ sboxSingleBandStdDev->setValue( mDefaultStandardDeviation );
rbtnSingleBandMinMax->setChecked( true );
leGrayMin->setText( QString::number( mRasterLayer->minimumValue( cboGray->currentText() ) ) );
leGrayMax->setText( QString::number( mRasterLayer->maximumValue( cboGray->currentText() ) ) );
@@ -2412,7 +2424,15 @@
else
{
sboxSingleBandStdDev->setValue( mRasterLayer->standardDeviations() );
- rbtnSingleBandStdDev->setChecked( true );
+ if ( mRasterLayer->standardDeviations() == 0.0 )
+ {
+ sboxSingleBandStdDev->setValue( mDefaultStandardDeviation );
+ rbtnSingleBandStdDev->setChecked( false );
+ }
+ else
+ {
+ rbtnSingleBandStdDev->setChecked( true );
+ }
}
// Populate transparency table with single value transparency pixels
@@ -2493,7 +2513,16 @@
else
{
sboxThreeBandStdDev->setValue( mRasterLayer->standardDeviations() );
- rbtnThreeBandStdDev->setChecked( true );
+ if ( mRasterLayer->standardDeviations() == 0.0 )
+ {
+ sboxThreeBandStdDev->setValue( mDefaultStandardDeviation );
+ rbtnThreeBandStdDev->setChecked( false );
+ }
+ else
+ {
+ rbtnThreeBandStdDev->setChecked( true );
+ }
+
}
// Populate transparency table with single value transparency pixels
More information about the QGIS-commit
mailing list