Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 7 commits into from
Jun 9, 2021
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e5074ab
Merge pull request #1 from USGS-Astrogeology/dev
KrisBecker Feb 15, 2021
8e6a1ef
Merge pull request #2 from USGS-Astrogeology/dev
KrisBecker Feb 19, 2021
fb6a418
Merge pull request #3 from USGS-Astrogeology/dev
KrisBecker May 13, 2021
18f747f
Merge pull request #4 from USGS-Astrogeology/dev
KrisBecker Jun 3, 2021
5d84e85
Merge pull request #5 from USGS-Astrogeology/dev
KrisBecker Jun 4, 2021
0c18bfc
Add missing dot command from graphviz package
KrisBecker Jun 5, 2021
6d0ec26
Fixed path to ISIS docs for -WEBHELP
KrisBecker Jun 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions environment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ dependencies:
- geos>=3.7,<3.8
- geotiff
- gmp
- graphviz
- gsl>=2.6
- hdf5
- icu
Expand Down
1 change: 1 addition & 0 deletions environment_gcc4.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ dependencies:
- geos=3.7.1
- geotiff
- gmp
- graphviz
- gsl
- hdf5
- icu
Expand Down
5 changes: 4 additions & 1 deletion isis/src/base/objs/UserInterface/UserInterface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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) {
Expand Down
1 change: 1 addition & 0 deletions isis/src/base/objs/UserInterface/UserInterface.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
*
*/

Expand Down