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

Change tick display for past vs. forecast data

Browse source
This commit is contained in:
Dan Paulat 2024-02-17 23:35:08 -06:00
parent 900267b16f
commit 7de1b1d57d
3 changed files with 86 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

40
scwx-qt/source/scwx/qt/gl/draw/linked_vectors.cpp
View file

@ -50,6 +50,10 @@ struct LinkedVectorDrawItem
float width_ {5.0f};
bool visible_ {true};
std::string hoverText_ {};
bool ticksEnabled_ {false};
units::length::nautical_miles<double> tickRadius_ {1.0};
units::length::nautical_miles<double> tickRadiusIncrement_ {0.0};
};
class LinkedVectors::Impl
@ -69,10 +73,6 @@ public:
std::vector<std::shared_ptr<LinkedVectorDrawItem>> vectorList_ {};
std::shared_ptr<GeoLines> geoLines_;
bool ticksEnabled_ {false};
units::length::nautical_miles<double> tickRadius_ {1.0};
units::length::nautical_miles<double> tickRadiusIncrement_ {1.0};
};
LinkedVectors::LinkedVectors(std::shared_ptr<GlContext> context) :
@ -176,6 +176,26 @@ void LinkedVectors::SetVectorHoverText(
di->hoverText_ = text;
}
void LinkedVectors::SetVectorTicksEnabled(
const std::shared_ptr<LinkedVectorDrawItem>& di, bool enabled)
{
di->ticksEnabled_ = enabled;
}
void LinkedVectors::SetVectorTickRadius(
const std::shared_ptr<LinkedVectorDrawItem>& di,
units::length::meters<double> radius)
{
di->tickRadius_ = radius;
}
void LinkedVectors::SetVectorTickRadiusIncrement(
const std::shared_ptr<LinkedVectorDrawItem>& di,
units::length::meters<double> radiusIncrement)
{
di->tickRadiusIncrement_ = radiusIncrement;
}
void LinkedVectors::FinishVectors()
{
// Generate borders
@ -183,7 +203,7 @@ void LinkedVectors::FinishVectors()
{
for (auto& di : p->vectorList_)
{
auto tickRadius = p->tickRadius_;
auto tickRadius = di->tickRadius_;
for (std::size_t i = 0; i < di->coordinates_.size() - 1; ++i)
{
@ -207,7 +227,7 @@ void LinkedVectors::FinishVectors()
di->borderDrawItems_.emplace_back(std::move(borderLine));
if (p->ticksEnabled_)
if (di->ticksEnabled_)
{
auto angle = util::GeographicLib::GetAngle(
latitude1, longitude1, latitude2, longitude2);
@ -234,7 +254,7 @@ void LinkedVectors::FinishVectors()
GeoLines::SetLineVisible(tickBorderLine, di->visible_);
GeoLines::SetLineHoverText(tickBorderLine, di->hoverText_);
tickRadius += p->tickRadiusIncrement_;
tickRadius += di->tickRadiusIncrement_;
}
}
}
@ -243,7 +263,7 @@ void LinkedVectors::FinishVectors()
// Generate geo lines
for (auto& di : p->vectorList_)
{
auto tickRadius = p->tickRadius_;
auto tickRadius = di->tickRadius_;
for (std::size_t i = 0; i < di->coordinates_.size() - 1; ++i)
{
@ -272,7 +292,7 @@ void LinkedVectors::FinishVectors()
di->lineDrawItems_.emplace_back(std::move(geoLine));
if (p->ticksEnabled_)
if (di->ticksEnabled_)
{
auto angle = util::GeographicLib::GetAngle(
latitude1, longitude1, latitude2, longitude2);
@ -304,7 +324,7 @@ void LinkedVectors::FinishVectors()
GeoLines::SetLineHoverText(tickGeoLine, di->hoverText_);
}
tickRadius += p->tickRadiusIncrement_;
tickRadius += di->tickRadiusIncrement_;
}
}
}

31
scwx-qt/source/scwx/qt/gl/draw/linked_vectors.hpp
View file

@ -4,6 +4,7 @@
#include <scwx/qt/gl/draw/draw_item.hpp>
#include <boost/gil.hpp>
#include <units/length.h>
namespace scwx
{
@ -131,6 +132,36 @@ public:
SetVectorHoverText(const std::shared_ptr<LinkedVectorDrawItem>& di,
const std::string& text);
/**
* Sets the presence of ticks on the linked vector.
*
* @param [in] di Linked vector draw item
* @param [in] enabled Ticks enabled
*/
static void
SetVectorTicksEnabled(const std::shared_ptr<LinkedVectorDrawItem>& di,
bool enabled);
/**
* Sets the tick radius of the linked vector.
*
* @param [in] di Linked vector draw item
* @param [in] radius Length of the tick extending beyond the linked vector
*/
static void
SetVectorTickRadius(const std::shared_ptr<LinkedVectorDrawItem>& di,
units::length::meters<double> radius);
/**
* Sets the tick radius increment of the linked vector.
*
* @param [in] di Linked vector draw item
* @param [in] radiusIncrement Length increment of each tick beyond the first
*/
static void
SetVectorTickRadiusIncrement(const std::shared_ptr<LinkedVectorDrawItem>& di,
units::length::meters<double> radiusIncrement);
/**
* Finalizes the draw item after adding new linked vectors.
*/