Fixed last failing test

DOI-USGS · Sep 12, 2023 · 2bf12a2 · 2bf12a2
1 parent ab64316
commit 2bf12a2
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 9 deletions.
diff --git a/isis/src/base/objs/CSMCamera/CSMCamera.cpp b/isis/src/base/objs/CSMCamera/CSMCamera.cpp
@@ -1123,8 +1123,8 @@ void sanitize(std::string &input);
    * @param lon Sub-solar longitude
    */
   void CSMCamera::subSolarPoint(double &lat, double &lon) {
-    lat = 0;
-    lon = 0;
+    QString msg = "Sub solar point is not supported for CSM camera models";
+    throw IException(IException::Programmer, msg, _FILEINFO_);
   }
 
 

diff --git a/isis/src/base/objs/CameraPointInfo/CameraPointInfo.cpp b/isis/src/base/objs/CameraPointInfo/CameraPointInfo.cpp
@@ -585,13 +585,13 @@ namespace Isis {
         gp->findKeyword("LookDirectionBodyFixed").addValue(toString(lookB[2]), "DEGREE");
         gp->findKeyword("LookDirectionBodyFixed").addComment("Look Direction Unit Vectors in Body Fixed, J2000, and Camera Coordinate Systems.");
 
-        try {
+        if (m_camera->bodyRotation() != NULL) {
           std::vector<double>lookJ = m_camera->lookDirectionJ2000();
           gp->findKeyword("LookDirectionJ2000").addValue(toString(lookJ[0]), "DEGREE");
           gp->findKeyword("LookDirectionJ2000").addValue(toString(lookJ[1]), "DEGREE");
           gp->findKeyword("LookDirectionJ2000").addValue(toString(lookJ[2]), "DEGREE");
         }
-        catch (IException &e) {
+        else {
           gp->findKeyword("LookDirectionJ2000").addValue("Null");
           gp->findKeyword("LookDirectionJ2000").addValue("Null");
           gp->findKeyword("LookDirectionJ2000").addValue("Null");

diff --git a/isis/src/qisis/objs/AdvancedTrackTool/AdvancedTrackTool.cpp b/isis/src/qisis/objs/AdvancedTrackTool/AdvancedTrackTool.cpp
@@ -444,15 +444,22 @@ namespace Isis {
           p_tableWin->table()->item(row, getIndex("North Azimuth"))->setText("");
         }
 
-        double sunAzi = cvp->camera()->SunAzimuth();
-        if (Isis::IsValidPixel(sunAzi)) {
-          p_tableWin->table()->item(row, getIndex("Sun Azimuth"))->
-                               setText(QString::number(sunAzi));
+
+        try {
+          double sunAzi = cvp->camera()->SunAzimuth();
+          if (Isis::IsValidPixel(sunAzi)) {
+            p_tableWin->table()->item(row, getIndex("Sun Azimuth"))->
+                                setText(QString::number(sunAzi));
+          }
+          else { // sun azimuth is null
+            p_tableWin->table()->item(row, getIndex("Sun Azimuth"))->setText("");
+          }
         }
-        else { // sun azimuth is null
+        catch(IException &e) {
           p_tableWin->table()->item(row, getIndex("Sun Azimuth"))->setText("");
         }
 
+
         double spacecraftAzi = cvp->camera()->SpacecraftAzimuth();
         if (Isis::IsValidPixel(spacecraftAzi)) {
           p_tableWin->table()->item(row, getIndex("Spacecraft Azimuth"))->