Commit 4146d81d authored by Tyler Wilson's avatar Tyler Wilson
Browse files

Resolved spiceit/dev merge conflict.

parents 1e54977a aca22153

.gitignore

+36 −2
Original line number Diff line number Diff line 
# Ignore all

*



# Unignore all with extensions

!*.*



# Unignore all dirs

!*/



!Makefile



*.cub

*.o

*.so

*.so.*

*.a

moc_*

*.pb.*

*.lbl

*.img



!TestPreferences



print.prt



object_script.*.Release

object_script.*.Debug

*_plugin_import.cpp

*.moc

ui_*.h

*.pb.cc

*.pb.h
 


*/3rdParty/*

!*/3rdParty/Makefile



*/inc/*



*/bin/*



*/lib/*



*/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/isisminer/CnetReaderStrategy.cpp

+83 −84
Original line number Diff line number Diff line
@@ -116,10 +116,9 @@ namespace Isis { 


    int nrows = pointNum;



    QString cfile = translateKeywordArgs("CnetFile", globals);

    QScopedPointer<LatestControlNetFile> netFile(ControlNetVersioner::Read(FileName(cfile))); 

    Pvl pvl(netFile->toPvl());

    netFile.reset();

    FileName netfile(translateKeywordArgs("CnetFile", globals));

    ControlNetVersioner cnetReader(netfile);

    Pvl pvl(cnetReader.toPvl());



    PvlObject &network(pvl.findObject("ControlNetwork"));

    PvlFlatMap netkeys(loadkeys(network));

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")) {