Unverified Commit 1a98af80 authored by Makayla Shepherd's avatar Makayla Shepherd Committed by GitHub
Browse files

Merge pull request #87 from kdl222/m05125 

Removed units of look direction vectors in campt. Fixes #5125
parents 0c01a787 f64f9796

isis/src/base/apps/campt/campt.cpp

+29 −24
Original line number Original line Diff line number Diff line
@@ -173,6 +173,11 @@ void writePoints(const UserInterface &ui, QList<PvlGroup*> camPoints) { 
    prog.CheckStatus();

    prog.CheckStatus();

    point = camPoints[p];

    point = camPoints[p];





    // Remove units on look direction vectors

    point -> findKeyword("LookDirectionBodyFixed").setUnits("");

    point -> findKeyword("LookDirectionJ2000").setUnits("");

    point -> findKeyword("LookDirectionCamera").setUnits("");



    // write to output file

    // write to output file

    if (ui.WasEntered("TO")) {

    if (ui.WasEntered("TO")) {

      // Write the pvl group out to the file

      // Write the pvl group out to the file
@@ -189,7 +194,6 @@ void writePoints(const UserInterface &ui, QList<PvlGroup*> camPoints) { 
          temp.write(outFile);

          temp.write(outFile);

        }

        }

     }

     }

      

      // Create a flatfile from PVL data

      // Create a flatfile from PVL data

      // The flatfile is comma delimited and can be imported into Excel

      // The flatfile is comma delimited and can be imported into Excel

      else {

      else {
@@ -252,6 +256,7 @@ void writePoints(const UserInterface &ui, QList<PvlGroup*> camPoints) { 
        throw IException(IException::User, msg, _FILEINFO_);

        throw IException(IException::User, msg, _FILEINFO_);

      }

      }

    }

    }



    // we still want to output the results

    // we still want to output the results

    Application::Log((*point));

    Application::Log((*point));

    delete point;

    delete point;

isis/src/base/apps/campt/campt.xml

+83 −80
Original line number Original line Diff line number Diff line
@@ -217,6 +217,9 @@ End_Group 
      setting of "false". In addition, corrected behavior where

      setting of "false". In addition, corrected behavior where

      manually setting "allowoutside" to "false" was ignored. Ref # 2258.

      manually setting "allowoutside" to "false" was ignored. Ref # 2258.

    </change>

    </change>

    <change name="Kaitlyn Lee" date="2018-02-16">

      Removed units on look direction vectors to make them unitless. Fixes #5125.

    </change>

  </history>

  </history>





  <oldName>

  <oldName>