Commit d8fdaf1d authored by Jesse Mapel's avatar Jesse Mapel
Browse files

Changed BundleMeasure, BundleImage, BundleTargetBody,... 

Changed BundleMeasure, BundleImage, BundleTargetBody, BundleObservationSolveSettings, and BundleSettings to no longer derive from QObject.  Fixes #4192.

git-svn-id: http://subversion.wr.usgs.gov/repos/prog/isis3/branches/ipce@7012 41f8697f-d340-4b68-9986-7bafba869bb8
parent 7ca03dff

isis/src/control/objs/BundleSettings/BundleSettings.cpp

+4 −8
Original line number Diff line number Diff line
@@ -27,12 +27,10 @@ 
namespace Isis {



  /**

   * Constructs a BundleSettings object from a pointer to a parent QObject. 

   * Constructs a BundleSettings object. 

   * Default values are set for all member variables. 

   *  

   * @param parent A pointer to a parent QObject. Defaults to NULL pointer. 

   */

  BundleSettings::BundleSettings(QObject *parent) : QObject(parent) {

  BundleSettings::BundleSettings() {

    m_id = NULL;

    m_id = new QUuid(QUuid::createUuid());
@@ -52,7 +50,7 @@ namespace Isis { 
    m_globalLongitudeAprioriSigma = Isis::Null;

    m_globalRadiusAprioriSigma    = Isis::Null;



    BundleObservationSolveSettings defaultSolveSettings(NULL);

    BundleObservationSolveSettings defaultSolveSettings;

    m_observationSolveSettings.append(defaultSolveSettings);



    // Convergence Criteria
@@ -95,11 +93,9 @@ namespace Isis { 
   *

   * @param project A pointer to the project where the Settings will be saved.

   * @param xmlReader An XML reader that's up to an <bundleSettings/> tag.

   * @param parent The Qt-relationship parent

   */

  BundleSettings::BundleSettings(Project *project, 

                                 XmlStackedHandlerReader *xmlReader,

                                 QObject *parent) : QObject(parent) {

                                 XmlStackedHandlerReader *xmlReader) {

    m_id = NULL;

    // what about the rest of the member data ??? should we set defaults ??? CREATE INITIALIZE METHOD

isis/src/control/objs/BundleSettings/BundleSettings.h

+4 −9
Original line number Diff line number Diff line
@@ -21,8 +21,6 @@ 
 *   http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on

 *   http://www.usgs.gov/privacy.html.

 */

// parent class

#include <QObject>



// Qt library

#include <QList>
@@ -87,8 +85,7 @@ namespace Isis { 
   *                           Added documentation. Updated test. References #3976. Fixes #.

   *   @history 2016-08-15 Jesse Mapel - Added methods to check if solving for triaxial radii,

   *                           mean radius, or Prime Meridian Acceleration. Fixes #4159.

   *  

   *  

   *   @history 2016-08-18 Jesse Mapel - Changed to no longer inherit from QObject.  Fixes #4192.

   *  

   *  

   *   @todo Determine which XmlStackedHandlerReader constructor is preferred
@@ -103,18 +100,16 @@ namespace Isis { 
   *   @todo Determine which to use or delete: XML or HDF5. Whichever is used needs to be fully

   *         documented, tested

   */

  class BundleSettings : public QObject {

    Q_OBJECT

  class BundleSettings {

    public:



      //=====================================================================//

      //================ constructors, destructor, operators ================//

      //=====================================================================//

      BundleSettings(QObject *parent = NULL);

      BundleSettings();

      BundleSettings(const BundleSettings &other);

      BundleSettings(Project *project, 

                     XmlStackedHandlerReader *xmlReader, 

                     QObject *parent = NULL);

                     XmlStackedHandlerReader *xmlReader);

#if 0

      BundleSettings(FileName xmlFile,

                     Project *project,

isis/src/control/objs/BundleUtilities/BundleImage.h

+2 −4
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ 
 *   http://www.usgs.gov/privacy.html.

 */



#include <QObject>

#include <QSharedPointer>



namespace Isis {
@@ -46,11 +45,10 @@ namespace Isis { 
   *                           for merging from IPCE to ISIS.  Fixes #4076.

   *   @history 2016-08-03 Jesse Mapel - Changed parent observation to a QSharedPointer.

   *                           Fixes #4150.

   *   @history 2016-08-18 Jesse Mapel - Changed to no longer inherit from QObject.  Fixes #4192.

   *   

   */

  class BundleImage : public QObject {



  Q_OBJECT

  class BundleImage {



  public:

    // constructor

isis/src/control/objs/BundleUtilities/BundleMeasure.h

+2 −4
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ 
 *   http://www.usgs.gov/privacy.html.

 */



#include <QObject>

#include <QSharedPointer>



namespace Isis {
@@ -56,6 +55,7 @@ namespace Isis { 
   *   @history 2016-08-15 Jesse Mapel - Changed parent BundleImage to a QSharedPointer and added

   *                           a mutator.  Added wrapper methods for several ControlMeasure

   *                           methods.  Added typedef for BundleMeasureQsp.  Fixes #4159.

   *   @history 2016-08-18 Jesse Mapel - Changed to no longer inherit from QObject.  Fixes #4192.

   */



  class BundleControlPoint;
@@ -65,9 +65,7 @@ namespace Isis { 
  class Camera;

  class ControlMeasure;



  class BundleMeasure : public QObject {



    Q_OBJECT

  class BundleMeasure {



    public:

      // constructor

isis/src/control/objs/BundleUtilities/BundleObservation.cpp

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ namespace Isis { 
  /**

   * Destructor.

   *

   * Upon destruction, any contained QObjects (BundleImages) will be deleted.

   * Contained BundleImages will remain until all shared pointers are deleted.

   */

  BundleObservation::~BundleObservation() {

    clear();