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

Reformat marker formats after rename

Browse source
This commit is contained in:
AdenKoperczak 2024-10-05 09:24:14 -04:00
parent 31940441ed
commit 74f3a15eb2
3 changed files with 19 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -42,7 +42,6 @@ public:
void ReadMarkerSettings(); void ReadMarkerSettings();
void WriteMarkerSettings(); void WriteMarkerSettings();
std::shared_ptr<MarkerRecord> GetMarkerByName(const std::string& name); std::shared_ptr<MarkerRecord> GetMarkerByName(const std::string& name);
}; };
class MarkerManager::Impl::MarkerRecord class MarkerManager::Impl::MarkerRecord
@ -76,7 +75,6 @@ public:
} }
}; };
void MarkerManager::Impl::InitializeMarkerSettings() void MarkerManager::Impl::InitializeMarkerSettings()
{ {
std::string appDataPath { std::string appDataPath {
@ -235,9 +233,7 @@ void MarkerManager::move_marker(size_t from, size_t to)
std::shared_ptr<MarkerManager::Impl::MarkerRecord> markerRecord = std::shared_ptr<MarkerManager::Impl::MarkerRecord> markerRecord =
p->markerRecords_[from]; p->markerRecords_[from];
if (from == to) if (from == to) {}
{
}
else if (from < to) else if (from < to)
{ {
for (size_t i = from; i < to; i++) for (size_t i = from; i < to; i++)
@ -260,7 +256,8 @@ std::shared_ptr<MarkerManager> MarkerManager::Instance()
{ {
static std::weak_ptr<MarkerManager> markerManagerReference_ {}; static std::weak_ptr<MarkerManager> markerManagerReference_ {};
std::shared_ptr<MarkerManager> markerManager = markerManagerReference_.lock(); std::shared_ptr<MarkerManager> markerManager =
markerManagerReference_.lock();
if (markerManager == nullptr) if (markerManager == nullptr)
{ {

8
scwx-qt/source/scwx/qt/map/marker_layer.cpp
View file

@ -15,7 +15,6 @@ namespace map
static const std::string logPrefix_ = "scwx::qt::map::marker_layer"; static const std::string logPrefix_ = "scwx::qt::map::marker_layer";
static const auto logger_ = scwx::util::Logger::Create(logPrefix_); static const auto logger_ = scwx::util::Logger::Create(logPrefix_);
class MarkerLayer::Impl class MarkerLayer::Impl
{ {
public: public:
@ -51,8 +50,7 @@ void MarkerLayer::Impl::ReloadMarkers()
} }
MarkerLayer::MarkerLayer(const std::shared_ptr<MapContext>& context) : MarkerLayer::MarkerLayer(const std::shared_ptr<MapContext>& context) :
DrawLayer(context), DrawLayer(context), p(std::make_unique<MarkerLayer::Impl>(context))
p(std::make_unique<MarkerLayer::Impl>(context))
{ {
AddDrawItem(p->geoIcons_); AddDrawItem(p->geoIcons_);
} }
@ -69,8 +67,7 @@ void MarkerLayer::Initialize()
p->geoIcons_->FinishIconSheets(); p->geoIcons_->FinishIconSheets();
} }
void MarkerLayer::Render( void MarkerLayer::Render(const QMapLibre::CustomLayerRenderParameters& params)
const QMapLibre::CustomLayerRenderParameters& params)
{ {
// auto markerManager = manager::MarkerManager::Instance(); // auto markerManager = manager::MarkerManager::Instance();
gl::OpenGLFunctions& gl = context()->gl(); gl::OpenGLFunctions& gl = context()->gl();
@ -93,4 +90,3 @@ void MarkerLayer::Deinitialize()
} // namespace map } // namespace map
} // namespace qt } // namespace qt
} // namespace scwx } // namespace scwx