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

Use new alert layers

Browse source
This commit is contained in:
Dan Paulat 2024-07-16 23:44:23 -05:00
parent 204e2e8a0e
commit a219b1eca4
1 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

13
scwx-qt/source/scwx/qt/map/map_widget.cpp
View file

@ -4,7 +4,7 @@
#include <scwx/qt/manager/hotkey_manager.hpp> #include <scwx/qt/manager/hotkey_manager.hpp>
#include <scwx/qt/manager/placefile_manager.hpp> #include <scwx/qt/manager/placefile_manager.hpp>
#include <scwx/qt/manager/radar_product_manager.hpp> #include <scwx/qt/manager/radar_product_manager.hpp>
#include <scwx/qt/map/alert_layer_old.hpp> #include <scwx/qt/map/alert_layer.hpp>
#include <scwx/qt/map/color_table_layer.hpp> #include <scwx/qt/map/color_table_layer.hpp>
#include <scwx/qt/map/layer_wrapper.hpp> #include <scwx/qt/map/layer_wrapper.hpp>
#include <scwx/qt/map/map_provider.hpp> #include <scwx/qt/map/map_provider.hpp>
@ -79,7 +79,6 @@ public:
imGuiRendererInitialized_ {false}, imGuiRendererInitialized_ {false},
radarProductManager_ {nullptr}, radarProductManager_ {nullptr},
radarProductLayer_ {nullptr}, radarProductLayer_ {nullptr},
alertLayer_ {std::make_shared<AlertLayerOld>(context_)},
overlayLayer_ {nullptr}, overlayLayer_ {nullptr},
placefileLayer_ {nullptr}, placefileLayer_ {nullptr},
colorTableLayer_ {nullptr}, colorTableLayer_ {nullptr},
@ -218,7 +217,6 @@ public:
std::shared_ptr<manager::RadarProductManager> radarProductManager_; std::shared_ptr<manager::RadarProductManager> radarProductManager_;
std::shared_ptr<RadarProductLayer> radarProductLayer_; std::shared_ptr<RadarProductLayer> radarProductLayer_;
std::shared_ptr<AlertLayerOld> alertLayer_;
std::shared_ptr<OverlayLayer> overlayLayer_; std::shared_ptr<OverlayLayer> overlayLayer_;
std::shared_ptr<OverlayProductLayer> overlayProductLayer_ {nullptr}; std::shared_ptr<OverlayProductLayer> overlayProductLayer_ {nullptr};
std::shared_ptr<PlacefileLayer> placefileLayer_; std::shared_ptr<PlacefileLayer> placefileLayer_;
@ -1180,10 +1178,11 @@ void MapWidgetImpl::AddLayer(types::LayerType type,
} }
else if (type == types::LayerType::Alert) else if (type == types::LayerType::Alert)
{ {
// Add the alert layer for the phenomenon auto phenomenon = std::get<awips::Phenomenon>(description);
auto newLayers = alertLayer_->AddLayers(
std::get<awips::Phenomenon>(description), before); AddLayer(fmt::format("alert.{}", awips::GetPhenomenonCode(phenomenon)),
layerList_.insert(layerList_.end(), newLayers.cbegin(), newLayers.cend()); std::make_shared<AlertLayer>(context_, phenomenon),
before);
} }
else if (type == types::LayerType::Placefile) else if (type == types::LayerType::Placefile)
{ {