sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-27 00:33:48 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix #8298 ignored first selection of recently used CRS in projection selector

Browse Source
This commit is contained in:
Mathias Walker 2014-03-26 11:50:02 +01:00
parent 19da71cca0
commit abc7b9b807
3 changed files with 29 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/app/qgsprojectproperties.cpp
View File

@ -602,6 +602,12 @@ void QgsProjectProperties::apply()
if ( srs.mapUnits() != QGis::UnknownUnit )
mMapCanvas->setMapUnits( srs.mapUnits() );
}
if ( cbxProjectionEnabled->isChecked() )
{
// mark selected projection for push to front
projectionSelector->pushProjectionToFront();
}
}
// Set the project title

26
src/gui/qgsprojectionselector.cpp
View File

@ -32,11 +32,17 @@ QgsProjectionSelector::QgsProjectionSelector( QWidget* parent, const char *name,
, mUserProjListDone( false )
, mRecentProjListDone( false )
, mSearchColumn( NONE )
, mSkipFirstRecent( true )
, mPushProjectionToFront( false )
{
Q_UNUSED( name );
setupUi( this );
if ( qobject_cast<QDialog*>( parent ) )
{
// mark selected projection for push to front if parent dialog is accepted
connect( parent, SIGNAL( accepted() ), this, SLOT( pushProjectionToFront() ) );
}
// Get the full path name to the sqlite3 spatial reference database.
mSrsDatabaseFileName = QgsApplication::srsDbFilePath();
@ -94,6 +100,11 @@ QgsProjectionSelector::QgsProjectionSelector( QWidget* parent, const char *name,
QgsProjectionSelector::~QgsProjectionSelector()
{
if ( !mPushProjectionToFront )
{
return;
}
// Push current projection to front, only if set
long crsId = selectedCrsId();
if ( crsId == 0 )
@ -750,12 +761,6 @@ void QgsProjectionSelector::on_lstRecent_currentItemChanged( QTreeWidgetItem *cu
{
QgsDebugMsg( "Entered." );
if ( mSkipFirstRecent )
{
mSkipFirstRecent = false;
return;
}
if ( !current )
{
QgsDebugMsg( "no current item" );
@ -862,6 +867,13 @@ void QgsProjectionSelector::on_leSearch_textChanged( const QString & theFilterTx
}
void QgsProjectionSelector::pushProjectionToFront()
{
// set flag to push selected projection to front in destructor
mPushProjectionToFront = true;
}
long QgsProjectionSelector::getLargestCRSIDMatch( QString theSql )
{
long srsId = 0;

5
src/gui/qgsprojectionselector.h
View File

@ -104,6 +104,9 @@ class GUI_EXPORT QgsProjectionSelector : public QWidget, private Ui::QgsProjecti
void on_cbxHideDeprecated_stateChanged();
void on_leSearch_textChanged( const QString & );
//! mark selected projection for push to front
void pushProjectionToFront();
protected:
/** Used to ensure the projection list view is actually populated */
void showEvent( QShowEvent * theEvent );
@ -181,7 +184,7 @@ class GUI_EXPORT QgsProjectionSelector : public QWidget, private Ui::QgsProjecti
int mSearchColumn;
QString mSearchValue;
bool mSkipFirstRecent;
bool mPushProjectionToFront;
//! The set of OGC WMS CRSs that want to be applied to this widget
QSet<QString> mCrsFilter;