Comment qDebug statements in JigsawSetupDialog, changed enabling/disabling of... (56ffbefb) · Commits · aflab / astrogeology / ISIS3

isis/src/qisis/objs/ControlPointEditWidget/ControlPointEditWidget.cpp

+2 −0

Original line number	Diff line number	Diff line
		@@ -1545,6 +1545,8 @@ namespace Isis {
		emit netChanged();
		// Refresh chipViewports to show new positions of controlPoints
		m_measureEditor->refreshChips();

		emit saveControlNet();
		}

isis/src/qisis/objs/JigsawDialog/JigsawDialog.cpp

+8 −5

Original line number	Diff line number	Diff line
		@@ -276,8 +276,6 @@ namespace Isis {
		m_bRunning = false;
		m_ui->JigsawRunButton->setText("&Aborting...");
		update();
		// Since the bundle has stopped, the user can close the dialog via "Close" again
		m_close->setEnabled(true);
		}
		}

		@@ -387,6 +385,8 @@ namespace Isis {

		// Make sure that when we add our results, we let the use last settings box be checkable.
		m_ui->useLastSettings->setEnabled(true);
		// Once the bundle has been accepted, re-enable the close button
		m_close->setEnabled(true);

		//TODO: move correlation matrix to correct position in project directory
		//
		@@ -439,9 +439,10 @@ namespace Isis {
		void JigsawDialog::rejectBundleResults() {
		// TODO should there be a prompt to user (are you sure?) -- Annoying?
		// TODO Add tooltip/what'sthis for the buttons!!!! (CTR)
		// Disable the "Accept" and "Reject" buttons.
		// Disable the "Accept" and "Reject" buttons, enable the "Close" button
		m_accept->setEnabled(false);
		m_reject->setEnabled(false);
		m_close->setEnabled(true);

		// Clear the dialog so the lcd's are 0 and the status text is cleared.
		clearDialog();
		@@ -502,11 +503,15 @@ namespace Isis {
		*/
		void JigsawDialog::errorString(QString error) {
		QString errorStr = "\n" + error;
		// qDebug()<<"JIgsawDialog::errorString errorStr = "<<errorStr;
		m_ui->statusUpdatesLabel->setText( m_ui->statusUpdatesLabel->text().append(errorStr) );

		updateScrollBar();

		update();

		// Re-enable the close button
		m_close->setEnabled(true);
		}


		@@ -578,8 +583,6 @@ namespace Isis {
		// Since results are available, the user can accept (save) or reject(discard) the results.
		m_accept->setEnabled(true);
		m_reject->setEnabled(true);
		// The bundle is done, so the user can close again.
		m_close->setEnabled(true);
		}
		}

isis/src/qisis/objs/JigsawDialog/JigsawDialog.h

+3 −0

Original line number	Diff line number	Diff line
		@@ -71,6 +71,9 @@ namespace Isis {
		* @history 2017-05-15 Tracie Sucharski - Commented out code in acceptBundleResults which was
		* not being used and causing compile warnings. Add creation of
		* BundleSolutionInfo folder to the acceptBundleResults method.
		* @history 2017-05-16 Tracie Sucharski - Disable Close button if jigsaw has been run, force
		* selection of accept or reject. Once a choice has been made,
		* re-enable the Close button.
		*/
		class JigsawDialog : public QDialog {
		Q_OBJECT

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

+3 −3

Original line number	Diff line number	Diff line
		@@ -891,7 +891,7 @@ namespace Isis {

		void Isis::JigsawSetupDialog::checkIsValid() {
		if (!m_ui->aRadiusSigmaLineEdit->hasAcceptableInput()) {
		qDebug() << "invalid input";
		// qDebug() << "invalid input";
		}


		@@ -899,12 +899,12 @@ namespace Isis {


		void Isis::JigsawSetupDialog::slotTextChanged(const QString &text) {
		qDebug() << "Text change to" << text << "and value is valid ==" << m_ui->aRadiusSigmaLineEdit->hasAcceptableInput();
		// qDebug() << "Text change to" << text << "and value is valid ==" << m_ui->aRadiusSigmaLineEdit->hasAcceptableInput();
		}


		void Isis::JigsawSetupDialog::on_aRadiusLineEdit_textChanged(const QString &arg1) {
		qDebug() << "Text change to" << arg1 << "and value is valid ==" << m_ui->aRadiusLineEdit->hasAcceptableInput();
		// qDebug() << "Text change to" << arg1 << "and value is valid ==" << m_ui->aRadiusLineEdit->hasAcceptableInput();
		}

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -41,6 +41,7 @@ namespace Isis {
		* @history 2017-04-27 Ian Humphrey - Added selectControl() to allow JigsawDialog to
		* properly tell the setup dialog which control to select in its
		* combo box. References #4817.
		* @history 2017-05-16 Tracie Sucharski - Comment qDebug statements.
		*/

		class JigsawSetupDialog : public QDialog {