Singleton, code cleanups, more tests, error reporting

qgis · Jan 20, 2021 · 3024694 · 3024694
1 parent 5bdabd3
commit 3024694
Show file tree

Hide file tree

Showing 7 changed files with 370 additions and 154 deletions.
diff --git a/python/core/auto_generated/qgsapplication.sip.in b/python/core/auto_generated/qgsapplication.sip.in
@@ -789,9 +789,14 @@ Returns the application's classification methods registry, used in graduated ren
 %Docstring
 Returns the application's bookmark manager, used for storing installation-wide bookmarks.
 
+.. note::
+
+   not available in Python bindings
+
 .. versionadded:: 3.10
 %End
 
+
     static QgsStyleModel *defaultStyleModel();
 %Docstring
 Returns a shared QgsStyleModel containing the default style library (see :py:func:`QgsStyle.defaultStyle()`).

diff --git a/src/core/qgsapplication.cpp b/src/core/qgsapplication.cpp
@@ -51,6 +51,7 @@
 #include "qgsmessagelog.h"
 #include "qgsannotationregistry.h"
 #include "qgssettings.h"
+#include "qgstiledownloadmanager.h"
 #include "qgsunittypes.h"
 #include "qgsuserprofile.h"
 #include "qgsuserprofilemanager.h"
@@ -2276,6 +2277,11 @@ QgsBookmarkManager *QgsApplication::bookmarkManager()
   return members()->mBookmarkManager;
 }
 
+QgsTileDownloadManager *QgsApplication::tileDownloadManager()
+{
+  return members()->mTileDownloadManager;
+}
+
 QgsStyleModel *QgsApplication::defaultStyleModel()
 {
   return members()->mStyleModel;
@@ -2492,6 +2498,11 @@ QgsApplication::ApplicationMembers::ApplicationMembers()
     mBookmarkManager = new QgsBookmarkManager( nullptr );
     profiler->end();
   }
+  {
+    profiler->start( tr( "Setup tile download manager" ) );
+    mTileDownloadManager = new QgsTileDownloadManager();
+    profiler->end();
+  }
   {
     profiler->start( tr( "Setup scalebar registry" ) );
     mScaleBarRendererRegistry = new QgsScaleBarRendererRegistry();
@@ -2502,6 +2513,7 @@ QgsApplication::ApplicationMembers::ApplicationMembers()
 QgsApplication::ApplicationMembers::~ApplicationMembers()
 {
   delete mStyleModel;
+  delete mTileDownloadManager;
   delete mScaleBarRendererRegistry;
   delete mValidityCheckRegistry;
   delete mActionScopeRegistry;

diff --git a/src/core/qgsapplication.h b/src/core/qgsapplication.h
@@ -64,6 +64,7 @@ class QgsConnectionRegistry;
 class QgsScaleBarRendererRegistry;
 class Qgs3DSymbolRegistry;
 class QgsPointCloudRendererRegistry;
+class QgsTileDownloadManager;
 
 /**
  * \ingroup core
@@ -733,10 +734,17 @@ class CORE_EXPORT QgsApplication : public QApplication
 
     /**
      * Returns the application's bookmark manager, used for storing installation-wide bookmarks.
+     * \note not available in Python bindings
      * \since QGIS 3.10
      */
     static QgsBookmarkManager *bookmarkManager();
 
+    /**
+     * Returns the application's tile download manager, used for download of map tiles when rendering.
+     * \since QGIS 3.18
+     */
+    static QgsTileDownloadManager *tileDownloadManager() SIP_SKIP;
+
     /**
      * Returns a shared QgsStyleModel containing the default style library (see QgsStyle::defaultStyle()).
      *
@@ -1010,6 +1018,7 @@ class CORE_EXPORT QgsApplication : public QApplication
       QgsAnnotationItemRegistry *mAnnotationItemRegistry = nullptr;
       QgsUserProfileManager *mUserConfigManager = nullptr;
       QgsBookmarkManager *mBookmarkManager = nullptr;
+      QgsTileDownloadManager *mTileDownloadManager = nullptr;
       QgsStyleModel *mStyleModel = nullptr;
       QString mNullRepresentation;
       QStringList mSvgPathCache;