Commit e5def871 authored by Kris J. Becker's avatar Kris J. Becker Committed by Jesse Mapel
Browse files

ISIS Docs build fix for incorrect path and -WEBHELP issues (#4511) 

* Add missing dot command from graphviz package

When building ISIS documentation, the dot command is not found. This dependancy is in the graphiviz package, which is added to the environment files.

* Fixed path to ISIS docs for -WEBHELP

The hardcoded path to ISIS docs was incorrect. The path to docmentation is $ISISROOT/docs - the s was missing in the path spec.
parent 1a2145a6

environment.yml

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ dependencies: 
  - geos>=3.7,<3.8

  - geotiff

  - gmp

  - graphviz

  - gsl>=2.6

  - hdf5

  - icu

environment_gcc4.yml

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ dependencies: 
  - geos=3.7.1

  - geotiff

  - gmp

  - graphviz

  - gsl

  - hdf5

  - icu

isis/src/base/objs/UserInterface/UserInterface.cpp

+4 −1
Original line number Diff line number Diff line
@@ -642,6 +642,9 @@ namespace Isis { 
   * @throws Isis::IException::User - -ERRLIST expects a file name

   * @throws Isis::IException::User - -ONERROR only accpets CONTINUE and ABORT as valid values

   * @throws Isis::IException::Unknown - -GUI and -PID are incompatible arguments

   *

   * @internal

   * @history 2021-06-05 Kris Becker - Fixed path to ISIS docs

   */

  void UserInterface::evaluateOption(const QString name,

                                     const QString value) {
@@ -680,7 +683,7 @@ namespace Isis { 
    else if(name == "-WEBHELP") {

      Isis::PvlGroup &pref = Isis::Preference::Preferences().findGroup("UserInterface");

      QString command = pref["GuiHelpBrowser"];

      command += " $ISISROOT/doc/Application/presentation/Tabbed/";

      command += " $ISISROOT/docs/Application/presentation/Tabbed/";

      command += FileName(p_progName).name() + "/" + FileName(p_progName).name() + ".html";

      // cannot test else in unit test - don't want to open webhelp

      if (unitTest) {

isis/src/base/objs/UserInterface/UserInterface.h

+1 −0
Original line number Diff line number Diff line
@@ -133,6 +133,7 @@ namespace Isis { 
   *   @history 2018-04-20 Adam Goins - Modified loadHistory() to print out the last command

   *                           so that users can see the actual command that the -last arg loads.

   *                           Fixes #4779.

   *   @history 2021-06-05 Kris Becker - Fixed path to ISIS documentation when -WEBHELP is used

   *

   */