Merge pull request #142 from kledmundson/ipce (f9945f88) · Commits · aflab / astrogeology / ISIS3

isis/src/qisis/objs/BundleObservationView/BundleObservationView.cpp

+14 −1

Original line number	Diff line number	Diff line
		@@ -105,7 +105,10 @@ namespace Isis {
		header3 = in.readLine();
		lineToken3 = header3.split(",");

		for (int i = 0; i < lineToken1.size(); i++) {
		lineToken1.append("");
		lineToken2.append("");

		for (int i = 0; i < lineToken3.size(); i++) {
		QString t1 = lineToken1.at(i);
		QString t2 = lineToken2.at(i);
		QString t3 = lineToken3.at(i);
		@@ -123,11 +126,21 @@ namespace Isis {
		// parse line into separate pieces(tokens) with "," as the delimiter
		QStringList lineToken = fileLine.split(",", QString::SkipEmptyParts);

		bool rejected = false;
		if (lineToken.at(lineToken.size()-1) == "*") {
		rejected = true;
		}

		// load parsed data to model accordingly
		for (int i = 0; i < lineToken.size(); i++) {
		QString value = lineToken.at(i);

		QStandardItem *item = new QStandardItem(value);

		if (rejected) {
		item->setData(QColor(200,0,0), Qt::BackgroundRole);
		}

		model->setItem(lineindex, i, item);
		}
		lineindex++;

+3 −0

Original line number	Diff line number	Diff line
		@@ -44,6 +44,9 @@ namespace Isis{
		* Fixes #4850.
		* @history 2018-03-26 Ken Edmundson - Modified displayTextFile method to query for system's
		* fixed width font.
		* @history 2018-04-16 Ken Edmundson - Modified display of residuals.csv to properly show the
		* rejected column if there are rejected measures. Also displays
		* rejected measure row in red.
		*/

		class BundleObservationView : public AbstractProjectItemView