Commit 946f8ed9 authored by Jeannie Backer's avatar Jeannie Backer
Browse files

Fixed unitTest seg fault due to improper use of QSharedPointers. 

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

isis/src/control/objs/BundleSolutionInfo/BundleSolutionInfo.cpp

+2 −0
Original line number Diff line number Diff line
@@ -63,6 +63,8 @@ namespace Isis { 
    m_statisticsResults = NULL;

    m_statisticsResults = new BundleResults();



    m_settings = BundleSettingsQsp(new BundleSettings);



    m_images = NULL;

    m_images = new QList<ImageList *>;// change to QList<QStringList> ???

isis/src/control/objs/BundleSolutionInfo/BundleSolutionInfo.truth

+6 −0
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ Object = DefaultSolutionInfoObject 
    NumberImageParameters             = 0

    NumberConstrainedPointParameters  = 0

    NumberConstrainedImageParameters  = 0

    NumberConstrainedTargetParameters = 0

    NumberUnknownParameters           = 0

    DegreesOfFreedom                  = -1

    Sigma0                            = 0.0
@@ -144,6 +145,7 @@ Object = CopySolutionInfoObject 
    NumberImageParameters             = 0

    NumberConstrainedPointParameters  = 0

    NumberConstrainedImageParameters  = 0

    NumberConstrainedTargetParameters = 0

    NumberUnknownParameters           = 0

    DegreesOfFreedom                  = -1

    Sigma0                            = 0.0
@@ -233,6 +235,7 @@ Object = SelfAssignedSolutionInfoObject 
    NumberImageParameters             = 0

    NumberConstrainedPointParameters  = 0

    NumberConstrainedImageParameters  = 0

    NumberConstrainedTargetParameters = 0

    NumberUnknownParameters           = 0

    DegreesOfFreedom                  = -1

    Sigma0                            = 0.0
@@ -322,6 +325,7 @@ Object = AssignedSolutionInfoObject 
    NumberImageParameters             = 0

    NumberConstrainedPointParameters  = 0

    NumberConstrainedImageParameters  = 0

    NumberConstrainedTargetParameters = 0

    NumberUnknownParameters           = 0

    DegreesOfFreedom                  = -1

    Sigma0                            = 0.0
@@ -411,6 +415,7 @@ Object = MutatorTest 
    NumberImageParameters             = 0

    NumberConstrainedPointParameters  = 0

    NumberConstrainedImageParameters  = 0

    NumberConstrainedTargetParameters = 0

    NumberUnknownParameters           = 0

    DegreesOfFreedom                  = -1

    Sigma0                            = 0.0
@@ -507,6 +512,7 @@ Object = BundleSolutionInfoFromHDF 
    NumberImageParameters             = 0

    NumberConstrainedPointParameters  = 0

    NumberConstrainedImageParameters  = 0

    NumberConstrainedTargetParameters = 0

    NumberUnknownParameters           = 0

    DegreesOfFreedom                  = -1

    Sigma0                            = 0.0

isis/src/control/objs/BundleSolutionInfo/unitTest.cpp

+1 −2
Original line number Diff line number Diff line
@@ -79,10 +79,9 @@ int main(int argc, char *argv[]) { 
    qDebug() << "Printing PVL group with results from the settings/cnet/statistics constructor...";



    // create default settings and statistics objects to pass into results object

    BundleSettingsQsp settings;

    BundleSettingsQsp settings = BundleSettingsQsp(new BundleSettings);

    FileName cnetFile("cnetfile.net");

    BundleResults statistics;



    QObject *parent = NULL;

    BundleSolutionInfo results(settings, cnetFile, statistics, parent);