Qnet-Fixed bug when moving a reference measure or a point that is locked. ... (e2811e89) · Commits · aflab / astrogeology / ISIS3

isis/src/control/objs/ControlNet/ControlNet.cpp

+0 −2

Changes for isis/src/control/objs/ControlNet/ControlNet.cpp: 0 added lines, 2 removed lines.
Original line number	Diff line number	Diff line
		@@ -1525,7 +1525,6 @@ namespace Isis {
		for (int m = 0; m < serialNums.size(); m++) {
		ControlMeasure curMeasure = (curPoint)[serialNums[m]];

		if (!curMeasure->IsIgnored()) {
		QString serialNumber = curMeasure->GetCubeSerialNumber();
		if (list.HasSerialNumber(serialNumber)) {
		curMeasure->SetCamera(p_cameraMap[serialNumber]);
		@@ -1542,7 +1541,6 @@ namespace Isis {
		}
		}
		}
		}


		/**

+1 −0

Changes for isis/src/control/objs/ControlNet/ControlNet.h: 1 added line, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -178,6 +178,7 @@ namespace Isis {
		* ControlNet reference. Added swap(). Refactored assignment
		* operator to use copy-and-swap idiom which fixed a bug where
		* you couldn't access control points by index after an assignment.
		* @history 2013-11-08 Tracie Sucharski - Add camera to ignored measures. References #1603.
		*/
		class ControlNet : public QObject {
		Q_OBJECT

+6 −0

Changes for isis/src/qisis/apps/qnet/qnet.xml: 6 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -529,5 +529,11 @@
		measures in a point. Fixed repetitive warnings when the current edit point does
		not fall on the ground source. Fixes #1491, #1493, #1655.
		</change>
		<change name="Tracie Sucharski" date="2013-12-06">
		Fixed following bugs: seg fault when selecting a new reference measure and moving
		the point, seg fault when moving edit locked points without un-locking.
		Also, improved error checking on ignored reference measures on constrained and
		fixed points. Fixes #1603, #1624.
		</change>
		</history>
		</application>

+18 −0

Changes for isis/src/qisis/objs/ControlPointEdit/ControlPointEdit.cpp: 18 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -1073,12 +1073,23 @@ namespace Isis {
		* and current coordinate. If autoreg has been
		* calculated, save coordinate to apriori before
		* updating to subpixel registered coordinate.
		* @history 2013-11-07 Tracie Sucharski - Moved error checking on edit locked measures from
		* QnetTool::measureSaved to ::saveMeasure. The error checking now
		* forces the edit lock check box to be unchecked before the measure
		* can be saved.
		*
		*/
		void ControlPointEdit::saveMeasure() {

		if ( p_rightMeasure != NULL ) {

		if (p_rightMeasure->IsEditLocked()) {
		QString message = "The right measure is locked. You must first unlock the measure by ";
		message += "clicking the check box above labeled \"Edit Lock Measure\".";
		QMessageBox::warning((QWidget *)parent(),"Warning",message);
		return;
		}

		if ( p_autoRegShown ) {
		// Reset AprioriSample/Line to the current coordinate, before the
		// coordinate is updated with the registered coordinate.
		@@ -1125,6 +1136,13 @@ namespace Isis {

		if ( p_allowLeftMouse ) {
		if ( p_leftMeasure != NULL ) {
		if (p_leftMeasure->IsEditLocked()) {
		QString message = "The left measure is locked. You must first unlock the measure by ";
		message += "clicking the check box above labeled \"Edit Lock Measure\".";
		QMessageBox::warning((QWidget *)parent(),"Warning",message);
		return;
		}

		p_leftMeasure->SetCoordinate(p_leftView->tackSample(), p_leftView->tackLine());
		p_leftMeasure->SetDateTime();
		p_leftMeasure->SetChooserName(Application::UserName());

+4 −0

Changes for isis/src/qisis/objs/ControlPointEdit/ControlPointEdit.h: 4 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -123,6 +123,10 @@ namespace Isis {
		* and right viewports. Zoom factors were being passed into the
		* Chip::Load method as the second argument which should be the rotation
		* value.
		* @history 2013-11-07 Tracie Sucharski - Moved error checking on edit locked measures from
		* QnetTool::measureSaved to ::saveMeasure. The error checking now
		* forces the edit lock check box to be unchecked before the measure
		* can be saved. Fixes #1624.
		*
		* @todo Re-think design of the change made on 2012-07-26. The linking was put into
		* ::updateLeftPositionLabel because it was the fastest solution, but