Merge pull request #323 from AdenKoperczak/finish_inverted_threshold

Add inverted threshold to mouse picking
dpaulat · Dec 26, 2024 · ddac6c1 · ddac6c1
2 parents 41a134e + 27f8c1f
commit ddac6c1
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 8 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

diff --git a/scwx-qt/source/scwx/qt/gl/draw/placefile_icons.cpp b/scwx-qt/source/scwx/qt/gl/draw/placefile_icons.cpp
@@ -737,8 +737,10 @@ bool PlacefileIcons::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)) ||
 
              (
                 // Line has a start time

diff --git a/scwx-qt/source/scwx/qt/gl/draw/placefile_lines.cpp b/scwx-qt/source/scwx/qt/gl/draw/placefile_lines.cpp
@@ -544,8 +544,10 @@ bool PlacefileLines::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