Skip to content
Permalink
Browse files
Set prompt as default behaviour for unknown CRS
  • Loading branch information
mhugent authored and mach0 committed Nov 13, 2011
1 parent 712fd61 commit b79c4d3c4cd6eeef414c5a50dc09baa700245def
Showing with 4 additions and 4 deletions.
  1. +1 −1 src/app/qgisapp.cpp
  2. +2 −2 src/app/qgsoptions.cpp
  3. +1 −1 src/plugins/georeferencer/qgsopenrasterdialog.cpp
@@ -321,7 +321,7 @@ static void customSrsValidation_( QgsCoordinateReferenceSystem* srs )
{
static QString authid = QString::null;
QSettings mySettings;
QString myDefaultProjectionOption = mySettings.value( "/Projections/defaultBehaviour" ).toString();
QString myDefaultProjectionOption = mySettings.value( "/Projections/defaultBehaviour", "prompt" ).toString();
if ( myDefaultProjectionOption == "prompt" )
{
//@note this class is not a descendent of QWidget so we cant pass
@@ -176,11 +176,11 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WFlags fl ) :
// set the display update threshold
spinBoxUpdateThreshold->setValue( settings.value( "/Map/updateThreshold" ).toInt() );
//set the default projection behaviour radio buttongs
if ( settings.value( "/Projections/defaultBehaviour" ).toString() == "prompt" )
if ( settings.value( "/Projections/defaultBehaviour", "prompt" ).toString() == "prompt" )
{
radPromptForProjection->setChecked( true );
}
else if ( settings.value( "/Projections/defaultBehaviour" ).toString() == "useProject" )
else if ( settings.value( "/Projections/defaultBehaviour", "prompt" ).toString() == "useProject" )
{
radUseProjectProjection->setChecked( true );
}
@@ -94,7 +94,7 @@ void QgsOpenRasterDialog::on_tbnSelectRaster_clicked()

// What DOING this code?
QgsProject* prj = QgsProject::instance();
QString projBehaviour = settings.value( "/Projections/defaultBehaviour" ).toString();
QString projBehaviour = settings.value( "/Projections/defaultBehaviour", "prompt" ).toString();
QString projectCRS = prj->readEntry( "SpatialRefSys", "/ProjectCRSProj4String" );
int projectCrsId = prj->readNumEntry( "SpatialRefSys", "/ProjectCrsId" );

0 comments on commit b79c4d3

Please sign in to comment.