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

Move MarkerManager to using an ID system for markers, instead of index

Browse source
This commit is contained in:
AdenKoperczak 2024-11-03 14:16:56 -05:00
parent 236d7c1e35
commit 7a070b3e7f
8 changed files with 233 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

85
scwx-qt/source/scwx/qt/manager/marker_manager.cpp
View file

@ -38,6 +38,8 @@ public:
std::string markerSettingsPath_ {""};
std::vector<std::shared_ptr<MarkerRecord>> markerRecords_ {};
std::unordered_map<types::MarkerId, size_t> idToIndex_ {};
MarkerManager* self_;
@ -48,6 +50,10 @@ public:
void ReadMarkerSettings();
void WriteMarkerSettings();
std::shared_ptr<MarkerRecord> GetMarkerByName(const std::string& name);
void InitalizeIds();
types::MarkerId NewId();
types::MarkerId lastId_;
};
class MarkerManager::Impl::MarkerRecord
@ -88,6 +94,16 @@ public:
}
};
void MarkerManager::Impl::InitalizeIds()
{
lastId_ = 0;
}
types::MarkerId MarkerManager::Impl::NewId()
{
return ++lastId_;
}
void MarkerManager::Impl::InitializeMarkerSettings()
{
std::string appDataPath {
@ -109,6 +125,7 @@ void MarkerManager::Impl::InitializeMarkerSettings()
void MarkerManager::Impl::ReadMarkerSettings()
{
logger_->info("Reading location marker settings");
InitalizeIds();
boost::json::value markerJson = nullptr;
{
@ -125,6 +142,7 @@ void MarkerManager::Impl::ReadMarkerSettings()
// For each marker entry
auto& markerArray = markerJson.as_array();
markerRecords_.reserve(markerArray.size());
idToIndex_.reserve(markerArray.size());
for (auto& markerEntry : markerArray)
{
try
@ -134,8 +152,12 @@ void MarkerManager::Impl::ReadMarkerSettings()
if (!record.markerInfo_.name.empty())
{
types::MarkerId id = NewId();
size_t index = markerRecords_.size();
record.markerInfo_.id = id;
markerRecords_.emplace_back(
std::make_shared<MarkerRecord>(record.markerInfo_));
idToIndex_.emplace(id, index);
}
}
catch (const std::exception& ex)
@ -206,11 +228,17 @@ size_t MarkerManager::marker_count()
return p->markerRecords_.size();
}
std::optional<types::MarkerInfo> MarkerManager::get_marker(size_t index)
std::optional<types::MarkerInfo> MarkerManager::get_marker(types::MarkerId id)
{
std::shared_lock lock(p->markerRecordLock_);
if (!p->idToIndex_.contains(id))
{
return {};
}
size_t index = p->idToIndex_[id];
if (index >= p->markerRecords_.size())
{
logger_->warn("id in idToIndex_ but out of range!");
return {};
}
std::shared_ptr<MarkerManager::Impl::MarkerRecord>& markerRecord =
@ -218,45 +246,81 @@ std::optional<types::MarkerInfo> MarkerManager::get_marker(size_t index)
return markerRecord->toMarkerInfo();
}
void MarkerManager::set_marker(size_t index, const types::MarkerInfo& marker)
std::optional<size_t> MarkerManager::get_index(types::MarkerId id)
{
std::shared_lock lock(p->markerRecordLock_);
if (!p->idToIndex_.contains(id))
{
return {};
}
return p->idToIndex_[id];
}
void MarkerManager::set_marker(types::MarkerId id, const types::MarkerInfo& marker)
{
{
std::unique_lock lock(p->markerRecordLock_);
if (!p->idToIndex_.contains(id))
{
return;
}
size_t index = p->idToIndex_[id];
if (index >= p->markerRecords_.size())
{
logger_->warn("id in idToIndex_ but out of range!");
return;
}
std::shared_ptr<MarkerManager::Impl::MarkerRecord>& markerRecord =
p->markerRecords_[index];
markerRecord->markerInfo_ = marker;
}
Q_EMIT MarkerChanged(index);
Q_EMIT MarkerChanged(id);
Q_EMIT MarkersUpdated();
}
void MarkerManager::add_marker(const types::MarkerInfo& marker)
{
types::MarkerId id;
{
std::unique_lock lock(p->markerRecordLock_);
id = p->NewId();
size_t index = p->markerRecords_.size();
p->idToIndex_.emplace(id, index);
p->markerRecords_.emplace_back(std::make_shared<Impl::MarkerRecord>(marker));
p->markerRecords_[index]->markerInfo_.id = id;
}
Q_EMIT MarkerAdded();
Q_EMIT MarkerAdded(id);
Q_EMIT MarkersUpdated();
}
void MarkerManager::remove_marker(size_t index)
void MarkerManager::remove_marker(types::MarkerId id)
{
{
std::unique_lock lock(p->markerRecordLock_);
if (!p->idToIndex_.contains(id))
{
return;
}
size_t index = p->idToIndex_[id];
if (index >= p->markerRecords_.size())
{
logger_->warn("id in idToIndex_ but out of range!");
return;
}
p->markerRecords_.erase(std::next(p->markerRecords_.begin(), index));
p->idToIndex_.erase(id);
for (auto& pair : p->idToIndex_)
{
if (pair.second > index)
{
p->idToIndex_[pair.first] = pair.second - 1;
}
}
}
Q_EMIT MarkerRemoved(index);
Q_EMIT MarkerRemoved(id);
Q_EMIT MarkersUpdated();
}
@ -292,6 +356,15 @@ void MarkerManager::move_marker(size_t from, size_t to)
Q_EMIT MarkersUpdated();
}
void MarkerManager::for_each(std::function<MarkerForEachFunc> func)
{
std::shared_lock lock(p->markerRecordLock_);
for (auto marker : p->markerRecords_)
{
func(marker->markerInfo_);
}
}
// Only use for testing
void MarkerManager::set_marker_settings_path(const std::string& path)
{

16
scwx-qt/source/scwx/qt/manager/marker_manager.hpp
View file

@ -12,6 +12,7 @@ namespace qt
namespace manager
{
typedef void MarkerForEachFunc(const types::MarkerInfo&);
class MarkerManager : public QObject
{
Q_OBJECT
@ -21,12 +22,15 @@ public:
~MarkerManager();
size_t marker_count();
std::optional<types::MarkerInfo> get_marker(size_t index);
void set_marker(size_t index, const types::MarkerInfo& marker);
std::optional<types::MarkerInfo> get_marker(types::MarkerId id);
std::optional<size_t> get_index(types::MarkerId id);
void set_marker(types::MarkerId id, const types::MarkerInfo& marker);
void add_marker(const types::MarkerInfo& marker);
void remove_marker(size_t index);
void remove_marker(types::MarkerId id);
void move_marker(size_t from, size_t to);
void for_each(std::function<MarkerForEachFunc> func);
// Only use for testing
void set_marker_settings_path(const std::string& path);
@ -35,9 +39,9 @@ public:
signals:
void MarkersInitialized(size_t count);
void MarkersUpdated();
void MarkerChanged(size_t index);
void MarkerAdded();
void MarkerRemoved(size_t index);
void MarkerChanged(types::MarkerId id);
void MarkerAdded(types::MarkerId id);
void MarkerRemoved(types::MarkerId id);
private:
class Impl;