Commit d4209ca9 authored by Adam Paquette's avatar Adam Paquette
Browse files

Uncommented and modified help info for the 2D and 3D plot tool in qview. Fixes #2126 

git-svn-id: http://subversion.wr.usgs.gov/repos/prog/isis3/trunk@8065 41f8697f-d340-4b68-9986-7bafba869bb8
parent 7f15ea32

isis/src/qisis/apps/qview/qview.xml

+8 −4
Original line number Diff line number Diff line
@@ -160,5 +160,9 @@ 
      Fixed initial loading of viewport and Fit to viewport zoom to correctly zoom to the center

      of the image. Fixes #4756.

    </change>

    <change name="Adam Paquette" date="2017-05-19">

      Readded help menu for the 2D and 3D plot tools. Now properly display in both tools.

      Fixes #2126.

    </change>

  </history>

</application>

isis/src/qisis/objs/PlotWindow/PlotWindow.cpp

+29 −27
Original line number Diff line number Diff line
@@ -1052,7 +1052,7 @@ namespace Isis { 
    QMenu *fileMenu = new QMenu("&File");

    QMenu *editMenu = new QMenu("&Edit");

    QMenu *optionsMenu = new QMenu("&Options");

//     QMenu *helpMenu = new QMenu("&Help");

    QMenu *helpMenu = new QMenu("&Help");



    if ((optionsToProvide & SaveMenuOption) == SaveMenuOption) {

      QAction *save = new QAction(m_plot);
@@ -1251,6 +1251,15 @@ namespace Isis { 
      actions.push_back(configurePlot);

    }



    QAction *basicHelp = new QAction(m_plot);

    basicHelp->setText("Basic Help");

    QString text = "<b>Function:</b> Provides a basic overview on using components "

                   "of the qview plot window";

    basicHelp->setWhatsThis(text);

    connect( basicHelp, SIGNAL( triggered() ),

             this, SLOT( showHelp() ) );

    helpMenu->addAction(basicHelp);



    /*setup menus*/

    m_pasteAct = new QAction(QIcon::fromTheme("edit-paste"),

                             "&Paste Curve", m_plot);
@@ -1260,12 +1269,6 @@ namespace Isis { 
            this, SLOT(pasteCurve()));

    editMenu->addAction(m_pasteAct);



//     QAction *basicHelp = new QAction(m_plot);

//     basicHelp->setText("Basic Help");

//     connect( basicHelp, SIGNAL( triggered() ),

//              this, SLOT( showHelp() ) );

//     helpMenu->addAction(basicHelp);



    menu.push_back(fileMenu);

    menu.push_back(editMenu);
@@ -1277,13 +1280,13 @@ namespace Isis { 
      optionsMenu = NULL;

    }



//    if (helpMenu->actions().size()) {

//       menu.push_back(helpMenu);

//     }

//     else {

//       delete helpMenu;

//       helpMenu = NULL;

//     }

   if (helpMenu->actions().size()) {

      menu.push_back(helpMenu);

    }

    else {

      delete helpMenu;

      helpMenu = NULL;

    }



    setMenus(menu, actions);

  }
@@ -1897,4 +1900,3 @@ namespace Isis { 
  }



}

isis/src/qisis/objs/PlotWindow/PlotWindow.h

+2 −0
Original line number Diff line number Diff line
@@ -82,6 +82,8 @@ namespace Isis { 
   *                           #2089.

   *   @history 2016-09-14 Ian Humphrey - Modified printPlot() and save() - replaced deprecated

   *                           static QPixmap::grabWidget with QWidget::grab. References #4304.

   *   @history 2017-05-19 Adam Paquette - Uncommented and modified code for a help menu

   *                           in the plotting tools. Fixes #2126 

   */

  class PlotWindow : public MainWindow {

      Q_OBJECT