[FEATURE] WMTS

Author: jef-n

scripts/prepare-commit.sh

@@ -34,10 +34,10 @@ fi
 # save original changes
 if [ -d .svn ]; then
 	REV=r$(svn info | sed -ne "s/Revision: //p")
-	svn diff >$REV.diff
+	svn diff >rev-$REV.diff
 elif [ -d .git ]; then
 	REV=$(git log -n1 --pretty=%H)
-	git diff >$REV.diff
+	git diff >sha-$REV.diff
 fi
 
 ASTYLEDIFF=astyle.$REV.diff

src/app/CMakeLists.txt

@@ -95,7 +95,6 @@ SET(QGIS_APP_SRCS
   qgssinglesymboldialog.cpp
   qgssnappingdialog.cpp
   qgsundowidget.cpp
-  qgstilescalewidget.cpp
   qgstipgui.cpp
   qgstipfactory.cpp
   qgsuniquevaluedialog.cpp
@@ -232,7 +231,6 @@ SET (QGIS_APP_MOC_HDRS
   qgssnappingdialog.h
   qgssponsors.h
   qgstextannotationdialog.h
-  qgstilescalewidget.h
   qgstipgui.h
   qgstipfactory.h
   qgsundowidget.h

src/app/qgisapp.cpp

@@ -164,7 +164,6 @@
 #include "qgssnappingdialog.h"
 #include "qgssponsors.h"
 #include "qgstextannotationitem.h"
-#include "qgstilescalewidget.h"
 #include "qgstipgui.h"
 #include "qgsundowidget.h"
 #include "qgsvectordataprovider.h"
@@ -403,7 +402,6 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, QWidget * parent,
     , mSplash( splash )
     , mShowProjectionTab( false )
     , mPythonUtils( NULL )
-    , mpTileScaleWidget( NULL )
 #ifdef Q_OS_WIN
     , mSkipNextContextMenuEvent( 0 )
 #endif
@@ -651,6 +649,8 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, QWidget * parent,
   // request notification of FileOpen events (double clicking a file icon in Mac OS X Finder)
   QgsApplication::setFileOpenEventReceiver( this );
 
+  QgsProviderRegistry::instance()->registerGuis( this );
+
   // update windows
   qApp->processEvents();
 
@@ -788,12 +788,6 @@ void QgisApp::readSettings()
 
   // Add the recently accessed project file paths to the File menu
   mRecentProjectPaths = settings.value( "/UI/recentProjectsList" ).toStringList();
-
-  // Restore state of tile scale widget
-  if ( settings.value( "/UI/tileScaleEnabled", false ).toBool() )
-  {
-    showTileScale();
-  }
 }
 
 
@@ -899,7 +893,6 @@ void QgisApp::createActions()
   connect( mActionRemoveLayer, SIGNAL( triggered() ), this, SLOT( removeLayer() ) );
   connect( mActionSetLayerCRS, SIGNAL( triggered() ), this, SLOT( setLayerCRS() ) );
   connect( mActionSetProjectCRSFromLayer, SIGNAL( triggered() ), this, SLOT( setProjectCRSFromLayer() ) );
-  connect( mActionTileScale, SIGNAL( triggered() ), this, SLOT( showTileScale() ) );
   connect( mActionLayerProperties, SIGNAL( triggered() ), this, SLOT( layerProperties() ) );
   connect( mActionLayerSubsetString, SIGNAL( triggered() ), this, SLOT( layerSubsetString() ) );
   connect( mActionAddToOverview, SIGNAL( triggered() ), this, SLOT( isInOverview() ) );
@@ -2072,17 +2065,6 @@ void QgisApp::saveWindowState()
   // store window geometry
   settings.setValue( "/UI/geometry", saveGeometry() );
 
-  // Persist state of tile scale slider
-  if ( mpTileScaleWidget )
-  {
-    settings.setValue( "/UI/tileScaleEnabled", true );
-    delete mpTileScaleWidget;
-  }
-  else
-  {
-    settings.setValue( "/UI/tileScaleEnabled", false );
-  }
-
   QgsPluginRegistry::instance()->unloadAll();
 }
 
