Commit 24137ce6 authored by Kelvin Rodriguez's avatar Kelvin Rodriguez
Browse files

ShapeModel class no longer has constructor ShapeModel(Target, Pvl). Fixes #2214 

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

isis/src/base/objs/ShapeModel/ShapeModel.cpp

+0 −16
Original line number Diff line number Diff line
@@ -35,22 +35,6 @@ namespace Isis { 
  }





  /**

   * Constructs and loads a shape model from a pvl

   *  

   * This constructor creates ShapeModel object, initializing name to an 

   * empty string, surface point to an empty surface point, has intersection to 

   * FALSE, has normal to FALSE, has ellipsoid intersection to FALSE, normal 

   * vector size to 3, and  target to the given target.

   *

   * @param pvl A valid ISIS cube label.

   */

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

    Initialize();

    m_target = target;

  }





  /**

   * Constructs and loads a shape model from a target only

   *

isis/src/base/objs/ShapeModel/ShapeModel.h

+2 −2
Original line number Diff line number Diff line
@@ -62,12 +62,13 @@ 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 ShapeModel(Target, Pvl).

   *                           Fixes #2214

   */

  class ShapeModel {

    public:

      // Constructors

      ShapeModel();

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

      ShapeModel(Target *target);



      // Initialization
@@ -169,4 +170,3 @@ namespace Isis { 
};



#endif

isis/src/base/objs/ShapeModel/unitTest.cpp

+5 −3
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ using namespace Isis; 
 */

class MyShape : public ShapeModel {

  public:

  MyShape(Target *target, Pvl &lab) : ShapeModel (target, lab) {

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

    setName("Test");

  }
@@ -230,7 +230,7 @@ int main() { 


    cout << "Begin testing Shape Model base class...." << endl;



    MyShape shape(&targ, pvl);

    MyShape shape(&targ);



    cout << endl << "  Shape name is " << shape.name() << endl;

    cout << "    Do we have an intersection? " << shape.hasIntersection() << endl;
@@ -460,10 +460,12 @@ int main() { 
      cout << "      Do we have a normal? " << eshape.normalStatus() << endl;

      myNormal = eshape.normal();

      cout << "      local normal = (" << myNormal[0] << ", " << myNormal[1] << ", " << myNormal[2] << ")" << endl;

      cout << endl << "    Testing  method targetRadii..." << endl;

      eshape.calculateSurfaceNormal();

      myNormal = eshape.normal();

      cout << endl << "    Testing  method targetRadii..." << endl;

      cout << "      true normal = (" << myNormal[0] << ", " << myNormal[1] << ", " << myNormal[2] << ")" << endl;





    }

    catch(Isis::IException &e) {

      IException(e, IException::Unknown, "Test ellipse methods failed.", _FILEINFO_).print();