Commit 418ebbef authored by Makayla Shepherd's avatar Makayla Shepherd
Browse files

Fixed an error introduced in last change which caused grid to no longer work... 

Fixed an error introduced in last change which caused grid to no longer work on multi-band cubes that don't have a camera model (such as mosaics). Fixed 4586.

git-svn-id: http://subversion.wr.usgs.gov/repos/prog/isis3/trunk@7426 41f8697f-d340-4b68-9986-7bafba869bb8
parent 8e767851

isis/src/base/apps/grid/grid.cpp

+5 −2
Original line number Diff line number Diff line
@@ -121,9 +121,12 @@ void IsisMain() { 


    //if > 1 input band and IsBandIndependent = false, need to regenerate grid for 

    // each band



    if (icube->hasGroup("Instrument")) {

      if ((inputBands >= 2) && !(icube->camera()->IsBandIndependent())) {

        recalculateForEachBand = true; 

      }

    }



    gmap = new UniversalGroundMap(*icube, UniversalGroundMap::ProjectionFirst);

isis/src/base/apps/grid/grid.xml

+4 −0
Original line number Diff line number Diff line
@@ -166,6 +166,10 @@ 
      when MODE="GROUND" on a Cube with a band-dependent camera model, the grid will 

      be re-calculated for each band. Fixes #2191.

    </change>

    <change name="Kristin Berry" date="2017-02-16">

      Fixed error introduced in last change which caused grid to no longer work on multi-band 

      cubes without camera models (for example: a mosaic will not have a camera model.) Fixes #4586. 

    </change>

  </history>



  <groups>

isis/src/base/apps/grid/tsts/mosaic/Makefile

0 → 100644
+10 −0
Original line number Diff line number Diff line 
APPNAME = grid



# Added to test that grid works on mosaics, which notably will not have camera models.



include $(ISISROOT)/make/isismake.tsts



commands:

	$(APPNAME) from=$(INPUT)/lroMosaicOntop.cub \

	to=$(OUTPUT)/lroMosaicOntop.cub > /dev/null;