Commit 311b62ac authored by Kelvin Rodriguez's avatar Kelvin Rodriguez
Browse files

Updated constructors for classes EllipsoidShape, NaifDskShape, and PlaneShape... 

Updated constructors for classes EllipsoidShape, NaifDskShape, and PlaneShape classes to call different parent contructor. References #2214

git-svn-id: http://subversion.wr.usgs.gov/repos/prog/isis3/trunk@6852 41f8697f-d340-4b68-9986-7bafba869bb8
parent 37c36127

isis/src/base/objs/DemShape/DemShape.cpp

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ namespace Isis { 
   * @param target Pointer to a valid target.

   * @param pvl Valid ISIS cube label.

   */

  DemShape::DemShape(Target *target, Pvl &pvl) : ShapeModel (target, pvl) {

  DemShape::DemShape(Target *target, Pvl &pvl) : ShapeModel(target) {

    setName("DemShape");

    m_demProj = NULL;

    m_demCube = NULL;

isis/src/base/objs/DemShape/DemShape.h

+2 −1
Original line number Diff line number Diff line
@@ -51,6 +51,8 @@ namespace Isis { 
   *                             were signaled. References #2248.

   *   @history 2015-10-01 Jeannie Backer - Made improvements to documentation and brought code

   *                           closer to ISIS coding standards. References #1438

   *   @history 2016-06-13 Kelvin Rodriguez - Removed redundant contructor PlaneShape(Target, Pvl).

   *                           References #2214

   */

  class DemShape : public ShapeModel {

    public:
@@ -101,4 +103,3 @@ namespace Isis { 
}



#endif

isis/src/base/objs/EllipsoidShape/EllipsoidShape.cpp

+0 −11
Original line number Diff line number Diff line
@@ -18,22 +18,12 @@ 
using namespace std;



namespace Isis {

  /**

   * Initialize the EllipsoidShape.

   *

   * @param pvl Valid Isis3 cube label.

   */

  EllipsoidShape::EllipsoidShape(Target *target, Pvl &pvl) : ShapeModel (target, pvl) {

    setName("Ellipsoid");

  }





  /**

   * Initialize the EllipsoidShape.

   *

   * @param pvl Valid Isis3 cube label.

   */

  // EllipsoidShape::EllipsoidShape(Target *target) : ShapeModel (target) {

  EllipsoidShape::EllipsoidShape(Target *target) : ShapeModel (target) {

    setName("Ellipsoid");

  }
@@ -44,7 +34,6 @@ namespace Isis { 
   *

   * @param pvl Valid Isis3 cube label.

   */

  // EllipsoidShape::EllipsoidShape() : ShapeModel () {

  EllipsoidShape::EllipsoidShape() : ShapeModel () {

    setName("Ellipsoid");

  }

isis/src/base/objs/EllipsoidShape/EllipsoidShape.h

+3 −3
Original line number Diff line number Diff line
@@ -41,16 +41,17 @@ namespace Isis { 
   * @author 2010-08-02 Debbie A. Cook

   *

   * @internal

   *   @history 2012-12-21 - Debbie A. Cook - Cleaned up intersectSurface method to

   *   @history 2012-12-21 Debbie A. Cook - Cleaned up intersectSurface method to

   *                           reflect changes made to ShapeModel class.  References #1343.

   *   @history 2015-04-30 Jeannie Backer - Added isDEM() method. References #2243.

   *   @history 2015-07-21 Kristin Berry - Added NaifStatus::CheckErrors() to see if any NAIF errors

   *                           were signaled. References #2248.

   *   @history 2016-06-13 Kelvin Rodriguez - Removed redundant contructor 

   *                           EllipsoidShape(Target, Pvl). References #2214

   */

  class EllipsoidShape : public Isis::ShapeModel {

    public:

      //! Constructors

      EllipsoidShape(Target *target, Isis::Pvl &pvl);

      EllipsoidShape(Target *target);

      EllipsoidShape();
@@ -81,4 +82,3 @@ namespace Isis { 
};



#endif

isis/src/base/objs/EllipsoidShape/EllipsoidShape.truth

+1 −2
Original line number Diff line number Diff line 
Begin testing Ellipsoid Shape Model class....



  Testing constructors...

    Shape1  name is Ellipsoid

    Shape  name is Ellipsoid

    Shape2  name is Ellipsoid

    Shape3  name is Ellipsoid

    Shape is DEM type?No



  Testing method intersectSurface with failure...