From 3b879d0de968c4a43679b12133e7143beb771b16 Mon Sep 17 00:00:00 2001 From: kledmundson <6842706+kledmundson@users.noreply.github.com> Date: Tue, 13 Aug 2024 14:36:26 -0700 Subject: [PATCH] Bug fix in noproj to remove persistent temporary lbl file (#5578) * Added line to close match cube in noproj.cpp. Not closing the cube resulted in a temporary "*.lbl" file that remained after running the noproj application. Addresses #5577. * CHANGELOG entry for noproj bug fix. Addresses #5577. * Added history entry in noproj.xml. Addresses #5577. --- CHANGELOG.md | 1 + isis/src/base/apps/noproj/noproj.cpp | 3 ++- isis/src/base/apps/noproj/noproj.xml | 4 ++++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2ef0ed0da3..b6934a7fe0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -46,6 +46,7 @@ release. - Pinned `suitesparse` dependency version to maximum not including 7.7.0 [#5496](https://github.com/DOI-USGS/ISIS3/issues/5496) ### Fixed +- Fixed a bug in noproj.cpp which left a persisent lbl file after running noproj. [#5577] (https://github.com/DOI-USGS/ISIS3/issues/5577) - 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) diff --git a/isis/src/base/apps/noproj/noproj.cpp b/isis/src/base/apps/noproj/noproj.cpp index c35bdf97f7..021792ec28 100644 --- a/isis/src/base/apps/noproj/noproj.cpp +++ b/isis/src/base/apps/noproj/noproj.cpp @@ -378,7 +378,8 @@ namespace Isis { Cube matchCube; matchCube.open(matchCubeFile.expanded(), "rw"); cam2cam(icube, &matchCube, cam2camUI); - + matchCube.close(); + // Cleanup by deleting the match files QStringList detfiles = findAllDetachedFiles( label ); detfiles.append(matchLbl); diff --git a/isis/src/base/apps/noproj/noproj.xml b/isis/src/base/apps/noproj/noproj.xml index ca270a2d60..249e887d5f 100644 --- a/isis/src/base/apps/noproj/noproj.xml +++ b/isis/src/base/apps/noproj/noproj.xml @@ -84,6 +84,10 @@ Incorporated Kris Becker's 2021-09-22 bug fix above into USGS code base. + + Additional bug fix to address persistent temporary lbl file after + running noproj. Fixes #5577. + -- GitLab