Commit ee5843aa authored by Amy Stamile's avatar Amy Stamile
Browse files

Updated table, tablefield, and tablerecord

parent 72ae8ee2

isis/src/base/apps/caminfo/caminfo.cpp

+1 −1
Original line number Diff line number Diff line
@@ -262,7 +262,7 @@ namespace Isis{ 
          Table csTable = incube->readTable("CameraStatistics");



          for (int rec = 0; rec < csTable.Records(); rec++) {

            QString tableRec = TableRecord::toString(csTable[rec]);

            QString tableRec = QString::fromStdString(TableRecord::toString(csTable[rec]));

            QString recordName = tableRec.split(",").at(0);



            camstats->append(MakePair(recordName + "Minimum", tableRec.split(",").at(1)));

isis/src/base/apps/camstats/camstats.cpp

+1 −1
Original line number Diff line number Diff line
@@ -192,7 +192,7 @@ namespace Isis { 
        PvlGroup &group = statsPvl.group(i);



        int entry = 0;

        record[entry] = group.name();

        record[entry] = group.name().toStdString();

        entry++;

        for (int j = 0; j < group.keywords(); j++) {

          record[entry] = toDouble(group[j][0]);

isis/src/base/apps/csv2table/main.cpp

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ void IsisMain() { 
      // If the next column header is different, create a field for this one

      QRegularExpressionMatch nextMatch = (columnIndex<numColumns-1)?rex.match(header[columnIndex+1]):QRegularExpressionMatch();

      if ((columnIndex == numColumns-1) || (nextMatch.hasMatch() && (name != nextMatch.captured("name")))) {

        TableField columnField(name, TableField::Double, (index.length()>0)?(index.toInt()+1):1);

        TableField columnField(name.toStdString(), TableField::Double, (index.length()>0)?(index.toInt()+1):1);

        tableRow += columnField;

      }

    }

isis/src/base/apps/table2cube/main.cpp

+7 −7
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ void IsisMain() { 
    g_numElements = ui.GetInteger("NUMELEM");

  }

  else {

    g_numElements = (*g_table)[g_startRecord][g_field].size() - (g_startElement - 1);

    g_numElements = (*g_table)[g_startRecord][g_field.toStdString()].size() - (g_startElement - 1);

  }



  p.SetOutputCube("TO", g_numElements, g_numRecords);
@@ -56,16 +56,16 @@ void readTable(Isis::Buffer &outcube) { 
    for (int element = g_startElement; element < g_startElement + g_numElements; element ++) {

      int index = (g_numElements * (record - 1)) + (element - g_startElement);



      if ((*g_table)[record-1][g_field].isReal()) {

        std::vector<float> data = (*g_table)[record-1][g_field];

      if ((*g_table)[record-1][g_field.toStdString()].isReal()) {

        std::vector<float> data = (*g_table)[record-1][g_field.toStdString()];

        outcube[index] = data.at(element - 1);

      }

      else if ((*g_table)[record-1][g_field].isInteger()) {

        std::vector<int> data = (*g_table)[record-1][g_field];

      else if ((*g_table)[record-1][g_field.toStdString()].isInteger()) {

        std::vector<int> data = (*g_table)[record-1][g_field.toStdString()];

        outcube[index] = data.at(element - 1);

      }

      else if ((*g_table)[record-1][g_field].isDouble()) {

        std::vector<double> data = (*g_table)[record-1][g_field];

      else if ((*g_table)[record-1][g_field.toStdString()].isDouble()) {

        std::vector<double> data = (*g_table)[record-1][g_field.toStdString()];

        outcube[index] = data.at(element - 1);

      }

    }

isis/src/base/apps/tabledump/main.cpp

+3 −3
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ void IsisMain() { 


  for (int i = 0; i < table[0].Fields(); i++) {

    for (int j = 0; j < table[0][i].size(); j++) {

      QString title = table[0][i].name();

      QString title = QString::fromStdString(table[0][i].name());

      if (table[0][i].isText()) {

        j += table[0][i].bytes();

      }
@@ -79,7 +79,7 @@ void IsisMain() { 
          ss << IString((double)table[i][j]);

        }

        else if (table[i][j].isText()) {

          ss << (QString)table[i][j];

          ss << (std::string)table[i][j];

        }

        if (j < table[i].Fields() - 1) {

          ss << delimit;
@@ -89,7 +89,7 @@ void IsisMain() { 
      // and output them with the delimiter character between

      else {

        if (table[i][j].isText()) {

          ss << (QString)table[i][j] << delimit;

          ss << (std::string)table[i][j] << delimit;

        }

        else if (table[i][j].isInteger()) {

          vector<int> currField = table[i][j];