Commit a80265a4 authored by kberryUSGS's avatar kberryUSGS Committed by Jesse Mapel
Browse files

Removed unit-test specific changes I made to the code instead of the unit test

parent 29dffc80

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

+7 −0
Original line number Diff line number Diff line
@@ -254,7 +254,14 @@ int main(int argc, char *argv[]) { 
    QVector<BundleControlPointQsp> bundleControlPointVector;

    bundleControlPointVector.append(freeBundleControlPoint);

    bundleControlPointVector.append(fixedBundleControlPoint);



    // Need to create a camera

    QString inputFile = "$ISISTESTDATA/isis/src/mgs/unitTestData/ab102401.lev2.cub";

    Cube cube;

    cube.open(inputFile);

    Camera *camera = NULL;

    camera = cube.camera();



    BundleImage bundleImage(camera,

                            "TestImageSerialNumber",

                            "TestImageFileName");

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

+7 −0
Original line number Diff line number Diff line
@@ -139,7 +139,14 @@ int main(int argc, char *argv[]) { 
    QVector<BundleControlPointQsp> bundleControlPointVector;

    bundleControlPointVector.append(freeBundleControlPoint);

    bundleControlPointVector.append(fixedBundleControlPoint);



    // Need to create a camera

    QString inputFile = "$ISISTESTDATA/isis/src/mgs/unitTestData/ab102401.lev2.cub";

    Cube cube;

    cube.open(inputFile);

    Camera *camera = NULL;

    camera = cube.camera();



    BundleImage bundleImage(camera,

                            "Ignored",

                            "TestImageFileName");

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

+4 −10
Original line number Diff line number Diff line
@@ -128,10 +128,7 @@ namespace Isis { 


      bool isIsisObservation = true;



      // This NULL check is needed solely for the unit test

      if (bundleImage->camera() != NULL) {

      isIsisObservation = bundleImage->camera()->GetCameraType() != Camera::Csm;

      }



      AbstractBundleObservation *observation = NULL;
@@ -177,14 +174,11 @@ namespace Isis { 


      if (isIsisObservation) {

        QSharedPointer<BundleObservation> isisObs = qSharedPointerDynamicCast<BundleObservation>(bundleObservation);

        // This check is needed for the current unit test

        if (bundleImage->camera() != NULL) {

        isisObs->initializeExteriorOrientation();

        if (bundleSettings->solveTargetBody()) {

          isisObs->initializeBodyRotation();

        }

      }

      }



      // update observation number to observation ptr map

      m_observationNumberToObservationMap.insertMulti(observationNumber, bundleObservation);