sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-25 00:58:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

Run WFS feature counter task in separate thread

Browse Source
This commit is contained in:
Matthias Kuhn 2018-05-23 12:17:27 +02:00
parent 365fbed2a6
commit 9b5c5b0081
No known key found for this signature in database
GPG Key ID: A0E766808764D73F
1 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/providers/wfs/qgswfsrequest.cpp
View File

@ -24,6 +24,8 @@
#include <QEventLoop>
#include <QNetworkCacheMetaData>
#include <QCryptographicHash> // just for testin file:// fake_qgis_http_endpoint hack
#include <QFuture>
#include <QtConcurrent>
const qint64 READ_BUFFER_SIZE_HINT = 1024 * 1024;
@ -140,12 +142,27 @@ bool QgsWfsRequest::sendGET( const QUrl &url, bool synchronous, bool forceRefres
if ( !synchronous )
return true;
else
{
QEventLoop loop;
connect( this, &QgsWfsRequest::downloadFinished, &loop, &QEventLoop::quit );
QEventLoop loop;
connect( this, &QgsWfsRequest::downloadFinished, &loop, &QEventLoop::quit );
loop.exec( QEventLoop::ExcludeUserInputEvents );
if ( QThread::currentThread() == QApplication::instance()->thread() )
{
QFuture<void> future = QtConcurrent::run( [ &loop ]()
{
loop.exec();
} );
return mErrorMessage.isEmpty();
future.waitForFinished();
}
else
{
loop.exec();
}
return mErrorMessage.isEmpty();
}
}
bool QgsWfsRequest::sendPOST( const QUrl &url, const QString &contentTypeHeader, const QByteArray &data )