QtLocationPlugin: Update TileCacheWorker

mavlink · Aug 27, 2024 · 2de885a · 2de885a
1 parent b822875
commit 2de885a
Show file tree

Hide file tree

Showing 7 changed files with 1,411 additions and 932 deletions.
diff --git a/src/QtLocationPlugin/CMakeLists.txt b/src/QtLocationPlugin/CMakeLists.txt
@@ -26,6 +26,8 @@ qt_add_plugin(QGCLocation STATIC
     QGCMapUrlEngine.cpp
     QGCMapUrlEngine.h
     QGCTile.h
+    QGCTileCacheDB.cpp
+    QGCTileCacheDB.h
     QGCTileCacheWorker.cpp
     QGCTileCacheWorker.h
     QGCTileSet.h
@@ -53,6 +55,7 @@ endif()
 target_link_libraries(QGCLocation
     PRIVATE
         Qt6::Positioning
+        Qt6::Sql
         QGC
         Settings
         Utilities
@@ -61,7 +64,6 @@ target_link_libraries(QGCLocation
         Qt6::Location
         Qt6::LocationPrivate
         Qt6::Network
-        Qt6::Sql
         QmlControls
 )
 

diff --git a/src/QtLocationPlugin/QGCMapEngine.cpp b/src/QtLocationPlugin/QGCMapEngine.cpp
@@ -29,6 +29,8 @@
 #include <QtCore/qapplicationstatic.h>
 #include <QtCore/QStandardPaths>
 #include <QtCore/QDir>
+#include <QtCore/QThread>
+#include <qnamespace.h>
 
 #define CACHE_PATH_VERSION "300"
 
@@ -51,23 +53,27 @@ QGCMapEngine* QGCMapEngine::instance()
 QGCMapEngine::QGCMapEngine(QObject *parent)
     : QObject(parent)
     , m_worker(new QGCCacheWorker(this))
+    // , m_thread(new QThread(this))
 {
     // qCDebug(QGCMapEngineLog) << Q_FUNC_INFO << this;
 
-    (void) qRegisterMetaType<QGCMapTask::TaskType>();
-    (void) qRegisterMetaType<QGCTile>();
-    (void) qRegisterMetaType<QList<QGCTile*>>();
-    (void) qRegisterMetaType<QGCTileSet>();
-    (void) qRegisterMetaType<QGCCacheTile>();
+    (void) qRegisterMetaType<QGCMapTask::TaskType>("GCMapTask::TaskType");
+    (void) qRegisterMetaType<QGCTile>("QGCTile");
+    (void) qRegisterMetaType<QList<QGCTile*>>("QList<QGCTile*>");
+    (void) qRegisterMetaType<QGCTileSet>("QGCTileSet");
+    (void) qRegisterMetaType<QGCCacheTile>("QGCCacheTile");
 
-    (void) connect(m_worker, &QGCCacheWorker::updateTotals, this, &QGCMapEngine::_updateTotals);
+    // m_worker->moveToThread(m_thread);
+    (void) connect(m_worker, &QGCCacheWorker::updateTotals, this, &QGCMapEngine::_updateTotals, Qt::AutoConnection);
+    // m_thread->start();
 }
 
 QGCMapEngine::~QGCMapEngine()
 {
     (void) disconnect(m_worker);
-    m_worker->quit();
-    m_worker->wait();
+    (void) QMetaObject::invokeMethod(m_worker, "stop", Qt::AutoConnection);
+    m_worker->stop();
+    (void) m_worker->wait();
 
     // qCDebug(QGCMapEngineLog) << Q_FUNC_INFO << this;
 }
@@ -96,7 +102,7 @@ void QGCMapEngine::init()
     m_cachePath = cacheDir;
     if (!m_cachePath.isEmpty()) {
         const QString databaseFilePath(m_cachePath + "/" + QGeoFileTileCacheQGC::getCacheFilename());
-        m_worker->setDatabaseFile(databaseFilePath);
+        m_worker->setDatabaseFilePath(databaseFilePath);
 
         qCDebug(QGCMapEngineLog) << "Map Cache in:" << databaseFilePath;
     } else {
@@ -115,7 +121,9 @@ void QGCMapEngine::init()
 
 bool QGCMapEngine::addTask(QGCMapTask *task)
 {
-    return m_worker->enqueueTask(task);
+    bool result;
+    (void) QMetaObject::invokeMethod(m_worker, "enqueueTask", Qt::AutoConnection, qReturnArg(result), task);
+    return result;
 }
 
 bool QGCMapEngine::_wipeDirectory(const QString &dirPath)

diff --git a/src/QtLocationPlugin/QGCMapEngine.h b/src/QtLocationPlugin/QGCMapEngine.h
@@ -26,6 +26,7 @@ Q_DECLARE_LOGGING_CATEGORY(QGCMapEngineLog)
 
 class QGCMapTask;
 class QGCCacheWorker;
+class QThread;
 
 class QGCMapEngine : public QObject
 {
@@ -57,6 +58,7 @@ private slots:
     bool m_prunning = false;
     bool m_cacheWasReset = false;
     QString m_cachePath;
+    QThread *m_thread = nullptr;
 };
 
 QGCMapEngine* getQGCMapEngine();