Unverified Commit fe23f469 authored by Summer Stapleton's avatar Summer Stapleton Committed by GitHub
Browse files

Merge pull request #348 from kdl222/deleteme 

Fixed code taken out in merge conflict
parents 57572534 c6abd37c

isis/src/qisis/objs/Footprint2DView/Footprint2DView.cpp

+5 −8
Original line number Diff line number Diff line
@@ -306,11 +306,7 @@ namespace Isis { 


  /**

   * A slot function that is called when directory emits a siganl that an active

   * control network is set. It enables the control network editor tool in the

   * toolpad.

   * We do not load the network here because the network does not open until

   * the tool is beng used. This is done in MosaicControlNetTool::updateTool() and

   * is connected in MosaicTool.

   * control network is set. It enables the control network editor tool in the toolpad.

   *

   * @param value The boolean that holds if a control network has been set.

   */
@@ -318,12 +314,13 @@ namespace Isis { 
    foreach (QAction *action, m_toolPad->actions()) {

      if (action->toolTip() == "Control Net (c)") {

        action->setEnabled(value);

        MosaicControlNetTool *cnetTool =

              static_cast<MosaicControlNetTool *>(m_controlNetToolAction->parent());

        if (value) {

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

          cnetTool->loadNetwork();

        }

      }

    }

  }





  /**