Commit 02f94f2e authored by Adam Goins's avatar Adam Goins
Browse files

Merge branch 'dev' of github.com:USGS-Astrogeology/ISIS3 into coloredmos

parents 0fc0bb28 a76dbbb7

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

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

    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

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

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

        }

     }

      

      // Create a flatfile from PVL data

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

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

      }

    }



    // we still want to output the results

    Application::Log((*point));

    delete point;

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

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

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

    </change>

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

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

    </change>

  </history>



  <oldName>

isis/src/base/apps/gauss/gauss.cpp

+0 −1
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ void setFilter(int size, double stdDev) { 
  //Iterate through the input kernel's data values to fill the coefs array

  const double PI = 3.141592653589793;

  int i = 0;

  cout << exp((double)1.0) << endl;

  for(double y = -(size / 2) ; y <= (size / 2) ; y++) {

    for(double x = -(size / 2) ; x <= (size / 2) ; x++) {

      /*

isis/src/base/apps/gauss/gauss.xml

+50 −47
Original line number Diff line number Diff line
@@ -64,6 +64,9 @@ 
    <change name="Brendan George" date="2006-09-21">

        Documentation fixes

    </change>

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

        Removed the cout that was outputting e to the terminal. Fixes #5198.

    </change>

  </history>



  <category>

isis/src/base/apps/getsn/getsn.cpp

+10 −14
Original line number Diff line number Diff line
@@ -34,16 +34,12 @@ void IsisMain() { 
  bool WriteObservation = ui.GetBoolean("OBSERVATION");



  QString format = ui.GetString("FORMAT");

  bool pvl = true;

  bool pvl;

  if (format == "PVL") {

    pvl = true;

  }

  else if (format == "FLAT") {

    pvl = false;

  }

  else {

    QString msg = "Invalid format QString [" + format + "]";

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

    pvl = false;

  }



  // Extract label from cube file