@@ -4854,32 +4836,6 @@ void QgisApp::setProjectCRSFromLayer()
   mMapCanvas->refresh();
 }
 
-void QgisApp::showTileScale()
-{
-  if ( !mpTileScaleWidget )
-  {
-    mpTileScaleWidget = new QgsTileScaleWidget( mMapCanvas );
-    //create the dock widget
-    mpTileScaleDock = new QDockWidget( tr( "Tile scale" ), this );
-    mpTileScaleDock->setObjectName( "TileScale" );
-    mpTileScaleDock->setAllowedAreas( Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea );
-    addDockWidget( Qt::RightDockWidgetArea, mpTileScaleDock );
-    // add to the Panel submenu
-    mPanelMenu->addAction( mpTileScaleDock->toggleViewAction() );
-    // now add our widget to the dock - ownership of the widget is passed to the dock
-    mpTileScaleDock->setWidget( mpTileScaleWidget );
-    mpTileScaleDock->show();
-
-    connect( mMapLegend, SIGNAL( currentLayerChanged( QgsMapLayer* ) ),
-             mpTileScaleWidget, SLOT( layerChanged( QgsMapLayer* ) ) );
-
-  }
-  else
-  {
-    mpTileScaleDock->setVisible( mpTileScaleDock->isHidden() );
-  }
-}
-
 void QgisApp::zoomToLayerExtent()
 {
   mMapLegend->legendLayerZoom();

src/app/qgisapp.h

@@ -58,7 +58,6 @@ class QgsRasterLayer;
 class QgsRectangle;
 class QgsUndoWidget;
 class QgsVectorLayer;
-class QgsTileScaleWidget;
 
 class QDomDocument;
 class QNetworkReply;
@@ -289,7 +288,6 @@ class QgisApp : public QMainWindow, private Ui::MainWindow
     QAction *actionRemoveLayer() { return mActionRemoveLayer; }
     QAction *actionSetLayerCRS() { return mActionSetLayerCRS; }
     QAction *actionSetProjectCRSFromLayer() { return mActionSetProjectCRSFromLayer; }
-    QAction *actionTileScale() { return mActionTileScale; }
     QAction *actionLayerProperties() { return mActionLayerProperties; }
     QAction *actionLayerSubsetString() { return mActionLayerSubsetString; }
     QAction *actionAddToOverview() { return mActionAddToOverview; }
@@ -544,8 +542,6 @@ class QgisApp : public QMainWindow, private Ui::MainWindow
     void setLayerCRS();
     //! Assign layer CRS to project
     void setProjectCRSFromLayer();
-    //! Show tile scale slider
-    void showTileScale();
     //! zoom to extent of layer
     void zoomToLayerExtent();
     //! zoom to actual size of raster layer
@@ -1005,7 +1001,6 @@ class QgisApp : public QMainWindow, private Ui::MainWindow
     QDockWidget *mLegendDock;
     QDockWidget *mLayerOrderDock;
     QDockWidget *mOverviewDock;
-    QDockWidget *mpTileScaleDock;
     QDockWidget *mpGpsDock;
     QDockWidget *mLogDock;
 
@@ -1173,9 +1168,6 @@ class QgisApp : public QMainWindow, private Ui::MainWindow
 
     QgsSnappingDialog* mSnappingDialog;
 
-    //! Persistent tile scale slider
-    QgsTileScaleWidget * mpTileScaleWidget;
-
     QgsDecorationCopyright* mDecorationCopyright;
     QgsDecorationNorthArrow* mDecorationNorthArrow;
     QgsDecorationScaleBar* mDecorationScaleBar;

src/core/qgscoordinatereferencesystem.cpp

@@ -133,16 +133,25 @@ bool QgsCoordinateReferenceSystem::createFromString( const QString theDefinition
 
 bool QgsCoordinateReferenceSystem::createFromOgcWmsCrs( QString theCrs )
 {
-  QRegExp re( "(user|custom|qgis):(\\d+)", Qt::CaseInsensitive );
-  if ( re.exactMatch( theCrs ) && createFromSrsId( re.cap( 2 ).toInt() ) )
+  QRegExp re( "urn:ogc:def:crs:([^:]+).+([^:]+)", Qt::CaseInsensitive );
+  if ( re.exactMatch( theCrs ) )
   {
-    return true;
+    theCrs = re.cap( 1 ) + ":" + re.cap( 2 );
+  }
+  else
+  {
+    re.setPattern( "(user|custom|qgis):(\\d+)" );
+    if ( re.exactMatch( theCrs ) && createFromSrsId( re.cap( 2 ).toInt() ) )
+    {
+      return true;
+    }
   }
 
   if ( loadFromDb( QgsApplication::srsDbFilePath(), "lower(auth_name||':'||auth_id)", theCrs.toLower() ) )
     return true;
 
-  if ( theCrs.compare( "CRS:84", Qt::CaseInsensitive ) == 0 )
+  if ( theCrs.compare( "CRS:84", Qt::CaseInsensitive ) == 0 ||
+       theCrs.compare( "OGC:CRS84", Qt::CaseInsensitive ) == 0 )
   {
     createFromSrsId( GEOCRS_ID );
     return true;

src/core/qgsproviderregistry.cpp

@@ -436,20 +436,15 @@ typedef QWidget * selectFactoryFunction_t( QWidget * parent, Qt::WFlags fl );
 QWidget* QgsProviderRegistry::selectWidget( const QString & providerKey,
     QWidget * parent, Qt::WFlags fl )
 {
-  QLibrary *myLib = providerLibrary( providerKey );
-  if ( !myLib )
-    return 0;
-
   selectFactoryFunction_t * selectFactory =
-    ( selectFactoryFunction_t * ) cast_to_fptr( myLib->resolve( "selectWidget" ) );
+    ( selectFactoryFunction_t * ) cast_to_fptr( function( providerKey, "selectWidget" ) );
 
   if ( !selectFactory )
     return 0;
 
   return selectFactory( parent, fl );
 }
 
-
 void * QgsProviderRegistry::function( QString const & providerKey,
                                       QString const & functionName )
 {
@@ -489,6 +484,21 @@ QLibrary *QgsProviderRegistry::providerLibrary( QString const & providerKey ) co
   return 0;
 }
 
+void QgsProviderRegistry::registerGuis( QWidget *parent )
+{
+  typedef void registerGui_function( QWidget * parent );
+
+  foreach( const QString &provider, providerList() )
+  {
+    registerGui_function *registerGui = ( registerGui_function * ) cast_to_fptr( function( provider, "registerGui" ) );
+
+    if ( !registerGui )
+      continue;
+
+    registerGui( parent );
+  }
+}
+
 QString QgsProviderRegistry::fileVectorFilters() const
 {
   return mVectorFileFilters;

src/core/qgsproviderregistry.h

@@ -140,6 +140,8 @@ class CORE_EXPORT QgsProviderRegistry
     /** type for data provider metadata associative container */
     typedef std::map<QString, QgsProviderMetadata*> Providers;
 
+    void registerGuis( QWidget *widget );
+
   private:
 
     /** ctor private since instance() creates it */

src/gui/qgsmapcanvas.cpp

@@ -83,7 +83,7 @@ QgsMapCanvas::QgsMapCanvas( QWidget * parent, const char *name )
     , mPainting( false )
     , mAntiAliasing( false )
 {
-  Q_UNUSED( name );
+  setObjectName( name );
   //disable the update that leads to the resize crash
   if ( viewport() )
   {

src/providers/wms/CMakeLists.txt

@@ -4,12 +4,16 @@ SET (WMS_SRCS
   qgswmssourceselect.cpp 
   qgswmsconnection.cpp 
   qgswmsdataitems.cpp
+  qgstilescalewidget.cpp
+  qgswmtsdimensions.cpp
 )
 SET (WMS_MOC_HDRS  
   qgswmsprovider.h 
   qgswmssourceselect.h 
   qgswmsconnection.h 
   qgswmsdataitems.h
+  qgstilescalewidget.h
+  qgswmtsdimensions.h
 )
 
 QT4_WRAP_CPP (WMS_MOC_SRCS ${WMS_MOC_HDRS})