Commit 5be7bf82 authored by Tracie Sucharski's avatar Tracie Sucharski
Browse files

PROG: Recovering from bad git merge (accidently merged ipceDocks into ipce).

parent 47bf9ac0

isis/src/qisis/objs/Directory/Directory.cpp

+5 −0
Original line number Diff line number Diff line
@@ -1804,6 +1804,11 @@ namespace Isis { 
        "has been saved.";

      m_historyTreeWidget->addToHistory(saveCnetHistoryEntry);

    }



    // Make sure the ControlPointEditView "Save Net" button is no longer red

    if (controlPointEditView()) {

      controlPointEditView()->controlPointEditWidget()->colorizeSaveNetButton(true);

    }

  }

isis/src/qisis/objs/Directory/Directory.h

+2 −0
Original line number Diff line number Diff line
@@ -231,6 +231,8 @@ namespace Isis { 
   *                           instead of a CnetEditorWidget. This way there is no longer a

   *                           disconnect between what has been added to the QMdiArea and what is

   *                           stored in m_cnetEditorViewWidgets. 

   *   @history 2018-05-08 Tracie Sucharski - When saving active control, reset the "Save Net"

   *                           button to black in the ControlPointEditorWidget.

   */

  class Directory : public QObject {

    Q_OBJECT