Skip to content

Commit cb529d0

Browse files
committed
Merge branch 'release-1_7_0' of github.com:qgis/Quantum-GIS into release-1_7_0
2 parents 3cfcb79 + 26d280c commit cb529d0

File tree

4 files changed

+8
-6
lines changed

4 files changed

+8
-6
lines changed

python/plugins/fTools/tools/frmRandPoints.ui

+2-2
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
<number>1</number>
7878
</property>
7979
<property name="maximum">
80-
<number>9999</number>
80+
<number>1000000</number>
8181
</property>
8282
</widget>
8383
</item>
@@ -115,7 +115,7 @@
115115
<number>1</number>
116116
</property>
117117
<property name="maximum">
118-
<number>9999</number>
118+
<number>1000000</number>
119119
</property>
120120
</widget>
121121
</item>

src/app/qgsrasterlayerproperties.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -756,7 +756,7 @@ void QgsRasterLayerProperties::sync()
756756
{
757757
labelDefaultContrastEnhancementAlgorithm->setText( tr( "No Stretch" ) );
758758
}
759-
mDefaultStandardDeviation = myQSettings.value( "/Raster/defaultStandardDeviation", 1.0 ).toDouble();
759+
mDefaultStandardDeviation = myQSettings.value( "/Raster/defaultStandardDeviation", 2.0 ).toDouble();
760760
sboxThreeBandStdDev->setValue( mDefaultStandardDeviation );
761761
}
762762

src/core/raster/qgsrasterlayer.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -2364,7 +2364,7 @@ void QgsRasterLayer::setDataProvider( QString const & provider,
23642364
//Try to read the default contrast enhancement from the config file
23652365

23662366
QSettings myQSettings;
2367-
setContrastEnhancementAlgorithm( myQSettings.value( "/Raster/defaultContrastEnhancementAlgorithm", "StretchToMinimumMaximum" ).toString() );
2367+
setContrastEnhancementAlgorithm( myQSettings.value( "/Raster/defaultContrastEnhancementAlgorithm", "NoEnhancement" ).toString() );
23682368

23692369
//decide what type of layer this is...
23702370
//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,
24612461
// read standard deviations
24622462
if ( mContrastEnhancementAlgorithm == QgsContrastEnhancement::StretchToMinimumMaximum )
24632463
{
2464-
setStandardDeviations( myQSettings.value( "/Raster/defaultStandardDeviation", 1.0 ).toInt() );
2464+
setStandardDeviations( myQSettings.value( "/Raster/defaultStandardDeviation", 2.0 ).toInt() );
24652465
}
24662466
}
24672467
else //GrayOrUndefined
@@ -2476,7 +2476,7 @@ void QgsRasterLayer::setDataProvider( QString const & provider,
24762476
// read standard deviations
24772477
if ( mContrastEnhancementAlgorithm == QgsContrastEnhancement::StretchToMinimumMaximum )
24782478
{
2479-
setStandardDeviations( myQSettings.value( "/Raster/defaultStandardDeviation", 1.0 ).toInt() );
2479+
setStandardDeviations( myQSettings.value( "/Raster/defaultStandardDeviation", 2.0 ).toInt() );
24802480
}
24812481
}
24822482
// Debug

src/gui/qgsprojectionselector.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,8 @@ void QgsProjectionSelector::showEvent( QShowEvent * theEvent )
168168
applySelection();
169169
}
170170

171+
lstRecent->clear();
172+
171173
for ( int i = mRecentProjections.size() - 1; i >= 0; i-- )
172174
insertRecent( mRecentProjections.at( i ).toLong() );
173175

0 commit comments

Comments
 (0)