Skip to content

Commit

Permalink
Error Report Fix for Program Launcher (#5331)
Browse files Browse the repository at this point in the history
* Removed line that gets class, it is derived from the code

* Added more detailed error around itime not finding the leapsecond kernel

* Added changelog entry
  • Loading branch information
acpaquette authored Nov 17, 2023
1 parent b8bcf39 commit a679ce1
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 2 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ release.
- Fixed target name translation for any dawn images with target "4 CERES" [#5294](https://github.com/DOI-USGS/ISIS3/pull/5294)
- Fixed exception pop ups in qview when viewing images created using the CSM Camera [#5259](https://github.com/DOI-USGS/ISIS3/pull/5295/files)
- Fixed shadowtau input file parseing errors when using example file [#5316](https://github.com/DOI-USGS/ISIS3/pull/5316)
- Fixed ProgramLauncher failing while reporting errors from launched programs [#5331](https://github.com/DOI-USGS/ISIS3/pull/5331)

## [8.0.1] - 2023-08-23

Expand Down
1 change: 0 additions & 1 deletion isis/src/base/objs/ProgramLauncher/ProgramLauncher.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,6 @@ namespace Isis {

for(int i = 0; i < errorPvl.groups(); i++) {
PvlGroup &g = errorPvl.group(i);
QString eclass = g["Class"];
QString emsg = g["Message"];
int ecode = g["Code"];
QString efile = g["File"];
Expand Down
9 changes: 8 additions & 1 deletion isis/src/base/objs/iTime/iTime.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -478,9 +478,16 @@ namespace Isis {
QString baseDir = dataDir["Base"];
baseDir += "/kernels/lsk/";
FileName leapSecond(baseDir + "naif????.tls");
QString leapSecondName;
try {
leapSecondName = QString(leapSecond.highestVersion().expanded());
}
catch (IException &e) {
QString msg = "Unable to load leadsecond file. Either the data area is not set or there are no naif####.tls files present";
throw IException(e, IException::User, msg, _FILEINFO_);
}

NaifStatus::CheckErrors();
QString leapSecondName(leapSecond.highestVersion().expanded());
furnsh_c(leapSecondName.toLatin1().data());
NaifStatus::CheckErrors();

Expand Down

0 comments on commit a679ce1

Please sign in to comment.