Made changes from feedback (3b8a88ba) · Commits · aflab / astrogeology / ISIS3

isis/src/base/objs/EquatorialCylindricalShape/EquatorialCylindricalShape.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -425,7 +425,7 @@ namespace Isis {
		*
		* param &c SpiceDouble reference to be set
		*/
		virtual void setTargetRadii(SpiceDouble &a, SpiceDouble &b, SpiceDouble &c) {
		void EquatorialCylindricalShape::setTargetRadii(SpiceDouble &a, SpiceDouble &b, SpiceDouble &c) {
		a = m_maxRadius->kilometers();
		b = m_maxRadius->kilometers();
		c = m_maxRadius->kilometers();

+2 −2

Original line number	Diff line number	Diff line
		@@ -47,8 +47,8 @@ namespace Isis {
		* intersection in intersectSurface() method to prevent early return
		* and attempt the iterative method even when the ellipsoid is not
		* intersected. Fixes #1438
		* @history 2017-11-22 Jeff Anderson - Added the intersectEllipsoid virtual method so that the DTM
		* intersect method can use a the MaximumRadius found in the
		* @history 2018-02-05 Cole Neubauer - Added the setTargetRadii virtual method so that the
		* intersectEllipsoid method can use a the MaximumRadius found in the
		* ShapeModelStatistics group of the labels (often written during a run of
		* demprep) as a starting radius for the ellipsoid as opposed to the
		* default radius of the target.

+1 −11

Original line number	Diff line number	Diff line
		@@ -207,7 +207,7 @@ namespace Isis {
		*
		* param &c SpiceDouble reference to be set
		*/
		void setTargetRadii(SpiceDouble &a, SpiceDouble &b, SpiceDouble &c) {
		void ShapeModel::setTargetRadii(SpiceDouble &a, SpiceDouble &b, SpiceDouble &c) {
		// get target radii
		std::vector<Distance> radii = targetRadii();
		a = radii[0].kilometers();
		@@ -226,16 +226,6 @@ namespace Isis {
		}


		// /**
		// * Used to set the private member variable m_hasEllipsoidIntersection
		// *
		// * @param status boolean value to set the m_hasEllipsoidIntersection variable to
		// */
		// void setHasEllipsoidIntersection(bool status) {
		// m_hasEllipsoidIntersection = status;
		// }


		/**
		* Computes and returns incidence angle, in degrees, given the illuminator position.
		*

+6 −2

Original line number	Diff line number	Diff line
		@@ -23,6 +23,7 @@
		*/

		#include <vector>

		#include "Spice.h"


		@@ -69,8 +70,6 @@ namespace Isis {
		* @history 2017-05-19 Tyler Wilson - Removed the calculateEllipsoidalSurfaceNormal() function,
		* as this is now being handled in the EllipsoidShape class.
		* References #1028.
		* @history 2017-11-22 Jeff Anderson - made intersectEllipsoid method virtual so it can be
		* overridden in the EquatorialCylindricalShape class
		* @history 2017-03-23 Kris Becker - added isVisibleFrom() and two
		* intersectSurface() methods to address real
		* occlusions. It is recommended that derived
		@@ -78,6 +77,11 @@ namespace Isis {
		* setSurfacePoint() & clearSurfacePoint() virtual
		* to give some hope of a consistent internal state
		* in derived models.
		* @history 2018-02-05 Cole Neubauer - added virtual method setTargetRadii to be
		* called from intersectEllipsoid. This is to avoid
		* redundant code that comes with having intersectEllipsoid be
		* virtual as the only code that was changed will now be handled
		* in setTargetRadii Fixes m05242
		*/
		class ShapeModel {
		public: