Add inverted threshold to mouse picking for geo icons/lines

dpaulat · Dec 19, 2024 · 27f8c1f · 27f8c1f
1 parent ecf7579
commit 27f8c1f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/scwx-qt/source/scwx/qt/gl/draw/geo_icons.cpp b/scwx-qt/source/scwx/qt/gl/draw/geo_icons.cpp
@@ -947,8 +947,10 @@ bool GeoIcons::RunMousePicking(
                    units::length::nautical_miles<double> {icon.di_->threshold_}
                       .value())) < 999 &&
 
-                // Map distance is beyond the threshold
-                icon.di_->threshold_ < mapDistance) ||
+                // Map distance is beyond/within the threshold
+                icon.di_->threshold_ < mapDistance &&
+                (icon.di_->threshold_.value() >= 0.0 ||
+                 -(icon.di_->threshold_) > mapDistance)) ||
 
              (
                 // Geo icon has a start time

diff --git a/scwx-qt/source/scwx/qt/gl/draw/geo_lines.cpp b/scwx-qt/source/scwx/qt/gl/draw/geo_lines.cpp
@@ -740,8 +740,10 @@ bool GeoLines::RunMousePicking(
                    units::length::nautical_miles<double> {line.di_->threshold_}
                       .value())) < 999 &&
 
-                // Map distance is beyond the threshold
-                line.di_->threshold_ < mapDistance) ||
+                // Map distance is beyond/within the threshold
+                line.di_->threshold_ < mapDistance &&
+                (line.di_->threshold_.value() >= 0.0 ||
+                 -(line.di_->threshold_) > mapDistance)) ||
 
              (
                 // Line has a start time