Added and/or revised documentation as per KEdmundson's review suggestions. (2691d071) · Commits · aflab / astrogeology / ISIS3

isis/src/qisis/objs/ControlMeasureEditWidget/ControlMeasureEditWidget.cpp

+21 −0

Original line number	Diff line number	Diff line
		@@ -756,6 +756,13 @@ namespace Isis {
		}


		/**
		* Set the tack position of the measure in the left ChipViewport
		*
		* @param sample[in] Sample of the tack position for the right ChipViewport
		* @param line[in] Line of the tack position for the left ChipViewport
		*
		*/
		void ControlMeasureEditWidget::setLeftPosition(double sample, double line) {

		m_leftChip->TackCube(sample, line);
		@@ -763,6 +770,13 @@ namespace Isis {
		}


		/**
		* Set the tack position of the measure in the right ChipViewport
		*
		* @param sample[in] Sample of the tack position for the right ChipViewport
		* @param line[in] Line of the tack position for the left ChipViewport
		*
		*/
		void ControlMeasureEditWidget::setRightPosition(double sample, double line) {

		m_rightChip->TackCube(sample, line);
		@@ -1708,6 +1722,13 @@ namespace Isis {
		}


		/**
		* Set the Control Point for this widget
		*
		* @param editPoint[in] ControlPoint for this widget
		* @param snList[in] SerialNumberList associated with the control net containing the ControlPoint
		*
		*/
		void ControlMeasureEditWidget::setPoint(ControlPoint editPoint, SerialNumberList snList) {

		m_editPoint = editPoint;

+5 −6

Original line number	Diff line number	Diff line
		@@ -289,7 +289,7 @@ namespace Isis {
		QString serialNumber = SerialNumber::Compose(*vp->cube(), true);

		// Get list of shapes in the ipce project and see if the serial number for viewport passed in
		// matches any of the project shapes. If there's a match, draw any ground measures.
		// matches any of the project shapes. If there's a match, draw any ground points.
		QList<ShapeList *> projectShapes = m_directory->project()->shapes();
		foreach (ShapeList *shapeList, projectShapes) {
		foreach (Shape shape, shapeList) {
		@@ -373,12 +373,11 @@ namespace Isis {

		/**
		* Draw all Fixed or Constrained points on the ground source viewport
		* @param vp Viewport whose measurements will be drawn
		* @param painter
		*
		* @author 2011-09-16 Tracie Sucharski
		* @param vp Viewport whose measurements will be drawn
		* @param painter The QPainter used to draw crosshair
		* @param groundMap The UniversalGroundMap for the Cube associated with this viewport
		*
		* @internal
		*/
		void ControlNetTool::drawGroundMeasures(MdiCubeViewport vp, QPainter painter,
		UniversalGroundMap *groundMap) {
		@@ -399,7 +398,7 @@ namespace Isis {
		if (p.GetType() == ControlPoint::Free) continue;
		if (!p.HasAprioriCoordinates()) continue;

		// Find the measure on the ground image
		// Find the sample, line location on the ground image
		if (groundMap->SetGround(p.GetAprioriSurfacePoint().GetLatitude(),
		p.GetAprioriSurfacePoint().GetLongitude())) {
		double samp = groundMap->Sample();

+1 −1

Original line number	Diff line number	Diff line
		@@ -59,7 +59,7 @@ namespace Isis {
		* @history 2018-04-13 Tracie Sucharski - In mouseButtonRelease method return if a control net
		* has not been set.
		* @history 2018-09-21 Tracie Sucharski - Draw Fixed and Constrained points on ground cubes.
		* Refereces #5504.
		* References #5504.
		*/
		class ControlNetTool : public Tool {
		Q_OBJECT

+19 −2

Original line number	Diff line number	Diff line
		@@ -560,8 +560,8 @@ namespace Isis {


		/**
		* Fill m_projectShapeNames with ALL shapes currently in project for the current m_editPoint. The
		* first m_numberProjectShapesWithPoint contain the location of m_editPoint.
		* Fill m_projectShapeNames with ALL shapes currently in project. The first
		* m_numberProjectShapesWithPoint actually contain the location of m_editPoint.
		*
		* @param latitude (double) Latitude for determining point location. Defaults to Null which
		* results in the m_editPoint location being used, AprioriCoordinates
		@@ -1001,6 +1001,13 @@ namespace Isis {
		}


		/**
		* Initialize the given Dem and appropriate member variables for later use editing Fixed or
		* Constrained control points.
		*
		* @param demFile QString The file name of the DEM
		*
		*/
		void ControlPointEditWidget::initDem (QString demFile) {

		// If a DEM is already opened, check if new is same as old. If new,
		@@ -1427,6 +1434,16 @@ namespace Isis {
		}


		/**
		* Create a new control point at the given latitude, longitude
		*
		* @param latitude The latitude position for the new control point
		* @param longitude The longitude position for the new control point
		* @param cube The cube that the user used to select position for new control point
		* @param isGroundSource Boolean indicating whether the cube used to choose position is a ground source
		*
		*/

		void ControlPointEditWidget::createControlPoint(double latitude, double longitude, Cube *cube,
		bool isGroundSource) {