use custom widget for projection selection in options

qgis · Jan 5, 2015 · 5e670ff · 5e670ff
1 parent f68cd5e
commit 5e670ff
Show file tree

Hide file tree

Showing 3 changed files with 329 additions and 223 deletions.
diff --git a/src/app/qgsoptions.cpp b/src/app/qgsoptions.cpp
@@ -363,8 +363,7 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WindowFlags fl ) :
   }
   QString myLayerDefaultCrs = settings.value( "/Projections/layerDefaultCrs", GEO_EPSG_CRS_AUTHID ).toString();
   mLayerDefaultCrs.createFromOgcWmsCrs( myLayerDefaultCrs );
-  //display the crs as friendly text rather than in wkt
+  leLayerGlobalCrs->setCrs( mLayerDefaultCrs );
-  leLayerGlobalCrs->setText( mLayerDefaultCrs.authid() + " - " + mLayerDefaultCrs.description() );
 
   //on the fly CRS transformation settings
   //it would be logical to have single settings value but originaly the radio buttons were checkboxes
@@ -383,8 +382,7 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WindowFlags fl ) :
 
   QString myDefaultCrs = settings.value( "/Projections/projectDefaultCrs", GEO_EPSG_CRS_AUTHID ).toString();
   mDefaultCrs.createFromOgcWmsCrs( myDefaultCrs );
-  //display the crs as friendly text rather than in wkt
+  leProjectGlobalCrs->setCrs( mDefaultCrs );
-  leProjectGlobalCrs->setText( mDefaultCrs.authid() + " - " + mDefaultCrs.description() );
 
   //default datum transformations
   settings.beginGroup( "/Projections" );
@@ -1454,49 +1452,14 @@ void QgsOptions::on_mBoldGroupBoxTitleChkBx_clicked( bool chkd )
   mStyleSheetBuilder->buildStyleSheet( mStyleSheetNewOpts );
 }
 
-void QgsOptions::on_pbnSelectProjection_clicked()
+void QgsOptions::on_leProjectGlobalCrs_crsChanged(QgsCoordinateReferenceSystem crs)
 {
-  QSettings settings;
+  mDefaultCrs = crs;
-  QgsGenericProjectionSelector * mySelector = new QgsGenericProjectionSelector( this );
-
-  //find out crs id of current proj4 string
-  mySelector->setSelectedCrsId( mLayerDefaultCrs.srsid() );
-
-  if ( mySelector->exec() )
-  {
-    mLayerDefaultCrs.createFromOgcWmsCrs( mySelector->selectedAuthId() );
-    QgsDebugMsg( QString( "Setting default project CRS to : %1" ).arg( mySelector->selectedAuthId() ) );
-    leLayerGlobalCrs->setText( mLayerDefaultCrs.authid() + " - " + mLayerDefaultCrs.description() );
-    QgsDebugMsg( QString( "------ Global Layer Default Projection Selection set to ----------\n%1" ).arg( leLayerGlobalCrs->text() ) );
-  }
-  else
-  {
-    QgsDebugMsg( "------ Global Layer Default Projection Selection change cancelled ----------" );
-    QApplication::restoreOverrideCursor();
-  }
-
 }
 
-void QgsOptions::on_pbnSelectOtfProjection_clicked()
+void QgsOptions::on_leLayerGlobalCrs_crsChanged(QgsCoordinateReferenceSystem crs)
 {
-  QSettings settings;
+mLayerDefaultCrs = crs;
-  QgsGenericProjectionSelector * mySelector = new QgsGenericProjectionSelector( this );
-
-  //find out crs id of current proj4 string
-  mySelector->setSelectedCrsId( mDefaultCrs.srsid() );
-
-  if ( mySelector->exec() )
-  {
-    mDefaultCrs.createFromOgcWmsCrs( mySelector->selectedAuthId() );
-    QgsDebugMsg( QString( "Setting default project CRS to : %1" ).arg( mySelector->selectedAuthId() ) );
-    leProjectGlobalCrs->setText( mDefaultCrs.authid() + " - " + mDefaultCrs.description() );
-    QgsDebugMsg( QString( "------ Global OTF Projection Selection set to ----------\n%1" ).arg( leProjectGlobalCrs->text() ) );
-  }
-  else
-  {
-    QgsDebugMsg( "------ Global OTF Projection Selection change cancelled ----------" );
-    QApplication::restoreOverrideCursor();
-  }
 }
 
 void QgsOptions::on_lstGdalDrivers_itemDoubleClicked( QTreeWidgetItem * item, int column )

diff --git a/src/app/qgsoptions.h b/src/app/qgsoptions.h
@@ -64,9 +64,9 @@ class APP_EXPORT QgsOptions : public QgsOptionsDialogBase, private Ui::QgsOption
     void on_pbnTemplateFolderBrowse_pressed();
     void on_pbnTemplateFolderReset_pressed();
     //! Slot called when user chooses to change the project wide projection.
-    void on_pbnSelectProjection_clicked();
+    void on_leProjectGlobalCrs_crsChanged(QgsCoordinateReferenceSystem crs);
     //! Slot called when user chooses to change the default 'on the fly' projection.
-    void on_pbnSelectOtfProjection_clicked();
+    void on_leLayerGlobalCrs_crsChanged(QgsCoordinateReferenceSystem crs);
     void on_lstGdalDrivers_itemDoubleClicked( QTreeWidgetItem * item, int column );
     void on_pbnEditCreateOptions_pressed();
     void on_pbnEditPyramidsOptions_pressed();