Commit 45aedb38 authored by Kaitlyn Lee's avatar Kaitlyn Lee
Browse files

Changed QStrings to a QVector and int.

parent 2e63da5e

isis/src/base/apps/trackextract/trackextract.cpp

+20 −17
Original line number Diff line number Diff line
@@ -19,9 +19,9 @@ using namespace Isis; 
const int FLOAT_MIN = -16777215;

const int FLOAT_MAX = 16777216;



void findTrackBand(QString inputName, QString &copyBands, QString &trackBand);

void createMosaicCube(QString inputName, QString outputName, QString bands);

void createTrackCube(QString inputName, QString ouputName, QString trackBand);

void findTrackBand(QString inputName, QVector<QString> &copyBands, int &trackBand);

void createMosaicCube(QString inputName, QString outputName, QVector<QString> bandsVector);

void createTrackCube(QString inputName, QString ouputName, int trackBand);

void copyPixels(Buffer &in, Buffer &out);

void copyTrackPixels(Buffer &in, Buffer &out);
@@ -29,8 +29,8 @@ void IsisMain() { 
  UserInterface &ui = Application::GetUserInterface();

  QString inputName = ui.GetFileName("FROM");

  QString outputName = ui.GetFileName("TO");

  QString copyBands;

  QString trackBand;

  QVector<QString> copyBands;

  int trackBand;

  findTrackBand(inputName, copyBands, trackBand);

  createMosaicCube(inputName, outputName, copyBands);

  createTrackCube(inputName, outputName, trackBand);
@@ -47,19 +47,19 @@ void IsisMain() { 
 * @param copyBands Indices of the bands to copy over to the mosaic cube

 * @param trackBand Index of the tracking band

 */

void findTrackBand(QString inputName, QString &copyBands, QString &trackBand) {

void findTrackBand(QString inputName, QVector<QString> &copyBands, int &trackBand) {

  Cube inputCube = Cube(inputName);

  if (inputCube.hasGroup("BandBin")) {

    PvlGroup &bandBinGroup = inputCube.group("BandBin");

    try {

      PvlKeyword &currentKeyword = bandBinGroup[0];

      trackBand = -1;

      for (int i = 0; i < currentKeyword.size(); i++) {

        if (currentKeyword[i] != "TRACKING") {

          copyBands += QString::number(i + 1); // Make it 1 based

          copyBands += ",";

          copyBands.append(QString::number(i + 1)); // Make it 1 based

        }

        else {

          trackBand = QString::number(i + 1);

          trackBand = i + 1;

        }

      }

    }
@@ -73,7 +73,7 @@ void findTrackBand(QString inputName, QString &copyBands, QString &trackBand) { 
    QString msg = "The input cube [" + inputName + "] does not have a BandBin group.";

    throw IException(IException::Programmer, msg, _FILEINFO_);

  }

  if (trackBand == "") {

  if (trackBand == -1) {

    QString msg = "The input cube [" + inputName + "] does not have a tracking band.";

    msg += " If you want to create a tracking cube, run a mosaic program.";

    throw IException(IException::Programmer, msg, _FILEINFO_);
@@ -88,11 +88,14 @@ void findTrackBand(QString inputName, QString &copyBands, QString &trackBand) { 
 *

 * @param inputName   The name of the input cube

 * @param ouputName   The name of the output cube

 * @param bands     The indices of the bands that are not the tracking band

 * @param bandsVector The indices of the bands that are not the tracking band

 */

void createMosaicCube(QString inputName, QString outputName, QString bands) {

void createMosaicCube(QString inputName, QString outputName, QVector<QString> bandsVector) {

  ProcessByLine p;

  CubeAttributeInput inAtt = CubeAttributeInput("+" + bands);



  CubeAttributeInput inAtt = CubeAttributeInput();

  inAtt.setBands(bandsVector.toStdVector());

  

  p.SetInputCube(inputName, inAtt);

  p.SetOutputCube("TO");

  p.StartProcess(copyPixels);
@@ -134,10 +137,10 @@ void createMosaicCube(QString inputName, QString outputName, QString bands) { 
 * @param ouputName    The name of the output cube

 * @param trackingBand The index of the tracking band

 */

void createTrackCube(QString inputName, QString ouputName, QString trackBand) {

void createTrackCube(QString inputName, QString ouputName, int trackBand) {

  ProcessByLine p;



  CubeAttributeInput inAtt = CubeAttributeInput("+" + trackBand);

  CubeAttributeInput inAtt = CubeAttributeInput("+" + QString::number(trackBand));

  p.SetInputCube(inputName, inAtt);



  FileName cubeName = FileName(ouputName);

isis/src/base/objs/CubeAttribute/CubeAttribute.cpp

+1 −1
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ namespace Isis { 




  void CubeAttributeInput::setBands(const vector<QString> &bands) {

    setAttributes(toString(bands));

    setAttributes("+" + toString(bands));

  }

isis/src/base/objs/CubeAttribute/CubeAttribute.h

+2 −0
Original line number Diff line number Diff line
@@ -391,6 +391,8 @@ namespace Isis { 
   *                           CubeAttribute parent class now. Updated to match current

   *                           coding standards. Added safety checks for

   *                           unrecognized attributes. References #961.

   *   @history 2018-07-27 Kaitlyn Lee - Added "+" in setBands() because without it,

   *                           setAttributes() was skipping the list of band indices.

   */

  class CubeAttributeInput : public CubeAttribute<CubeAttributeInput> {