Commit b3610c4d authored by Tyler Wilson's avatar Tyler Wilson
Browse files

Merge branch 'dev' into spiceit

parents 088b109a e70d885c

.gitignore

+2 −1
Original line number Diff line number Diff line
@@ -27,10 +27,11 @@ object_script.*.Debug 
*_plugin_import.cpp

*.moc

ui_*.h

*.html

*html



# ignore all files created by squish coco

*csmes

*csexe



print.prt

isis/make/config.linux-x86_64

+3 −0
Original line number Diff line number Diff line
@@ -526,5 +526,8 @@ THIRDPARTYLIBS += "$(ISIS3LOCAL)/lib/libtbb*.so*" 
# Add the Boost libraries

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libboost*.so*"



# Add srtp deps (Qt5WebEngine deps) -- see #5365

THIRDPARTYLIBS    += "$(ISIS3SYSLIB)/libsrtp*.so*"



#  Plugins

THIRDPARTYPLUGINS += "$(ISIS3LOCAL)/plugins/"

isis/make/config.linux-x86_64_Fedora25

+4 −1
Original line number Diff line number Diff line
@@ -479,7 +479,6 @@ THIRDPARTYLIBS += "$(ISIS3LOCAL)/lib/libsuperlu*.so" 
THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libsuitesparseconfig.so"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/liblapack.so"

THIRDPARTYLIBS    += "$(ISIS3SYSLIB)/libblas*.so*"

THIRDPARTYLIBS    += "$(ISIS3ALTSYSLIB)/libgfortran.so*"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libxerces-c*.so*"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libgeotiff*.so*"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libtiff*.so*"
@@ -533,5 +532,9 @@ THIRDPARTYLIBS += "$(ISIS3LOCAL)/lib/libtbb*.so*" 
# Add the Boost libraries

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libboost*.so*"



# Add and patch the gfortran's rpath to $ORIGIN (so it can find its quadmath dependency) -- #4610

PATCHLIBS         += "$(ISIS3ALTSYSLIB)/libgfortran.so*"

THIRDPARTYLIBS    += "$(ISIS3SYSLIB)/libquadmath*.so*"



#  Plugins

THIRDPARTYPLUGINS += "$(ISIS3LOCAL)/plugins/"

isis/src/base/apps/campt/campt.cpp

+29 −24
Original line number Diff line number Diff line
@@ -173,6 +173,11 @@ void writePoints(const UserInterface &ui, QList<PvlGroup*> camPoints) { 
    prog.CheckStatus();

    point = camPoints[p];



    // Remove units on look direction vectors

    point -> findKeyword("LookDirectionBodyFixed").setUnits("");

    point -> findKeyword("LookDirectionJ2000").setUnits("");

    point -> findKeyword("LookDirectionCamera").setUnits("");



    // write to output file

    if (ui.WasEntered("TO")) {

      // Write the pvl group out to the file
@@ -189,7 +194,6 @@ void writePoints(const UserInterface &ui, QList<PvlGroup*> camPoints) { 
          temp.write(outFile);

        }

     }

      

      // Create a flatfile from PVL data

      // The flatfile is comma delimited and can be imported into Excel

      else {
@@ -252,6 +256,7 @@ void writePoints(const UserInterface &ui, QList<PvlGroup*> camPoints) { 
        throw IException(IException::User, msg, _FILEINFO_);

      }

    }



    // we still want to output the results

    Application::Log((*point));

    delete point;

isis/src/base/apps/campt/campt.xml

+83 −80
Original line number Diff line number Diff line
@@ -217,6 +217,9 @@ End_Group 
      setting of "false". In addition, corrected behavior where

      manually setting "allowoutside" to "false" was ignored. Ref # 2258.

    </change>

    <change name="Kaitlyn Lee" date="2018-02-16">

      Removed units on look direction vectors to make them unitless. Fixes #5125.

    </change>

  </history>



  <oldName>