Commit 3dd59731 authored by Makayla Shepherd's avatar Makayla Shepherd
Browse files

Removed hdf5 dependancy in Statistics. Fixes #4795. 

git-svn-id: http://subversion.wr.usgs.gov/repos/prog/isis3/branches/ipce_FY17-Sprint1@7593 41f8697f-d340-4b68-9986-7bafba869bb8
parent 1ce69ce9

isis/src/base/objs/Statistics/Statistics.cpp

+0 −86
Original line number Diff line number Diff line
@@ -27,10 +27,6 @@ 


#include <float.h>



#include <H5Cpp.h>

#include <hdf5_hl.h>

#include <hdf5.h>



#include "IException.h"

#include "IString.h"

#include "Project.h"
@@ -939,86 +935,4 @@ namespace Isis { 
    return statistics.read(stream);

  }



//??? not working for prog14/15???

// dyld: Symbol not found: __ZN2H58PredType12NATIVE_INT64E

//   Referenced from: /usgs/pkgs/isis3beta2015-12-24/isis/bin/../lib/libisis3.4.12.dylib

//   Expected in: flat namespace

//  in /usgs/pkgs/isis3beta2015-12-24/isis/bin/../lib/libisis3.4.12.dylib



  /** 

   *  H5 compound data type uses the offesets from the QDataStream returned by

   *  the write(QDataStream &stream) method.

   */

  H5::CompType Statistics::compoundH5DataType() {



    H5::CompType compoundDataType((size_t)124);



    size_t offset = 0;

    compoundDataType.insertMember("Sum", offset, H5::PredType::NATIVE_DOUBLE);



    // offset += sizeof(m_sum);

    offset += sizeof(double);

    compoundDataType.insertMember("SumSquared", offset, H5::PredType::NATIVE_DOUBLE);



    // offset += sizeof(m_sumsum);

    offset += sizeof(double);

    compoundDataType.insertMember("Minimum", offset, H5::PredType::NATIVE_DOUBLE);



    // offset += sizeof(m_minimum);

    offset += sizeof(double);

    compoundDataType.insertMember("Maximum", offset, H5::PredType::NATIVE_DOUBLE);



    // offset += sizeof(m_maximum);

    offset += sizeof(double);

    compoundDataType.insertMember("ValidMinimum", offset, H5::PredType::NATIVE_DOUBLE);



    // offset += sizeof(m_validMinimum);

    offset += sizeof(double);

    compoundDataType.insertMember("ValidMaximum", offset, H5::PredType::NATIVE_DOUBLE);



    // offset += sizeof(m_validMaximum);

    offset += sizeof(double);

    compoundDataType.insertMember("TotalPixels", offset, H5::PredType::NATIVE_INT64);



    // offset += sizeof(m_totalPixels);

    offset += sizeof(BigInt);

    compoundDataType.insertMember("ValidPixels", offset, H5::PredType::NATIVE_INT64);



    // offset += sizeof(m_validPixels);

    offset += sizeof(BigInt);

    compoundDataType.insertMember("NullPixels", offset, H5::PredType::NATIVE_INT64);



    // offset += sizeof(m_nullPixels);

    offset += sizeof(BigInt);

    compoundDataType.insertMember("LRSPixels", offset, H5::PredType::NATIVE_INT64);



    // offset += sizeof(m_lrsPixels);

    offset += sizeof(BigInt);

    compoundDataType.insertMember("LISPixels", offset, H5::PredType::NATIVE_INT64);



    // offset += sizeof(m_lisPixels);

    offset += sizeof(BigInt);

    compoundDataType.insertMember("HRSPixels", offset, H5::PredType::NATIVE_INT64);



    // offset += sizeof(m_hrsPixels);

    offset += sizeof(BigInt);

    compoundDataType.insertMember("HISPixels", offset, H5::PredType::NATIVE_INT64);



    // offset += sizeof(m_hisPixels);

    offset += sizeof(BigInt);

    compoundDataType.insertMember("UnderRangePixels", offset, H5::PredType::NATIVE_INT64);



    // offset += sizeof(m_underRangePixels);

    offset += sizeof(BigInt);

    compoundDataType.insertMember("OverRangePixels", offset, H5::PredType::NATIVE_INT64);



    // offset += sizeof(m_overRangePixels);

    offset += sizeof(BigInt);

    compoundDataType.insertMember("RemovedData", offset, H5::PredType::NATIVE_HBOOL);

    // mac osx has problem with "sizeof" commented lines and the native data

    // types too... will consider this later when ready to add serialization.



    return compoundDataType;

  }



} // end namespace isis

isis/src/base/objs/Statistics/Statistics.h

+2 −6
Original line number Diff line number Diff line
@@ -23,10 +23,6 @@ 
#include <QObject>

#include <QString>



#include <H5Cpp.h>

#include <hdf5_hl.h>

#include <hdf5.h>



#include "Constants.h"

#include "PvlGroup.h"

#include "SpecialPixel.h"
@@ -100,6 +96,8 @@ namespace Isis { 
   *   @history 2016-07-15 Ian Humphrey - Added constructor that initializes a Statistics object

   *                           from a PvlGroup. Added toPvl() and fromPvl() methods to allow

   *                           Statistics serialization/unserialization. References #2282.

   *   @history 2017-04-20 Makayla Shepherd - Removed the hdf5 code because we are using XML for

   *                           serialization. Fixes #4795.

   *

   *   @todo 2005-02-07 Deborah Lee Soltesz - add example using cube data to the class documentation

   *   @todo 2015-08-13 Jeannie Backer - Clean up header and implementation files once
@@ -169,8 +167,6 @@ namespace Isis { 
      QDataStream &write(QDataStream &stream) const;

      QDataStream &read(QDataStream &stream);



      static H5::CompType compoundH5DataType();



    private:



      void fromPvl(const PvlGroup &inStats);