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

Merge branch 'develop' into feature/radar-smoothing

Browse source
This commit is contained in:
Dan Paulat 2024-12-14 06:57:24 -06:00
commit 82ea0dacd3
6 changed files with 157 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
scwx-qt/source/scwx/qt/gl/draw/placefile_text.cpp
View file

@ -136,7 +136,11 @@ void PlacefileText::Impl::RenderTextDrawItem(
std::chrono::system_clock::now() :
selectedTime_;
if ((!thresholded_ || mapDistance_ <= di->threshold_) &&
const bool thresholdMet =
!thresholded_ || mapDistance_ <= di->threshold_ ||
(di->threshold_.value() < 0.0 && mapDistance_ >= -(di->threshold_));
if (thresholdMet &&
(di->startTime_ == std::chrono::system_clock::time_point {} ||
(di->startTime_ <= selectedTime && selectedTime < di->endTime_)))
{