Merge pull request #307 from USGS-Astrogeology/revert-305-ipceBundleWindow (2a53e5a2) · Commits · aflab / astrogeology / ISIS3

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

+78 −1

Original line number	Diff line number	Diff line
		@@ -453,6 +453,55 @@ namespace Isis {
		m_ui->ckDegreeSpinBox->setValue(observationSolveSettings.ckDegree());
		m_ui->ckSolveDegreeSpinBox->setValue(observationSolveSettings.ckSolveDegree());

		// weighting tab
		if ( !IsNullPixel(settings->globalLatitudeAprioriSigma()) ) {
		m_ui->pointLatitudeSigmaLineEdit->setText(toString(settings->globalLatitudeAprioriSigma()));
		m_ui->pointLatitudeSigmaLineEdit->setModified(true);
		}
		if ( !IsNullPixel(settings->globalLongitudeAprioriSigma()) ) {
		m_ui->pointLongitudeSigmaLineEdit->setText(toString(settings->globalLongitudeAprioriSigma()));
		m_ui->pointLongitudeSigmaLineEdit->setModified(true);
		}
		if ( !IsNullPixel(settings->globalRadiusAprioriSigma()) ) {
		m_ui->pointRadiusSigmaLineEdit->setText(toString(settings->globalRadiusAprioriSigma()));
		m_ui->pointRadiusSigmaLineEdit->setModified(true);

		}

		QList<double> aprioriPositionSigmas = observationSolveSettings.aprioriPositionSigmas();

		if ( aprioriPositionSigmas.size() > 0 && !IsNullPixel(aprioriPositionSigmas[0]) ) {
		m_ui->positionSigmaLineEdit->setText(toString(aprioriPositionSigmas[0]));
		m_ui->positionSigmaLineEdit->setModified(true);
		}

		if ( aprioriPositionSigmas.size() > 1 && !IsNullPixel(aprioriPositionSigmas[1]) ) {
		m_ui->velocitySigmaLineEdit->setText(toString(aprioriPositionSigmas[1]));
		m_ui->velocitySigmaLineEdit->setModified(true);
		}

		if ( aprioriPositionSigmas.size() > 2 && !IsNullPixel(aprioriPositionSigmas[2]) ) {
		m_ui->accelerationSigmaLineEdit->setText(toString(aprioriPositionSigmas[2]));
		m_ui->accelerationSigmaLineEdit->setModified(true);
		}

		QList<double> aprioriPointingSigmas = observationSolveSettings.aprioriPointingSigmas();

		if ( aprioriPointingSigmas.size() > 0 && !IsNullPixel(aprioriPointingSigmas[0]) ) {
		m_ui->pointingAnglesSigmaLineEdit->setText(toString(aprioriPointingSigmas[0]));
		m_ui->pointingAnglesSigmaLineEdit->setModified(true);
		}

		if ( aprioriPointingSigmas.size() > 1 && !IsNullPixel(aprioriPointingSigmas[1]) ) {
		m_ui->pointingAngularVelocitySigmaLineEdit->setText(toString(aprioriPointingSigmas[1]));
		m_ui->pointingAngularVelocitySigmaLineEdit->setModified(true);
		}

		if ( aprioriPointingSigmas.size() > 2 && !IsNullPixel(aprioriPointingSigmas[2]) ) {
		m_ui->pointingAngularAccelerationSigmaLineEdit->setText(toString(aprioriPointingSigmas[2]));
		m_ui->pointingAngularAccelerationSigmaLineEdit->setModified(true);
		}

		// maximum liklihood tab

		// self-calibration tab
		@@ -504,6 +553,15 @@ namespace Isis {
		double angularVelocitySigma = -1.0;
		double angularAccelerationSigma = -1.0;

		if (m_ui->pointingAnglesSigmaLineEdit->isModified()) {
		anglesSigma = m_ui->pointingAnglesSigmaLineEdit->text().toDouble();
		}
		if (m_ui->pointingAngularVelocitySigmaLineEdit->isModified()) {
		angularVelocitySigma = m_ui->pointingAngularVelocitySigmaLineEdit->text().toDouble();
		}
		if (m_ui->pointingAngularAccelerationSigmaLineEdit->isModified()) {
		angularAccelerationSigma = m_ui->pointingAngularAccelerationSigmaLineEdit->text().toDouble();
		}
		observationSolveSettings.setInstrumentPointingSettings(
		BundleObservationSolveSettings::stringToInstrumentPointingSolveOption("ANGLES"),
		// BundleObservationSolveSettings::stringToInstrumentPointingSolveOption(m_ui->pointingComboBox->currentText()),
		@@ -517,7 +575,15 @@ namespace Isis {
		double positionSigma = -1.0;
		double velocitySigma = -1.0;
		double accelerationSigma = -1.0;

		if (m_ui->positionSigmaLineEdit->isModified()) {
		positionSigma = m_ui->positionSigmaLineEdit->text().toDouble();
		}
		if (m_ui->velocitySigmaLineEdit->isModified()) {
		velocitySigma = m_ui->velocitySigmaLineEdit->text().toDouble();
		}
		if (m_ui->accelerationSigmaLineEdit->isModified()) {
		accelerationSigma = m_ui->accelerationSigmaLineEdit->text().toDouble();
		}
		observationSolveSettings.setInstrumentPositionSettings(
		BundleObservationSolveSettings::stringToInstrumentPositionSolveOption("NONE"),
		// BundleObservationSolveSettings::stringToInstrumentPositionSolveOption(m_ui->positionComboBox->currentText()),
		@@ -901,6 +967,17 @@ namespace Isis {
		m_ui->ckDegreeSpinBox->setEnabled(false);
		m_ui->ckSolveDegreeSpinBox->setEnabled(false);

		// weighting tab
		m_ui->pointLatitudeSigmaLineEdit->setEnabled(false);
		m_ui->pointLongitudeSigmaLineEdit->setEnabled(false);
		m_ui->pointRadiusSigmaLineEdit->setEnabled(false);
		m_ui->positionSigmaLineEdit->setEnabled(false);
		m_ui->velocitySigmaLineEdit->setEnabled(false);
		m_ui->accelerationSigmaLineEdit->setEnabled(false);
		m_ui->pointingAnglesSigmaLineEdit->setEnabled(false);
		m_ui->pointingAngularVelocitySigmaLineEdit->setEnabled(false);
		m_ui->pointingAngularAccelerationSigmaLineEdit->setEnabled(false);

		// maximum liklihood tab

		// self-calibration tab

isis/src/qisis/objs/JigsawSetupDialog/JigsawSetupDialog.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -85,7 +85,6 @@ namespace Isis {
		* invalid a priori sigma values whenever an a priori sigma values changes.
		* If any value is invalid, the OK and Apply Settings buttons are disabled
		* until all the a priori sigma values are valid again. References #497.
		* @history 2018-06-28 Makayla Shepherd - Removed the weighting tab.
		*/
		class JigsawSetupDialog : public QDialog {
		Q_OBJECT

isis/src/qisis/objs/JigsawSetupDialog/JigsawSetupDialog.ui

+330 −0

Original line number	Diff line number	Diff line
		@@ -1531,6 +1531,336 @@ Valid Range: 1.0e-10 to 1.0e+10</string>
		</item>
		</layout>
		</widget>
		<widget class="QWidget" name="weightingTab">
		<attribute name="title">
		<string>Weighting</string>
		</attribute>
		<layout class="QGridLayout" name="gridLayout_3">
		<item row="0" column="0">
		<layout class="QGridLayout" name="globalParameterUncertaintiesGridLayout">
		<item row="3" column="0">
		<widget class="QLabel" name="accelerationSigmaLabel">
		<property name="enabled">
		<bool>false</bool>
		</property>
		<property name="text">
		<string>Instrument Acceleration Sigma</string>
		</property>
		<property name="buddy">
		<cstring>accelerationSigmaLineEdit</cstring>
		</property>
		</widget>
		</item>
		<item row="5" column="1">
		<widget class="QLineEdit" name="pointingAngularVelocitySigmaLineEdit">
		<property name="enabled">
		<bool>false</bool>
		</property>
		<property name="sizePolicy">
		<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
		<horstretch>0</horstretch>
		<verstretch>0</verstretch>
		</sizepolicy>
		</property>
		</widget>
		</item>
		<item row="6" column="1">
		<widget class="QLineEdit" name="pointingAngularAccelerationSigmaLineEdit">
		<property name="enabled">
		<bool>false</bool>
		</property>
		<property name="sizePolicy">
		<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
		<horstretch>0</horstretch>
		<verstretch>0</verstretch>
		</sizepolicy>
		</property>
		</widget>
		</item>
		<item row="1" column="2">
		<widget class="QLabel" name="positionSigmaUnitsLabel">
		<property name="enabled">
		<bool>false</bool>
		</property>
		<property name="sizePolicy">
		<sizepolicy hsizetype="Maximum" vsizetype="Preferred">
		<horstretch>0</horstretch>
		<verstretch>0</verstretch>
		</sizepolicy>
		</property>
		<property name="maximumSize">
		<size>
		<width>49</width>
		<height>16777215</height>
		</size>
		</property>
		<property name="text">
		<string>&meters</string>
		</property>
		<property name="buddy">
		<cstring>positionSigmaLineEdit</cstring>
		</property>
		</widget>
		</item>
		<item row="2" column="1">
		<widget class="QLineEdit" name="velocitySigmaLineEdit">
		<property name="enabled">
		<bool>false</bool>
		</property>
		<property name="sizePolicy">
		<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
		<horstretch>0</horstretch>
		<verstretch>0</verstretch>
		</sizepolicy>
		</property>
		</widget>
		</item>
		<item row="6" column="2">
		<widget class="QLabel" name="pointingAngularAccelerationSigmaUnitsLabel">
		<property name="enabled">
		<bool>false</bool>
		</property>
		<property name="sizePolicy">
		<sizepolicy hsizetype="Maximum" vsizetype="Preferred">
		<horstretch>0</horstretch>
		<verstretch>0</verstretch>
		</sizepolicy>
		</property>
		<property name="maximumSize">
		<size>
		<width>202</width>
		<height>16777215</height>
		</size>
		</property>
		<property name="text">
		<string>degrees per second squared</string>
		</property>
		<property name="buddy">
		<cstring>pointingAngularAccelerationSigmaLineEdit</cstring>
		</property>
		</widget>
		</item>
		<item row="1" column="0">
		<widget class="QLabel" name="positionSigmaLabel">
		<property name="enabled">
		<bool>false</bool>
		</property>
		<property name="text">
		<string>Instrument Position Sigma</string>
		</property>
		<property name="buddy">
		<cstring>positionSigmaLineEdit</cstring>
		</property>
		</widget>
		</item>
		<item row="2" column="2">
		<widget class="QLabel" name="velocitySigmaUnitsLabel">
		<property name="enabled">
		<bool>false</bool>
		</property>
		<property name="sizePolicy">
		<sizepolicy hsizetype="Maximum" vsizetype="Preferred">
		<horstretch>0</horstretch>
		<verstretch>0</verstretch>
		</sizepolicy>
		</property>
		<property name="maximumSize">
		<size>
		<width>132</width>
		<height>16777215</height>
		</size>
		</property>
		<property name="text">
		<string>meters per second</string>
		</property>
		<property name="buddy">
		<cstring>velocitySigmaLineEdit</cstring>
		</property>
		</widget>
		</item>
		<item row="4" column="2">
		<widget class="QLabel" name="pointingAnglesSigmaUnitsLabel">
		<property name="sizePolicy">
		<sizepolicy hsizetype="Maximum" vsizetype="Preferred">
		<horstretch>0</horstretch>
		<verstretch>0</verstretch>
		</sizepolicy>
		</property>
		<property name="maximumSize">
		<size>
		<width>58</width>
		<height>16777215</height>
		</size>
		</property>
		<property name="text">
		<string>degrees</string>
		</property>
		<property name="buddy">
		<cstring>pointingAnglesSigmaLineEdit</cstring>
		</property>
		</widget>
		</item>
		<item row="1" column="1">
		<widget class="QLineEdit" name="positionSigmaLineEdit">
		<property name="enabled">
		<bool>false</bool>
		</property>
		<property name="sizePolicy">
		<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
		<horstretch>0</horstretch>
		<verstretch>0</verstretch>
		</sizepolicy>
		</property>
		</widget>
		</item>
		<item row="3" column="1">
		<widget class="QLineEdit" name="accelerationSigmaLineEdit">
		<property name="enabled">
		<bool>false</bool>
		</property>
		<property name="sizePolicy">
		<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
		<horstretch>0</horstretch>
		<verstretch>0</verstretch>
		</sizepolicy>
		</property>
		</widget>
		</item>
		<item row="4" column="1">
		<widget class="QLineEdit" name="pointingAnglesSigmaLineEdit">
		<property name="sizePolicy">
		<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
		<horstretch>0</horstretch>
		<verstretch>0</verstretch>
		</sizepolicy>
		</property>
		</widget>
		</item>
		<item row="5" column="0">
		<widget class="QLabel" name="pointingAngularVelocitySigmaLabel">
		<property name="enabled">
		<bool>false</bool>
		</property>
		<property name="text">
		<string>Instrument Pointing Angular Velocity Sigma</string>
		</property>
		<property name="buddy">
		<cstring>pointingAngularVelocitySigmaLineEdit</cstring>
		</property>
		</widget>
		</item>
		<item row="4" column="0">
		<widget class="QLabel" name="pointingAnglesSigmaLabel">
		<property name="text">
		<string>Instrument Pointing Angles Sigma</string>
		</property>
		<property name="buddy">
		<cstring>pointingAnglesSigmaLineEdit</cstring>
		</property>
		</widget>
		</item>
		<item row="2" column="0">
		<widget class="QLabel" name="velocitySigmaLabel">
		<property name="enabled">
		<bool>false</bool>
		</property>
		<property name="text">
		<string>Instrument Velocity Sigma</string>
		</property>
		<property name="buddy">
		<cstring>velocitySigmaLineEdit</cstring>
		</property>
		</widget>
		</item>
		<item row="6" column="0">
		<widget class="QLabel" name="pointingAngularAccelerationSigmaLabel">
		<property name="enabled">
		<bool>false</bool>
		</property>
		<property name="sizePolicy">
		<sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
		<horstretch>0</horstretch>
		<verstretch>0</verstretch>
		</sizepolicy>
		</property>
		<property name="minimumSize">
		<size>
		<width>326</width>
		<height>0</height>
		</size>
		</property>
		<property name="text">
		<string>Instrument Pointing Angular Acceleration Sigma</string>
		</property>
		<property name="buddy">
		<cstring>pointingAngularAccelerationSigmaLineEdit</cstring>
		</property>
		</widget>
		</item>
		<item row="5" column="2">
		<widget class="QLabel" name="pointingAngularVelocitySigmaUnitsLabel">
		<property name="enabled">
		<bool>false</bool>
		</property>
		<property name="sizePolicy">
		<sizepolicy hsizetype="Maximum" vsizetype="Preferred">
		<horstretch>0</horstretch>
		<verstretch>0</verstretch>
		</sizepolicy>
		</property>
		<property name="maximumSize">
		<size>
		<width>141</width>
		<height>16777215</height>
		</size>
		</property>
		<property name="text">
		<string>degrees per second</string>
		</property>
		<property name="buddy">
		<cstring>pointingAngularVelocitySigmaLineEdit</cstring>
		</property>
		</widget>
		</item>
		<item row="0" column="0" colspan="3">
		<widget class="QLabel" name="globalParameterUncertaintiesLabel">
		<property name="text">
		<string>Global Parameter Uncertainties</string>
		</property>
		<property name="alignment">
		<set>Qt::AlignCenter</set>
		</property>
		</widget>
		</item>
		<item row="3" column="2">
		<widget class="QLabel" name="accelerationSigmaUnitsLabel">
		<property name="enabled">
		<bool>false</bool>
		</property>
		<property name="sizePolicy">
		<sizepolicy hsizetype="Maximum" vsizetype="Preferred">
		<horstretch>0</horstretch>
		<verstretch>0</verstretch>
		</sizepolicy>
		</property>
		<property name="maximumSize">
		<size>
		<width>193</width>
		<height>16777215</height>
		</size>
		</property>
		<property name="text">
		<string>meters per second s&quared</string>
		</property>
		<property name="buddy">
		<cstring>accelerationSigmaLineEdit</cstring>
		</property>
		</widget>
		</item>
		</layout>
		</item>
		</layout>
		</widget>
		<widget class="QWidget" name="targetBodyTab">
		<attribute name="title">
		<string>Target Body</string>