Commit b7ff7a2b authored by Kaitlyn Lee's avatar Kaitlyn Lee
Browse files

Moved signals to Footprint2DView and CubeDnView.

parent 7fdf1ab9

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

+0 −25
Original line number Diff line number Diff line
@@ -718,25 +718,12 @@ namespace Isis { 
    connect(this, SIGNAL(redrawMeasures()), result, SIGNAL(redrawMeasures()));

    connect(this, SIGNAL(cnetModified()), result, SIGNAL(redrawMeasures()));



    // Note:  This assumes the Control Net tool is the 1st in the toolpad.

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

    // QAction* cnetAction = toolbar[0];

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



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

             result, SLOT(enableControlNetTool(bool)));

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

    //          cnetTool, SLOT(loadNetwork()));



    //  If an active control has not been set, make the control net tool inactive

    // if (!project()->activeControl()) {

    //   cnetAction->setEnabled(false);

    // }



    return result;

  }





  /**

   * @brief Add the qmos view widget to the window.

   * @return @b (Footprint2DView*) A pointer to the Footprint2DView to display.
@@ -774,20 +761,8 @@ namespace Isis { 
    //  to be drawn with different color/shape.

    connect(this, SIGNAL(redrawMeasures()), result, SIGNAL(redrawMeasures()));



    // Note:  This assumes the Control Net tool is the 4th in the toolpad.

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

    // QAction* cnetAction = toolbar[3];

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



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

             result, SLOT(enableControlNetTool(bool)));

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

    //          cnetTool, SLOT(loadNetwork()));

    //

    // //  Control Net tool will only be active if the project has an active Control.

    // if (!project()->activeControl()) {

    //   cnetAction->setEnabled(false);

    // }



    return result;

  }

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

+3 −3
Original line number Diff line number Diff line
@@ -238,9 +238,9 @@ namespace Isis { 
   *   @history 2018-05-14 Tracie Sucharski - Serialize Footprint2DView rather than

   *                           MosaicSceneWidget. This will allow all parts of Footprint2DView to be

   *                           saved/restored including the ImageFileListWidget. Fixes #5422.

   *   @history 2018-06-13 Kaitlyn Lee - The signal activeControlSet() in addCubeDnView() now connects

   *                           to enableControlNetTool() in CubeDnView, instead of enabling the tool 

   *                           directly.

   *   @history 2018-06-13 Kaitlyn Lee - The signal activeControlSet() in addCubeDnView() and

   *                           addFootprint2DView() now connects to enableControlNetTool() in

   *                           CubeDnView and Footprint2DView, instead of enabling the tool directly.

   */

  class Directory : public QObject {

    Q_OBJECT