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

Removed the save active control button.

parent fa41f542

isis/src/qisis/apps/ipce/IpceMainWindow.cpp

+2 −44
Original line number Diff line number Diff line
@@ -338,31 +338,6 @@ namespace Isis { 
    m_fileMenuActions.append(exitAction);

    m_permToolBarActions.append(exitAction);



    // 6-13-18 Kaitlyn Lee - Commented this out because it is not currently being used

    // QAction *saveNet = new QAction("&Save Active Control Network", this);

    // saveNet->setIcon( QIcon::fromTheme("document-save") );

    // saveNet->setShortcut(Qt::CTRL + Qt::Key_S);

    // saveNet->setToolTip("Save current active control network");

    // saveNet->setStatusTip("Save current active control network");

    // QString whatsThis = "<b>Function:</b> Saves the current active<i>"

    //                     "control network</i>";

    // saveNet->setWhatsThis(whatsThis);

    // connect(saveNet, SIGNAL(triggered()), m_directory, SLOT(saveActiveControl()));

    // m_permToolBarActions.append(saveNet);



//  m_saveAsNet = new QAction(QPixmap(toolIconDir() + "/mActionFileSaveAs.png"),

//                            "Save Control Network &As...",

//                            m_matchTool);

//  m_saveAsNet->setToolTip("Save current control network to chosen file");

//  m_saveAsNet->setStatusTip("Save current control network to chosen file");

//  whatsThis = "<b>Function:</b> Saves the current <i>"

//      "control network</i> under chosen filename";

//  m_saveAsNet->setWhatsThis(whatsThis);

//  connect(m_saveAsNet, SIGNAL(triggered()), this, SLOT(saveAsNet()));









    QAction *undoAction = m_directory->undoAction();

    undoAction->setShortcut(Qt::Key_Z | Qt::CTRL);
@@ -486,36 +461,19 @@ namespace Isis { 
   */

  void IpceMainWindow::createToolBars() {

    m_permToolBar = new QToolBar(this);

    //m_activeToolBar = new QToolBar(this);

    //m_toolPad = new QToolBar(this);



    QSize iconSize(25, 45);



    m_permToolBar->setIconSize(iconSize);

    //m_activeToolBar->setIconSize(iconSize);

    //m_toolPad->setIconSize(iconSize);



    m_permToolBar->setObjectName("PermanentToolBar");

    //m_activeToolBar->setObjectName("ActiveToolBar");

    //m_toolPad->setObjectName("ToolPad");

    m_permToolBar->setToolTip("PermanentToolBar");



    addToolBar(m_permToolBar);

    //addToolBar(m_activeToolBar);

    //addToolBar(m_toolPad);



    foreach ( QAction *action, m_directory->permToolBarActions() ) {

      m_permToolBar->addAction(action);

    }



    foreach (QAction *action, m_permToolBarActions) {

      if (action->text() == "&Save Active Control Network") {

        m_permToolBar->addSeparator();

      m_permToolBar->addAction(action);

        m_permToolBar->addSeparator();

      }

      else {

        m_permToolBar->addAction(action);

      }

    }

  }

isis/src/qisis/apps/ipce/IpceMainWindow.h

+2 −2
Original line number Diff line number Diff line
@@ -137,8 +137,8 @@ namespace Isis { 
   *                           for cleanup because there is no way to get the dock from the view.

   *                           Cleanup connections are made for the views and the docks to ensure

   *                           that cleanup happens for both.  Fixes #5433.

   *   @history 2018-06-13 Kaitlyn Lee - Commented out code adding the save active control net button and

   *                           the toolpad, since they are not currently being used.

   *   @history 2018-06-13 Kaitlyn Lee - Removed code adding the save active control net button and

   *                           the toolpad, since control nets can be saved with the project save button.

   *

   */

  class IpceMainWindow : public QMainWindow {

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

+0 −22
Original line number Diff line number Diff line
@@ -1792,28 +1792,6 @@ namespace Isis { 
    m_editPointId = controlPointEditView()->controlPointEditWidget()->editPointId();

  }





  /**

   * Save the current active control.

   * 6-13-18 Kaitlyn Lee - Commented this out because it is not currently being used

   */

  // void Directory::saveActiveControl() {

  //

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

  //     project()->activeControl()->write();

  //     // add to HistoryTreeWidget

  //     QString saveCnetHistoryEntry = project()->activeControl()->fileName() +

  //       "has been saved.";

  //     m_historyTreeWidget->addToHistory(saveCnetHistoryEntry);

  //   }

  //

  //   // Make sure the ControlPointEditView "Save Net" button is no longer red

  //   if (controlPointEditView()) {

  //     controlPointEditView()->controlPointEditWidget()->colorizeSaveNetButton(true);

  //   }

  // }





  /**

   * Autosave for control net.  The control net is auto saved to the same directory as the input

   * net.  It is saved to controlNetFilename.net.bak.

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

+2 −1
Original line number Diff line number Diff line
@@ -238,7 +238,8 @@ 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 - Commented out saveActiveControl() since it is not currently being used.

   *   @history 2018-06-13 Kaitlyn Lee - Removed  saveActiveControl() since users can save the control

   *                           network with the project save button.

   */

  class Directory : public QObject {

    Q_OBJECT