From a06590fa879ff27f999ca61ba34e275df9e27ce3 Mon Sep 17 00:00:00 2001 From: Alexander Bruy Date: Tue, 2 Aug 2011 19:46:29 +0300 Subject: [PATCH 1/3] [BACKPORT] set default contrast enchacement algorithm to NoStretch (addresses #3867). Also set default standard deviations value to 2.0 because this is more appropriate value --- src/app/qgsrasterlayerproperties.cpp | 2 +- src/core/raster/qgsrasterlayer.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/app/qgsrasterlayerproperties.cpp b/src/app/qgsrasterlayerproperties.cpp index 46a962121b02..354f8420e434 100644 --- a/src/app/qgsrasterlayerproperties.cpp +++ b/src/app/qgsrasterlayerproperties.cpp @@ -756,7 +756,7 @@ void QgsRasterLayerProperties::sync() { labelDefaultContrastEnhancementAlgorithm->setText( tr( "No Stretch" ) ); } - mDefaultStandardDeviation = myQSettings.value( "/Raster/defaultStandardDeviation", 1.0 ).toDouble(); + mDefaultStandardDeviation = myQSettings.value( "/Raster/defaultStandardDeviation", 2.0 ).toDouble(); sboxThreeBandStdDev->setValue( mDefaultStandardDeviation ); } diff --git a/src/core/raster/qgsrasterlayer.cpp b/src/core/raster/qgsrasterlayer.cpp index 92c056c86e8b..0f3c04446afe 100644 --- a/src/core/raster/qgsrasterlayer.cpp +++ b/src/core/raster/qgsrasterlayer.cpp @@ -2364,7 +2364,7 @@ void QgsRasterLayer::setDataProvider( QString const & provider, //Try to read the default contrast enhancement from the config file QSettings myQSettings; - setContrastEnhancementAlgorithm( myQSettings.value( "/Raster/defaultContrastEnhancementAlgorithm", "StretchToMinimumMaximum" ).toString() ); + setContrastEnhancementAlgorithm( myQSettings.value( "/Raster/defaultContrastEnhancementAlgorithm", "NoEnhancement" ).toString() ); //decide what type of layer this is... //TODO Change this to look at the color interp and palette interp to decide which type of layer it is @@ -2461,7 +2461,7 @@ void QgsRasterLayer::setDataProvider( QString const & provider, // read standard deviations if ( mContrastEnhancementAlgorithm == QgsContrastEnhancement::StretchToMinimumMaximum ) { - setStandardDeviations( myQSettings.value( "/Raster/defaultStandardDeviation", 1.0 ).toInt() ); + setStandardDeviations( myQSettings.value( "/Raster/defaultStandardDeviation", 2.0 ).toInt() ); } } else //GrayOrUndefined @@ -2476,7 +2476,7 @@ void QgsRasterLayer::setDataProvider( QString const & provider, // read standard deviations if ( mContrastEnhancementAlgorithm == QgsContrastEnhancement::StretchToMinimumMaximum ) { - setStandardDeviations( myQSettings.value( "/Raster/defaultStandardDeviation", 1.0 ).toInt() ); + setStandardDeviations( myQSettings.value( "/Raster/defaultStandardDeviation", 2.0 ).toInt() ); } } // Debug From 482f36da367e42a638396cebeec5f5c8536ec417 Mon Sep 17 00:00:00 2001 From: Alexander Bruy Date: Thu, 4 Aug 2011 18:21:56 +0300 Subject: [PATCH 2/3] [BACKPORT] increase maximum points count in Random Points tool --- python/plugins/fTools/tools/frmRandPoints.ui | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/python/plugins/fTools/tools/frmRandPoints.ui b/python/plugins/fTools/tools/frmRandPoints.ui index e0a63d012f68..5e766e06af04 100644 --- a/python/plugins/fTools/tools/frmRandPoints.ui +++ b/python/plugins/fTools/tools/frmRandPoints.ui @@ -77,7 +77,7 @@ 1 - 9999 + 1000000 @@ -115,7 +115,7 @@ 1 - 9999 + 1000000 From 26d280cc74b358385233d3dd106545f714c3fab4 Mon Sep 17 00:00:00 2001 From: Werner Macho Date: Thu, 4 Aug 2011 23:52:40 +0200 Subject: [PATCH 3/3] BUGFIX Backport of #4113 and #2805 --- src/gui/qgsprojectionselector.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/gui/qgsprojectionselector.cpp b/src/gui/qgsprojectionselector.cpp index 978ceb4a080d..f1fed08ce6e8 100644 --- a/src/gui/qgsprojectionselector.cpp +++ b/src/gui/qgsprojectionselector.cpp @@ -168,6 +168,8 @@ void QgsProjectionSelector::showEvent( QShowEvent * theEvent ) applySelection(); } + lstRecent->clear(); + for ( int i = mRecentProjections.size() - 1; i >= 0; i-- ) insertRecent( mRecentProjections.at( i ).toLong() );