WCS support

qgis · Apr 25, 2012 · 7ddadbf · 7ddadbf
1 parent 7d500ea
commit 7ddadbf
Show file tree

Hide file tree

Showing 7 changed files with 45 additions and 1 deletion.
diff --git a/images/images.qrc b/images/images.qrc
@@ -33,6 +33,7 @@
         <file>themes/default/mActionAddRing.png</file>
         <file>themes/default/mActionAddSpatiaLiteLayer.png</file>
         <file>themes/default/mActionAddVertex.png</file>
+        <file>themes/default/mActionAddWcsLayer.png</file>
         <file>themes/default/mActionAddWmsLayer.png</file>
         <file>themes/default/mActionAlignBottom.png</file>
         <file>themes/default/mActionAlignHCenter.png</file>

diff --git a/images/themes/default/mActionAddWcsLayer.png b/images/themes/default/mActionAddWcsLayer.png
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -888,6 +888,7 @@ void QgisApp::createActions()
   connect( mActionAddSpatiaLiteLayer, SIGNAL( triggered() ), this, SLOT( addSpatiaLiteLayer() ) );
   connect( mActionAddMssqlLayer, SIGNAL( triggered() ), this, SLOT( addMssqlLayer() ) );
   connect( mActionAddWmsLayer, SIGNAL( triggered() ), this, SLOT( addWmsLayer() ) );
+  connect( mActionAddWcsLayer, SIGNAL( triggered() ), this, SLOT( addWcsLayer() ) );
   connect( mActionAddWfsLayer, SIGNAL( triggered() ), this, SLOT( addWfsLayer() ) );
   connect( mActionOpenTable, SIGNAL( triggered() ), this, SLOT( attributeTable() ) );
   connect( mActionToggleEditing, SIGNAL( triggered() ), this, SLOT( toggleEditing() ) );
@@ -1583,6 +1584,7 @@ void QgisApp::setTheme( QString theThemeName )
   mActionNewBookmark->setIcon( getThemeIcon( "/mActionNewBookmark.png" ) );
   mActionCustomProjection->setIcon( getThemeIcon( "/mActionCustomProjection.png" ) );
   mActionAddWmsLayer->setIcon( getThemeIcon( "/mActionAddWmsLayer.png" ) );
+  mActionAddWcsLayer->setIcon( getThemeIcon( "/mActionAddWcsLayer.png" ) );
   mActionAddWfsLayer->setIcon( getThemeIcon( "/mActionAddWfsLayer.png" ) );
   mActionAddToOverview->setIcon( getThemeIcon( "/mActionInOverview.png" ) );
   mActionAnnotation->setIcon( getThemeIcon( "/mActionAnnotation.png" ) );
@@ -2632,6 +2634,27 @@ void QgisApp::addWmsLayer()
   delete wmss;
 }
 
