use project projections instead of WGS84 for WMS crs preselection (fixes #6939)

jef-n · jef-n · commit a575711f1988 · 2013-01-03T19:26:38.000+01:00
diff --git a/src/providers/wms/qgswmssourceselect.cpp b/src/providers/wms/qgswmssourceselect.cpp
@@ -59,6 +59,7 @@ QgsWMSSourceSelect::QgsWMSSourceSelect( QWidget * parent, Qt::WFlags fl, bool ma
     , mManagerMode( managerMode )
     , mEmbeddedMode( embeddedMode )
     , mCurrentTileset( 0 )
+    , mDefaultCRS( GEO_EPSG_CRS_AUTHID )
 {
   setupUi( this );
 
@@ -117,7 +118,7 @@ QgsWMSSourceSelect::QgsWMSSourceSelect( QWidget * parent, Qt::WFlags fl, bool ma
       QgsCoordinateReferenceSystem currentRefSys( currentCRS, QgsCoordinateReferenceSystem::InternalCrsId );
       if ( currentRefSys.isValid() )
       {
-        mCRS = currentRefSys.authid();
+        mDefaultCRS = mCRS = currentRefSys.authid();
       }
     }
 
@@ -409,6 +410,8 @@ bool QgsWMSSourceSelect::populateLayerList( QgsWmsProvider *wmsProvider )
     lstLayers->expandItem( lstLayers->topLevelItem( 0 ) );
   }
 
+  on_lstLayers_itemSelectionChanged();
+
   return true;
 }
 
@@ -741,7 +744,6 @@ void QgsWMSSourceSelect::on_lstLayers_itemSelectionChanged()
   mCurrentSelection = lstLayers->selectedItems();
   lstLayers->blockSignals( false );
 
-
   // selected layers with styles
   QStringList layers;
   QStringList styles;
@@ -801,7 +803,7 @@ void QgsWMSSourceSelect::on_lstLayers_itemSelectionChanged()
         defaultCRS = *it;
 
       // prefer value of DEFAULT_GEO_EPSG_CRS_ID if available
-      if ( *it == GEO_EPSG_CRS_AUTHID )
+      if ( *it == mDefaultCRS )
         defaultCRS = *it;
     }
 
@@ -813,7 +815,7 @@ void QgsWMSSourceSelect::on_lstLayers_itemSelectionChanged()
     }
 
   }
-  else if ( mCRSs.isEmpty() )
+  else if ( layers.isEmpty() || mCRSs.isEmpty() )
   {
     mCRS = "";
     labelCoordRefSys->setText( "" );
diff --git a/src/providers/wms/qgswmssourceselect.h b/src/providers/wms/qgswmssourceselect.h
@@ -133,6 +133,9 @@ class QgsWMSSourceSelect : public QDialog, private Ui::QgsWMSSourceSelectBase
     //! Selected CRS
     QString mCRS;
 
+    //! Default CRS
+    QString mDefaultCRS;
+
     //! Common CRSs for selected layers
     QSet<QString> mCRSs;
 

Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,7 @@ QgsWMSSourceSelect::QgsWMSSourceSelect( QWidget * parent, Qt::WFlags fl, bool ma`
`59`	`59`	`, mManagerMode( managerMode )`
`60`	`60`	`, mEmbeddedMode( embeddedMode )`
`61`	`61`	`, mCurrentTileset( 0 )`
	`62`	`+ , mDefaultCRS( GEO_EPSG_CRS_AUTHID )`
`62`	`63`	`{`
`63`	`64`	`setupUi( this );`
`64`	`65`
`@@ -117,7 +118,7 @@ QgsWMSSourceSelect::QgsWMSSourceSelect( QWidget * parent, Qt::WFlags fl, bool ma`
`117`	`118`	`QgsCoordinateReferenceSystem currentRefSys( currentCRS, QgsCoordinateReferenceSystem::InternalCrsId );`
`118`	`119`	`if ( currentRefSys.isValid() )`
`119`	`120`	`{`
`120`		`- mCRS = currentRefSys.authid();`
	`121`	`+ mDefaultCRS = mCRS = currentRefSys.authid();`
`121`	`122`	`}`
`122`	`123`	`}`
`123`	`124`
`@@ -409,6 +410,8 @@ bool QgsWMSSourceSelect::populateLayerList( QgsWmsProvider *wmsProvider )`
`409`	`410`	`lstLayers->expandItem( lstLayers->topLevelItem( 0 ) );`
`410`	`411`	`}`
`411`	`412`
	`413`	`+ on_lstLayers_itemSelectionChanged();`
	`414`	`+`
`412`	`415`	`return true;`
`413`	`416`	`}`
`414`	`417`
`@@ -741,7 +744,6 @@ void QgsWMSSourceSelect::on_lstLayers_itemSelectionChanged()`
`741`	`744`	`mCurrentSelection = lstLayers->selectedItems();`
`742`	`745`	`lstLayers->blockSignals( false );`
`743`	`746`
`744`		`-`
`745`	`747`	`// selected layers with styles`
`746`	`748`	`QStringList layers;`
`747`	`749`	`QStringList styles;`
`@@ -801,7 +803,7 @@ void QgsWMSSourceSelect::on_lstLayers_itemSelectionChanged()`
`801`	`803`	`defaultCRS = *it;`
`802`	`804`
`803`	`805`	`// prefer value of DEFAULT_GEO_EPSG_CRS_ID if available`
`804`		`- if ( *it == GEO_EPSG_CRS_AUTHID )`
	`806`	`+ if ( *it == mDefaultCRS )`
`805`	`807`	`defaultCRS = *it;`
`806`	`808`	`}`
`807`	`809`
`@@ -813,7 +815,7 @@ void QgsWMSSourceSelect::on_lstLayers_itemSelectionChanged()`
`813`	`815`	`}`
`814`	`816`
`815`	`817`	`}`
`816`		`- else if ( mCRSs.isEmpty() )`
	`818`	`+ else if ( layers.isEmpty() \|\| mCRSs.isEmpty() )`
`817`	`819`	`{`
`818`	`820`	`mCRS = "";`
`819`	`821`	`labelCoordRefSys->setText( "" );`