Merge branch 'master' of github.com:qgis/Quantum-GIS

qgis · Oct 15, 2011 · 54754f1 · 54754f1
2 parents 10d81dd + fb6d551
commit 54754f1
Show file tree

Hide file tree

Showing 11 changed files with 359 additions and 233 deletions.
diff --git a/src/app/qgsbrowserdockwidget.cpp b/src/app/qgsbrowserdockwidget.cpp
@@ -269,7 +269,7 @@ void QgsBrowserDockWidget::refreshModel( const QModelIndex& index )
   for ( int i = 0 ; i < mModel->rowCount( index ); i++ )
   {
     QModelIndex idx = mModel->index( i, 0, index );
-    if ( mBrowserView->isExpanded( idx ) )
+    if ( mBrowserView->isExpanded( idx ) || !mModel->hasChildren( idx ) )
     {
       refreshModel( idx );
     }

diff --git a/src/browser/qgsbrowser.cpp b/src/browser/qgsbrowser.cpp
@@ -531,7 +531,7 @@ void QgsBrowser::refresh( const QModelIndex& index )
   for ( int i = 0 ; i < mModel->rowCount( index ); i++ )
   {
     QModelIndex idx = mModel->index( i, 0, index );
-    if ( treeView->isExpanded( idx ) )
+    if ( treeView->isExpanded( idx ) || !mModel->hasChildren( idx ) )
     {
       refresh( idx );
     }

diff --git a/src/core/qgsdataitem.cpp b/src/core/qgsdataitem.cpp
@@ -565,3 +565,16 @@ void QgsDirectoryParamWidget::showHideColumn()
   }
   settings.setValue( "/dataitem/directoryHiddenColumns", lst );
 }
+
+
+QgsErrorItem::QgsErrorItem( QgsDataItem* parent, QString error, QString path )
+    : QgsDataItem( QgsDataItem::Error, parent, error, path )
+{
+  mIcon = QIcon( getThemePixmap( "/mIconDelete.png" ) );
+
+  mPopulated = true; // no more children
+}
+
+QgsErrorItem::~QgsErrorItem()
+{
+}
diff --git a/src/core/qgsdataitem.h b/src/core/qgsdataitem.h
@@ -46,6 +46,7 @@ class CORE_EXPORT QgsDataItem : public QObject
       Collection,
       Directory,
       Layer,
+      Error,
     };
 
     QgsDataItem( QgsDataItem::Type type, QgsDataItem* parent, QString name, QString path );
@@ -225,6 +226,24 @@ class CORE_EXPORT QgsDirectoryItem : public QgsDataCollectionItem
     static QVector<QLibrary*> mLibraries;
 };
 
+/**
+ Data item that can be used to report problems (e.g. network error)
+ */
+class CORE_EXPORT QgsErrorItem : public QgsDataItem
+{
+    Q_OBJECT
+  public:
+
+    QgsErrorItem( QgsDataItem* parent, QString error, QString path );
+    ~QgsErrorItem();
+
+    //QVector<QgsDataItem*> createChildren();
+    //virtual bool equal( const QgsDataItem *other );
+};
+
+
+// ---------
+
 class QgsDirectoryParamWidget : public QTreeWidget
 {
     Q_OBJECT

diff --git a/src/providers/postgres/qgspostgresdataitems.cpp b/src/providers/postgres/qgspostgresdataitems.cpp
@@ -29,7 +29,10 @@ QVector<QgsDataItem*> QgsPGConnectionItem::createChildren()
   QgsDebugMsg( "mConnInfo = " + mConnInfo );
 
   if ( !pgProvider->supportedLayers( mLayerProperties, true, false, false ) )
+  {
+    children.append( new QgsErrorItem( this, tr( "Failed to retrieve layers" ), mPath + "/error" ) );
     return children;
+  }
 
   QMap<QString, QVector<QgsPostgresLayerProperty> > schemasMap;
   foreach( QgsPostgresLayerProperty layerProperty, mLayerProperties )

diff --git a/src/providers/wfs/qgswfsdataitems.cpp b/src/providers/wfs/qgswfsdataitems.cpp
@@ -57,7 +57,7 @@ QVector<QgsDataItem*> QgsWFSConnectionItem::createChildren()
   }
   else
   {
-    // TODO: return an "error" item
+    layers.append( new QgsErrorItem( this, tr( "Failed to retrieve layers" ), mPath + "/error" ) );
   }
 
   mConn->deleteLater();

diff --git a/src/providers/wms/CMakeLists.txt b/src/providers/wms/CMakeLists.txt
@@ -3,11 +3,13 @@ SET (WMS_SRCS
   qgswmsprovider.cpp 
   qgswmssourceselect.cpp 
   qgswmsconnection.cpp 
+  qgswmsdataitems.cpp
 )
 SET (WMS_MOC_HDRS  
   qgswmsprovider.h 
   qgswmssourceselect.h 
   qgswmsconnection.h 
+  qgswmsdataitems.h
 )
 
 QT4_WRAP_CPP (WMS_MOC_SRCS ${WMS_MOC_HDRS})

