diff --git a/CHANGELOG.md b/CHANGELOG.md index 96d4534747..f511cdcfeb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -100,6 +100,7 @@ ctest FunctionalTestJigsawApollo to validate this output. [#5710](https://github - Fixed `footprintinit` to find mapping group (no caps). [#5920](https://github.com/DOI-USGS/ISIS3/pull/5820) - Fixed unnecessary un/distortion checks for pixels near the origin. [#5861](https://github.com/DOI-USGS/ISIS3/issues/5861) - Fixed the isisStartup scripts for users outside of USGS systems. [#5478](https://github.com/DOI-USGS/ISIS3/issues/5478) +- Fixed all Q apps not consistently prioritized projction over camera in various tools [#5896](https://github.com/DOI-USGS/ISIS3/issue/5896) ### Removed - QT 6 removed MySQL support so MySQL is no longer supported in `isisminer` [#5909](https://github.com/DOI-USGS/ISIS3/pull/5909) diff --git a/isis/src/qisis/objs/CubeViewport/CubeViewport.cpp b/isis/src/qisis/objs/CubeViewport/CubeViewport.cpp index 40b9019ef9..6d58895dde 100644 --- a/isis/src/qisis/objs/CubeViewport/CubeViewport.cpp +++ b/isis/src/qisis/objs/CubeViewport/CubeViewport.cpp @@ -147,7 +147,7 @@ namespace Isis { // Setup a universal ground map try { - p_groundMap = new UniversalGroundMap(*p_cube); + p_groundMap = new UniversalGroundMap(*p_cube, UniversalGroundMap::ProjectionFirst); } catch(IException &) { } diff --git a/isis/src/qisis/objs/FindTool/FindTool.cpp b/isis/src/qisis/objs/FindTool/FindTool.cpp index 574d810649..e7ae47f10c 100644 --- a/isis/src/qisis/objs/FindTool/FindTool.cpp +++ b/isis/src/qisis/objs/FindTool/FindTool.cpp @@ -632,7 +632,7 @@ namespace Isis { Distance FindTool::distancePerPixel(MdiCubeViewport *viewport, double lat, double lon) { // UniversalGroundMaps default to camera priority, so create a new one so that we can use projection if it exists. - std::unique_ptr groundMap(new UniversalGroundMap(*(viewport->cube()), UniversalGroundMap::ProjectionFirst)); + UniversalGroundMap *groundMap = viewport->universalGroundMap(); Distance viewportResolution; if (groundMap->Camera() != NULL){ if (groundMap->Camera()->target()->isSky()) {