Merge branch 'dev' into jigsaw_test_mini

README.md

@@ -17,7 +17,7 @@
 * [Installing Older Versions of ISIS](README.md#Installing-older-versions-of-ISIS)
 
 ## Requests for Comment
-The ISIS project uses a Request for Comment (RFC) model whereby major potential changes to the code base, data area, or binary delivery process are proposed, iterated on by any interested parties, and potentially adopted. Right now, RFCs are being housed in this repository's [wiki](https://github.com/USGS-Astrogeology/ISIS3/wiki) with associated discussions occurring on [astrodiscuss](astrodiscuss.usgs.gov).
+The ISIS project uses a Request for Comment (RFC) model whereby major potential changes to the code base, data area, or binary delivery process are proposed, iterated on by any interested parties, and potentially adopted. Right now, RFCs are being housed in this repository's [wiki](https://github.com/USGS-Astrogeology/ISIS3/wiki) with associated discussions occurring on [astrodiscuss](https://astrodiscuss.usgs.gov).
 
 Current open RFCs:
   * [Migration of ISIS Data to Git](https://github.com/USGS-Astrogeology/ISIS3/wiki/RFC4---Migration-of-ISIS-Data-to-Git)

isis/src/base/objs/Spice/Spice.cpp

@@ -208,6 +208,7 @@ namespace Isis {
         m_usingAle = true;
       }
       catch(...) {
+
         // Backup to stadnard ISIS implementation
         if (noTables) {
           load(kernels["TargetPosition"], noTables);

isis/src/control/apps/jigsaw/jigsaw.cpp

@@ -148,6 +148,14 @@ namespace Isis {
         gp += PvlKeyword("Status", "Camera pointing NOT updated");
       }
       if (log) {
+        Pvl summary;
+        std::istringstream iss (bundleAdjustment->iterationSummaryGroup().toStdString());
+        iss >> summary; 
+
+        for (auto grpIt = summary.beginGroup(); grpIt!= summary.endGroup(); grpIt++) {
+          log->addGroup(*grpIt);
+        }
+
         log->addGroup(gp);
       }
       delete bundleSolution;

isis/src/control/objs/BundleAdjust/BundleAdjust.cpp

@@ -3062,9 +3062,13 @@ namespace Isis {
     std::ostringstream ostr;
     ostr << summaryGroup << std::endl;
     m_iterationSummary += QString::fromStdString( ostr.str() );
-    if (m_printSummary) {
+
+    if (m_printSummary && iApp != NULL) {
       Application::Log(summaryGroup);
     }
+    else {
+      std::cout << summaryGroup << std::endl;
+    }
   }
 
 
@@ -3110,7 +3114,10 @@ namespace Isis {
    *                           -Wformat-security warning during the build.
    */
   void BundleAdjust::outputBundleStatus(QString status) {
-    if (QCoreApplication::applicationName() != "ipce") {
+    if (iApp == NULL) { // in a function call
+      printf("%s", status.toStdString().c_str());
+    }
+    else if (QCoreApplication::applicationName() != "ipce") {
       printf("%s", status.toStdString().c_str());
     }
   }

isis/tests/ConstantsTests.cpp

@@ -0,0 +1,29 @@
+#include "Constants.h"
+#include <gtest/gtest.h>
+
+TEST (ConstantsTests, TestPi){
+  ASSERT_NEAR(Isis::PI, 3.141592653589793, .000000000000001);
+}
+
+
+TEST (ConstantsTests, TestHalfPi){
+  ASSERT_NEAR(Isis::PI/2, 1.570796326794897, .000000000000001);
+}
+
+TEST (ConstantsTests, TestE){
+  ASSERT_NEAR(Isis::E, 2.718281828459045, .000000000000001);
+}
+
+TEST (ConstantsTests, TestDeg2Rad){
+  ASSERT_NEAR(Isis::DEG2RAD, 0.0174532925199433, .000000000000001);
+  ASSERT_EQ(Isis::DEG2RAD * 180, Isis::PI);
+}
+
+TEST (ConstantsTests, TestRad2Deg){
+  ASSERT_NEAR(Isis::RAD2DEG, 57.29577951308232, .000000000000001);
+  ASSERT_EQ(Isis::RAD2DEG * Isis::PI/2, 90);
+}
+
+TEST (ConstantsTests, TestBigInt){
+  ASSERT_EQ(sizeof(Isis::BigInt), 8);
+}

isis/tests/Fixtures.cpp

@@ -402,6 +402,53 @@ namespace Isis {
     }
   }
 
+  void ObservationPair::SetUp() {
+      FileName labelPathL = FileName("data/observationPair/observationImageL.pvl");
+      FileName labelPathR = FileName("data/observationPair/observationImageR.pvl");
+
+      isdPathL = new FileName("data/observationPair/observationImageL.isd");
+      isdPathR = new FileName("data/observationPair/observationImageR.isd");
+
+      cubeL = new Cube();
+      cubeR = new Cube();
+
+      cubeLPath = tempDir.path() + "/observationPairL.cub";
+      cubeRPath = tempDir.path() + "/observationPairR.cub";
+
+      cubeL->fromIsd(cubeLPath, labelPathL, *isdPathL, "rw");    
+      cubeR->fromIsd(cubeRPath, labelPathR, *isdPathR, "rw");    
+
+      cubeList = new FileList();
+      cubeList->append(cubeL->fileName());
+      cubeList->append(cubeR->fileName());
+
+      cubeListFile = tempDir.path() + "/cubes.lis";
+      cubeList->write(cubeListFile);
+
+      cnetPath = "data/observationPair/observationPair.net";
+      network = new ControlNet();
+      network->ReadControl(cnetPath);
+  }
+
+
+  void ObservationPair::TearDown() {
+    delete cubeList;
+    delete network;
+
+    if (cubeL) {
+      delete cubeL;
+    }
+
+    if (cubeR) {
+      delete cubeR;
+    }
+
+    delete isdPathL;
+    delete isdPathR;
+
+  }
+
+
   void MroCube::setInstrument(QString ikid, QString instrumentId, QString spacecraftName) {
     PvlGroup &kernels = testCube->label()->findObject("IsisCube").findGroup("Kernels");
     kernels.findKeyword("NaifFrameCode").setValue(ikid);    

isis/tests/Fixtures.h

@@ -130,6 +130,28 @@ namespace Isis {
       FileList *cubeList;
       QString cubeListFile;
       QString controlNetPath;
+
+      void SetUp() override;
+      void TearDown() override;
+  }
+
+  class ObservationPair : public TempTestingFiles {
+    protected: 
+
+      Cube *cubeL; 
+      Cube *cubeR;
+
+      QString cubeLPath; 
+      QString cubeRPath; 
+
+      FileName *isdPathL;
+      FileName *isdPathR; 
+
+      FileList *cubeList; 
+      QString cubeListFile;
+
+      ControlNet *network; 
+      QString cnetPath; 
 
       void SetUp() override;
       void TearDown() override;