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

Don't differentiate borders

Browse source
This commit is contained in:
Dan Paulat 2024-07-08 23:01:39 -05:00
parent b2d648e960
commit c60f10707f
1 changed files with 2 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

9
scwx-qt/source/scwx/qt/map/alert_layer.cpp
View file

@ -109,8 +109,6 @@ public:
explicit Impl(std::shared_ptr<MapContext> context, explicit Impl(std::shared_ptr<MapContext> context,
awips::Phenomenon phenomenon) : awips::Phenomenon phenomenon) :
phenomenon_ {phenomenon}, phenomenon_ {phenomenon},
borders_ {{false, std::make_shared<gl::draw::GeoLines>(context)},
{true, std::make_shared<gl::draw::GeoLines>(context)}},
lines_ {{false, std::make_shared<gl::draw::GeoLines>(context)}, lines_ {{false, std::make_shared<gl::draw::GeoLines>(context)},
{true, std::make_shared<gl::draw::GeoLines>(context)}} {true, std::make_shared<gl::draw::GeoLines>(context)}}
{ {
@ -156,7 +154,6 @@ public:
std::unique_ptr<QObject> receiver_ {std::make_unique<QObject>()}; std::unique_ptr<QObject> receiver_ {std::make_unique<QObject>()};
std::unordered_map<bool, std::shared_ptr<gl::draw::GeoLines>> borders_;
std::unordered_map<bool, std::shared_ptr<gl::draw::GeoLines>> lines_; std::unordered_map<bool, std::shared_ptr<gl::draw::GeoLines>> lines_;
std::unordered_map<bool, boost::gil::rgba8_pixel_t> lineColor_; std::unordered_map<bool, boost::gil::rgba8_pixel_t> lineColor_;
@ -168,10 +165,8 @@ AlertLayer::AlertLayer(std::shared_ptr<MapContext> context,
{ {
for (auto alertActive : {false, true}) for (auto alertActive : {false, true})
{ {
auto& borders = p->borders_.at(alertActive);
auto& lines = p->lines_.at(alertActive); auto& lines = p->lines_.at(alertActive);
AddDrawItem(borders);
AddDrawItem(lines); AddDrawItem(lines);
} }
} }
@ -186,12 +181,8 @@ void AlertLayer::Initialize()
for (auto alertActive : {false, true}) for (auto alertActive : {false, true})
{ {
auto& borders = p->borders_.at(alertActive);
auto& lines = p->lines_.at(alertActive); auto& lines = p->lines_.at(alertActive);
borders->StartLines();
borders->FinishLines();
lines->StartLines(); lines->StartLines();
lines->FinishLines(); lines->FinishLines();
} }