Commit 219ec554 authored by Tracie Sucharski's avatar Tracie Sucharski
Browse files

PROG: When setting new active control, do not close old active if it is being... 

PROG: When setting new active control, do not close old active if it is being used in a CnetEditor view. References #5026.
parent 06187d69

isis/src/qisis/objs/Project/Project.cpp

+4 −1
Original line number Diff line number Diff line
@@ -1711,8 +1711,11 @@ namespace Isis { 
      ProjectItem *item = directory()->model()->findItemData(m_activeControl->

                          displayProperties()->displayName(), Qt::DisplayRole);

      item->setTextColor(Qt::black);

      // Make sure active not used in a CnetEditorWidget before closing

      if (!directory()->controlUsedInCnetEditorWidget(m_activeControl)) {

        m_activeControl->closeControlNet();

      }

    }



    ProjectItem *item = directory()->model()->findItemData(displayName, Qt::DisplayRole);

    if (item && item->isControl()) {

isis/src/qisis/objs/Project/Project.h

+3 −0
Original line number Diff line number Diff line
@@ -232,6 +232,9 @@ namespace Isis { 
   *   @history 2018-03-23 Ken Edmundson - Modified loadBundleSolutionInfo method to add the

   *                           BundleSolutionInfo's output control id to the project member variable

   *                           m_idToControlMap.

   *   @history 2018-03-26 Tracie Sucharski - When setting a new active control do not close the old

   *                           active control net if it is still being viewed in a CnetEditorWidget.

   *                           References #5026.

   */

  class Project : public QObject {

    Q_OBJECT