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

Alert layer warning cleanup

Browse source
This commit is contained in:
Dan Paulat 2025-05-04 23:05:36 -05:00
parent 671ec1d658
commit f40c24ce6f
2 changed files with 31 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -19,12 +19,9 @@
#include <boost/container/stable_vector.hpp> #include <boost/container/stable_vector.hpp>
#include <boost/container_hash/hash.hpp> #include <boost/container_hash/hash.hpp>
#include <QEvent> #include <QEvent>
#include <utility>
namespace scwx namespace scwx::qt::map
{
namespace qt
{
namespace map
{ {
static const std::string logPrefix_ = "scwx::qt::map::alert_layer"; static const std::string logPrefix_ = "scwx::qt::map::alert_layer";
@ -46,6 +43,8 @@ static bool IsAlertActive(const std::shared_ptr<const awips::Segment>& segment);
class AlertLayerHandler : public QObject class AlertLayerHandler : public QObject
{ {
Q_OBJECT Q_OBJECT
Q_DISABLE_COPY_MOVE(AlertLayerHandler)
public: public:
struct SegmentRecord struct SegmentRecord
{ {
@ -57,10 +56,10 @@ public:
SegmentRecord( SegmentRecord(
const std::shared_ptr<const awips::Segment>& segment, const std::shared_ptr<const awips::Segment>& segment,
const types::TextEventKey& key, types::TextEventKey key,
const std::shared_ptr<const awips::TextProductMessage>& message) : const std::shared_ptr<const awips::TextProductMessage>& message) :
segment_ {segment}, segment_ {segment},
key_ {key}, key_ {std::move(key)},
message_ {message}, message_ {message},
segmentBegin_ {segment->event_begin()}, segmentBegin_ {segment->event_begin()},
segmentEnd_ {segment->event_end()} segmentEnd_ {segment->event_end()}
@ -161,6 +160,11 @@ public:
std::unique_lock lock(linesMutex_); std::unique_lock lock(linesMutex_);
}; };
Impl(const Impl&) = delete;
Impl& operator=(const Impl&) = delete;
Impl(const Impl&&) = delete;
Impl& operator=(const Impl&&) = delete;
void AddAlert( void AddAlert(
const std::shared_ptr<AlertLayerHandler::SegmentRecord>& segmentRecord); const std::shared_ptr<AlertLayerHandler::SegmentRecord>& segmentRecord);
void UpdateAlert( void UpdateAlert(
@ -182,14 +186,14 @@ public:
std::shared_ptr<gl::draw::GeoLineDrawItem>& di, std::shared_ptr<gl::draw::GeoLineDrawItem>& di,
const common::Coordinate& p1, const common::Coordinate& p1,
const common::Coordinate& p2, const common::Coordinate& p2,
boost::gil::rgba32f_pixel_t color, const boost::gil::rgba32f_pixel_t& color,
float width, float width,
std::chrono::system_clock::time_point startTime, std::chrono::system_clock::time_point startTime,
std::chrono::system_clock::time_point endTime, std::chrono::system_clock::time_point endTime,
bool enableHover); bool enableHover);
void AddLines(std::shared_ptr<gl::draw::GeoLines>& geoLines, void AddLines(std::shared_ptr<gl::draw::GeoLines>& geoLines,
const std::vector<common::Coordinate>& coordinates, const std::vector<common::Coordinate>& coordinates,
boost::gil::rgba32f_pixel_t color, const boost::gil::rgba32f_pixel_t& color,
float width, float width,
std::chrono::system_clock::time_point startTime, std::chrono::system_clock::time_point startTime,
std::chrono::system_clock::time_point endTime, std::chrono::system_clock::time_point endTime,
@ -238,7 +242,7 @@ public:
std::vector<boost::signals2::scoped_connection> connections_ {}; std::vector<boost::signals2::scoped_connection> connections_ {};
}; };
AlertLayer::AlertLayer(std::shared_ptr<MapContext> context, AlertLayer::AlertLayer(const std::shared_ptr<MapContext>& context,
awips::Phenomenon phenomenon) : awips::Phenomenon phenomenon) :
DrawLayer( DrawLayer(
context, context,
@ -620,9 +624,9 @@ void AlertLayer::Impl::AddAlert(
// If draw items were added // If draw items were added
if (drawItems.second) if (drawItems.second)
{ {
const float borderWidth = lineData.borderWidth_; const float borderWidth = static_cast<float>(lineData.borderWidth_);
const float highlightWidth = lineData.highlightWidth_; const float highlightWidth = static_cast<float>(lineData.highlightWidth_);
const float lineWidth = lineData.lineWidth_; const float lineWidth = static_cast<float>(lineData.lineWidth_);
const float totalHighlightWidth = lineWidth + (highlightWidth * 2.0f); const float totalHighlightWidth = lineWidth + (highlightWidth * 2.0f);
const float totalBorderWidth = totalHighlightWidth + (borderWidth * 2.0f); const float totalBorderWidth = totalHighlightWidth + (borderWidth * 2.0f);
@ -699,7 +703,7 @@ void AlertLayer::Impl::UpdateAlert(
void AlertLayer::Impl::AddLines( void AlertLayer::Impl::AddLines(
std::shared_ptr<gl::draw::GeoLines>& geoLines, std::shared_ptr<gl::draw::GeoLines>& geoLines,
const std::vector<common::Coordinate>& coordinates, const std::vector<common::Coordinate>& coordinates,
boost::gil::rgba32f_pixel_t color, const boost::gil::rgba32f_pixel_t& color,
float width, float width,
std::chrono::system_clock::time_point startTime, std::chrono::system_clock::time_point startTime,
std::chrono::system_clock::time_point endTime, std::chrono::system_clock::time_point endTime,
@ -739,14 +743,17 @@ void AlertLayer::Impl::AddLine(std::shared_ptr<gl::draw::GeoLines>& geoLines,
std::shared_ptr<gl::draw::GeoLineDrawItem>& di, std::shared_ptr<gl::draw::GeoLineDrawItem>& di,
const common::Coordinate& p1, const common::Coordinate& p1,
const common::Coordinate& p2, const common::Coordinate& p2,
boost::gil::rgba32f_pixel_t color, const boost::gil::rgba32f_pixel_t& color,
float width, float width,
std::chrono::system_clock::time_point startTime, std::chrono::system_clock::time_point startTime,
std::chrono::system_clock::time_point endTime, std::chrono::system_clock::time_point endTime,
bool enableHover) bool enableHover)
{ {
geoLines->SetLineLocation( geoLines->SetLineLocation(di,
di, p1.latitude_, p1.longitude_, p2.latitude_, p2.longitude_); static_cast<float>(p1.latitude_),
static_cast<float>(p1.longitude_),
static_cast<float>(p2.latitude_),
static_cast<float>(p2.longitude_));
geoLines->SetLineModulate(di, color); geoLines->SetLineModulate(di, color);
geoLines->SetLineWidth(di, width); geoLines->SetLineWidth(di, width);
geoLines->SetLineStartTime(di, startTime); geoLines->SetLineStartTime(di, startTime);
@ -805,9 +812,9 @@ void AlertLayer::Impl::UpdateLines()
auto& lineData = GetLineData(segment, alertActive); auto& lineData = GetLineData(segment, alertActive);
auto& geoLines = geoLines_.at(alertActive); auto& geoLines = geoLines_.at(alertActive);
const float borderWidth = lineData.borderWidth_; const float borderWidth = static_cast<float>(lineData.borderWidth_);
const float highlightWidth = lineData.highlightWidth_; const float highlightWidth = static_cast<float>(lineData.highlightWidth_);
const float lineWidth = lineData.lineWidth_; const float lineWidth = static_cast<float>(lineData.lineWidth_);
const float totalHighlightWidth = lineWidth + (highlightWidth * 2.0f); const float totalHighlightWidth = lineWidth + (highlightWidth * 2.0f);
const float totalBorderWidth = totalHighlightWidth + (borderWidth * 2.0f); const float totalBorderWidth = totalHighlightWidth + (borderWidth * 2.0f);
@ -982,8 +989,6 @@ size_t AlertTypeHash<std::pair<awips::Phenomenon, bool>>::operator()(
return seed; return seed;
} }
} // namespace map } // namespace scwx::qt::map
} // namespace qt
} // namespace scwx
#include "alert_layer.moc" #include "alert_layer.moc"

2
scwx-qt/source/scwx/qt/map/alert_layer.hpp
View file

@ -22,7 +22,7 @@ class AlertLayer : public DrawLayer
Q_DISABLE_COPY_MOVE(AlertLayer) Q_DISABLE_COPY_MOVE(AlertLayer)
public: public:
explicit AlertLayer(std::shared_ptr<MapContext> context, explicit AlertLayer(const std::shared_ptr<MapContext>& context,
scwx::awips::Phenomenon phenomenon); scwx::awips::Phenomenon phenomenon);
~AlertLayer(); ~AlertLayer();