ows data items: population of children already runs in a thread - don't use subthreads for each provider (fixes #12507)

jef-n · jef-n · commit 402df0323e81 · 2015-06-08T14:10:23.000+02:00
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -7051,6 +7051,9 @@ void QgisApp::showMouseCoordinate( const QgsPoint & p )
   {
     if ( mMapCanvas->mapUnits() == QGis::Degrees )
     {
+      if ( !mMapCanvas->mapSettings().destinationCrs().isValid() )
+        return;
+
       QgsPoint geo = p;
       if ( !mMapCanvas->mapSettings().destinationCrs().geographicFlag() )
       {
diff --git a/src/core/qgsdataitem.cpp b/src/core/qgsdataitem.cpp
@@ -350,14 +350,14 @@ QVector<QgsDataItem*> QgsDataItem::createChildren()
   return QVector<QgsDataItem*>();
 }
 
-void QgsDataItem::populate()
+void QgsDataItem::populate( bool foreground )
 {
   if ( state() == Populated || state() == Populating )
     return;
 
   QgsDebugMsg( "mPath = " + mPath );
 
-  if ( capabilities2() & QgsDataItem::Fast )
+  if ( capabilities2() & QgsDataItem::Fast || foreground )
   {
     populate( createChildren() );
   }
@@ -390,7 +390,7 @@ QVector<QgsDataItem*> QgsDataItem::runCreateChildren( QgsDataItem* item )
     QgsDebugMsg( "moveToThread child " + child->path() );
     child->moveToThread( QApplication::instance()->thread() ); // moves also children
   }
-  QgsDebugMsg( "finished path = " + item->path() );
+  QgsDebugMsg( QString( "finished path %1: %2 children" ).arg( item->path() ).arg( children.size() ) );
   return children;
 }
 
diff --git a/src/core/qgsdataitem.h b/src/core/qgsdataitem.h
@@ -241,7 +241,8 @@ class CORE_EXPORT QgsDataItem : public QObject
     virtual void deleteLater();
 
     // Populate children using children vector created by createChildren()
-    virtual void populate();
+    // @param foreground run createChildren in foreground
+    virtual void populate( bool foreground = false );
 
     /** Remove children recursively and set as not populated. This is used when refreshing collapsed items. */
     virtual void depopulate();
diff --git a/src/providers/ows/qgsowsdataitems.cpp b/src/providers/ows/qgsowsdataitems.cpp
@@ -69,7 +69,7 @@ QVector<QgsDataItem*> QgsOWSConnectionItem::createChildren()
       continue;
     }
 
-    item->populate();
+    item->populate( true ); // populate in foreground - this is already run in a thread
 
     layerCount += item->rowCount();
     if ( item->rowCount() > 0 )
diff --git a/src/providers/wms/qgswmsdataitems.cpp b/src/providers/wms/qgswmsdataitems.cpp
@@ -20,13 +20,9 @@
 #include "qgswmscapabilities.h"
 #include "qgswmsconnection.h"
 #include "qgswmssourceselect.h"
-
 #include "qgsnewhttpconnection.h"
-
 #include "qgstilescalewidget.h"
 
-#include "qgsapplication.h"
-
 // ---------------------------------------------------------------------------
 QgsWMSConnectionItem::QgsWMSConnectionItem( QgsDataItem* parent, QString name, QString path, QString uri )
     : QgsDataCollectionItem( parent, name, path )
@@ -46,19 +42,7 @@ QVector<QgsDataItem*> QgsWMSConnectionItem::createChildren()
 
   QgsDataSourceURI uri;
   uri.setEncodedUri( mUri );
-#if 0
-  if ( mPath.contains( "url=" ) )
-  {
-    encodedUri = mPath;
-    uri.setEncodedUri( encodedUri );
-  }
-  else
-  {
-    QgsWMSConnection connection( mName );
-    uri = connection.uri();
-    encodedUri = uri.encodedUri();
-  }
-#endif
+
   QgsDebugMsg( "mUri = " + mUri );
 
   QgsWmsSettings wmsSettings;
