Commit c81e8b34 authored by Tracie Sucharski's avatar Tracie Sucharski
Browse files

PROG: Changed MosaicControlNetTool to ControlNetTool in addCubeDnView. References #5026.

parent 89839f6c

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

+3 −2
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ 
#include "ControlDisplayProperties.h"

#include "ControlList.h"

#include "ControlNet.h"

#include "ControlNetTool.h"

#include "ControlPointEditView.h"

#include "ControlPointEditWidget.h"

#include "CubeDnView.h"
@@ -738,13 +739,13 @@ namespace Isis { 
    if (!project()->activeControl()) {

      QList<QAction *> toolbar = result->toolPadActions();

      QAction* cnetAction = toolbar[0];

      MosaicControlNetTool *cnetButton = static_cast<MosaicControlNetTool *>(cnetAction->parent());

      ControlNetTool *cnetTool = static_cast<ControlNetTool *>(cnetAction->parent());



      cnetAction->setEnabled(false);

      connect (project(), SIGNAL(activeControlSet(bool)),

              cnetAction, SLOT(setEnabled(bool)));

      connect (project(), SIGNAL(activeControlSet(bool)),

              cnetButton, SLOT(loadNetwork()));

              cnetTool, SLOT(loadNetwork()));

    }



    return result;

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

+2 −0
Original line number Diff line number Diff line
@@ -206,6 +206,8 @@ namespace Isis { 
   *                           projects. Fixes #5216.

   *   @history 2017-12-05 Christopher Combs - Added support for TemplateEditorWidget and

   *                           TemplateEditViewWorkOrder. Fixes #5168.

   *   @history 2018-03-14 Tracie Sucharski - Changed MosaicControlNetTool to ControlNetTool in

   *                           addCubeDnView. References #5026.

   */

  class Directory : public QObject {

    Q_OBJECT