Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

8.0.2 -> 8.0.3 Updates #5475

Merged
merged 18 commits into from
Apr 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 23 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,34 @@ release.

## [Unreleased]

## [8.0.3] - 2023-04-18

### Changed
- Disabled option to use web=true when running spiceinit with HRSC images. [#5223](https://github.com/DOI-USGS/ISIS3/issues/5223)
- Changed the default spiceinit url to https://astrogeology.usgs.gov/apis/ale/v0.9.1/spiceserver/ and added deprecation warning for use of https://services.isis.astrogeology.usgs.gov/cgi-bin/spiceinit.cgi url. [#5327](https://github.com/USGS-Astrogeology/ISIS3/issues/5327)

### Fixed
- Fixed a bug in which capital E was problematic for OSX / Ubuntu [#5466](https://github.com/DOI-USGS/ISIS3/pull/5466)
- Fixed bug in which not all references to 'version' file were replaced with new 'isis_version.txt' file [#5374](https://github.com/DOI-USGS/ISIS3/issues/5374)
- Fixed a bug in which the IrregularBodyCameraGroundMap unit test was removed but not the associated truth file. [#5461](https://github.com/DOI-USGS/ISIS3/issues/5461)
- Fixed a bug in which the histogram tool used the entire image to calculate bin size, which caused an issue with high dynamic range images. [#5371](https://github.com/DOI-USGS/ISIS3/issues/5371)
- Fixed a bug in which 'version' file was compiled as source and prevented subsequent ISIS recompilation [#5374](https://github.com/DOI-USGS/ISIS3/issues/5374)
- Fixed <i>noproj</i> bug where some temporary files were not deleted after call to cam2cam. Issue: [#4813](https://github.com/USGS-Astrogeology/ISIS3/issues/4813)
- Fixed <i>noproj</i> bug where missing shapemodel-related keywords (RayTraceEngine, BulletParts, Tolerance) are dropped when the output label is created. This resulted in the Bullet collision detection engine not being used. Issue: [#5377](https://github.com/USGS-Astrogeology/ISIS3/issues/5377)
- Fixed ISIS failing to expand env variables with an "_" in them. [#5402](https://github.com/DOI-USGS/ISIS3/pull/5402)
- Fixed <i>noproj</i> bug where match cube not NULL when not specifying MATCH parameter [#5381](https://github.com/USGS-Astrogeology/ISIS3/issues/5381)
- Fixed rclone.conf/downloadIsisData pointing to old naif kernel location, updated to archived locations and https [5394](https://github.com/DOI-USGS/ISIS3/issues/5394)
- Fixed a parsing error in FitsToJson when an empty comment was reached. [#5469](https://github.com/DOI-USGS/ISIS3/pull/5469)

### Added
- Added new Hayabusa2 translation for `SpacecraftName` to accept `HAYABUSA2` [#5395](https://github.com/DOI-USGS/ISIS3/issues/5395)

## [8.0.2] - 2023-12-05
### Changed
- Cnetedit has been refactored to be callable; old Makefile tests have been removed and replaced by gtests. Issue: [#5346](https://github.com/USGS-Astrogeology/ISIS3/issues/5346),
- Cnetdiff has been refactored to be callable; old Makefile tests have been removed and replaced by gtests. Issue: [#5322](https://github.com/USGS-Astrogeology/ISIS3/issues/5322),
### Fixed
- Bug fix for Cnetthinner app resolving divide by zero in CnetManager.cpp. Issue: [#5354](https://github.com/USGS-Astrogeology/ISIS3/issues/5354),
- Bug fix for Cnetthinner app resolving divide by zero in CnetManager.cpp. Issue: [#5354](https://github.com/USGS-Astrogeology/ISIS3/issues/5354)
- Updated photomet MinnaertEmpirical model to support photemplate-style PVL format [#3621](https://github.com/DOI-USGS/ISIS3/issues/3621)
- 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)
Expand Down
37 changes: 37 additions & 0 deletions code.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,43 @@
"date": {
"metadataLastUpdated": "2023-02-27"
}
}, {
"name": "ISIS3",
"organization": "U.S. Geological Survey",
"description": "GitHub code repository for the Integrated Software for Imagers and Spectrometers (ISIS)",
"version": "8.0.3",
"status": "Production",
"permissions": {
"usageType": "openSource",
"licenses": [
{
"name": "Public Domain, CC0-1.0",
"URL": "https://code.usgs.gov/astrogeology/isis/-/raw/8.0.3/LICENSE.md"
}
]
},
"homepageURL": "https://isis.astrogeology.usgs.gov",
"downloadURL": "https://code.usgs.gov/astrogeology/isis/-/archive/8.0.3/isis-8.0.3.zip",
"disclaimerURL": "https://code.usgs.gov/astrogeology/isis/-/raw/8.0.3/DISCLAIMER.md",
"repositoryURL": "https://code.usgs.gov/astrogeology/isis.git",
"vcs": "git",
"laborHours": 0,
"tags": [
"Planetary",
"Remote Sensing",
"Photogrammetry",
"Data Processing"
],
"languages": [
"C++"
],
"contact": {
"name": "Adam Paquette",
"email": "acpaquette@usgs.gov"
},
"date": {
"metadataLastUpdated": "2023-04-18"
}
}, {
"name": "ISIS3",
"organization": "U.S. Geological Survey",
Expand Down
6 changes: 3 additions & 3 deletions isis/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ set(PACKAGE "ISIS")
set(PACKAGE_NAME "USGS ISIS")

# Version number
set(VERSION "8.0.2")
set(VERSION "8.0.3")
string(REPLACE "." ";" VERSION_LIST ${VERSION})
list(GET VERSION_LIST 0 VERSION_MAJOR)
list(GET VERSION_LIST 1 VERSION_MINOR)
Expand Down Expand Up @@ -419,7 +419,7 @@ set(sourceXmlFolder ${CMAKE_BINARY_DIR}/bin/xml)
execute_process(COMMAND mkdir -p ${CMAKE_BINARY_DIR}/bin/xml)

# Create the version file
configure_file(${CMAKE_SOURCE_DIR}/cmake/version.in ${CMAKE_BINARY_DIR}/version)
configure_file(${CMAKE_SOURCE_DIR}/cmake/version.in ${CMAKE_BINARY_DIR}/isis_version.txt)

# Set up install of the make folder.
install(DIRECTORY ${CMAKE_SOURCE_DIR}/make DESTINATION ${CMAKE_INSTALL_PREFIX})
Expand Down Expand Up @@ -595,7 +595,7 @@ install(FILES ${CMAKE_SOURCE_DIR}/IsisPreferences DESTINATION ${CMAKE_INSTA
install(FILES ${CMAKE_SOURCE_DIR}/../LICENSE.md DESTINATION ${CMAKE_INSTALL_PREFIX})
install(FILES ${CMAKE_SOURCE_DIR}/../AUTHORS.rst DESTINATION ${CMAKE_INSTALL_PREFIX})
install(FILES ${CMAKE_SOURCE_DIR}/../CHANGELOG.md DESTINATION ${CMAKE_INSTALL_PREFIX})
install(FILES ${CMAKE_BINARY_DIR}/version DESTINATION ${CMAKE_INSTALL_PREFIX})
install(FILES ${CMAKE_BINARY_DIR}/isis_version.txt DESTINATION ${CMAKE_INSTALL_PREFIX})
install(DIRECTORY ${CMAKE_SOURCE_DIR}/scripts DESTINATION ${CMAKE_INSTALL_PREFIX})
install(PROGRAMS ${CMAKE_BINARY_DIR}/lib/Camera.plugin DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/)
install(PROGRAMS ${CMAKE_SOURCE_DIR}/scripts/downloadIsisData DESTINATION ${CMAKE_INSTALL_PREFIX}/bin/)
Expand Down
2 changes: 1 addition & 1 deletion isis/config/config.mak
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
SHELL=bash
.SILENT:

ISISLOCALVERSION := $(shell head -n 3 $(ISISROOT)/version | tail -n 1 | sed 's/\#.*//' | sed 's/ *$$//')
ISISLOCALVERSION := $(shell head -n 3 $(ISISROOT)/isis_version.txt | tail -n 1 | sed 's/\#.*//' | sed 's/ *$$//')
QMAKE ?= $(shell which qmake 2 >& /dev/null)

ifeq ($(QMAKE),)
Expand Down
42 changes: 21 additions & 21 deletions isis/config/rclone.conf
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ url = http://spiftp.esac.esa.int/

[naif]
type = http
url = http://naif.jpl.nasa.gov/
url = https://naif.jpl.nasa.gov/pub/naif/

[jaxa]
type = http
Expand Down Expand Up @@ -62,7 +62,7 @@ upstreams = tgo_usgs: tgo_naifKernels:

[dawn_naifKernels]
type = combine
upstreams = kernels=naif:/pub/naif/DAWN/kernels/
upstreams = kernels=naif:DAWN/kernels/

[dawn_usgs]
type = alias
Expand All @@ -82,7 +82,7 @@ upstreams = dawn_kernel_combine: dawn_naifKernels: dawn_usgs:

[cassini_naifKernels]
type = combine
upstreams = kernels=naif:/pub/naif/CASSINI/kernels/
upstreams = kernels=naif:CASSINI/kernels/

[cassini_usgs]
type = alias
Expand All @@ -106,7 +106,7 @@ upstreams = hayabusa2_usgs: hayabusa2_naifKernels:

[galileo_naifKernels]
type = combine
upstreams = kernels=naif:/pub/naif/GLL/kernels/
upstreams = kernels=naif:GLL/kernels/

[galileo_usgs]
type = alias
Expand All @@ -118,7 +118,7 @@ upstreams = galileo_usgs: galileo_naifKernels:

[juno_naifKernels]
type = combine
upstreams = kernels=naif:/pub/naif/JUNO/kernels/
upstreams = kernels=naif:JUNO/kernels/

[juno_usgs]
type = alias
Expand All @@ -134,7 +134,7 @@ remote = asc_s3:asc-isisdata/usgs_data/lo/

[odyssey_naifKernels]
type = combine
upstreams = kernels=naif:/pub/naif/M01/kernels/
upstreams = kernels=naif:M01/kernels/

[odyssey_usgs]
type = alias
Expand All @@ -146,7 +146,7 @@ upstreams = odyssey_usgs: odyssey_naifKernels:

[mro_naifKernels]
type = combine
upstreams = kernels=naif:/pub/naif/MRO/kernels/
upstreams = kernels=naif:MRO/kernels/

[mro_usgs]
type = alias
Expand All @@ -158,7 +158,7 @@ upstreams = mro_usgs: mro_naifKernels:

[mex_naifKernels]
type = combine
upstreams = kernels=naif:/pub/naif/MEX/kernels/
upstreams = kernels=naif:MEX/kernels/

[mex_usgs]
type = alias
Expand Down Expand Up @@ -194,7 +194,7 @@ upstreams = chandrayaan1_usgs: chandrayaan1_naifKernels:

[clementine1_naifKernels]
type = combine
upstreams = naif:/pub/naif/CLEMENTINE/kernels/
upstreams = naif:pds/data/clem1-l-spice-6-v1.0/clsp_1000/data/

[clementine1_usgs]
type = alias
Expand All @@ -218,7 +218,7 @@ upstreams = kaguya_usgs: kaguya_naifKernels:

[mariner10_naifKernels]
type = combine
upstreams = kernels=naif:/pub/naif/M10/kernels/
upstreams = kernels=naif:M10/kernels/

[mariner10_usgs]
type = alias
Expand All @@ -234,7 +234,7 @@ remote = asc_s3:asc-isisdata/usgs_data/mer/

[messenger_naifKernels]
type = combine
upstreams = kernels=naif:/pub/naif/pds/data/mess-e_v_h-spice-6-v1.0/messsp_1000/data/kernels/
upstreams = kernels=naif:pds/data/mess-e_v_h-spice-6-v1.0/messsp_1000/data/

[messenger_usgs]
type = alias
Expand All @@ -246,7 +246,7 @@ upstreams = messenger_usgs: messenger_naifKernels:

[mgs_naifKernels]
type = combine
upstreams = kernels=naif:/pub/naif/pds/data/mgs-m-spice-6-v1.0/mgsp_1000/data/kernels/
upstreams = kernels=naif:pds/data/mgs-m-spice-6-v1.0/mgsp_1000/data/

[mgs_usgs]
type = alias
Expand All @@ -258,7 +258,7 @@ upstreams = mgs_usgs: mgs_naifKernels:

[near_naifKernels]
type = combine
upstreams = kernels=naif:/pub/naif/pds/data/near-a-spice-6-v1.0/nearsp_1000/data/
upstreams = kernels=naif:pds/data/near-a-spice-6-v1.0/nearsp_1000/data/

[near_usgs]
type = alias
Expand All @@ -270,7 +270,7 @@ upstreams = near_usgs: near_naifKernels:

[newhorizons_naifKernels]
type = combine
upstreams = kernels=naif:/pub/naif/NEWHORIZONS/kernels/
upstreams = kernels=naif:pds/data/nh-j_p_ss-spice-6-v1.0/nhsp_1000/data/

[newhorizons_usgs]
type = alias
Expand All @@ -282,7 +282,7 @@ upstreams = newhorizons_usgs: newhorizons_naifKernels:

[osirisrex_naifKernels]
type = combine
upstreams = kernels=naif:/pub/naif/pds/pds4/orex/orex_spice/spice_kernels/
upstreams = kernels=naif:pds/pds4/orex/orex_spice/spice_kernels/

[osirisrex_usgs]
type = alias
Expand All @@ -298,7 +298,7 @@ remote = asc_s3:asc-isisdata/usgs_data/rolo/

[rosetta_naifKernels]
type = combine
upstreams = kernels=naif:/pub/naif/ROSETTA/kernels/
upstreams = kernels=naif:ROSETTA/kernels/

[rosetta_usgs]
type = alias
Expand All @@ -322,7 +322,7 @@ upstreams = smart1_usgs: smart1_naifKernels:

[viking1_naifKernels]
type = combine
upstreams = kernels=naif:/pub/naif/VIKING/kernels/
upstreams = kernels=naif:pds/data/vo1_vo2-m-spice-6-v1.0/vosp_1000/data/

[viking1_usgs]
type = alias
Expand All @@ -334,7 +334,7 @@ upstreams = viking1_usgs: viking1_naifKernels:

[viking2_naifKernels]
type = combine
upstreams = kernels=naif:/pub/naif/VIKING/kernels/
upstreams = kernels=naif:pds/data/vo1_vo2-m-spice-6-v1.0/vosp_1000/data/

[viking2_usgs]
type = alias
Expand All @@ -346,7 +346,7 @@ upstreams = viking2_usgs: viking2_naifKernels:

[voyager1_naifKernels]
type = combine
upstreams = kernels=naif:/pub/naif/VOYAGER/kernels/
upstreams = kernels=naif:VOYAGER/kernels/

[voyager1_usgs]
type = alias
Expand All @@ -358,7 +358,7 @@ upstreams = voyager1_usgs: voyager1_naifKernels:

[voyager2_naifKernels]
type = combine
upstreams = kernels=naif:/pub/naif/VOYAGER/kernels/
upstreams = kernels=naif:VOYAGER/kernels/

[voyager2_usgs]
type = alias
Expand All @@ -374,7 +374,7 @@ remote = asc_s3:asc-isisdata/usgs_data/msl/

[msl_naifKernels]
type = combine
upstreams = kernels=naif:/pub/naif/MSL/kernels/
upstreams = kernels=naif:MSL/kernels/

[msl]
type = union
Expand Down
2 changes: 1 addition & 1 deletion isis/scripts/isisVarInit.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ def activate_text(shell: dict, env_vars: dict, cat=False) -> str:
lines.append(shell["activate_extra"])

if cat:
lines.append("cat $ISISROOT/version")
lines.append("cat $ISISROOT/isis_version.txt")

return "\n".join(lines)

Expand Down
7 changes: 7 additions & 0 deletions isis/src/base/apps/noproj/main.cpp
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
/** This is free and unencumbered software released into the public domain.

The authors of ISIS do not claim copyright on the contents of this file.
For more details about the LICENSE terms and the AUTHORS, you will
find files of those names at the top level of this repository. **/

/* SPDX-License-Identifier: CC0-1.0 */
#define GUIHELPERS
#include "Isis.h"

Expand Down
Loading