jigsaw provides control network validation messages to user in its output. Fixes #4313 (be4e8676) · Commits · aflab / astrogeology / ISIS3

isis/src/control/apps/jigsaw/jigsaw.xml

+4 −0

Original line number	Diff line number	Diff line
		@@ -204,6 +204,10 @@
		<change name="Adam Paquette" data="2016-08-31">
		Updated how jigsaw handles its prefix parameter along with a small documentation change. Fixes #4309.
		</change>
		<change name="Ian Humphrey" date="2016-09-22">
		Output from jigsaw will again provide "Validating network" and "Validation complete" messages
		to inform user that their control network has been validated. Fixes #4313."
		</change>
		</history>

		<groups>

+5 −2

Original line number	Diff line number	Diff line
		@@ -459,9 +459,12 @@ namespace Isis {
		* @history 2011-08-4 Debbie A. Cook - Changed error message to
		* indicate it fails with one measure as
		* well as no measures.
		* @history 2016-09-22 Ian Humphrey - Replaced statusUpdate signal emits with direct
		* calls to outputBundleStats() so the validation messages are
		* printed to stdout. References #4313.
		*/
		bool BundleAdjust::validateNetwork() {
		emit statusUpdate("Validating network...");
		outputBundleStatus("\nValidating network...");

		int nimagesWithInsufficientMeasures = 0;
		QString msg = "Images with one or less measures:\n";
		@@ -485,7 +488,7 @@ namespace Isis {
		throw IException(IException::User, msg, _FILEINFO_);
		}

		emit statusUpdate("Validation complete!...");
		outputBundleStatus("Validation complete!...");

		return true;
		}

+2 −0

Original line number	Diff line number	Diff line
		@@ -225,6 +225,8 @@ namespace Isis {
		* @history 2016-08-23 Jesse Mapel - Removed output file calls. Apps and objects that use
		* BundleAdjust must call output methods from BundleSolutionInfo.
		* Fixes #4279.
		* @history 2016-09-22 Ian Humphrey - Modified validateNetwork() so that validation status
		* messages are logged to stdout. Fixes #4313.
		*/
		class BundleAdjust : public QObject {
		Q_OBJECT