[QGIS Commit] r8593 - in trunk/qgis: python/gui src/app src/gui

[svn_qgis at osgeo.org]

Author: mhugent
Date: 2008-06-05 05:30:48 -0400 (Thu, 05 Jun 2008)
New Revision: 8593

Modified:
   trunk/qgis/python/gui/qgisinterface.sip
   trunk/qgis/src/app/qgisapp.cpp
   trunk/qgis/src/app/qgisapp.h
   trunk/qgis/src/app/qgisappinterface.cpp
   trunk/qgis/src/app/qgisappinterface.h
   trunk/qgis/src/gui/qgisinterface.h
Log:
possibility to add WMS layers through plugin interface

Modified: trunk/qgis/python/gui/qgisinterface.sip
===================================================================
--- trunk/qgis/python/gui/qgisinterface.sip	2008-06-04 21:22:31 UTC (rev 8592)
+++ trunk/qgis/python/gui/qgisinterface.sip	2008-06-05 09:30:48 UTC (rev 8593)
@@ -39,6 +39,8 @@
     virtual QgsVectorLayer* addVectorLayer(QString vectorLayerPath, QString baseName, QString providerKey)=0;
     //! Add a raster layer given a raster layer file name
     virtual QgsRasterLayer* addRasterLayer(QString rasterLayerPath, QString baseName = QString())=0;
+    //! Add a WMS layer
+    virtual QgsRasterLayer* addRasterLayer(const QString& url, const QString& layerName, const QString& providerKey, const QStringList& layers, const QStringList& styles, const QString& format, const QString& crs) = 0;
 
     //! Add a project
     virtual bool addProject(QString theProject)=0; 

Modified: trunk/qgis/src/app/qgisapp.cpp
===================================================================
--- trunk/qgis/src/app/qgisapp.cpp	2008-06-04 21:22:31 UTC (rev 8592)
+++ trunk/qgis/src/app/qgisapp.cpp	2008-06-05 09:30:48 UTC (rev 8593)
@@ -5216,7 +5216,7 @@
   \note   Copied from the equivalent addVectorLayer function in this file
   TODO    Make it work for rasters specifically.
   */
-void QgisApp::addRasterLayer(QString const & rasterLayerPath,
+QgsRasterLayer* QgisApp::addRasterLayer(QString const & rasterLayerPath,
     QString const & baseName,
     QString const & providerKey,
     QStringList const & layers,
@@ -5232,7 +5232,7 @@
 
   if(mMapCanvas && mMapCanvas->isDrawing())
     {
-      return;
+      return 0;
     }
 
   mMapCanvas->freeze();
@@ -5278,6 +5278,7 @@
   // draw the map
   mMapCanvas->freeze(false);
   mMapCanvas->refresh();
+  return layer;
 
 // Let render() do its own cursor management
 //  QApplication::restoreOverrideCursor();

Modified: trunk/qgis/src/app/qgisapp.h
===================================================================
--- trunk/qgis/src/app/qgisapp.h	2008-06-04 21:22:31 UTC (rev 8592)
+++ trunk/qgis/src/app/qgisapp.h	2008-06-05 09:30:48 UTC (rev 8593)
@@ -96,7 +96,7 @@
    *  Note this is included to support WMS layers only at this stage,
    *  GDAL layer support via a Provider is not yet implemented.
    */
-  void addRasterLayer(QString const & rasterLayerPath,
+  QgsRasterLayer* addRasterLayer(QString const & rasterLayerPath,
       QString const & baseName,
       QString const & providerKey,
       QStringList const & layers,

Modified: trunk/qgis/src/app/qgisappinterface.cpp
===================================================================
--- trunk/qgis/src/app/qgisappinterface.cpp	2008-06-04 21:22:31 UTC (rev 8592)
+++ trunk/qgis/src/app/qgisappinterface.cpp	2008-06-05 09:30:48 UTC (rev 8593)
@@ -77,7 +77,13 @@
   return qgis->addRasterLayer(rasterLayerPath, baseName);
 }
 
+QgsRasterLayer* QgisAppInterface::addRasterLayer(const QString& url, const QString& baseName, const QString& providerKey, \
+						 const QStringList& layers, const QStringList& styles, const QString& format, const QString& crs)
+{
+  return qgis->addRasterLayer(url, baseName, providerKey, layers, styles, format, crs);
+}
 
+
 bool QgisAppInterface::addProject(QString theProjectName)
 {
   return qgis->addProject(theProjectName);

Modified: trunk/qgis/src/app/qgisappinterface.h
===================================================================
--- trunk/qgis/src/app/qgisappinterface.h	2008-06-04 21:22:31 UTC (rev 8592)
+++ trunk/qgis/src/app/qgisappinterface.h	2008-06-05 09:30:48 UTC (rev 8593)
@@ -54,6 +54,9 @@
         QgsVectorLayer* addVectorLayer(QString vectorLayerPath, QString baseName, QString providerKey);
         //! Add a raster layer given its file name
         QgsRasterLayer* addRasterLayer(QString rasterLayerPath, QString baseName);
+	//! Add a WMS layer
+	QgsRasterLayer* addRasterLayer(const QString& url, const QString& baseName, const QString& providerKey, \
+				       const QStringList& layers, const QStringList& styles, const QString& format, const QString& crs);
 
         //! Add a project
         bool addProject(QString theProjectName);

Modified: trunk/qgis/src/gui/qgisinterface.h
===================================================================
--- trunk/qgis/src/gui/qgisinterface.h	2008-06-04 21:22:31 UTC (rev 8592)
+++ trunk/qgis/src/gui/qgisinterface.h	2008-06-05 09:30:48 UTC (rev 8593)
@@ -72,6 +72,9 @@
     virtual QgsVectorLayer* addVectorLayer(QString vectorLayerPath, QString baseName, QString providerKey)=0;
     //! Add a raster layer given a raster layer file name
     virtual QgsRasterLayer* addRasterLayer(QString rasterLayerPath, QString baseName = QString())=0;
+    //! Add a WMS layer
+    virtual QgsRasterLayer* addRasterLayer(const QString& url, const QString& layerName, const QString& providerKey, const QStringList& layers, \
+					   const QStringList& styles, const QString& format, const QString& crs) = 0;
 
     //! Add a project
     virtual bool addProject(QString theProject)=0;