Skip to content
Permalink
Browse files
Merge branch 'release-1_7_0' of github.com:qgis/Quantum-GIS into rele…
…ase-1_7_0
  • Loading branch information
timlinux committed Aug 7, 2011
2 parents 3cfcb79 + 26d280c commit cb529d0973321f2eb5ed05ce267899d6eae2be7e
Showing with 8 additions and 6 deletions.
  1. +2 −2 python/plugins/fTools/tools/frmRandPoints.ui
  2. +1 −1 src/app/qgsrasterlayerproperties.cpp
  3. +3 −3 src/core/raster/qgsrasterlayer.cpp
  4. +2 −0 src/gui/qgsprojectionselector.cpp
@@ -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>
@@ -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 );
}

@@ -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
@@ -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() );

0 comments on commit cb529d0

Please sign in to comment.