Unverified Commit cff27910 authored by Summer Stapleton's avatar Summer Stapleton Committed by GitHub
Browse files

Merge pull request #51 from twilson271828/spiceit 

Spiceit - merged dev into spiceit branch, and made compile time faster
parents 2b14c4ee ae79b0a4

.gitignore

+9 −11
Original line number Diff line number Diff line
@@ -7,7 +7,10 @@ 
# Unignore all dirs

!*/



# Unignore Makefiles, and TestPreferences

!Makefile

!TestPreferences

!*/3rdParty/Makefile



*.cub

*.o
@@ -18,27 +21,22 @@ moc_* 
*.pb.*

*.lbl

*.img



!TestPreferences



print.prt



*.kate-swp

object_script.*.Release

object_script.*.Debug

*_plugin_import.cpp

*.moc

ui_*.h



*/3rdParty/*

!*/3rdParty/Makefile

# ignore all files created by squish coco

*csmes



*/inc/*

print.prt



*/3rdParty/*

*/inc/*

*/bin/*



*/lib/*



*/tsts/*/input/*

*/tsts/*/truth/*

*/tsts/*/output/*

isis/src/base/apps/spiceit/spiceit/isis.pri

+6 −3
Original line number Diff line number Diff line
@@ -10,8 +10,11 @@ CONFIG(debug, debug|release) { 
    DEFINES += SUPERVERBOSE

}



HEADERS += $$PWD/../../../../../inc/*.h ../../../../qisis/objs/ControlPointEditWidget/ui_*.h ../../../../qisis/objs/MatchTool/ui_*.h ../../../../qisis/objs/StereoTool/ui_*.h ../../../../qisis/objs/QnetTools/ui_*.h

HEADERS += $$PWD/../../../../../inc/Camera.h $$PWD/../../../../../inc/CameraFactory.h $$PWD/../../../../../inc/Cube.h $$PWD/../../../../../inc/FileName.h $$PWD/../../../../../inc/IString.h $$PWD/../../../../../inc/Kernel.h $$PWD/../../../../../inc/KernelDb.h $$PWD/../../../../../inc/Longitude.h $$PWD/../../../../../inc/Process.h $$PWD/../../../../../inc/Pvl.h $$PWD/../../../../../inc/PvlToPvlTranslationManager.h $$PWD/../../../../../inc/Table.h $$PWD/../../../../../inc/TextFile.h



INCLUDEPATH += $$PWD/ ../../../../qisis/objs/ControlPointEditWidget ../../../../qisis/objs/MatchTool ../../../../qisis/objs/StereoTool ../../../../qisis/objs/QnetTools /usgs/pkgs/local/v007/include/qt/qt5.7.1 /usgs/pkgs/local/v007/include/qt/qt5.7.1/Qt /usgs/pkgs/local/v007/include/qt/qt5.7.1/QtCore /usgs/pkgs/local/v007/include/qt/qt5.7.1/QtAssistant /usgs/pkgs/local/v007/include/qt/qt5.7.1/QtConcurrent /usgs/pkgs/local/v007/include/qt/qt5.7.1/QtDBus /usgs/pkgs/local/v007/include/qt/qt5.7.1/QtGui /usgs/pkgs/local/v007/include/qt/qt5.7.1/QtMultimedia /usgs/pkgs/local/v007/include/qt/qt5.7.1/QtMultimediaWidgets /usgs/pkgs/local/v007/include/qt/qt5.7.1/QtNetwork /usgs/pkgs/local/v007/include/qt/qt5.7.1/QtOpenGL /usgs/pkgs/local/v007/include/qt/qt5.7.1/QtPositioning /usgs/pkgs/local/v007/include/qt/qt5.7.1/QtPrintSupport /usgs/pkgs/local/v007/include/qt/qt5.7.1/QtQml /usgs/pkgs/local/v007/include/qt/qt5.7.1/QtQuick /usgs/pkgs/local/v007/include/qt/qt5.7.1/QtScript /usgs/pkgs/local/v007/include/qt/qt5.7.1/QtScriptTools /usgs/pkgs/local/v007/include/qt/qt5.7.1/QtSensors /usgs/pkgs/local/v007/include/qt/qt5.7.1/QtSql /usgs/pkgs/local/v007/include/qt/qt5.7.1/QtSvg /usgs/pkgs/local/v007/include/qt/qt5.7.1/QtTest /usgs/pkgs/local/v007/include/qt/qt5.7.1/QtWebChannel /usgs/pkgs/local/v007/include/qt/qt5.7.1/QtWebEngine /usgs/pkgs/local/v007/include/qt/qt5.7.1/QtWebEngineWidgets /usgs/pkgs/local/v007/include/qt/qt5.7.1/QtWidgets /usgs/pkgs/local/v007/include/qt/qt5.7.1/QtXml /usgs/pkgs/local/v007/include/qt/qt5.7.1/QtXmlPatterns /usgs/pkgs/local/v007/include/qwt /usgs/pkgs/local/v007/include/xercesc/xercesc-3.1.2 /usgs/pkgs/local/v007/include/geotiff /usgs/pkgs/local/v007/include/tiff/tiff-4.0.5 /usgs/pkgs/local/v007/include/naif  /usgs/pkgs/local/v007/include/tnt/tnt126  /usgs/pkgs/local/v007/include/tnt/tnt126/tnt /usgs/pkgs/local/v007/include/jama/jama125  /usgs/pkgs/local/v007/include/geos/geos3.5.1 /usgs/pkgs/local/v007/include  /usgs/pkgs/local/v007/include/gmm/gmm-5.0  /usgs/pkgs/local/v007/include/gmm/gmm-5.0/gmm /usgs/pkgs/local/v007/include/google-protobuf/protobuf2.6.1  /usgs/pkgs/local/v007/include/boost/boost1.59.0 /usgs/pkgs/local/v007/include/kakadu/v7_9_1-01762L /usgs/pkgs/local/v007/include/SuiteSparse/SuiteSparse4.4.5/SuiteSparse /usgs/pkgs/local/v007/include/hdf5 /usgs/pkgs/local/v007/include/eigen /usgs/pkgs/local/v007/include/flann  /usgs/pkgs/local/v007/include/pcl-1.8 /usgs/pkgs/local/v007/include/vtk-7.1 /usgs/pkgs/local/v007/include/superlu/superlu4.3 /usgs/pkgs/local/v007/include /usgs/pkgs/local/v007/include/nn /usgs/pkgs/local/v007/include/bullet /usgs/pkgs/local/v007/include/embree2 /usgs/pkgs/local/v007/include



DEPENDPATH += $$PWD/ ../../../../qisis/objs/ControlPointEditWidget ../../../../qisis/objs/MatchTool ../../../../qisis/objs/StereoTool ../../../../qisis/objs/QnetTools /usgs/pkgs/local/v007/include/qt/qt5.7.1 /usgs/pkgs/local/v007/include/qt/qt5.7.1/Qt /usgs/pkgs/local/v007/include/qt/qt5.7.1/QtCore /usgs/pkgs/local/v007/include/qt/qt5.7.1/QtAssistant /usgs/pkgs/local/v007/include/qt/qt5.7.1/QtConcurrent /usgs/pkgs/local/v007/include/qt/qt5.7.1/QtDBus /usgs/pkgs/local/v007/include/qt/qt5.7.1/QtGui /usgs/pkgs/local/v007/include/qt/qt5.7.1/QtMultimedia /usgs/pkgs/local/v007/include/qt/qt5.7.1/QtMultimediaWidgets /usgs/pkgs/local/v007/include/qt/qt5.7.1/QtNetwork /usgs/pkgs/local/v007/include/qt/qt5.7.1/QtOpenGL /usgs/pkgs/local/v007/include/qt/qt5.7.1/QtPositioning /usgs/pkgs/local/v007/include/qt/qt5.7.1/QtPrintSupport /usgs/pkgs/local/v007/include/qt/qt5.7.1/QtQml /usgs/pkgs/local/v007/include/qt/qt5.7.1/QtQuick /usgs/pkgs/local/v007/include/qt/qt5.7.1/QtScript /usgs/pkgs/local/v007/include/qt/qt5.7.1/QtScriptTools /usgs/pkgs/local/v007/include/qt/qt5.7.1/QtSensors /usgs/pkgs/local/v007/include/qt/qt5.7.1/QtSql /usgs/pkgs/local/v007/include/qt/qt5.7.1/QtSvg /usgs/pkgs/local/v007/include/qt/qt5.7.1/QtTest /usgs/pkgs/local/v007/include/qt/qt5.7.1/QtWebChannel /usgs/pkgs/local/v007/include/qt/qt5.7.1/QtWebEngine /usgs/pkgs/local/v007/include/qt/qt5.7.1/QtWebEngineWidgets /usgs/pkgs/local/v007/include/qt/qt5.7.1/QtWidgets /usgs/pkgs/local/v007/include/qt/qt5.7.1/QtXml /usgs/pkgs/local/v007/include/qt/qt5.7.1/QtXmlPatterns /usgs/pkgs/local/v007/include/qwt /usgs/pkgs/local/v007/include/xercesc/xercesc-3.1.2 /usgs/pkgs/local/v007/include/geotiff /usgs/pkgs/local/v007/include/tiff/tiff-4.0.5 /usgs/pkgs/local/v007/include/naif  /usgs/pkgs/local/v007/include/tnt/tnt126  /usgs/pkgs/local/v007/include/tnt/tnt126/tnt /usgs/pkgs/local/v007/include/jama/jama125  /usgs/pkgs/local/v007/include/geos/geos3.5.1 /usgs/pkgs/local/v007/include  /usgs/pkgs/local/v007/include/gmm/gmm-5.0  /usgs/pkgs/local/v007/include/gmm/gmm-5.0/gmm /usgs/pkgs/local/v007/include/google-protobuf/protobuf2.6.1  /usgs/pkgs/local/v007/include/boost/boost1.59.0 /usgs/pkgs/local/v007/include/kakadu/v7_9_1-01762L /usgs/pkgs/local/v007/include/SuiteSparse/SuiteSparse4.4.5/SuiteSparse /usgs/pkgs/local/v007/include/hdf5 /usgs/pkgs/local/v007/include/eigen /usgs/pkgs/local/v007/include/flann  /usgs/pkgs/local/v007/include/pcl-1.8 /usgs/pkgs/local/v007/include/vtk-7.1 /usgs/pkgs/local/v007/include/superlu/superlu4.3 /usgs/pkgs/local/v007/include /usgs/pkgs/local/v007/include/nn /usgs/pkgs/local/v007/include/bullet /usgs/pkgs/local/v007/include/embree2 /usgs/pkgs/local/v007/include
 


INCLUDEPATH += $$PWD/ /usgs/pkgs/local/v007/include/qt/qt5.7.1/QtCore /usgs/pkgs/local/v007/include/qt/qt5.7.1/Qt /usgs/pkgs/local/v007/include/naif /usgs/pkgs/local/v007/include/qwt /usgs/pkgs/local/v007/include/xercesc/xercesc-3.1.2 /usgs/pkgs/local/v007/include/geotiff /usgs/pkgs/local/v007/include/tiff/tiff-4.0.5 /usgs/pkgs/local/v007/include/naif  /usgs/pkgs/local/v007/include/tnt/tnt126  /usgs/pkgs/local/v007/include/tnt/tnt126/tnt /usgs/pkgs/local/v007/include/jama/jama125 /usgs/pkgs/local/v007/include/geos/geos3.5.1 /usgs/pkgs/local/v007/include  /usgs/pkgs/local/v007/include/gmm/gmm-5.0  /usgs/pkgs/local/v007/include/gmm/gmm-5.0/gmm /usgs/pkgs/local/v007/include/google-protobuf/protobuf2.6.1  /usgs/pkgs/local/v007/include/boost/boost1.59.0 /usgs/pkgs/local/v007/include/kakadu/v7_9_1-01762L /usgs/pkgs/local/v007/include/SuiteSparse/SuiteSparse4.4.5/SuiteSparse /usgs/pkgs/local/v007/include/hdf5 /usgs/pkgs/local/v007/include/eigen /usgs/pkgs/local/v007/include/flann  /usgs/pkgs/local/v007/include/pcl-1.8 /usgs/pkgs/local/v007/include/vtk-7.1 /usgs/pkgs/local/v007/include/superlu/superlu4.3 /usgs/pkgs/local/v007/include /usgs/pkgs/local/v007/include/nn /usgs/pkgs/local/v007/include/bullet /usgs/pkgs/local/v007/include/embree2 /usgs/pkgs/local/v007/include





DEPENDPATH += $$PWD/ /usgs/pkgs/local/v007/include/qt/qt5.7.1/QtCore /usgs/pkgs/local/v007/include/qt/qt5.7.1/Qt /usgs/pkgs/local/v007/include/naif /usgs/pkgs/local/v007/include/qwt /usgs/pkgs/local/v007/include/xercesc/xercesc-3.1.2 /usgs/pkgs/local/v007/include/geotiff /usgs/pkgs/local/v007/include/tiff/tiff-4.0.5 /usgs/pkgs/local/v007/include/naif  /usgs/pkgs/local/v007/include/tnt/tnt126  /usgs/pkgs/local/v007/include/tnt/tnt126/tnt /usgs/pkgs/local/v007/include/jama/jama125 /usgs/pkgs/local/v007/include/geos/geos3.5.1 /usgs/pkgs/local/v007/include  /usgs/pkgs/local/v007/include/gmm/gmm-5.0  /usgs/pkgs/local/v007/include/gmm/gmm-5.0/gmm /usgs/pkgs/local/v007/include/google-protobuf/protobuf2.6.1  /usgs/pkgs/local/v007/include/boost/boost1.59.0 /usgs/pkgs/local/v007/include/kakadu/v7_9_1-01762L /usgs/pkgs/local/v007/include/SuiteSparse/SuiteSparse4.4.5/SuiteSparse /usgs/pkgs/local/v007/include/hdf5 /usgs/pkgs/local/v007/include/eigen /usgs/pkgs/local/v007/include/flann  /usgs/pkgs/local/v007/include/pcl-1.8 /usgs/pkgs/local/v007/include/vtk-7.1 /usgs/pkgs/local/v007/include/superlu/superlu4.3 /usgs/pkgs/local/v007/include /usgs/pkgs/local/v007/include/nn /usgs/pkgs/local/v007/include/bullet /usgs/pkgs/local/v007/include/embree2 /usgs/pkgs/local/v007/include

isis/src/base/apps/spiceit/spiceit/spiceit.pro

+1 −1
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ LIBS += -L../../../../../lib -lisis3 
LIBS += -L/usgs/pkgs/local/v007/lib -pthread  -lQt5Core -lQt5Concurrent -lQt5XmlPatterns -lQt5Xml -lQt5Network -lQt5Sql -lQt5Gui -lQt5PrintSupport -lQt5Positioning -lQt5Qml -lQt5Quick -lQt5Sensors -lQt5Svg -lQt5Test -lQt5OpenGL -lQt5Widgets -lQt5Multimedia -lQt5MultimediaWidgets -lQt5WebChannel -lQt5WebEngine -lQt5WebEngineWidgets -lQt5DBus -lqwt -lxerces-c -lgeotiff -ltiff -lcspice   -lgeos-3.5.1 -lgeos_c -lgsl -lgslcblas -lX11  -lprotobuf -lboost_date_time -lboost_filesystem -lboost_graph -lboost_math_c99f -lboost_math_c99l -lboost_math_c99 -lboost_math_tr1f -lboost_math_tr1l -lboost_math_tr1 -lboost_prg_exec_monitor -lboost_program_options -lboost_regex -lboost_serialization -lboost_signals -lboost_system -lboost_thread -lboost_unit_test_framework -lboost_wave -lboost_wserialization -lboost_timer -lboost_chrono -lkdu_a79R -lkdu_v79R -lcholmod -lamd -lcamd -lccolamd -lcolamd -llapack -lsuitesparseconfig -lhdf5 -lhdf5_hl -lhdf5_cpp -lhdf5_hl_cpp -lpcl_common -lpcl_octree -lpcl_io -lvtksys-7.1 -lsuperlu_4.3 -l:libblas.so.3 -l:libgfortran.so.3 -lBullet3Collision  -lBullet3Common -lBullet3Dynamics   -lBullet3Geometry  -lBullet3OpenCL_clew -lBulletCollision   -lBulletDynamics   -lBulletInverseDynamics -lBulletSoftBody    -lLinearMath  -lembree







#---------------------------------------------------------------------------------------

# The following lines import the shared QtWebApp library.

# You may need to modify the path names to match your computer.
@@ -51,4 +52,3 @@ CONFIG(debug, debug|release) { 
win32 {

   DEFINES += QTWEBAPPLIB_IMPORT

}

isis/src/base/objs/EndianSwapper/EndianSwapper.cpp

+22 −1
Original line number Diff line number Diff line
@@ -138,6 +138,28 @@ namespace Isis { 
    return result;

  }



  /**

   * Swaps a 32bit unsigned integer.

   *

   * @param buf Input uint32 integer value to swap.

   */

  uint32_t EndianSwapper::Uint32_t(void *buf) {

    uint32_t result = *(uint32_t *)buf;



    if(p_needSwap) {

      char *ptr = (char *)buf + (sizeof(uint32_t) - 1) * p_needSwap;



      for(unsigned int i = 0; i < sizeof(uint32_t); i++) {

        p_swapper.p_char[i] = *ptr;

        ptr += p_swapDirection;

      }



      result = p_swapper.p_uint32;

    }



    return result;

  }



  /**

   * Swaps an 8 byte integer value.

   *
@@ -203,4 +225,3 @@ namespace Isis { 
    return result;

  }

}

isis/src/base/objs/EndianSwapper/EndianSwapper.h

+4 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ namespace Isis { 
   *            not added because it is 4 bytes on 32-bit linux and 8 bytes on

   *            64-bit linux.

   *   @history 2016-04-21 Makayla Shepherd - Added UnsignedWord pixel type handling.

   *   @history 2018-01-29 Adam Goins - Added uint32_t behavior to EndianSwapper.

   */

  class EndianSwapper {

    private:
@@ -67,6 +68,8 @@ namespace Isis { 
       * byte format - all with swapped bytes.

       */

      union {

        //! Union containing the output uint32_t value with swapped bytes.

        uint32_t p_uint32;

        //! Union containing the output double precision value with swapped bytes.

        double p_double;

        //! Union containing the output floating point value with swapped bytes.
@@ -93,6 +96,7 @@ namespace Isis { 
      float Float(void *buf);

      int ExportFloat(void *buf);

      int Int(void *buf);

      uint32_t Uint32_t(void *buf);

      long long int LongLongInt(void *buf);

      short int ShortInt(void *buf);

      unsigned short int UnsignedShortInt(void *buf);