Commit 9f852952 authored by Summer Stapleton's avatar Summer Stapleton
Browse files

Merge branch 'dev' of github.com:USGS-Astrogeology/ISIS3 into 5145

parents eb48387c 7081aa2a

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -41,3 +41,4 @@ ui_*.h 
*/tsts/*/input/*

*/tsts/*/truth/*

*/tsts/*/output/*

README.md

0 → 100644
+2 −0
Original line number Diff line number Diff line 
# ISIS3

Integrated Software for Imagers and Spectrometers ISIS3 public release site

isis/src/base/apps/automos/automos.xml

+153 −143
Original line number Diff line number Diff line
@@ -470,6 +470,10 @@ 
    <change name="Jeannie Backer, Tammy Becker, and Kimberly Oyama" date="2014-04-07">

      Updated user documentation. Fixes #1617. Fixes #1620. References #1623. References #1550.

    </change>

    <change name="Cole Neubauer" date="2017-11-20">

      Added parameter checking to XML MAXLON and MAXLAT to check if they are greater than their

      minimum counterpart. Fixes #5148

    </change>

  </history>



  <groups>
@@ -805,6 +809,9 @@ 
        <description>

          The maximum latitude value boundary extent for the output mosaic.

        </description>

        <greaterThan>

            <item>MINLAT</item>

        </greaterThan>

      </parameter>

      <parameter name="MINLON">

        <type>double</type>
@@ -819,6 +826,9 @@ 
        <description>

          The maximum longitude value bounary extent for the output mosaic.

        </description>

        <greaterThan>

            <item>MINLON</item>

        </greaterThan>

      </parameter>

    </group>

isis/src/base/apps/spiceinit/spiceinit.cpp

+1 −1
Original line number Diff line number Diff line
@@ -418,7 +418,7 @@ bool tryKernels(Cube *icube, Process &p, 


      Application::Log(currentKernels);

      icube->putGroup(originalKernels);

      throw;

      throw IException(e);

    }



    if (ui.GetBoolean("ATTACH")) {

isis/src/base/apps/spiceinit/spiceinit.xml

+4 −0
Original line number Diff line number Diff line
@@ -286,6 +286,10 @@ 
      Updated spiceinit to remove code dealing with the CubeSupported Pvl Keyword, from the ShapeModel group in the IsisPreferences file, 

      which has been removed.

    </change>

    <change name="Christopher Combs" date="2018-01-11">

      Made change to camera construction error throw for better reporting on uninstantiated cameras.

      Fixes #5163.

    </change>

  </history>



  <oldName>