Fixed issues with setting simas to nulll. (d99d26ff) · Commits · aflab / astrogeology / ISIS3

isis/src/qisis/objs/JigsawSetupDialog/JigsawSetupDialog.cpp

+16 −7

Original line number	Diff line number	Diff line
		@@ -756,7 +756,6 @@ namespace Isis {
		if (m_ui->positionAprioriSigmaTable->item(2,3) )
		accelerationAprioriSigma = m_ui->positionAprioriSigmaTable->item(2,3)->data(0).toDouble();


		//Saving additionalPositional/Angular coefficients (deg >=3) in case they are needed
		//later.
		if (spkSolveDegree >2) {
		@@ -1383,12 +1382,8 @@ namespace Isis {
		if (item->column() != 3) {
		return;
		}

		// FREE is a valid value for the a priori sigma column
		int free = item->text().simplified().compare("FREE", Qt::CaseInsensitive);
		if (free == 0) {
		item->setText("FREE");
		}

		// Positive doubles are valid values for the a priori sigma column
		bool convertSuccess = false;
		@@ -1403,6 +1398,10 @@ namespace Isis {
		else {
		item->setBackground(table->palette().color(QPalette::Base));
		}

		if (sigma == 0.0) {
		item->setText("FREE");
		}
		}
		else {
		item->setData(Qt::UserRole, QVariant(false));
		@@ -1732,8 +1731,13 @@ namespace Isis {
		for (int row = 0; row < settings.aprioriPositionSigmas().count(); row++) {
		QTableWidgetItem * sigmaItem = m_ui->positionAprioriSigmaTable->item(row, 3);
		double sigma = settings.aprioriPositionSigmas()[row];
		if (sigma == Isis::Null) {
		sigmaItem->setText("FREE");
		}
		else {
		sigmaItem->setText(QString::number(sigma));
		}
		}

		// Instrument Pointing Solve Options
		m_ui->pointingComboBox->setCurrentIndex(settings.instrumentPointingSolveOption());
		@@ -1745,8 +1749,13 @@ namespace Isis {
		for (int row = 0; row < settings.aprioriPointingSigmas().count(); row++) {
		QTableWidgetItem * sigmaItem = m_ui->pointingAprioriSigmaTable->item(row, 3);
		double sigma = settings.aprioriPointingSigmas()[row];
		if (sigma == Isis::Null) {
		sigmaItem->setText("FREE");
		}
		else {
		sigmaItem->setText(QString::number(sigma));
		}
		}

		}