From 96f3b85b572b412b89858974e0bf54d08c755e6d Mon Sep 17 00:00:00 2001
From: David Gillingham <David.Gillingham@raytheon.com>
Date: Mon, 11 May 2015 14:15:48 -0500
Subject: [PATCH] Omaha #4384 (and 4385): Fix volume browser menus for NWPS
 models, display vector arrows for all mag values greater than 1.0.

Change-Id: Ib3b5a7fcf060364c09fadf57bd5b7151a4f6828e

Former-commit-id: bc3abb1effa93ff76c8287f59b64dd73017f3ad8
---
 .../rsc/general/AbstractGridResource.java     |  9 ++
 .../fields/planview-timeseries/sfc2d/NWPS.xml | 95 +++++++++++--------
 .../planes/planviewtime-timeseries/misc.xml   | 16 ++++
 .../base/grid/parameterInfo/nwpsCG1.xml       |  2 +-
 .../base/styleRules/d2dArrowStyleRules.xml    | 19 ++++
 5 files changed, 100 insertions(+), 41 deletions(-)

diff --git a/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/AbstractGridResource.java b/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/AbstractGridResource.java
index 16fc60ee67..422d7c5882 100644
--- a/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/AbstractGridResource.java
+++ b/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/AbstractGridResource.java
@@ -132,6 +132,8 @@ import com.vividsolutions.jts.geom.Coordinate;
  * Aug 21, 2014  DR 17313 jgerth      Implements ImageProvider
  * Oct 07, 2014  3668     bclement    Renamed requestJob to requestRunner
  * Dec 09, 2014  5056     jing        Added data access interfaces
+ * May 11, 2015  4384     dgilling    Add arrow style preference for minimum
+ *                                    magnitude.
  * 
  * </pre>
  * 
@@ -511,6 +513,12 @@ public abstract class AbstractGridResource<T extends AbstractResourceData>
                     } else {
                         config.setArrowScaler(new LogArrowScaler(-1 * scale));
                     }
+
+                    double minMagnitude = ((ArrowPreferences) stylePreferences)
+                            .getMinimumMagnitude();
+                    if (!Double.isNaN(minMagnitude)) {
+                        config.setMinimumMagnitude(minMagnitude);
+                    }
                 } else {
                     config.setLinearArrowScaleFactor(1.0);
                 }
@@ -969,6 +977,7 @@ public abstract class AbstractGridResource<T extends AbstractResourceData>
         return new ArrayList<PluginDataObject>(list);
     }
 