+void QgisApp::addWcsLayer()
+{
+  if ( mMapCanvas && mMapCanvas->isDrawing() )
+  {
+    return;
+  }
+  QgsDebugMsg( "about to addWcsLayer" );
+
+  // TODO: QDialog for now, switch to QWidget in future
+  QDialog *wcss = dynamic_cast<QDialog*>( QgsProviderRegistry::instance()->selectWidget( QString( "gdal" ), this ) );
+  if ( !wcss )
+  {
+    QMessageBox::warning( this, tr( "WCS" ), tr( "Cannot get WCS select dialog from provider." ) );
+    return;
+  }
+  connect( wcss , SIGNAL( addRasterLayer( QString const &, QString const &, QString const & ) ),
+           this , SLOT( addRasterLayer( QString const &, QString const &, QString const & ) ) );
+  wcss->exec();
+  delete wcss;
+}
+
 void QgisApp::addWfsLayer()
 {
   if ( !mMapCanvas )

diff --git a/src/app/qgisapp.h b/src/app/qgisapp.h
@@ -280,6 +280,7 @@ class QgisApp : public QMainWindow, private Ui::MainWindow
     QAction *actionAddPgLayer() { return mActionAddPgLayer; }
     QAction *actionAddSpatiaLiteLayer() { return mActionAddSpatiaLiteLayer; };
     QAction *actionAddWmsLayer() { return mActionAddWmsLayer; }
+    QAction *actionAddWcsLayer() { return mActionAddWcsLayer; }
     QAction *actionAddWfsLayer() { return mActionAddWfsLayer; }
     QAction *actionOpenTable() { return mActionOpenTable; }
     QAction *actionToggleEditing() { return mActionToggleEditing; }
@@ -763,6 +764,8 @@ class QgisApp : public QMainWindow, private Ui::MainWindow
     void fileExit();
     //! Add a WMS layer to the map
     void addWmsLayer();
+    //! Add a WCS layer to the map
+    void addWcsLayer();
     //! Add a WFS layer to the map
     void addWfsLayer();
     //! Set map tool to Zoom out

diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
@@ -76,6 +76,7 @@ SET(QGIS_CORE_SRCS
   qgsmessagelog.cpp
   qgscredentials.cpp
   qgsoverlayobject.cpp
+  qgsowsconnection.cpp
   qgspalgeometry.cpp
   qgspallabeling.cpp
   qgspalobjectpositionmanager.cpp
@@ -326,6 +327,7 @@ SET(QGIS_CORE_HDRS
   qgsmimedatautils.h
   qgscredentials.h
   qgsoverlayobjectpositionmanager.h
+  qgsowsconnection.h
   qgspallabeling.h
   qgspalobjectpositionmanager.h
   qgspluginlayer.h

diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
@@ -65,6 +65,7 @@ qgsnewhttpconnection.cpp
 qgsnewvectorlayerdialog.cpp
 qgsnumericsortlistviewitem.cpp
 qgscredentialdialog.cpp
+qgsowssourceselect.cpp
 qgsprojectbadlayerguihandler.cpp
 qgsprojectionselector.cpp
 qgsquickprint.cpp
@@ -137,6 +138,7 @@ qgsmessagelogviewer.h
 qgsnewhttpconnection.h
 qgsnewvectorlayerdialog.h
 qgscredentialdialog.h
+qgsowssourceselect.h
 qgsprojectionselector.h
 qgsquickprint.h
 qgsludialog.h
@@ -172,6 +174,7 @@ qgsmaptoolpan.h
 qgsmaptoolzoom.h
 qgsmessageviewer.h
 qgscredentialdialog.h
+qgsowssourceselect.h
 qgsprojectionselector.h
 qgsrubberband.h
 qgsvertexmarker.h
@@ -204,6 +207,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/../ui/ui_qgsdetaileditemwidgetbase.h
 ${CMAKE_CURRENT_BINARY_DIR}/../ui/ui_qgsgenericprojectionselectorbase.h
 ${CMAKE_CURRENT_BINARY_DIR}/../ui/ui_qgsmessageviewer.h
 ${CMAKE_CURRENT_BINARY_DIR}/../ui/ui_qgsmessagelogviewer.h
+${CMAKE_CURRENT_BINARY_DIR}/../ui/ui_qgsowssourceselectbase.h
 ${CMAKE_CURRENT_BINARY_DIR}/../ui/ui_qgscredentialdialog.h
 ${CMAKE_CURRENT_BINARY_DIR}/../ui/ui_qgsprojectionselectorbase.h
 ${CMAKE_CURRENT_BINARY_DIR}/../ui/ui_qgsquerybuilderbase.h

diff --git a/src/ui/qgisapp.ui b/src/ui/qgisapp.ui
@@ -17,7 +17,7 @@
      <x>0</x>
      <y>0</y>
      <width>1052</width>
-     <height>21</height>
+     <height>27</height>
     </rect>
    </property>
    <widget class="QMenu" name="mEditMenu">
@@ -150,6 +150,7 @@
     <addaction name="mActionAddMssqlLayer"/>
     <addaction name="mActionAddWmsLayer"/>
     <addaction name="mActionAddLayerSeparator"/>
+    <addaction name="mActionAddWcsLayer"/>
     <addaction name="mActionAddWfsLayer"/>
     <addaction name="separator"/>
     <addaction name="mActionOpenTable"/>
@@ -253,6 +254,7 @@
    <addaction name="mActionAddSpatiaLiteLayer"/>
    <addaction name="mActionAddMssqlLayer"/>
    <addaction name="mActionAddWmsLayer"/>
+   <addaction name="mActionAddWcsLayer"/>
    <addaction name="mActionAddWfsLayer"/>
    <addaction name="mActionNewVectorLayer"/>
    <addaction name="mActionRemoveLayer"/>
@@ -1648,6 +1650,15 @@
     <string>Offset Curve</string>
    </property>
   </action>
+  <action name="mActionAddWcsLayer">
+   <property name="icon">
+    <iconset resource="../../images/images.qrc">
+     <normaloff>:/images/themes/default/mActionAddWcsLayer.png</normaloff>:/images/themes/default/mActionAddWcsLayer.png</iconset>
+   </property>
+   <property name="text">
+    <string>Add WCS Layer...</string>
+   </property>
+  </action>
  </widget>
  <resources>
   <include location="../../images/images.qrc"/>