Commit 06187d69 authored by Tracie Sucharski's avatar Tracie Sucharski
Browse files

PROG: Changed MosaicControlNetTool to ControlNetTool in addCubeDnView. Added a... 

PROG: Changed MosaicControlNetTool to ControlNetTool in addCubeDnView. Added a method to determine if a control is being used in a CnetEditor view before closing the control net. References #5026.
parent d8475862

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

+48 −18
Original line number Diff line number Diff line
@@ -533,6 +533,9 @@ namespace Isis { 




  void Directory::newActiveControl(bool newControl) {



    // If the new active control is the same as what is showing in the cnetEditorWidget, allow

    // editing of control points from the widget, otherwise turnoff from context menu

    foreach(CnetEditorWidget *cnetEditorView, m_cnetEditorViewWidgets) {

      if (cnetEditorView->control() == project()->activeControl()->controlNet()) {

        cnetEditorView->pointTableView()->content()->setActiveControlNet(true);
@@ -618,6 +621,7 @@ namespace Isis { 
    QMenuBar *menuBar = new QMenuBar;

    resultLayout->addWidget(menuBar, row, 0, 1, 2);

    row++;



    CnetEditorWidget *mainWidget = new CnetEditorWidget(network, configFile.expanded());

    resultLayout->addWidget(mainWidget, row, 0, 1, 2);

    row++;
@@ -743,16 +747,19 @@ namespace Isis { 
    connect(this, SIGNAL(redrawMeasures()), result, SIGNAL(redrawMeasures()));

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



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

    // 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());



      cnetAction->setEnabled(false);

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

             cnetAction, SLOT(setEnabled(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;
@@ -796,18 +803,19 @@ namespace Isis { 
    //  to be drawn with different color/shape.

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



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

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

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

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

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

    QAction* cnetAction = toolbar[3];

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

    MosaicControlNetTool *cnetTool = static_cast<MosaicControlNetTool *>(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()));



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

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

      cnetAction->setEnabled(false);

    }



    return result;
@@ -865,6 +873,8 @@ namespace Isis { 


      connect(result->controlPointEditWidget(), SIGNAL(saveControlNet()),

              this, SLOT(makeBackupActiveControl()));

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

               result->controlPointEditWidget(), SLOT(setControlFromActive()));

    }



    return controlPointEditView();
@@ -1080,6 +1090,26 @@ namespace Isis { 
  }





  /**

   * @description Return true if control is not currently being viewed in a CnetEditorWidget 

   *  

   * @param Control * Control used to search current CnetEditorWidgets 

   *  

   * @return @b (bool) Returns true if control is currently being viewed in CnetEditorWidget 

   */

  bool Directory::controlUsedInCnetEditorWidget(Control *control) {



    bool result;

    if ( m_controlMap.count(control) == 0) {

      result = false;

    }

    else {

      result = true;

    }

    return result;

  }





  /**

   * @brief Removes pointers to deleted CubeDnView objects.

   */

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

+6 −1
Original line number Diff line number Diff line
@@ -212,7 +212,10 @@ namespace Isis { 
   *                           CnetEditorWidgets. Added ability to view bundleout.txt file in method

   *                           addBundleObservationView.

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

   *                           addCubeDnView. References #5026.

   *                           addCubeDnView. Added method controlUsedInCnetEditorWidget so Project

   *                           knows whether it is safe to close a control net when a new active is

   *                           set. References #5026.

   *  

   */

  class Directory : public QObject {

    Q_OBJECT
@@ -268,6 +271,8 @@ namespace Isis { 
      ControlPointEditView *controlPointEditView();

//      ChipViewportsWidget *controlPointChipViewports();



      bool controlUsedInCnetEditorWidget(Control *control);



      // Return the control point Id currently in the ControlPointEditWidget, if it exists

      QString editPointId();