Merge branch 'release-1_7_0' of github.com:qgis/Quantum-GIS into rele…

…ase-1_7_0
qgis · Aug 7, 2011 · cb529d0 · cb529d0
2 parents 3cfcb79 + 26d280c
commit cb529d0
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/python/plugins/fTools/tools/frmRandPoints.ui b/python/plugins/fTools/tools/frmRandPoints.ui
@@ -77,7 +77,7 @@
            <number>1</number>
           </property>
           <property name="maximum">
-           <number>9999</number>
+           <number>1000000</number>
           </property>
          </widget>
         </item>
@@ -115,7 +115,7 @@
            <number>1</number>
           </property>
           <property name="maximum">
-           <number>9999</number>
+           <number>1000000</number>
           </property>
          </widget>
         </item>

diff --git 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
@@ -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

diff --git 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() );