Commit e7aedbaa authored by Kaj Williams's avatar Kaj Williams
Browse files

Fixed trailing commas from header and data lines. References bug #4657. 

git-svn-id: http://subversion.wr.usgs.gov/repos/prog/isis3/trunk@7699 41f8697f-d340-4b68-9986-7bafba869bb8
parent f0a7209b

isis/src/control/apps/cnettable/cnettable.cpp

+39 −39
Original line number Diff line number Diff line 
#include "Isis.h"



#include <string>



#include <QList>

#include <QString>

#include <QStringList>



#include "CameraPointInfo.h"

#include "ControlMeasure.h"
@@ -21,13 +26,6 @@ 
#include "SurfacePoint.h"

#include "TextFile.h"

#include "UserInterface.h"

//#include "LocalPointInfo.h"



#include <QList>

#include <QString>

#include <QStringList>



#include <string>



using namespace std;

using namespace Isis;
@@ -192,11 +190,15 @@ void IsisMain() { 
    measureInfo += QString(CheckValue(Asp.GetLatSigma().degrees())) + ",";

    measureInfo += QString(CheckValue(Asp.GetLonSigma().degrees())) + ",";

    measureInfo += QString(CheckValue(Asp.GetLocalRadiusSigma().kilometers())) + ",";

    try { measureInfo += QString(CheckValue(Asp.GetLatSigmaDistance().kilometers())) + ","; }

    try { 

      measureInfo += QString(CheckValue(Asp.GetLatSigmaDistance().kilometers())) + ","; 

    }

    catch (IException &) {

      measureInfo += ",";

    }

    try { measureInfo += QString(CheckValue(Asp.GetLonSigmaDistance().kilometers())) + ","; }

    try { 

      measureInfo += QString(CheckValue(Asp.GetLonSigmaDistance().kilometers())) + ","; 

    }

    catch (IException &) {

      measureInfo += ",";

    }
@@ -214,11 +216,15 @@ void IsisMain() { 
    measureInfo += QString(CheckValue(sp.GetLatSigma().degrees())) + ",";

    measureInfo += QString(CheckValue(sp.GetLonSigma().degrees())) + ",";

    measureInfo += QString(CheckValue(sp.GetLocalRadiusSigma().kilometers())) + ",";

    try { measureInfo += QString(CheckValue(sp.GetLatSigmaDistance().kilometers())) + ","; }

    try { 

      measureInfo += QString(CheckValue(sp.GetLatSigmaDistance().kilometers())) + ","; 

    }

    catch (IException &e) {

      measureInfo += ",";

    }

    try { measureInfo += QString(CheckValue(sp.GetLonSigmaDistance().kilometers())) + ","; }

    try { 

      measureInfo += QString(CheckValue(sp.GetLonSigmaDistance().kilometers())) + ","; 

    }

    catch (IException &e) {

      measureInfo += ",";

    }
@@ -367,16 +373,13 @@ void Write(PvlGroup *point, const ControlMeasure &cm) { 
      }

    }



    // control measure information

    //dataNames = cm.GetMeasureDataNames();

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

    //  output += IString(dataNames[i] + ",");

    //}





    if (errors) output += QString((*point)[maxCount].name());

    isFirst = false;

    measureLabels += output;

    // In some cases, we need to trim a trailing comma:

    if (measureLabels.endsWith(",")) {

      measureLabels.chop(1);

    }

    txt->PutLine(measureLabels);

  }

  output.clear();
@@ -401,20 +404,17 @@ void Write(PvlGroup *point, const ControlMeasure &cm) { 
    }

  }



  //dataNames = cm.GetMeasureDataNames();

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

  //  output += IString(cm.GetMeasureData(dataNames[i])) + ",";

  //}







  if (errors) output += QString((*point)[maxCount][0]);



  // Meaure info comes first

  // Measure info comes first

  QString pri = "";

  pri += measureInfo;

  pri += output;



  // In some cases, we need to trim a trailing comma:

  if (pri.endsWith(",")) {

    pri.chop(1);

  }

  txt->PutLine(pri);



  output.clear();

isis/src/control/apps/cnettable/cnettable.xml

+4 −1
Original line number Diff line number Diff line
@@ -129,7 +129,10 @@ xsi:noNamespaceSchemaLocation="http://isis.astrogeology.usgs.gov/Schemas/Applica 
    <change name="Tyler Wilson" date="2014-08-17">

      Updated application truth data due to modifications in CameraPointInfo class.

      References #476.



    </change>

     <change name="Kaj Williams" date="2017-04-21">

     Trimmed extra commas from label and data.

      References #4657.

    </change>

  </history>