blakeridgway/supercell-wx
1
0
Fork 0
mirror of https://github.com/ciphervance/supercell-wx.git synced 2025-10-30 22:30:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move QGeoPositionInfoSource to non-GUI thread

Browse source
This commit is contained in:
Dan Paulat 2024-05-18 14:35:22 -05:00
parent f976e88359
commit 69309ca8e6
1 changed files with 36 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

48
scwx-qt/source/scwx/qt/manager/position_manager.cpp
View file

@ -1,5 +1,6 @@
#include <scwx/qt/manager/position_manager.hpp> #include <scwx/qt/manager/position_manager.hpp>
#include <scwx/qt/manager/settings_manager.hpp> #include <scwx/qt/manager/settings_manager.hpp>
#include <scwx/qt/manager/thread_manager.hpp>
#include <scwx/qt/settings/general_settings.hpp> #include <scwx/qt/settings/general_settings.hpp>
#include <scwx/qt/types/location_types.hpp> #include <scwx/qt/types/location_types.hpp>
#include <scwx/common/geographic.hpp> #include <scwx/common/geographic.hpp>
@ -9,6 +10,7 @@
#include <set> #include <set>
#include <boost/uuid/random_generator.hpp> #include <boost/uuid/random_generator.hpp>
#include <QAbstractEventDispatcher>
#include <QGeoPositionInfoSource> #include <QGeoPositionInfoSource>
namespace scwx namespace scwx
@ -29,11 +31,13 @@ public:
{ {
auto& generalSettings = settings::GeneralSettings::Instance(); auto& generalSettings = settings::GeneralSettings::Instance();
gpsParent_->moveToThread(gpsThread_);
logger_->debug( logger_->debug(
"Available sources: {}", "Available sources: {}",
QGeoPositionInfoSource::availableSources().join(", ").toStdString()); QGeoPositionInfoSource::availableSources().join(", ").toStdString());
CreatePositionSource(); CreatePositionSourceAsync();
positioningPluginCallbackUuid_ = positioningPluginCallbackUuid_ =
generalSettings.positioning_plugin().RegisterValueChangedCallback( generalSettings.positioning_plugin().RegisterValueChangedCallback(
@ -55,7 +59,7 @@ public:
{ {
if (createPositionSourcePending_) if (createPositionSourcePending_)
{ {
CreatePositionSource(); CreatePositionSourceAsync();
} }
}); });
} }
@ -69,11 +73,16 @@ public:
nmeaBaudRateCallbackUuid_); nmeaBaudRateCallbackUuid_);
generalSettings.nmea_source().UnregisterValueChangedCallback( generalSettings.nmea_source().UnregisterValueChangedCallback(
nmeaSourceCallbackUuid_); nmeaSourceCallbackUuid_);
gpsParent_->deleteLater();
} }
void CreatePositionSource(); void CreatePositionSource();
void CreatePositionSourceAsync();
void EnablePositionUpdates(boost::uuids::uuid uuid, bool enabled);
PositionManager* self_; PositionManager* self_;
QThread* gpsThread_ {ThreadManager::Instance().thread("position_manager")};
boost::uuids::uuid trackingUuid_; boost::uuids::uuid trackingUuid_;
bool trackingEnabled_ {false}; bool trackingEnabled_ {false};
@ -82,6 +91,7 @@ public:
std::mutex positionSourceMutex_ {}; std::mutex positionSourceMutex_ {};
QObject* gpsParent_ {new QObject};
QGeoPositionInfoSource* geoPositionInfoSource_ {}; QGeoPositionInfoSource* geoPositionInfoSource_ {};
QGeoPositionInfo position_ {}; QGeoPositionInfo position_ {};
@ -110,6 +120,12 @@ bool PositionManager::IsLocationTracked()
return p->trackingEnabled_; return p->trackingEnabled_;
} }
void PositionManager::Impl::CreatePositionSourceAsync()
{
QMetaObject::invokeMethod(QAbstractEventDispatcher::instance(gpsThread_),
[this]() { CreatePositionSource(); });
}
void PositionManager::Impl::CreatePositionSource() void PositionManager::Impl::CreatePositionSource()
{ {
auto& generalSettings = settings::GeneralSettings::Instance(); auto& generalSettings = settings::GeneralSettings::Instance();
@ -132,7 +148,7 @@ void PositionManager::Impl::CreatePositionSource()
// TODO: macOS requires permission // TODO: macOS requires permission
if (positioningPlugin == types::PositioningPlugin::Default) if (positioningPlugin == types::PositioningPlugin::Default)
{ {
positionSource = QGeoPositionInfoSource::createDefaultSource(self_); positionSource = QGeoPositionInfoSource::createDefaultSource(gpsParent_);
} }
else if (positioningPlugin == types::PositioningPlugin::Nmea) else if (positioningPlugin == types::PositioningPlugin::Nmea)
{ {
@ -141,7 +157,7 @@ void PositionManager::Impl::CreatePositionSource()
params["nmea.baudrate"] = static_cast<int>(nmeaBaudRate); params["nmea.baudrate"] = static_cast<int>(nmeaBaudRate);
positionSource = positionSource =
QGeoPositionInfoSource::createSource("nmea", params, self_); QGeoPositionInfoSource::createSource("nmea", params, gpsParent_);
} }
if (positionSource != nullptr) if (positionSource != nullptr)
@ -198,29 +214,37 @@ void PositionManager::Impl::CreatePositionSource()
void PositionManager::EnablePositionUpdates(boost::uuids::uuid uuid, void PositionManager::EnablePositionUpdates(boost::uuids::uuid uuid,
bool enabled) bool enabled)
{ {
std::unique_lock lock {p->positionSourceMutex_}; QMetaObject::invokeMethod(QAbstractEventDispatcher::instance(p->gpsThread_),
[=, this]()
{ p->EnablePositionUpdates(uuid, enabled); });
}
if (p->geoPositionInfoSource_ == nullptr) void PositionManager::Impl::EnablePositionUpdates(boost::uuids::uuid uuid,
bool enabled)
{
std::unique_lock lock {positionSourceMutex_};
if (geoPositionInfoSource_ == nullptr)
{ {
return; return;
} }
if (enabled) if (enabled)
{ {
if (p->uuids_.empty()) if (uuids_.empty())
{ {
p->geoPositionInfoSource_->startUpdates(); geoPositionInfoSource_->startUpdates();
} }
p->uuids_.insert(uuid); uuids_.insert(uuid);
} }
else else
{ {
p->uuids_.erase(uuid); uuids_.erase(uuid);
if (p->uuids_.empty()) if (uuids_.empty())
{ {
p->geoPositionInfoSource_->stopUpdates(); geoPositionInfoSource_->stopUpdates();
} }
} }
} }