Unverified Commit b7553b24 authored by dcookastro's avatar dcookastro Committed by GitHub
Browse files

Merge pull request #367 from dcookastro/devRadii 

Dev radii
parents f6314619 185049b9

isis/src/base/apps/dsk2isis/dsk2isis.cpp

+0 −8
Original line number Diff line number Diff line
@@ -114,11 +114,6 @@ void IsisMain() { 
          NaifVertex observer(3);

          point.ToNaifArray(&observer[0]);



          // Start debug

          std::cout << "observer = " << observer[0] << ", " << observer[1]

                    <<  ", " << observer[2] <<  std::endl;

          // end debug

          

          NaifStatus::CheckErrors();

          vscl_c(1.5, &observer[0], &observer[0]);

          NaifStatus::CheckErrors();
@@ -133,9 +128,6 @@ void IsisMain() { 
          if ( dsk.isPlateIdValid(dsk.plateIdOfIntercept(observer, raydir, xpt)) ) { 

            point.FromNaifArray(&xpt[0]);

            pixels[i] = point.GetLocalRadius().meters();

          // Start debug

            std::cout << "Local radius = " << pixels[i];

          // end debug

          }

        }

      }

isis/src/qisis/objs/TableMainWindow/TableMainWindow.cpp

+1 −0
Original line number Diff line number Diff line
@@ -140,6 +140,7 @@ namespace Isis { 


    QAction *clear = new QAction(this);

    clear->setText("Clear table");

    clear->setShortcut(Qt::CTRL + Qt::Key_Delete);

    connect(clear, SIGNAL(triggered()), this, SLOT(clearTable()));



    QAction *close = new QAction(this);

isis/src/qisis/objs/TableMainWindow/TableMainWindow.h

+2 −0
Original line number Diff line number Diff line
@@ -51,6 +51,8 @@ namespace Isis { 
  *                          Added resizeColumn() slot and readColumnSettings().

  *                          modified writeSettings() to write updated settings on destroy.

  *                          Fixes #5142.

  *   @history 2018-04-20 Adam Goins - Added the ctrl+del keyboard shortcut to the TableMainWindow's

  *                          "Clear Table" menu option. Fixes #4912.

  */

  class TableMainWindow : public MainWindow {

      Q_OBJECT