Commit 05036c19 authored by Kaitlyn Lee's avatar Kaitlyn Lee
Browse files

Fixed registration/undo-registration shortcuts

parent ff649532

isis/src/qisis/objs/ControlMeasureEditWidget/ControlMeasureEditWidget.cpp

+5 −1
Original line number Diff line number Diff line
@@ -601,7 +601,6 @@ namespace Isis { 
    m_autoReg->setShortcut(Qt::Key_R);

    m_autoReg->setToolTip("Sub-pixel register the right measure to the left. "

                          "<strong>Shortcut: R</strong>");

    m_autoReg->setToolTip("Sub-pixel register the right measure to the left");

    m_autoReg->setWhatsThis("Sub-pixel register the right measure to the left "

                       "and move the result under the crosshair.  After "

                       "viewing the results, the option exists to move the "
@@ -806,6 +805,8 @@ namespace Isis { 
      m_autoRegExtension->hide();

      m_autoReg->setText("Register");

      m_autoReg->setShortcut(Qt::Key_R);

      m_autoReg->setToolTip("Sub-pixel register the right measure to the left. "

                            "<strong>Shortcut: R</strong>");

    }

    m_autoRegAttempted = false;
@@ -1020,6 +1021,9 @@ namespace Isis { 
      m_autoRegShown = false;

      m_autoRegExtension->hide();

      m_autoReg->setText("Register");

      m_autoReg->setShortcut(Qt::Key_R);

      m_autoReg->setToolTip("Sub-pixel register the right measure to the left. "

                            "<strong>Shortcut: R</strong>");



      //  Reload chip with original measure

      emit updateRightView(m_rightMeasure->GetSample(),

isis/src/qisis/objs/ControlMeasureEditWidget/ControlMeasureEditWidget.h

+3 −1
Original line number Diff line number Diff line
@@ -145,7 +145,9 @@ namespace Isis { 
    *                           that the edit ControlPoint is no changed until user selects

    *                           "Save Measures", and colorize save buttons.  Fixes #4984.

    *   @history 2018-06-28 Kaitlyn Lee - Removed shortcuts from zoom buttons because of ambiguous

    *                           shortcut errors.

    *                           shortcut errors. Set the shortcut and tooltip of m_autoReg inside of

    *                           registerPoint() to allow the user to use the shortcut after an

    *                           undo-registration ocurs.

    *   @todo  Re-think design of the change made on 2012-07-26.  The linking was put into

    *                          ::updateLeftPositionLabel because it was the fastest solution, but

    *                          should this be put somewhere else.