"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "src/providers/wfs/qgswfsprovider.cpp" between
QGIS-final-3_10_11.tar.gz and QGIS-final-3_10_12.tar.gz

About: QGIS (Quantum GIS) is a Geographic Information System that supports vector, raster, and database formats. Long-term release (3.10.x series).

qgswfsprovider.cpp  (QGIS-final-3_10_11):qgswfsprovider.cpp  (QGIS-final-3_10_12)
skipping to change at line 120 skipping to change at line 120
if ( !mShared->computeFilter( mProcessSQLErrorMsg ) ) if ( !mShared->computeFilter( mProcessSQLErrorMsg ) )
{ {
QgsMessageLog::logMessage( mProcessSQLErrorMsg, tr( "WFS" ) ); QgsMessageLog::logMessage( mProcessSQLErrorMsg, tr( "WFS" ) );
mValid = false; mValid = false;
return; return;
} }
//Failed to detect feature type from describeFeatureType -> get first feature from layer to detect type //Failed to detect feature type from describeFeatureType -> get first feature from layer to detect type
if ( mShared->mWKBType == QgsWkbTypes::Unknown ) if ( mShared->mWKBType == QgsWkbTypes::Unknown )
{ {
QgsWFSFeatureDownloader downloader( mShared.get() ); const bool requestMadeFromMainThread = QThread::currentThread() == QApplicat
ion::instance()->thread();
QgsWFSFeatureDownloader downloader( mShared.get(), requestMadeFromMainThread
);
connect( &downloader, static_cast<void ( QgsWFSFeatureDownloader::* )( QVect or<QgsWFSFeatureGmlIdPair> )>( &QgsWFSFeatureDownloader::featureReceived ), connect( &downloader, static_cast<void ( QgsWFSFeatureDownloader::* )( QVect or<QgsWFSFeatureGmlIdPair> )>( &QgsWFSFeatureDownloader::featureReceived ),
this, &QgsWFSProvider::featureReceivedAnalyzeOneFeature ); this, &QgsWFSProvider::featureReceivedAnalyzeOneFeature );
if ( requestMadeFromMainThread )
{
auto processEvents = []()
{
QgsApplication::instance()->processEvents();
};
connect( &downloader, &QgsWFSFeatureDownloader::resumeMainThread,
this, processEvents );
}
downloader.run( false, /* serialize features */ downloader.run( false, /* serialize features */
1 /* maxfeatures */ ); 1 /* maxfeatures */ );
} }
qRegisterMetaType<QgsRectangle>( "QgsRectangle" ); qRegisterMetaType<QgsRectangle>( "QgsRectangle" );
} }
QgsWFSProvider::~QgsWFSProvider() QgsWFSProvider::~QgsWFSProvider()
{ {
QgsDebugMsgLevel( QStringLiteral( "~QgsWFSProvider()" ), 4 ); QgsDebugMsgLevel( QStringLiteral( "~QgsWFSProvider()" ), 4 );
 End of changes. 2 change blocks. 
1 lines changed or deleted 13 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)