mirror of
https://github.com/ciphervance/supercell-wx.git
synced 2025-11-01 20:20:06 +00:00
Merge pull request #323 from AdenKoperczak/finish_inverted_threshold
Add inverted threshold to mouse picking
This commit is contained in:
commit
ddac6c1963
4 changed files with 16 additions and 8 deletions
|
|
@ -947,8 +947,10 @@ bool GeoIcons::RunMousePicking(
|
||||||
units::length::nautical_miles<double> {icon.di_->threshold_}
|
units::length::nautical_miles<double> {icon.di_->threshold_}
|
||||||
.value())) < 999 &&
|
.value())) < 999 &&
|
||||||
|
|
||||||
// Map distance is beyond the threshold
|
// Map distance is beyond/within the threshold
|
||||||
icon.di_->threshold_ < mapDistance) ||
|
icon.di_->threshold_ < mapDistance &&
|
||||||
|
(icon.di_->threshold_.value() >= 0.0 ||
|
||||||
|
-(icon.di_->threshold_) > mapDistance)) ||
|
||||||
|
|
||||||
(
|
(
|
||||||
// Geo icon has a start time
|
// Geo icon has a start time
|
||||||
|
|
|
||||||
|
|
@ -740,8 +740,10 @@ bool GeoLines::RunMousePicking(
|
||||||
units::length::nautical_miles<double> {line.di_->threshold_}
|
units::length::nautical_miles<double> {line.di_->threshold_}
|
||||||
.value())) < 999 &&
|
.value())) < 999 &&
|
||||||
|
|
||||||
// Map distance is beyond the threshold
|
// Map distance is beyond/within the threshold
|
||||||
line.di_->threshold_ < mapDistance) ||
|
line.di_->threshold_ < mapDistance &&
|
||||||
|
(line.di_->threshold_.value() >= 0.0 ||
|
||||||
|
-(line.di_->threshold_) > mapDistance)) ||
|
||||||
|
|
||||||
(
|
(
|
||||||
// Line has a start time
|
// Line has a start time
|
||||||
|
|
|
||||||
|
|
@ -737,8 +737,10 @@ bool PlacefileIcons::RunMousePicking(
|
||||||
units::length::nautical_miles<double> {icon.di_->threshold_}
|
units::length::nautical_miles<double> {icon.di_->threshold_}
|
||||||
.value())) < 999 &&
|
.value())) < 999 &&
|
||||||
|
|
||||||
// Map distance is beyond the threshold
|
// Map distance is beyond/within the threshold
|
||||||
icon.di_->threshold_ < mapDistance) ||
|
icon.di_->threshold_ < mapDistance &&
|
||||||
|
(icon.di_->threshold_.value() >= 0.0 ||
|
||||||
|
-(icon.di_->threshold_) > mapDistance)) ||
|
||||||
|
|
||||||
(
|
(
|
||||||
// Line has a start time
|
// Line has a start time
|
||||||
|
|
|
||||||
|
|
@ -544,8 +544,10 @@ bool PlacefileLines::RunMousePicking(
|
||||||
units::length::nautical_miles<double> {line.di_->threshold_}
|
units::length::nautical_miles<double> {line.di_->threshold_}
|
||||||
.value())) < 999 &&
|
.value())) < 999 &&
|
||||||
|
|
||||||
// Map distance is beyond the threshold
|
// Map distance is beyond/within the threshold
|
||||||
line.di_->threshold_ < mapDistance) ||
|
line.di_->threshold_ < mapDistance &&
|
||||||
|
(line.di_->threshold_.value() >= 0.0 ||
|
||||||
|
-(line.di_->threshold_) > mapDistance)) ||
|
||||||
|
|
||||||
(
|
(
|
||||||
// Line has a start time
|
// Line has a start time
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue