Unverified Commit 465f7722 authored by jcwbacker's avatar jcwbacker Committed by GitHub
Browse files

Merge pull request #250 from kberryUSGS/CaSSIS_Pipeline 

Update ProcessExportPds4 so new functions will compile
parents c4322078 b65e5202

isis/src/base/objs/ProcessExportPds4/ProcessExportPds4.cpp

+7 −6
Original line number Diff line number Diff line
@@ -416,7 +416,8 @@ namespace Isis { 
    

    // Get the input Isis cube label and find the BandBin group if it has one

    if (m_imageType == StandardImage) {

      imageBandBin();

      //imageBandBin();

      translateBandBinImage(inputLabel);

    }

    else {

      // Add header info
@@ -425,16 +426,16 @@ namespace Isis { 
                "xmlns:sp", 

                "http://pds.nasa.gov/pds4/sp/v1");

      if (m_imageType == UniformlySampledSpectrum) {

        imageBandBinSpectrum();

        translateBandBinSpectrumUniform(inputLabel);

      }

      else if (m_imageType == BinSetSpectrum) {

        imageBandBinSpectrumBinSet();

        translateBandBinSpectrumBinSet(inputLabel);

      }

    }

  }





  void ProcessExportPds4::translateBandBinImage() {

  void ProcessExportPds4::translateBandBinImage(Pvl *inputLabel) {

    QString translationFile = "$base/translations/";

    translationFile += "pds4ExportBandBinImage.trn";

    FileName translationFileName(translationFile);
@@ -443,7 +444,7 @@ namespace Isis { 
  }





  void ProcessExportPds4::translateBandBinSpectrumUniform() {

  void ProcessExportPds4::translateBandBinSpectrumUniform(Pvl *inputLabel) {

    QString translationFile = "$base/translations/";

    translationFile += "pds4ExportBandBinSpectrumUniform.trn";

    FileName translationFileName(translationFile);
@@ -582,7 +583,7 @@ namespace Isis { 
  }





  void ProcessExportPds4::translateBandBinSpectrumBinSet() {

  void ProcessExportPds4::translateBandBinSpectrumBinSet(Pvl *inputLabel) {

    QString translationFile = "$base/translations/";

    translationFile += "pds4ExportBandBinSpectrumBinSet.trn";

    FileName translationFileName(translationFile);

isis/src/base/objs/ProcessExportPds4/ProcessExportPds4.h

+3 −3
Original line number Diff line number Diff line
@@ -125,9 +125,9 @@ namespace Isis { 
      QString PDS4PixelType(PixelType pixelType, ByteOrder endianType);

      static QMap<QString, QString> createUnitMap(Pvl configPvl);

      static void translateChildUnits(QDomElement parent, QMap<QString, QString> transMap);

      void translateBandBinImage();

      void translateBandBinSpectrumUniform();

      void translateBandBinSpectrumBinSet();

      void translateBandBinImage(Pvl *inputLabel);

      void translateBandBinSpectrumUniform(Pvl *inputLabel);

      void translateBandBinSpectrumBinSet(Pvl *inputLabel);



      QDomDocument *m_domDoc;               //!< XML label.

      QString m_schemaLocation;             //!< QString with all schema locations required.