diff --git a/cave/com.raytheon.viz.radar/localization/menus/radar/baseRadarMenu.xml b/cave/com.raytheon.viz.radar/localization/menus/radar/baseRadarMenu.xml index 6cd06a89fd..1dc668a142 100644 --- a/cave/com.raytheon.viz.radar/localization/menus/radar/baseRadarMenu.xml +++ b/cave/com.raytheon.viz.radar/localization/menus/radar/baseRadarMenu.xml @@ -28,7 +28,7 @@ - + @@ -43,17 +43,17 @@ - + - + - + diff --git a/cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResource.java b/cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResource.java index e7cce92de0..0cea97e475 100644 --- a/cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResource.java +++ b/cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResource.java @@ -127,6 +127,7 @@ import gov.noaa.nws.ncep.viz.common.area.IAreaProviderCapable; * Jun 12, 2014 3238 bsteffen Implement Interrogatable * Aug 21, 2014 DR 17313 jgerth Set no data value if no data mapping * Oct 15, 2014 3681 bsteffen create renderable in interrogate if necessary. + * Jun 24, 2015 mjames@ucar Mute interrogating raw data error. * * * @@ -442,7 +443,7 @@ public class SatResource extends .getRecord().getCoverage()); } } catch (Exception e) { - throw new VizException("Error interrogating raw data", e); + //throw new VizException("Error interrogating raw data", e); } } diff --git a/cave/com.raytheon.viz.ui.personalities.awips/splash.bmp b/cave/com.raytheon.viz.ui.personalities.awips/splash.bmp index fa8e578ef6..2fdc1d51c9 100644 Binary files a/cave/com.raytheon.viz.ui.personalities.awips/splash.bmp and b/cave/com.raytheon.viz.ui.personalities.awips/splash.bmp differ diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.radar/utility/common_static/base/colormaps/Radar/HHC NEXRCOMP.cmap b/edexOsgi/com.raytheon.uf.common.dataplugin.radar/utility/common_static/base/colormaps/Radar/HHC NEXRCOMP.cmap index 7fcb6ab8c7..62a93c3c94 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.radar/utility/common_static/base/colormaps/Radar/HHC NEXRCOMP.cmap +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.radar/utility/common_static/base/colormaps/Radar/HHC NEXRCOMP.cmap @@ -1,4 +1,3 @@ - @@ -118,6 +117,8 @@ + + @@ -249,4 +250,8 @@ + + + + \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/styleRules/satelliteImageryStyleRules.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/styleRules/satelliteImageryStyleRules.xml index 539fdcc1e5..6e03761850 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/styleRules/satelliteImageryStyleRules.xml +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/styleRules/satelliteImageryStyleRules.xml @@ -339,4 +339,181 @@ + + + N0R + + + dBZ + Radar/OSF/16 Level Reflectivity + + + + + + + + + + + + + + + + + + + + + + + DHR + N0Q + + + dBZ + Radar/Hi-Res Ref (SGF) + + + + + + + + + + + + + + + + + + + + DVL + + + kg/m^2 + + + 4 + + Radar/OSF/Digital VIL + + + + + + + + + + + + + + + + + + N1P + + + in + + + 4 + + Radar/8-bit STP + + + + + + + + + + + + + + + + + + + + + + NTP + + + in + + + 4 + + Radar/8-bit STP + + + + + + + + + + + + + + + + EET + + + kft + Radar/Enhanced Echo Tops + + + + + + + + + + + + + + + + HHC + + + *1 + Radar/HHC NEXRCOMP + + + + + + + + + + + + + + + + + + \ No newline at end of file