Skip to content

Commit

Permalink
8.2.0_RC2 Release Prep (#5521)
Browse files Browse the repository at this point in the history
* Added kalasiris to dev meta.yml (#5487)

* Add qview stretch bugfix (#5492)

* Add qview stretch bugfix

* Update changelog

* Fix Failing HiJitter Tests (#5507)

* Fixes proj segfault if a match cube is provided

* Revert mcube back into a pointer and correctly handle it

* Qview command line Fix (#5505)

* Avoid double image load when opening cubes from cmdline in qview

* Added changelog entry

* Revert interval change

* Update docs

* Fix meta.yaml formatting

---------

Co-authored-by: acpaquette <[email protected]>
  • Loading branch information
chkim-usgs and acpaquette authored Jun 20, 2024
1 parent ba02678 commit 73159eb
Show file tree
Hide file tree
Showing 6 changed files with 44 additions and 24 deletions.
5 changes: 4 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ release.

## [Unreleased]

## [8.2.0] - 2024-04-18
## [8.2.0] - 2024-06-18

### Changed
- 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)
Expand All @@ -55,6 +55,9 @@ release.
- 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)
- Fixed TrackTool, FindTool, and AdvancedTrackTool not reporting RA and DEC for images targeting the Sky. [#5409](https://github.com/DOI-USGS/ISIS3/pull/5409)
- 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)
- Fixed <i>noproj</i> bug where segfault occurs if match cube is provided [#5507](https://github.com/DOI-USGS/ISIS3/pull/5507)

### Added
- Added 8 new functions to the Sensor Utility Library: Slant Distance, Target Center Distance, Right Ascension Declination, Local Solar Time, Line Resolution, Sample Resolution, Pixel Resolution, and Solar Longitude.
Expand Down
14 changes: 7 additions & 7 deletions code.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,22 +47,22 @@
"name": "ISIS3",
"organization": "U.S. Geological Survey",
"description": "GitHub code repository for the Integrated Software for Imagers and Spectrometers (ISIS)",
"version": "8.2.0_RC1",
"version": "8.2.0_RC2",
"status": "Production",

"permissions": {
"usageType": "openSource",
"licenses": [
{
"name": "Public Domain, CC0-1.0",
"URL": "https://code.usgs.gov/astrogeology/isis/-/raw/8.2.0_RC1/LICENSE.md"
"URL": "https://code.usgs.gov/astrogeology/isis/-/raw/8.2.0_RC2/LICENSE.md"
}
]
},

"homepageURL": "https://isis.astrogeology.usgs.gov",
"downloadURL": "https://code.usgs.gov/astrogeology/isis/-/archive/8.2.0_RC1/8.2.0_RC1.zip",
"disclaimerURL": "https://code.usgs.gov/astrogeology/isis/-/raw/8.2.0_RC1/DISCLAIMER.md",
"downloadURL": "https://code.usgs.gov/astrogeology/isis/-/archive/8.2.0_RC2/8.2.0_RC2.zip",
"disclaimerURL": "https://code.usgs.gov/astrogeology/isis/-/raw/8.2.0_RC2/DISCLAIMER.md",
"repositoryURL": "https://code.usgs.gov/astrogeology/isis.git",
"vcs": "git",

Expand All @@ -80,12 +80,12 @@
],

"contact": {
"name": "Adam Paquette",
"email": "acpaquette@usgs.gov"
"name": "Christine Kim",
"email": "chkim@usgs.gov"
},

"date": {
"metadataLastUpdated": "2024-04-19"
"metadataLastUpdated": "2024-06-18"
}
}
]
4 changes: 3 additions & 1 deletion isis/src/base/apps/noproj/noproj.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,12 @@ namespace Isis {

Cube *mcube = NULL;
if((ui.WasEntered("MATCH"))) {
mcube->open(ui.GetCubeName("MATCH"));
mcube = new Cube(ui.GetCubeName("MATCH"));
}

noproj(&icube, mcube, ui);

free(mcube);
}

/**
Expand Down
9 changes: 8 additions & 1 deletion isis/src/qisis/objs/CubeViewport/ViewportBuffer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -754,7 +754,14 @@ namespace Isis {
* @return bool
*/
bool ViewportBuffer::working() {
return !p_actions->empty() || !p_bufferInitialized || !p_enabled;
bool hasFillAction = false;
for (auto action : *p_actions) {
if (action->getActionType() == ViewportBufferAction::fill) {
hasFillAction = true;
break;
}
}
return hasFillAction || !p_bufferInitialized || !p_enabled;
}


Expand Down
25 changes: 15 additions & 10 deletions isis/src/qisis/objs/StretchTool/StretchTool.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -188,21 +188,22 @@ namespace Isis {
p_minMaxTypeSelection->setToolTip("Min/Max Type");
text =
"<b>Function:</b> Select the minimum & maximum value types to \
set the stretch to. The three options are: \
<p>- Best: (default) The better of the absolute min/max or the \
set the stretch to. The four options are: \
<p>- Default: Min and max values are set to the \
0.5 and 99.5 percentiles, respectively. \
<p>- Best: The better of the absolute min/max or the \
Chebyshev min/max. The better value is considered the value \
closest to the mean. \
<p>- Absolute: The absolute min/max value of all valid pixels. \
<p>- Chebyshev: The min/max value such that a certain percentage \
of data will fall within K standard deviations of the average \
(Chebyshev's Theorem). It can be used to obtain a value that \
does not include statistical outliers. \
<p><b>Hint:</b> Percentages are set to mininum of 0.5 and \
maximum of 99.5.";
does not include statistical outliers.";
p_minMaxTypeSelection->setWhatsThis(text);
p_minMaxTypeSelection->addItem("Best", 0);
p_minMaxTypeSelection->addItem("Absolute", 1);
p_minMaxTypeSelection->addItem("Chebyshev", 2);
p_minMaxTypeSelection->addItem("Default", 0);
p_minMaxTypeSelection->addItem("Best", 1);
p_minMaxTypeSelection->addItem("Absolute", 2);
p_minMaxTypeSelection->addItem("Chebyshev", 3);

connect(p_minMaxTypeSelection, SIGNAL(currentIndexChanged(int)), this, SLOT(changeStretch()));

Expand Down Expand Up @@ -1135,21 +1136,25 @@ namespace Isis {

// Get current band statistics
Statistics stats = statsFromCube(cvp->cube(), bandNum);
Histogram hist = histFromCube(cvp->cube(), bandNum, stats.BestMinimum(), stats.BestMaximum());

// Set min/max given ComboBox selection
int minMaxIndex = p_minMaxTypeSelection->currentIndex();
double selectedMin = 0;
double selectedMax = 0;

if (minMaxIndex == 0) {
selectedMin = hist.Percent(0.5);
selectedMax = hist.Percent(99.5);
} else if (minMaxIndex == 1) {
// Best
selectedMin = stats.BestMinimum();
selectedMax = stats.BestMaximum();
} else if (minMaxIndex == 1) {
} else if (minMaxIndex == 2) {
// Absolute
selectedMin = stats.Minimum();
selectedMax = stats.Maximum();
} else if (minMaxIndex == 2) {
} else if (minMaxIndex == 3) {
// Chebyshev
selectedMin = stats.ChebyshevMinimum();
selectedMax = stats.ChebyshevMaximum();
Expand Down
11 changes: 7 additions & 4 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

package:
name: isis
version: {{ version }}.0_RC1
version: {{ version }}.0_RC2

source:
git_url: 'https://github.com/DOI-USGS/ISIS3.git'
Expand All @@ -45,7 +45,7 @@ build:
# Shotgun strat on requirements until we can narrow them down
requirements:
build:
- ale =0.10.0
- ale =0.10.0,<1
- aom
- armadillo
- boost >=1.72.0,<2
Expand Down Expand Up @@ -73,6 +73,7 @@ requirements:
- inja
- jama
- usgs-astrogeology::kakadu==1
- kalasiris
- krb5
- libboost >=1.72.0,<2
- libgdal >=3.7.2,<3.8.0a0
Expand All @@ -94,8 +95,8 @@ requirements:
- pcl >=1.10,<2
- plio
- protobuf
- python >=3.11
- python_abi >=3.11
- python =3.12
- python_abi =3.12
- pytest
- rclone
- qhull
Expand Down Expand Up @@ -142,6 +143,7 @@ requirements:
- jama
- {{ pin_compatible('jasper', max_pin='x.x') }}
- {{ pin_compatible('kakadu', max_pin='x') }}
- kalasiris
- libcxx
- libopenblas
- {{ pin_compatible('libopencv', max_pin='x.x') }}
Expand All @@ -155,6 +157,7 @@ requirements:
- {{ pin_compatible('opencv', max_pin='x.x') }}
- {{ pin_compatible('openssl', min_pin='x', max_pin='x.x') }}
- {{ pin_compatible('pcl', min_pin='x', max_pin='x.x') }}
- plio
- {{ pin_compatible('proj', min_pin='x.x', max_pin='x.x') }}
- {{ pin_compatible('protobuf', max_pin='x.x') }}
- qhull
Expand Down

0 comments on commit 73159eb

Please sign in to comment.