From aeca09eae269b981da5f466225bcab2b4a760ced Mon Sep 17 00:00:00 2001 From: Matthew Foster Date: Tue, 23 Jun 2015 16:50:21 +0000 Subject: [PATCH] VLab Issue #8856 - Fixes for Baumgardt additions; fixes #8856 Change-Id: I17afbe07047e4e07fa520ab8dff899b58796f53f Former-commit-id: 64fde808f4648dd846e156baf052a65ab11ebc90 --- .../volumebrowser/FieldDisplayTypes.xml | 3 + .../bundles/volume/ModelFamilyA.xml | 1 + .../bundles/volume/ModelFamilyB.xml | 2 + .../bundles/volume/ModelFamilyH.xml | 1 + .../bundles/volume/ModelFamilyV.xml | 1 + .../fields/planview-timeseries/tstorms.xml | 18 +- .../base/colormaps/Grid/Frontogenesis.cmap | 259 ++++++++++++++++++ .../base/colormaps/Grid/Vorticity.cmap | 259 ++++++++++++++++++ .../derivedParameters/definitions/HeliC.xml | 44 +++ .../derivedParameters/definitions/LM5.xml | 2 +- .../definitions/MaxWGS1hr.xml | 2 +- .../derivedParameters/definitions/RM5.xml | 2 +- .../derivedParameters/definitions/RMprop2.xml | 2 +- .../derivedParameters/definitions/SRMl.xml | 2 +- .../derivedParameters/definitions/SRMlM.xml | 2 +- .../derivedParameters/definitions/SRMm.xml | 2 +- .../derivedParameters/definitions/SRMmM.xml | 2 +- .../derivedParameters/definitions/SRMr.xml | 2 +- .../derivedParameters/definitions/SRMrM.xml | 2 +- .../derivedParameters/definitions/lm6.xml | 2 +- .../derivedParameters/definitions/rm6.xml | 2 +- .../base/styleRules/d2dArrowStyleRules.xml | 8 + .../base/styleRules/d2dContourStyleRules.xml | 4 +- .../base/styleRules/gridImageryStyleRules.xml | 20 +- 24 files changed, 619 insertions(+), 25 deletions(-) create mode 100755 edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/colormaps/Grid/Frontogenesis.cmap create mode 100755 edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/colormaps/Grid/Vorticity.cmap create mode 100755 edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/HeliC.xml diff --git a/cave/com.raytheon.viz.grid/localization/volumebrowser/FieldDisplayTypes.xml b/cave/com.raytheon.viz.grid/localization/volumebrowser/FieldDisplayTypes.xml index a82ec46999..66a99e8034 100644 --- a/cave/com.raytheon.viz.grid/localization/volumebrowser/FieldDisplayTypes.xml +++ b/cave/com.raytheon.viz.grid/localization/volumebrowser/FieldDisplayTypes.xml @@ -34,6 +34,9 @@ + + + diff --git a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyA.xml b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyA.xml index 9f3fbaa8fd..99d3c75213 100644 --- a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyA.xml +++ b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyA.xml @@ -367,6 +367,7 @@ ModFamA| |N|Conv: NonSupercell Tor Family| |OTHER | | \ + PLAN_VIEW diff --git a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyB.xml b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyB.xml index b8a33acaf2..3d259e7c50 100644 --- a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyB.xml +++ b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyB.xml @@ -378,6 +378,7 @@ + PLAN_VIEW @@ -413,6 +414,7 @@ + PLAN_VIEW diff --git a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyH.xml b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyH.xml index 52f4d88796..1ab7e1d4d7 100644 --- a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyH.xml +++ b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyH.xml @@ -383,6 +383,7 @@ ModFamH | | N|Conv: QLCS/Wind Family| | OTHER| | + PLAN_VIEW diff --git a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyV.xml b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyV.xml index d8350c41e1..b3336dec46 100644 --- a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyV.xml +++ b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyV.xml @@ -387,6 +387,7 @@ ModFamV | | N|Conv: Severe Type Family| | OTHER| | \ + PLAN_VIEW diff --git a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/tstorms.xml b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/tstorms.xml index b212db3d57..7635172cea 100644 --- a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/tstorms.xml +++ b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/tstorms.xml @@ -44,12 +44,12 @@ - - - - - - + + + + + + @@ -83,7 +83,7 @@ - + @@ -94,12 +94,12 @@ - + - + \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/colormaps/Grid/Frontogenesis.cmap b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/colormaps/Grid/Frontogenesis.cmap new file mode 100755 index 0000000000..bb682d71a7 --- /dev/null +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/colormaps/Grid/Frontogenesis.cmap @@ -0,0 +1,259 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/colormaps/Grid/Vorticity.cmap b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/colormaps/Grid/Vorticity.cmap new file mode 100755 index 0000000000..1e1b15be04 --- /dev/null +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/colormaps/Grid/Vorticity.cmap @@ -0,0 +1,259 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/HeliC.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/HeliC.xml new file mode 100755 index 0000000000..283a34d0ed --- /dev/null +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/HeliC.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/LM5.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/LM5.xml index c4ae1431ae..7a02e85c88 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/LM5.xml +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/LM5.xml @@ -18,7 +18,7 @@ See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for further_licensing_information. --> - + diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/MaxWGS1hr.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/MaxWGS1hr.xml index 806ceb2897..e57918e35a 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/MaxWGS1hr.xml +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/MaxWGS1hr.xml @@ -6,7 +6,7 @@ - + diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/RM5.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/RM5.xml index 87c4f6a3cf..67f0954221 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/RM5.xml +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/RM5.xml @@ -18,7 +18,7 @@ See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for further_licensing_information. --> - + diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/RMprop2.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/RMprop2.xml index 55ed7d91b6..ae1846ad8f 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/RMprop2.xml +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/RMprop2.xml @@ -43,7 +43,7 @@ - + diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/SRMl.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/SRMl.xml index bb5981959e..54ef6f555f 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/SRMl.xml +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/SRMl.xml @@ -18,7 +18,7 @@ See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for further_licensing_information. --> - + diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/SRMlM.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/SRMlM.xml index cc15f43985..4699eba6db 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/SRMlM.xml +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/SRMlM.xml @@ -18,7 +18,7 @@ See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for further_licensing_information. --> - + diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/SRMm.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/SRMm.xml index d7243010ab..fb1a7efeff 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/SRMm.xml +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/SRMm.xml @@ -24,7 +24,7 @@ AWIPS II NEW FILE - SRMm.xml --> - + diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/SRMmM.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/SRMmM.xml index 34a8bc1b67..2b9515acdf 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/SRMmM.xml +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/SRMmM.xml @@ -20,7 +20,7 @@ AWIPS II NEW FILE - SRMmM.xml --> - + diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/SRMr.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/SRMr.xml index 046f7a33a8..f16bfb8552 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/SRMr.xml +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/SRMr.xml @@ -18,7 +18,7 @@ See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for further_licensing_information. --> - + diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/SRMrM.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/SRMrM.xml index 839da9c09c..74fcaa53ec 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/SRMrM.xml +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/SRMrM.xml @@ -18,7 +18,7 @@ See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for further_licensing_information. --> - + diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/lm6.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/lm6.xml index 488f9c7772..48a1176c00 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/lm6.xml +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/lm6.xml @@ -21,7 +21,7 @@ AWIPS II NEW FILE - LM6.xml --> - + diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/rm6.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/rm6.xml index d05129d82f..43c1b3a258 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/rm6.xml +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/rm6.xml @@ -20,7 +20,7 @@ AWIPS II NEW FILE - RM6.xml --> - + 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 733f76bb33..8f20d48374 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 @@ -58,6 +58,14 @@ Geostrophic Wind Ageo Wind SNW + Corf + RM5 + LM5 + RM6 + LM6 + SRMr + SRMl + SRMm kts diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/d2dContourStyleRules.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/d2dContourStyleRules.xml index 18e6e44ba5..e37515b7b4 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/d2dContourStyleRules.xml +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/d2dContourStyleRules.xml @@ -4348,11 +4348,13 @@ in | .03937 | 0 | 4 | | |..|8000F0FF| | 16 | \ - + Tmax TwMax + Tmin + TwMin C diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/gridImageryStyleRules.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/gridImageryStyleRules.xml index 365cfa3b04..e45fc40543 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/gridImageryStyleRules.xml +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/gridImageryStyleRules.xml @@ -1410,7 +1410,7 @@ -5 30 - Grid/gridded data + Grid/Vorticity 5 @@ -3210,7 +3210,7 @@ 100 K/m/s*1.0E-10 - Grid/gridded data + Grid/Frontogenesis 20 @@ -4927,7 +4927,7 @@ 5 300 - Grid/gridded data + Grid/Vorticity 10 @@ -5604,4 +5604,18 @@ ft + + + + + TwMax + TwMin + Tmax + Tmin + + + C + Grid/gridded data + +