Navigation Menu

Skip to content

Commit

Permalink
Set prompt as default behaviour for unknown CRS
Browse files Browse the repository at this point in the history
  • Loading branch information
mhugent committed Oct 25, 2011
1 parent 1a1f5eb commit fecb0de
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion src/app/qgisapp.cpp
Expand Up @@ -327,7 +327,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
Expand Down
4 changes: 2 additions & 2 deletions src/app/qgsoptions.cpp
Expand Up @@ -177,11 +177,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 );
}
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/georeferencer/qgsopenrasterdialog.cpp
Expand Up @@ -93,7 +93,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" );

Expand Down

0 comments on commit fecb0de

Please sign in to comment.