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

Merge branch 'omaha_14.4.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into master_14.4.1

Browse source 
Former-commit-id: 47546ae196e170c6d673162ff24855cadfdfe6ae
This commit is contained in:
Fay.Liang 2015-05-12 16:53:33 -04:00
commit 53426e8b0d
5 changed files with 100 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/AbstractGridResource.java
View file

@ -132,6 +132,8 @@ import com.vividsolutions.jts.geom.Coordinate;
* Aug 21, 2014 DR 17313 jgerth Implements ImageProvider * Aug 21, 2014 DR 17313 jgerth Implements ImageProvider
* Oct 07, 2014 3668 bclement Renamed requestJob to requestRunner * Oct 07, 2014 3668 bclement Renamed requestJob to requestRunner
* Dec 09, 2014 5056 jing Added data access interfaces * Dec 09, 2014 5056 jing Added data access interfaces
* May 11, 2015 4384 dgilling Add arrow style preference for minimum
* magnitude.
* *
* </pre> * </pre>
* *
@ -511,6 +513,12 @@ public abstract class AbstractGridResource<T extends AbstractResourceData>
} else { } else {
config.setArrowScaler(new LogArrowScaler(-1 * scale)); config.setArrowScaler(new LogArrowScaler(-1 * scale));
} }
double minMagnitude = ((ArrowPreferences) stylePreferences)
.getMinimumMagnitude();
if (!Double.isNaN(minMagnitude)) {
config.setMinimumMagnitude(minMagnitude);
}
} else { } else {
config.setLinearArrowScaleFactor(1.0); config.setLinearArrowScaleFactor(1.0);
} }
@ -969,6 +977,7 @@ public abstract class AbstractGridResource<T extends AbstractResourceData>
return new ArrayList<PluginDataObject>(list); return new ArrayList<PluginDataObject>(list);
} }
@Override
public Collection<DrawableImage> getImages(IGraphicsTarget target, public Collection<DrawableImage> getImages(IGraphicsTarget target,
PaintProperties paintProps) throws VizException { PaintProperties paintProps) throws VizException {
if (getCapability(DisplayTypeCapability.class).getDisplayType() != DisplayType.IMAGE) { if (getCapability(DisplayTypeCapability.class).getDisplayType() != DisplayType.IMAGE) {

95
cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/sfc2d/NWPS.xml
View file

@ -19,44 +19,59 @@
further_licensing_information. further_licensing_information.
--> -->
<menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<contribute xsi:type="menuItem" menuText="Period1" <contribute xsi:type="toolbarSubMenu" menuText="nwpsCG1">
key="Period1" indentText="false" /> <contribute xsi:type="menuItem" menuText="Sig Wave Hgt"
<contribute xsi:type="menuItem" menuText="Period2" key="HTSGW" indentText="false" />
key="Period2" indentText="false" /> <contribute xsi:type="menuItem" menuText="Swell Hgt" key="SWELL"
<contribute xsi:type="menuItem" menuText="Period3" indentText="false" />
key="Period3" indentText="false" /> <contribute xsi:type="menuItem" menuText="Prim Wave Dir"
<contribute xsi:type="menuItem" menuText="Period4" key="dirPW" indentText="false" />
key="Period4" indentText="false" /> <contribute xsi:type="menuItem" menuText="Prim Wave Pd"
<contribute xsi:type="menuItem" menuText="Period5" key="PERPW" indentText="false" />
key="Period5" indentText="false" /> </contribute>
<contribute xsi:type="menuItem" menuText="Period6"
key="Period6" indentText="false" /> <contribute xsi:type="toolbarSubMenu" menuText="nwpsTrkngCG0">
<contribute xsi:type="menuItem" menuText="Period7" <contribute xsi:type="menuItem" menuText="Period1"
key="Period7" indentText="false" /> key="Period1" indentText="false" />
<contribute xsi:type="menuItem" menuText="Period8" <contribute xsi:type="menuItem" menuText="Period2"
key="Period8" indentText="false" /> key="Period2" indentText="false" />
<contribute xsi:type="menuItem" menuText="Period9" <contribute xsi:type="menuItem" menuText="Period3"
key="Period9" indentText="false" /> key="Period3" indentText="false" />
<contribute xsi:type="menuItem" menuText="Period10" <contribute xsi:type="menuItem" menuText="Period4"
key="Period10" indentText="false" /> key="Period4" indentText="false" />
<contribute xsi:type="menuItem" menuText="Wave1" <contribute xsi:type="menuItem" menuText="Period5"
key="Wave1" indentText="false" /> key="Period5" indentText="false" />
<contribute xsi:type="menuItem" menuText="Wave2" <contribute xsi:type="menuItem" menuText="Period6"
key="Wave2" indentText="false" /> key="Period6" indentText="false" />
<contribute xsi:type="menuItem" menuText="Wave3" <contribute xsi:type="menuItem" menuText="Period7"
key="Wave3" indentText="false" /> key="Period7" indentText="false" />
<contribute xsi:type="menuItem" menuText="Wave4" <contribute xsi:type="menuItem" menuText="Period8"
key="Wave4" indentText="false" /> key="Period8" indentText="false" />
<contribute xsi:type="menuItem" menuText="Wave5" <contribute xsi:type="menuItem" menuText="Period9"
key="Wave5" indentText="false" /> key="Period9" indentText="false" />
<contribute xsi:type="menuItem" menuText="Wave6" <contribute xsi:type="menuItem" menuText="Period10"
key="Wave6" indentText="false" /> key="Period10" indentText="false" />
<contribute xsi:type="menuItem" menuText="Wave7" <contribute xsi:type="menuItem" menuText="Wave1"
key="Wave7" indentText="false" /> key="Wave1" indentText="false" />
<contribute xsi:type="menuItem" menuText="Wave8" <contribute xsi:type="menuItem" menuText="Wave2"
key="Wave8" indentText="false" /> key="Wave2" indentText="false" />
<contribute xsi:type="menuItem" menuText="Wave9" <contribute xsi:type="menuItem" menuText="Wave3"
key="Wave9" indentText="false" /> key="Wave3" indentText="false" />
<contribute xsi:type="menuItem" menuText="Wave10" <contribute xsi:type="menuItem" menuText="Wave4"
key="Wave10" indentText="false" /> key="Wave4" indentText="false" />
<contribute xsi:type="menuItem" menuText="Wave5"
key="Wave5" indentText="false" />
<contribute xsi:type="menuItem" menuText="Wave6"
key="Wave6" indentText="false" />
<contribute xsi:type="menuItem" menuText="Wave7"
key="Wave7" indentText="false" />
<contribute xsi:type="menuItem" menuText="Wave8"
key="Wave8" indentText="false" />
<contribute xsi:type="menuItem" menuText="Wave9"
key="Wave9" indentText="false" />
<contribute xsi:type="menuItem" menuText="Wave10"
key="Wave10" indentText="false" />
<contribute xsi:type="menuItem" menuText="Swell Hgt"
key="SWELL" indentText="false" />
</contribute>
</menuTemplate> </menuTemplate>

16
cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/planes/planviewtime-timeseries/misc.xml
View file

@ -91,6 +91,22 @@
indentText="false" /> indentText="false" />
<contribute xsi:type="menuItem" menuText="Secondary" key="Secondary" <contribute xsi:type="menuItem" menuText="Secondary" key="Secondary"
indentText="false" /> indentText="false" />
<contribute xsi:type="menuItem" menuText="Tertiary" key="Tertiary"
indentText="false" />
<contribute xsi:type="menuItem" menuText="OSEQD-4" key="OSEQD-4"
indentText="false" />
<contribute xsi:type="menuItem" menuText="OSEQD-5" key="OSEQD-5"
indentText="false" />
<contribute xsi:type="menuItem" menuText="OSEQD-6" key="OSEQD-6"
indentText="false" />
<contribute xsi:type="menuItem" menuText="OSEQD-7" key="OSEQD-7"
indentText="false" />
<contribute xsi:type="menuItem" menuText="OSEQD-8" key="OSEQD-8"
indentText="false" />
<contribute xsi:type="menuItem" menuText="OSEQD-9" key="OSEQD-9"
indentText="false" />
<contribute xsi:type="menuItem" menuText="OSEQD-10" key="OSEQD-10"
indentText="false" />
<contribute xsi:type="menuItem" textLookup="LevelMapping" <contribute xsi:type="menuItem" textLookup="LevelMapping"
key="0BSS" indentText="false" /> key="0BSS" indentText="false" />
<contribute xsi:type="menuItem" menuText="0 AGL" key="0FHAG" <contribute xsi:type="menuItem" menuText="0 AGL" key="0FHAG"

2
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/nwpsCG1.xml
View file

@ -209,7 +209,7 @@
<uiname>primaryWaveDir</uiname> <uiname>primaryWaveDir</uiname>
<valid_range>0.0</valid_range> <valid_range>0.0</valid_range>
<valid_range>360.0</valid_range> <valid_range>360.0</valid_range>
<fillValue>-99999.0</fillValue> <fillValue>-999.0</fillValue>
<n3D>1</n3D> <n3D>1</n3D>
<levelsDesc>SFC</levelsDesc> <levelsDesc>SFC</levelsDesc>
<levels> <levels>

19
edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/d2dArrowStyleRules.xml
View file

@ -142,4 +142,23 @@
<scale>0.20</scale> <scale>0.20</scale>
</arrowStyle> </arrowStyle>
</styleRule> </styleRule>
<styleRule>
<paramLevelMatches>
<creatingEntity>nwpsTrkngCG0</creatingEntity>
<parameter>Wave1</parameter>
<parameter>Wave2</parameter>
<parameter>Wave3</parameter>
<parameter>Wave4</parameter>
<parameter>Wave5</parameter>
<parameter>Wave6</parameter>
<parameter>Wave7</parameter>
<parameter>Wave8</parameter>
<parameter>Wave9</parameter>
<parameter>Wave10</parameter>
</paramLevelMatches>
<arrowStyle>
<minimumMagnitude>1.00</minimumMagnitude>
</arrowStyle>
</styleRule>
</styleRuleset> </styleRuleset>