diff --git a/src/providers/wms/qgswmsdataitems.cpp b/src/providers/wms/qgswmsdataitems.cpp
@@ -0,0 +1,256 @@
+#include "qgswmsdataitems.h"
+
+#include "qgslogger.h"
+
+#include "qgswmsconnection.h"
+#include "qgswmssourceselect.h"
+
+#include "qgsnewhttpconnection.h"
+
+// ---------------------------------------------------------------------------
+QgsWMSConnectionItem::QgsWMSConnectionItem( QgsDataItem* parent, QString name, QString path )
+    : QgsDataCollectionItem( parent, name, path )
+{
+}
+
+QgsWMSConnectionItem::~QgsWMSConnectionItem()
+{
+}
+
+QVector<QgsDataItem*> QgsWMSConnectionItem::createChildren()
+{
+  QgsDebugMsg( "Entered" );
+  QVector<QgsDataItem*> children;
+  QgsWMSConnection connection( mName );
+  QgsWmsProvider *wmsProvider = connection.provider( );
+  if ( !wmsProvider )
+    return children;
+
+  QString mConnInfo = connection.connectionInfo();
+  QgsDebugMsg( "mConnInfo = " + mConnInfo );
+
+  // Attention: supportedLayers() gives tree leafes, not top level
+  if ( !wmsProvider->supportedLayers( mLayerProperties ) )
+  {
+    children.append( new QgsErrorItem( this, tr( "Failed to retrieve layers" ), mPath + "/error" ) );
+    return children;
+  }
+
+  QgsWmsCapabilitiesProperty mCapabilitiesProperty = wmsProvider->capabilitiesProperty();
+  QgsWmsCapabilityProperty capabilityProperty = mCapabilitiesProperty.capability;
+
+  // Top level layer is present max once
+  // <element name="Capability">
+  //    <element ref="wms:Layer" minOccurs="0"/>  - default maxOccurs=1
+  QgsWmsLayerProperty topLayerProperty = capabilityProperty.layer;
+  foreach( QgsWmsLayerProperty layerProperty, topLayerProperty.layer )
+  {
+    // Attention, the name may be empty
+    QgsDebugMsg( QString::number( layerProperty.orderId ) + " " + layerProperty.name + " " + layerProperty.title );
+    QString pathName = layerProperty.name.isEmpty() ? QString::number( layerProperty.orderId ) : layerProperty.name;
+
+    QgsWMSLayerItem * layer = new QgsWMSLayerItem( this, layerProperty.title, mPath + "/" + pathName, mCapabilitiesProperty, mConnInfo, layerProperty );
+
+    children.append( layer );
+  }
+  return children;
+}
+
+bool QgsWMSConnectionItem::equal( const QgsDataItem *other )
+{
+  if ( type() != other->type() )
+  {
+    return false;
+  }
+  const QgsWMSConnectionItem *o = dynamic_cast<const QgsWMSConnectionItem *>( other );
+  return ( mPath == o->mPath && mName == o->mName && mConnInfo == o->mConnInfo );
+}
+
+QList<QAction*> QgsWMSConnectionItem::actions()
+{
+  QList<QAction*> lst;
+
+  QAction* actionEdit = new QAction( tr( "Edit..." ), this );
+  connect( actionEdit, SIGNAL( triggered() ), this, SLOT( editConnection() ) );
+  lst.append( actionEdit );
+
+  QAction* actionDelete = new QAction( tr( "Delete" ), this );
+  connect( actionDelete, SIGNAL( triggered() ), this, SLOT( deleteConnection() ) );
+  lst.append( actionDelete );
+
+  return lst;
+}
+
+void QgsWMSConnectionItem::editConnection()
+{
+  QgsNewHttpConnection nc( 0, "/Qgis/connections-wms/", mName );
+
+  if ( nc.exec() )
+  {
+    // the parent should be updated
+    mParent->refresh();
+  }
+}
+
+void QgsWMSConnectionItem::deleteConnection()
+{
+  QgsWMSConnection::deleteConnection( mName );
+  // the parent should be updated
+  mParent->refresh();
+}
+
+
+// ---------------------------------------------------------------------------
+
+QgsWMSLayerItem::QgsWMSLayerItem( QgsDataItem* parent, QString name, QString path, QgsWmsCapabilitiesProperty capabilitiesProperty, QString connInfo, QgsWmsLayerProperty layerProperty )
+    : QgsLayerItem( parent, name, path, QString(), QgsLayerItem::Raster, "wms" ),
+    mCapabilitiesProperty( capabilitiesProperty ),
+    mConnInfo( connInfo ),
+    mLayerProperty( layerProperty )
+    //mProviderKey ("wms"),
+    //mLayerType ( QgsLayerItem::Raster )
+{
+  mUri = createUri();
+  // Populate everything, it costs nothing, all info about layers is collected
+  foreach( QgsWmsLayerProperty layerProperty, mLayerProperty.layer )
+  {
+    // Attention, the name may be empty
+    QgsDebugMsg( QString::number( layerProperty.orderId ) + " " + layerProperty.name + " " + layerProperty.title );
+    QString pathName = layerProperty.name.isEmpty() ? QString::number( layerProperty.orderId ) : layerProperty.name;
+    QgsWMSLayerItem * layer = new QgsWMSLayerItem( this, layerProperty.title, mPath + "/" + pathName, mCapabilitiesProperty, mConnInfo, layerProperty );
+    mChildren.append( layer );
+  }
+
+  if ( mChildren.size() == 0 )
+  {
+    mIcon = QIcon( getThemePixmap( "mIconWmsLayer.png" ) );
+  }
+  mPopulated = true;
+}
+
+QgsWMSLayerItem::~QgsWMSLayerItem()
+{
+}
+
+QString QgsWMSLayerItem::createUri()
+{
+  QString uri;
+  if ( mLayerProperty.name.isEmpty() )
+    return uri; // layer collection
+
+  QString rasterLayerPath = mConnInfo;
+  QString baseName = mLayerProperty.name;
+
+  // Number of styles must match number of layers
+  QStringList layers;
+  layers << mLayerProperty.name;
+  QStringList styles;
+  if ( mLayerProperty.style.size() > 0 )
+  {
+    styles.append( mLayerProperty.style[0].name );
+  }
+  else
+  {
+    styles << ""; // TODO: use loadDefaultStyleFlag
+  }
+
+  QString format;
+  // get first supporte by qt and server
+  QVector<QgsWmsSupportedFormat> formats = QgsWmsProvider::supportedFormats();
+  foreach( QgsWmsSupportedFormat f, formats )
+  {
+    if ( mCapabilitiesProperty.capability.request.getMap.format.indexOf( f.format ) >= 0 )
+    {
+      format = f.format;
+      break;
+    }
+  }
+  QString crs;
+  // get first known if possible
+  QgsCoordinateReferenceSystem testCrs;
+  foreach( QString c, mLayerProperty.crs )
+  {
+    testCrs.createFromOgcWmsCrs( c );
+    if ( testCrs.isValid() )
+    {
+      crs = c;
+      break;
+    }
+  }
+  if ( crs.isEmpty() && mLayerProperty.crs.size() > 0 )
+  {
+    crs = mLayerProperty.crs[0];
+  }
+  uri = rasterLayerPath + "|layers=" + layers.join( "," ) + "|styles=" + styles.join( "," ) + "|format=" + format + "|crs=" + crs;
+
+  return uri;
+}
+
+// ---------------------------------------------------------------------------
+QgsWMSRootItem::QgsWMSRootItem( QgsDataItem* parent, QString name, QString path )
+    : QgsDataCollectionItem( parent, name, path )
+{
+  mIcon = QIcon( getThemePixmap( "mIconWms.png" ) );
+
+  populate();
+}
+
+QgsWMSRootItem::~QgsWMSRootItem()
+{
+}
+
+QVector<QgsDataItem*>QgsWMSRootItem::createChildren()
+{
+  QVector<QgsDataItem*> connections;
+
+  foreach( QString connName, QgsWMSConnection::connectionList() )
+  {
+    QgsDataItem * conn = new QgsWMSConnectionItem( this, connName, mPath + "/" + connName );
+    connections.append( conn );
+  }
+  return connections;
+}
+
+QList<QAction*> QgsWMSRootItem::actions()
+{
+  QList<QAction*> lst;
+
+  QAction* actionNew = new QAction( tr( "New..." ), this );
+  connect( actionNew, SIGNAL( triggered() ), this, SLOT( newConnection() ) );
+  lst.append( actionNew );
+
+  return lst;
+}
+
+
+QWidget * QgsWMSRootItem::paramWidget()
+{
+  QgsWMSSourceSelect *select = new QgsWMSSourceSelect( 0, 0, true, true );
+  connect( select, SIGNAL( connectionsChanged() ), this, SLOT( connectionsChanged() ) );
+  return select;
+}
+void QgsWMSRootItem::connectionsChanged()
+{
+  refresh();
+}
+
+void QgsWMSRootItem::newConnection()
+{
+  QgsNewHttpConnection nc( 0 );
+
+  if ( nc.exec() )
+  {
+    refresh();
+  }
+}
+
+
+// ---------------------------------------------------------------------------
+
+QGISEXTERN QgsDataItem * dataItem( QString thePath, QgsDataItem* parentItem )
+{
+  Q_UNUSED( thePath );
+
+  return new QgsWMSRootItem( parentItem, "WMS", "wms:" );
+}
+