Commit 393168a0 authored by Jeannie Backer's avatar Jeannie Backer
Browse files

Updated from trunk. 

git-svn-id: http://subversion.wr.usgs.gov/repos/prog/isis3/branches/ipce@6265 41f8697f-d340-4b68-9986-7bafba869bb8
parent fbb54dd1

isis/make/config.linux-x86_64_Fedora21

+20 −0
Original line number Diff line number Diff line
@@ -249,6 +249,15 @@ CHOLMODINCDIR = -I$(ISIS3LOCAL)/include/CHOLMOD/CHOLMOD1.7.3 
CHOLMODLIBDIR = -L$(ISIS3LOCAL)/lib

CHOLMODLIB    = -lcholmod -lamd -lcolamd -llapack



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

# Set up for HDF5 libraries 

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

HDF5INCDIR = -I$(ISIS3LOCAL)/include/hdf5

HDF5LIBDIR = -L$(ISIS3LOCAL)/lib

# HDF5INCDIR = -I/work/projects/progteam/jlaura/hdf5-1.8.14/build/include

# HDF5LIBDIR = -L/work/projects/progteam/jlaura/hdf5-1.8.14/build/lib

HDF5LIB    = -lhdf5 -lhdf5_hl -lhdf5_cpp -lhdf5_hl_cpp



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

#  Define the third party distribution libraries (patterns)

#---------------------------------------------------------------------------
@@ -302,8 +311,10 @@ THIRDPARTYLIBS += "$(ISIS3LOCAL)/lib/libqwt.so*" 
THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libprotobuf.so*"

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

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



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

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



THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libsuperlu_4.3.a"

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

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libcolamd.so"
@@ -325,5 +336,14 @@ THIRDPARTYLIBS += "$(ISIS3SYSLIB)/libgsl*.so*" 
#THIRDPARTYLIBS    += "/lib64/libreadline.so*"

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



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

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

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

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

#THIRDPARTYLIBS += "/work/projects/progteam/jlaura/hdf5-1.8.14/build/lib/libhdf5.so*"

#THIRDPARTYLIBS += "/work/projects/progteam/jlaura/hdf5-1.8.14/build/lib/libhdf5_hl.so*"

#THIRDPARTYLIBS += "/work/projects/progteam/jlaura/hdf5-1.8.14/build/lib/libhdf5_cpp.so*"

#THIRDPARTYLIBS += "/work/projects/progteam/jlaura/hdf5-1.8.14/build/lib/libhdf5_hl_cpp.so*"



#  Plugins

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

isis/src/base/apps/camstats/camstats.xml

+16 −4
Original line number Diff line number Diff line
@@ -43,6 +43,16 @@ 
    Keep in mind that sparse increments assigned to LINC and SINC are 

    susceptible to an adverse effect on the accuracy of the statistics.

    </p>

    <p>

    The statistics are output both to the screen and to the print.prt file in PVL format.

    Additionally, if the user specifies a file using the TO parameter, the statistics are written to

    that file in PVL format (default) or as a comma-separated-value text file (FLAT file), depending

    on the FORMAT parameter.

    </p>

    <p>

    If the output file exists and the APPEND parameter is set to "no", the contents will be

    overwritten.

    </p>

  </description>



  <history>
@@ -81,7 +91,11 @@ 
      Updated FORMAT and APPEND documentation to be more clear. Made general

      edits for clarity.

    </change>

      

    <change name="Andrew Stebenne" date="2015-04-03">

      Removed the filter on the TO parameter so that any file can be used for output. Updated

      documentation to clarify the existence and functioning of a few quirks. Addresses redmine

      ticket #175.

    </change>

  </history>



  <category>
@@ -144,10 +158,8 @@ 
          Alternatively, the output can be written to a text file format, 

          see the "FORMAT" parameter for more information.

          </p>

          The format is ignored unless the "TO" parameter is specified.

        </description>

        <filter>

          *.txt *.TXT

        </filter>

      </parameter>

      <parameter name="FORMAT">

        <type>string</type>

isis/src/base/objs/Preference/Preference.cpp

+7 −0
Original line number Diff line number Diff line
@@ -48,6 +48,13 @@ namespace Isis { 
    if(Isis::FileName(file).fileExists()) {

      pvl.read(file);

    }

    else {

      // Throw an exception if the preference file isn't found

      throw IException(IException::User,

                       QString("The preference file %1 was not found or does not exist").arg(file),

                       _FILEINFO_);

    }





    // Override parameters each time load is called

    for(int i = 0; i < pvl.groups(); i++) {

isis/src/base/objs/Preference/Preference.h

+4 −0
Original line number Diff line number Diff line
@@ -69,6 +69,10 @@ namespace Isis { 
   *                           limit in the Qt global thread pool.

   *   @history 2013-03-27 Jeannie Backer - Added Near mission to DataDirectory

   *                           group to TestPreferences file. References #1248.

   *   @history 2015-05-27 Andrew Stebenne - Backwards Compatibility Issue:

   *                           Preference now throws an exception when Preference.Load()

   *                           is called on a nonexistent preference file. This may cause issues

   *                           for anyone who has been using a nonexistent preference file.

   */

  class Preference : public Pvl {

isis/src/base/objs/Preference/Preference.truth

+1 −0
Original line number Diff line number Diff line
@@ -10,3 +10,4 @@ End_Group 




Value of Vegetable is : Potatoe

**USER ERROR** The preference file dummyPrefs was not found or does not exist.