From c15058b9eb6ca9301ad65fa0e6867b2a9593f9c9 Mon Sep 17 00:00:00 2001 From: jef Date: Fri, 26 Mar 2010 23:57:57 +0000 Subject: [PATCH] fix #2592 git-svn-id: http://svn.osgeo.org/qgis/trunk@13167 c8812cc2-4d05-0410-92ff-de0c093fc19c --- src/providers/wms/qgswmsprovider.cpp | 6 ++++++ src/providers/wms/qgswmsprovider.h | 1 + 2 files changed, 7 insertions(+) diff --git a/src/providers/wms/qgswmsprovider.cpp b/src/providers/wms/qgswmsprovider.cpp index ce1d87e2ff8..8ade67bd15c 100644 --- a/src/providers/wms/qgswmsprovider.cpp +++ b/src/providers/wms/qgswmsprovider.cpp @@ -527,6 +527,7 @@ QImage *QgsWmsProvider::draw( QgsRectangle const &viewExtent, int pixelWidth, i QgsDebugMsg( QString( "getmap: %1" ).arg( url ) ); cacheReply = smNAM->get( QNetworkRequest( url ) ); connect( cacheReply, SIGNAL( finished() ), this, SLOT( cacheReplyFinished() ) ); + connect( cacheReply, SIGNAL( downloadProgress( qint64, qint64 ) ), this, SLOT( cacheReplyProgress( qint64, qint64 ) ) ); mWaiting = true; @@ -933,6 +934,11 @@ void QgsWmsProvider::capabilitiesReplyProgress( qint64 bytesReceived, qint64 byt emit statusChanged( tr( "%1 of %2 bytes of capabilities downloaded." ).arg( bytesReceived ).arg( bytesTotal < 0 ? QString( "unknown number of" ) : QString::number( bytesTotal ) ) ); } +void QgsWmsProvider::cacheReplyProgress( qint64 bytesReceived, qint64 bytesTotal ) +{ + emit statusChanged( tr( "%1 of %2 bytes of map downloaded." ).arg( bytesReceived ).arg( bytesTotal < 0 ? QString( "unknown number of" ) : QString::number( bytesTotal ) ) ); +} + bool QgsWmsProvider::parseCapabilitiesDom( QByteArray const &xml, QgsWmsCapabilitiesProperty& capabilitiesProperty ) { QgsDebugMsg( "entering." ); diff --git a/src/providers/wms/qgswmsprovider.h b/src/providers/wms/qgswmsprovider.h index 3a94d50cdfb..fe7872efc96 100644 --- a/src/providers/wms/qgswmsprovider.h +++ b/src/providers/wms/qgswmsprovider.h @@ -594,6 +594,7 @@ class QgsWmsProvider : public QgsRasterDataProvider private slots: void cacheReplyFinished(); + void cacheReplyProgress( qint64, qint64 ); void capabilitiesReplyFinished(); void capabilitiesReplyProgress( qint64, qint64 ); void identifyReplyFinished();