xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'unidata_17.1.1-osx' of github.com:Unidata/awips2 into unidata_17.1.1-osx

Browse source
This commit is contained in:
Michael James 2017-07-19 08:04:17 -06:00
commit 56fda707bc
5 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
cave/com.raytheon.viz.feature.awips.developer/feature.xml
View file

@ -209,6 +209,14 @@
id="com.raytheon.uf.viz.aviation.advisory.feature"
version="0.0.0"/>
<includes
id="com.raytheon.uf.viz.d2d.gfe.feature"
version="0.0.0"/>
<includes
id="com.raytheon.viz.gfe.feature"
version="0.0.0"/>
<requires>
<import feature="com.raytheon.uf.viz.application.feature" version="1.0.0.qualifier"/>
</requires>

2
cave/com.raytheon.viz.gfe/localization/gfe/userPython/gfeConfig/gfeConfig.py
View file

@ -222,7 +222,7 @@ PublishTimes = ['Today', 'Tonight', 'Tomorrow', 'Tomorrow Night', 'Day 3',
# Defines the initial loaded set of map backgrounds. The name of each
# background should match the name (without ".xml") of a map file in the
# CAVE/Bundles/maps directory under the Localization perspective.
MapBackgrounds_default = ['States','CWA']
MapBackgrounds_default = ['statesCounties','CWA']
# Specific Colors for a map background
# The user may specify a specific color to be used for a map background,

2
cave/com.raytheon.viz.gfe/plugin.xml
View file

@ -1039,7 +1039,7 @@
name="Grid Manager" />
</extension>
<extension point="org.eclipse.ui.menus">
<menuContribution locationURI="menu:org.eclipse.ui.main.menu?after=CAVE">
<menuContribution locationURI="menu:org.eclipse.ui.main.menu">
<menu id="gfe" label="GFE" mnemonic="G">
<visibleWhen>
<reference definitionId="com.raytheon.viz.gfe.inGFEActionSet">

2
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/GfeClient.java
View file

@ -72,6 +72,7 @@ import com.raytheon.viz.ui.personalities.awips.AbstractAWIPSComponent;
* Apr 26, 2015 4259 njensen Updated for new JEP API
* May 20, 2015 4509 njensen Added time and dataaccess to include path
* Apr 28, 2016 5236 njensen Use Jep redirectOutput for python prints
* Jul 19, 2017 ---- mjames@ucar Add common python include path.
*
* </pre>
*
@ -119,6 +120,7 @@ public class GfeClient extends AbstractAWIPSComponent {
boolean includeUser = (!VizApp.getWsId().getUserName().equals("SITE"));
String includePath = PyUtil.buildJepIncludePath(true, utilityDir,
PythonIncludePathUtil.getCommonPythonIncludePath(),
PythonIncludePathUtil.getCommonPythonIncludePath("time",
"dataaccess"), GfePyIncludeUtil
.getCommonGfeIncludePath(), GfePyIncludeUtil

4
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smarttool/script/SmartToolFactory.java
View file

@ -38,10 +38,11 @@ import com.raytheon.viz.gfe.core.DataManager;
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Mar 21, 2008 njensen Initial creation
* Jul 9, 2009 2454 ryu Put user and site's python scripts on path for import
* Jul 09, 2009 2454 ryu Put user and site's python scripts on path for import
* May 20, 2015 4509 njensen Added time and dataaccess to include path
* Jul 23, 2015 4263 dgilling Refactored to support changes to SmartToolController.
* Dec 14, 2015 4816 dgilling Support refactored PythonJobCoordinator API.
* Jul 19, 2017 ---- mjames@ucar Add common python include path.
*
* </pre>
*
@ -69,6 +70,7 @@ public abstract class SmartToolFactory<C extends SmartToolController>
protected static String getIncludePath() {
return PyUtil.buildJepIncludePath(PythonIncludePathUtil
.getCommonPythonIncludePath(), PythonIncludePathUtil
.getCommonPythonIncludePath("time", "dataaccess"),
GfePyIncludeUtil.getVtecIncludePath(), GfePyIncludeUtil
.getCommonGfeIncludePath(), GfePyIncludeUtil