Skip to content
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ ctest FunctionalTestJigsawApollo to validate this output. [#5710](https://github
- Added PAD or SHRINK options to crop for crops that extend beyond the source image [#5843](https://github.com/DOI-USGS/ISIS3/pull/5843)
- Added std:: namespace for isinf, fixes build errors for some versions of c++
- Adds PROJ into ISIS, and exposes the capability with a new class called IProj. [#5317](https://github.com/DOI-USGS/ISIS3/pull/5317)
- Added `MATCHBANDBIN` option to himos and hicolormos. [#5859](https://github.com/DOI-USGS/ISIS3/issues/5859) and [#5860](https://github.com/DOI-USGS/ISIS3/issues/5860)

### Changed
- Removed Arm dependency on xalan-c, as it does not build for now on conda-forge. This requires turning off doc building on Arm. Also changed some variables to avoid name clashes on Arm with clang 16. [#5802](https://github.com/DOI-USGS/ISIS3/pull/5802)
Expand Down
4 changes: 3 additions & 1 deletion isis/src/mro/apps/hicolormos/hicolormos.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -245,10 +245,12 @@ void hicolormos(Cube *from1, Cube* from2, UserInterface &ui) {

// automos step
QString MosaicPriority = ui.GetString("PRIORITY");
bool matchBandBin = ui.GetBoolean("MATCHBANDBIN");

QString parameters = "FROMLIST=" + tempFile.expanded() +
" MOSAIC=" + ui.GetCubeName("TO") +
" PRIORITY=" + MosaicPriority;
" PRIORITY=" + MosaicPriority +
" MATCHBANDBIN=" + (matchBandBin ? "TRUE" : "FALSE");
ProgramLauncher::RunIsisProgram("automos", parameters);

PvlGroup mos("Mosaic");
Expand Down
16 changes: 16 additions & 0 deletions isis/src/mro/apps/hicolormos/hicolormos.xml
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,22 @@
</option>
</list>
</parameter>

<parameter name="MATCHBANDBIN">
<type>boolean</type>
<brief>Input and mosaic BandBin Groups must match</brief>
<description>
This option set to TRUE causes the application to fail if the BandBin group keywords
are not identical for all input cubes and the output mosaic cube. The default
for this parameter is TRUE in order to preserve integrity of a multi-band
(multi-wavelength) mosaic product. The order of band wavelengths of the input
cubes must match each other and the mosaic. If MATCHBANDIN is set to FALSE,
then the BandBin Group keywords of the input images do not have to match the mosaic
BandBin Group labels. <b>Note:</b> The output mosaic BandBin Group and number
of output bands is established with the first input file into the mosaic.
</description>
<default><item>TRUE</item></default>
</parameter>
</group>
</groups>
</application>
6 changes: 5 additions & 1 deletion isis/src/mro/apps/himos/himos.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -247,8 +247,12 @@ namespace Isis {
QString list = ui.GetFileName("FROMLIST");
QString toMosaic = ui.GetCubeName("TO");
QString MosaicPriority = ui.GetString("PRIORITY");
bool matchBandBin = ui.GetBoolean("MATCHBANDBIN");

QString parameters = "FROMLIST=" + list + " MOSAIC=" + toMosaic + " PRIORITY=" + MosaicPriority;
QString parameters = "FROMLIST=" + list +
" MOSAIC=" + toMosaic +
" PRIORITY=" + MosaicPriority +
" MATCHBANDBIN=" + (matchBandBin ? "TRUE" : "FALSE");
ProgramLauncher::RunIsisProgram("automos", parameters);

// write out new information to new group mosaic
Expand Down
16 changes: 16 additions & 0 deletions isis/src/mro/apps/himos/himos.xml
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,22 @@
</option>
</list>
</parameter>

<parameter name="MATCHBANDBIN">
<type>boolean</type>
<brief>Input and mosaic BandBin Groups must match</brief>
<description>
This option set to TRUE causes the application to fail if the BandBin group keywords
are not identical for all input cubes and the output mosaic cube. The default
for this parameter is TRUE in order to preserve integrity of a multi-band
(multi-wavelength) mosaic product. The order of band wavelengths of the input
cubes must match each other and the mosaic. If MATCHBANDIN is set to FALSE,
then the BandBin Group keywords of the input images do not have to match the mosaic
BandBin Group labels. <b>Note:</b> The output mosaic BandBin Group and number
of output bands is established with the first input file into the mosaic.
</description>
<default><item>TRUE</item></default>
</parameter>
</group>
</groups>
</application>