+    @Override
     public Collection<DrawableImage> getImages(IGraphicsTarget target,
             PaintProperties paintProps) throws VizException {
         if (getCapability(DisplayTypeCapability.class).getDisplayType() != DisplayType.IMAGE) {
diff --git a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/sfc2d/NWPS.xml b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/sfc2d/NWPS.xml
index e819be7f6d..390392a4e7 100644
--- a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/sfc2d/NWPS.xml
+++ b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/sfc2d/NWPS.xml
@@ -19,44 +19,59 @@
         further_licensing_information.
     -->
 <menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <contribute xsi:type="menuItem" menuText="Period1"
-        key="Period1" indentText="false" />
-    <contribute xsi:type="menuItem" menuText="Period2"
-        key="Period2" indentText="false" />
-    <contribute xsi:type="menuItem" menuText="Period3"
-        key="Period3" indentText="false" />
-    <contribute xsi:type="menuItem" menuText="Period4"
-        key="Period4" indentText="false" />
-    <contribute xsi:type="menuItem" menuText="Period5"
-        key="Period5" indentText="false" />    
-    <contribute xsi:type="menuItem" menuText="Period6"
-        key="Period6" indentText="false" />
-    <contribute xsi:type="menuItem" menuText="Period7"
-        key="Period7" indentText="false" />
-    <contribute xsi:type="menuItem" menuText="Period8"
-        key="Period8" indentText="false" />
-    <contribute xsi:type="menuItem" menuText="Period9"
-        key="Period9" indentText="false" />
-    <contribute xsi:type="menuItem" menuText="Period10"
-        key="Period10" indentText="false" />
-    <contribute xsi:type="menuItem" menuText="Wave1"
-        key="Wave1" indentText="false" />
-	<contribute xsi:type="menuItem" menuText="Wave2"
-        key="Wave2" indentText="false" />
-	<contribute xsi:type="menuItem" menuText="Wave3"
-        key="Wave3" indentText="false" />
-	<contribute xsi:type="menuItem" menuText="Wave4"
-        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="toolbarSubMenu" menuText="nwpsCG1">
+        <contribute xsi:type="menuItem" menuText="Sig Wave Hgt"
+        	key="HTSGW" indentText="false" />
+        <contribute xsi:type="menuItem" menuText="Swell Hgt" key="SWELL"
+        	indentText="false" />
+        <contribute xsi:type="menuItem" menuText="Prim Wave Dir"
+        	key="dirPW" indentText="false" />
+    	<contribute xsi:type="menuItem" menuText="Prim Wave Pd"
+        	key="PERPW" indentText="false" />
+    </contribute>
+
+	<contribute xsi:type="toolbarSubMenu" menuText="nwpsTrkngCG0">
+        <contribute xsi:type="menuItem" menuText="Period1"
+        	key="Period1" indentText="false" />
+	    <contribute xsi:type="menuItem" menuText="Period2"
+	        key="Period2" indentText="false" />
+	    <contribute xsi:type="menuItem" menuText="Period3"
+	        key="Period3" indentText="false" />
+	    <contribute xsi:type="menuItem" menuText="Period4"
+	        key="Period4" indentText="false" />
+	    <contribute xsi:type="menuItem" menuText="Period5"
+	        key="Period5" indentText="false" />    
+	    <contribute xsi:type="menuItem" menuText="Period6"
+	        key="Period6" indentText="false" />
+	    <contribute xsi:type="menuItem" menuText="Period7"
+	        key="Period7" indentText="false" />
+	    <contribute xsi:type="menuItem" menuText="Period8"
+	        key="Period8" indentText="false" />
+	    <contribute xsi:type="menuItem" menuText="Period9"
+	        key="Period9" indentText="false" />
+	    <contribute xsi:type="menuItem" menuText="Period10"
+	        key="Period10" indentText="false" />
+	    <contribute xsi:type="menuItem" menuText="Wave1"
+	        key="Wave1" indentText="false" />
+		<contribute xsi:type="menuItem" menuText="Wave2"
+	        key="Wave2" indentText="false" />
+		<contribute xsi:type="menuItem" menuText="Wave3"
+	        key="Wave3" indentText="false" />
+		<contribute xsi:type="menuItem" menuText="Wave4"
+	        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>
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/planes/planviewtime-timeseries/misc.xml b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/planes/planviewtime-timeseries/misc.xml
index 265ffe28c8..52041d2d3c 100644
--- a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/planes/planviewtime-timeseries/misc.xml
+++ b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/planes/planviewtime-timeseries/misc.xml
@@ -91,6 +91,22 @@
         indentText="false" />
     <contribute xsi:type="menuItem" menuText="Secondary" key="Secondary"
         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"
         key="0BSS" indentText="false" />
     <contribute xsi:type="menuItem" menuText="0 AGL" key="0FHAG"
diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/nwpsCG1.xml b/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/nwpsCG1.xml
index 88f32bbbe2..5520f17536 100755
--- a/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/nwpsCG1.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/nwpsCG1.xml
@@ -209,7 +209,7 @@
     <uiname>primaryWaveDir</uiname>
     <valid_range>0.0</valid_range>
     <valid_range>360.0</valid_range>
-    <fillValue>-99999.0</fillValue>
+    <fillValue>-999.0</fillValue>
     <n3D>1</n3D>
     <levelsDesc>SFC</levelsDesc>
     <levels>
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/d2dArrowStyleRules.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/d2dArrowStyleRules.xml
index 52b707a4d9..b1a3ee551c 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/d2dArrowStyleRules.xml
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/d2dArrowStyleRules.xml
@@ -142,4 +142,23 @@
             <scale>0.20</scale>
 		</arrowStyle>
 	</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>