Unverified Commit 7edf07d9 authored by Austin Sanders's avatar Austin Sanders Committed by GitHub
Browse files

Find QView's FindTool UniversalGroundMap priority to Projection (#5555) 

* Change FindTool's UniversalGroundMap priority to Projection

* Updated changelog
parent a59442f8

CHANGELOG.md

+1 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ release. 




### Fixed

- Fixed a bug in QVIEW's FindTool in which camera was prioritized over projction [#5508](https://github.com/DOI-USGS/ISIS3/issues/5508)

- Fixed a bug in PolygonTools in which the program exited before attempting to fix an invalid Polygon [#5520](https://github.com/DOI-USGS/ISIS3/issues/5520)

- Fixed a bug in QVIEW's Stretch tool where the default min/max type was not an available option [#5289](https://github.com/DOI-USGS/ISIS3/issues/5289)

- Fixed a bug in QVIEW where images would double load if loaded from the commandline [#5505](https://github.com/DOI-USGS/ISIS3/pull/5505)

isis/src/qisis/objs/FindTool/FindTool.cpp

+3 −2
Original line number Diff line number Diff line
@@ -631,9 +631,10 @@ namespace Isis { 
   */

  Distance FindTool::distancePerPixel(MdiCubeViewport *viewport,

                                      double lat, double lon) {

    UniversalGroundMap *groundMap = viewport->universalGroundMap();

    // UniversalGroundMaps default to camera priority, so create a new one so that we can use projection if it exists.

    std::unique_ptr<UniversalGroundMap> groundMap(new UniversalGroundMap(*(viewport->cube()), UniversalGroundMap::ProjectionFirst));

    Distance viewportResolution;

    if (viewport->camera() != NULL){

    if (groundMap->Camera() != NULL){

      if (groundMap->Camera()->target()->isSky()) {

        return Distance(groundMap->Camera()->RaDecResolution(), Distance::Units::Meters);

      }