@@ -70,25 +54,6 @@ QVector<QgsDataItem*> QgsWMSConnectionItem::createChildren()
 
   QgsWmsCapabilitiesDownload capDownload( wmsSettings.baseUrl(), wmsSettings.authorization() );
 
-#if 0
-  QWidget *mainWindow = 0;
-
-  QWidgetList topLevelWidgets = qApp->topLevelWidgets();
-  for ( QWidgetList::iterator it = topLevelWidgets.begin(); it != topLevelWidgets.end(); ++it )
-  {
-    if (( *it )->objectName() == "QgisApp" )
-    {
-      mainWindow = *it;
-      break;
-    }
-  }
-
-  if ( mainWindow )
-  {
-    connect( &capDownload, SIGNAL( statusChanged( QString ) ), mainWindow, SLOT( showStatusMessage( QString ) ) );
-  }
-#endif
-
   bool res = capDownload.downloadCapabilities();
 
   if ( !res )
@@ -402,6 +367,7 @@ QWidget * QgsWMSRootItem::paramWidget()
   connect( select, SIGNAL( connectionsChanged() ), this, SLOT( connectionsChanged() ) );
   return select;
 }
+
 void QgsWMSRootItem::connectionsChanged()
 {
   refresh();

Original file line number	Diff line number	Diff line change
`@@ -7051,6 +7051,9 @@ void QgisApp::showMouseCoordinate( const QgsPoint & p )`
`7051`	`7051`	`{`
`7052`	`7052`	`if ( mMapCanvas->mapUnits() == QGis::Degrees )`
`7053`	`7053`	`{`
	`7054`	`+ if ( !mMapCanvas->mapSettings().destinationCrs().isValid() )`
	`7055`	`+ return;`
	`7056`	`+`
`7054`	`7057`	`QgsPoint geo = p;`
`7055`	`7058`	`if ( !mMapCanvas->mapSettings().destinationCrs().geographicFlag() )`
`7056`	`7059`	`{`
Original file line number	Diff line number	Diff line change
`@@ -350,14 +350,14 @@ QVector<QgsDataItem*> QgsDataItem::createChildren()`
`350`	`350`	`return QVector<QgsDataItem*>();`
`351`	`351`	`}`
`352`	`352`
`353`		`-void QgsDataItem::populate()`
	`353`	`+void QgsDataItem::populate( bool foreground )`
`354`	`354`	`{`
`355`	`355`	`if ( state() == Populated \|\| state() == Populating )`
`356`	`356`	`return;`
`357`	`357`
`358`	`358`	`QgsDebugMsg( "mPath = " + mPath );`
`359`	`359`
`360`		`- if ( capabilities2() & QgsDataItem::Fast )`
	`360`	`+ if ( capabilities2() & QgsDataItem::Fast \|\| foreground )`
`361`	`361`	`{`
`362`	`362`	`populate( createChildren() );`
`363`	`363`	`}`
`@@ -390,7 +390,7 @@ QVector<QgsDataItem> QgsDataItem::runCreateChildren( QgsDataItem item )`
`390`	`390`	`QgsDebugMsg( "moveToThread child " + child->path() );`
`391`	`391`	`child->moveToThread( QApplication::instance()->thread() ); // moves also children`
`392`	`392`	`}`
`393`		`- QgsDebugMsg( "finished path = " + item->path() );`
	`393`	`+ QgsDebugMsg( QString( "finished path %1: %2 children" ).arg( item->path() ).arg( children.size() ) );`
`394`	`394`	`return children;`
`395`	`395`	`}`
`396`	`396`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ QVector<QgsDataItem*> QgsOWSConnectionItem::createChildren()`
`69`	`69`	`continue;`
`70`	`70`	`}`
`71`	`71`
`72`		`- item->populate();`
	`72`	`+ item->populate( true ); // populate in foreground - this is already run in a thread`
`73`	`73`
`74`	`74`	`layerCount += item->rowCount();`
`75`	`75`	`if ( item->rowCount() > 0 )`