[QGIS Commit] r10173 - trunk/qgis/src/app
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Sun Feb 15 12:58:46 EST 2009
Author: ersts
Date: 2009-02-15 12:58:46 -0500 (Sun, 15 Feb 2009)
New Revision: 10173
Modified:
trunk/qgis/src/app/qgsrasterlayerproperties.cpp
Log:
-Added some qsetting checks/defaults for loading colormaps and transparency files
-Fix some sorting problems with the color map editor, which may address #1497
Modified: trunk/qgis/src/app/qgsrasterlayerproperties.cpp
===================================================================
--- trunk/qgis/src/app/qgsrasterlayerproperties.cpp 2009-02-15 15:16:04 UTC (rev 10172)
+++ trunk/qgis/src/app/qgsrasterlayerproperties.cpp 2009-02-15 17:58:46 UTC (rev 10173)
@@ -1397,6 +1397,11 @@
myColorRampItems.push_back( myNewColorRampItem );
inserted = true;
}
+ else if ( myColorRampItems[myCurrentIndex].value > myNewColorRampItem.value )
+ {
+ myColorRampItems.insert( myCurrentIndex, myNewColorRampItem );
+ inserted = true;
+ }
else if ( myColorRampItems[myCurrentIndex].value <= myNewColorRampItem.value && myCurrentIndex == myColorRampItems.size() - 1 )
{
myColorRampItems.push_back( myNewColorRampItem );
@@ -1809,7 +1814,9 @@
void QgsRasterLayerProperties::on_pbnExportTransparentPixelValues_clicked()
{
- QString myFileName = QFileDialog::getSaveFileName( this, tr( "Save file" ), "/", tr( "Textfile (*.txt)" ) );
+ QSettings myQSettings;
+ QString myLastDir = myQSettings.value( "lastRasterFileFilterDir", "" ).toString();
+ QString myFileName = QFileDialog::getSaveFileName( this, tr( "Save file" ), myLastDir, tr( "Textfile (*.txt)" ) );
if ( !myFileName.isEmpty() )
{
if ( !myFileName.endsWith( ".txt", Qt::CaseInsensitive ) )
@@ -2267,7 +2274,9 @@
int myLineCounter = 0;
bool myImportError = false;
QString myBadLines;
- QString myFileName = QFileDialog::getOpenFileName( this, tr( "Open file" ), "/", tr( "Textfile (*.txt)" ) );
+ QSettings myQSettings;
+ QString myLastDir = myQSettings.value( "lastRasterFileFilterDir", "" ).toString();
+ QString myFileName = QFileDialog::getOpenFileName( this, tr( "Open file" ), myLastDir, tr( "Textfile (*.txt)" ) );
QFile myInputFile( myFileName );
if ( myInputFile.open( QFile::ReadOnly ) )
{
@@ -2678,7 +2687,9 @@
void QgsRasterLayerProperties::on_pbtnExportColorMapToFile_clicked()
{
- QString myFileName = QFileDialog::getSaveFileName( this, tr( "Save file" ), "/", tr( "Textfile (*.txt)" ) );
+ QSettings myQSettings;
+ QString myLastDir = myQSettings.value( "lastRasterFileFilterDir", "" ).toString();
+ QString myFileName = QFileDialog::getSaveFileName( this, tr( "Save file" ), myLastDir, tr( "Textfile (*.txt)" ) );
if ( !myFileName.isEmpty() )
{
if ( !myFileName.endsWith( ".txt", Qt::CaseInsensitive ) )
@@ -2758,7 +2769,9 @@
int myLineCounter = 0;
bool myImportError = false;
QString myBadLines;
- QString myFileName = QFileDialog::getOpenFileName( this, tr( "Open file" ), "/", tr( "Textfile (*.txt)" ) );
+ QSettings myQSettings;
+ QString myLastDir = myQSettings.value( "lastRasterFileFilterDir", "" ).toString();
+ QString myFileName = QFileDialog::getOpenFileName( this, tr( "Open file" ), myLastDir, tr( "Textfile (*.txt)" ) );
QFile myInputFile( myFileName );
if ( myInputFile.open( QFile::ReadOnly ) )
{
@@ -2969,6 +2982,11 @@
myColorRampItems.push_back( myNewColorRampItem );
inserted = true;
}
+ else if ( myColorRampItems[myCurrentIndex].value > myNewColorRampItem.value )
+ {
+ myColorRampItems.insert( myCurrentIndex, myNewColorRampItem );
+ inserted = true;
+ }
else if ( myColorRampItems[myCurrentIndex].value <= myNewColorRampItem.value && myCurrentIndex == myColorRampItems.size() - 1 )
{
myColorRampItems.push_back( myNewColorRampItem );
More information about the QGIS-commit
mailing list