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

Merge branch 'master_14.4.1' of github.com:Unidata/awips2 into master_14.4.1

Browse source 
Former-commit-id: f816e86692 [formerly 5432c2f10f] [formerly 814feded341fcba8075c80dcd9c1916ec785a449 [formerly c815f50c0b]]
Former-commit-id: c120e27c5a979ee7aaccc835aadcc6e84112cf08 [formerly 322ead7fca]
Former-commit-id: 18524d838b
This commit is contained in:
mjames-upc 2015-06-25 10:08:57 -06:00
commit b685a8164b
5 changed files with 189 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
cave/com.raytheon.viz.radar/localization/menus/radar/baseRadarMenu.xml
View file

@ -28,7 +28,7 @@
<contribute xsi:type="bundleItem" file="bundles/DefaultRadarComposite.xml"
menuText="DVL - Digital VIL" id="DVL">
<substitute key="element" value="DVL"/>
<substitute key="colormap" value="Radar/Digital VIL"/>
<substitute key="colormap" value="Radar/OSF/Digital VIL"/>
</contribute>
<contribute xsi:type="bundleItem" file="bundles/DefaultRadarComposite.xml"
menuText="EET - Enhanced Echo Tops" id="EET">
@ -43,17 +43,17 @@
<contribute xsi:type="bundleItem" file="bundles/DefaultRadarComposite.xml"
menuText="N0R - Base Reflectivity" id="N0R">
<substitute key="element" value="N0R"/>
<substitute key="colormap" value="Radar/OSF/8 Level Reflectivity"/>
<substitute key="colormap" value="Radar/OSF/16 Level Reflectivity"/>
</contribute>
<contribute xsi:type="bundleItem" file="bundles/DefaultRadarComposite.xml"
menuText="N1P - One Hour Precipiation" id="N1P">
<substitute key="element" value="N1P"/>
<substitute key="colormap" value="Radar/Storm Total Precip"/>
<substitute key="colormap" value="Radar/8-bit STP"/>
</contribute>
<contribute xsi:type="bundleItem" file="bundles/DefaultRadarComposite.xml"
menuText="NTP - Storm Total Precipiation" id="NTP">
<substitute key="element" value="NTP"/>
<substitute key="colormap" value="Radar/Storm Total Precip"/>
<substitute key="colormap" value="Radar/8-bit STP"/>
</contribute>
<contribute xsi:type="titleItem" titleText="------ Mosaic ------"
id="RadarMosaic" />

3
cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResource.java
View file

@ -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.
*
* </pre>
*
@ -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);
}
}

BIN
cave/com.raytheon.viz.ui.personalities.awips/splash.bmp
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 308 KiB

After

Width:  |  Height:  |  Size: 410 KiB

7
edexOsgi/com.raytheon.uf.common.dataplugin.radar/utility/common_static/base/colormaps/Radar/HHC NEXRCOMP.cmap
View file

@ -1,4 +1,3 @@
<colorMap>
<color r = "0.0" g = "0.0" b = "0.0" a = "0.0" />
<color r = "0.611764705882" g = "0.611764705882" b = "0.611764705882" a = "1.0" />
<color r = "0.611764705882" g = "0.611764705882" b = "0.611764705882" a = "1.0" />
@ -118,6 +117,8 @@
<color r = "0.0" g = "0.0" b = "0.0" a = "1.0" />
<color r = "0.0" g = "0.0" b = "0.0" a = "1.0" />
<color r = "0.0" g = "0.0" b = "0.0" a = "1.0" />
<color r = "0.0" g = "0.0" b = "0.0" a = "1.0" />
<color r = "0.0" g = "0.0" b = "0.0" a = "1.0" />
<color r = "0.905882352941" g = "0.0" b = "1.0" a = "1.0" />
<color r = "0.905882352941" g = "0.0" b = "1.0" a = "1.0" />
<color r = "0.905882352941" g = "0.0" b = "1.0" a = "1.0" />
@ -249,4 +250,8 @@
<color r = "0.0" g = "0.0" b = "0.0" a = "0.0" />
<color r = "0.0" g = "0.0" b = "0.0" a = "0.0" />
<color r = "0.0" g = "0.0" b = "0.0" a = "0.0" />
<color r = "0.0" g = "0.0" b = "0.0" a = "0.0" />
<color r = "0.0" g = "0.0" b = "0.0" a = "0.0" />
<color r = "0.0" g = "0.0" b = "0.0" a = "0.0" />
<color r = "0.0" g = "0.0" b = "0.0" a = "0.0" />
</colorMap>

177
edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/styleRules/satelliteImageryStyleRules.xml
View file

@ -339,4 +339,181 @@
</dataMapping>
</imageStyle>
</styleRule>
<styleRule>
<paramLevelMatches>
<parameter>N0R</parameter>
</paramLevelMatches>
<imageStyle>
<displayUnits>dBZ</displayUnits>
<defaultColormap>Radar/OSF/16 Level Reflectivity</defaultColormap>
<dataMapping>
<entry displayValue='0' pixelValue='30' label="" />
<entry displayValue='5' />
<entry displayValue='10' />
<entry displayValue='15' />
<entry displayValue='20' />
<entry displayValue='25' />
<entry displayValue='30' />
<entry displayValue='35' />
<entry displayValue='40' />
<entry displayValue='45' />
<entry displayValue='50' />
<entry displayValue='55' />
<entry displayValue='60' />
<entry displayValue='65' />
<entry displayValue='70' />
<entry displayValue='80' pixelValue='110' label="" />
</dataMapping>
</imageStyle>
</styleRule>
<styleRule>
<paramLevelMatches>
<parameter>DHR</parameter>
<parameter>N0Q</parameter>
</paramLevelMatches>
<imageStyle>
<displayUnits>dBZ</displayUnits>
<defaultColormap>Radar/Hi-Res Ref (SGF)</defaultColormap>
<dataMapping>
<entry displayValue='-32.5' pixelValue='16' label="" />
<entry displayValue='-20.0' pixelValue='33' />
<entry displayValue='-10.0' />
<entry displayValue=' 0.0' />
<entry displayValue=' 10.0' />
<entry displayValue=' 20.0' />
<entry displayValue=' 30.0' />
<entry displayValue=' 40.0' />
<entry displayValue=' 50.0' />
<entry displayValue=' 60.0' />
<entry displayValue=' 70.0' />
<entry displayValue=' 75.0' pixelValue='240' label="" />
<entry displayValue=' 94.5' pixelValue='255' label="" />
</dataMapping>
</imageStyle>
</styleRule>
<styleRule>
<paramLevelMatches>
<parameter>DVL</parameter>
</paramLevelMatches>
<imageStyle>
<displayUnits>kg/m^2</displayUnits>
<samplePrefs>
<!-- Number of decimal places to format the sample string to -->
<formatString>4</formatString>
</samplePrefs>
<defaultColormap>Radar/OSF/Digital VIL</defaultColormap>
<dataMapping>
<entry displayValue='0' pixelValue='0' label="" />
<entry displayValue='.1' pixelValue='10' label=".1" />
<entry displayValue='.5' pixelValue='55' label=".5" />
<entry displayValue='1' pixelValue='80' />
<entry displayValue='2' pixelValue='105' />
<entry displayValue='5' pixelValue='143' />
<entry displayValue='10' pixelValue='170' />
<entry displayValue='20' pixelValue='200' />
<entry displayValue='40' pixelValue='227' />
<entry displayValue='60' pixelValue='245' />
<entry displayValue='80' pixelValue='254' label="" />
</dataMapping>
</imageStyle>
</styleRule>
<styleRule>
<paramLevelMatches>
<parameter>N1P</parameter>
</paramLevelMatches>
<imageStyle>
<displayUnits>in</displayUnits>
<samplePrefs>
<!-- Number of decimal places to format the sample string to -->
<formatString>4</formatString>
</samplePrefs>
<defaultColormap>Radar/8-bit STP</defaultColormap>
<dataMapping>
<entry displayValue='0' pixelValue='0'/>
<entry displayValue='.1' pixelValue='20'/>
<entry displayValue='.25' pixelValue='50'/>
<entry displayValue='.5' pixelValue='100'/>
<entry displayValue='1' pixelValue='111'/>
<entry displayValue='1.5' pixelValue='122'/>
<entry displayValue='2' pixelValue='133'/>
<entry displayValue='2.5' pixelValue='144'/>
<entry displayValue='3' pixelValue='155'/>
<entry displayValue='3.5' pixelValue='166'/>
<entry displayValue='4' pixelValue='177'/>
<entry displayValue='4.5' pixelValue='188'/>
<entry displayValue='5' pixelValue='200' />
<entry displayValue='10' pixelValue='239' />
<entry displayValue='12' pixelValue='255' />
</dataMapping>
</imageStyle>
</styleRule>
<styleRule>
<paramLevelMatches>
<parameter>NTP</parameter>
</paramLevelMatches>
<imageStyle>
<displayUnits>in</displayUnits>
<samplePrefs>
<!-- Number of decimal places to format the sample string to -->
<formatString>4</formatString>
</samplePrefs>
<defaultColormap>Radar/8-bit STP</defaultColormap>
<dataMapping>
<entry displayValue='0' pixelValue='0'/>
<entry displayValue='1' pixelValue='33'/>
<entry displayValue='2' pixelValue='67'/>
<entry displayValue='3' pixelValue='100'/>
<entry displayValue='5' pixelValue='129'/>
<entry displayValue='8' pixelValue='171'/>
<entry displayValue='10' pixelValue='200' />
<entry displayValue='20' pixelValue='239' />
<entry displayValue='24' pixelValue='255' label='' />
</dataMapping>
</imageStyle>
</styleRule>
<styleRule>
<paramLevelMatches>
<parameter>EET</parameter>
</paramLevelMatches>
<imageStyle>
<displayUnits>kft</displayUnits>
<defaultColormap>Radar/Enhanced Echo Tops</defaultColormap>
<dataMapping>
<entry displayValue='0' label="" />
<entry displayValue='20' label="20" />
<entry displayValue='50' label="50" />
<entry displayValue='71' label="70" />
<entry displayValue='130' label="0" />
<entry displayValue='150' label="20" />
<entry displayValue='170' label="50" />
<entry displayValue='199' label="70" />
<entry displayValue='228' label="Topped" />
</dataMapping>
</imageStyle>
</styleRule>
<styleRule>
<paramLevelMatches>
<parameter>HHC</parameter>
</paramLevelMatches>
<imageStyle>
<displayUnits>*1</displayUnits>
<defaultColormap>Radar/HHC NEXRCOMP</defaultColormap>
<dataMapping>
<entry displayValue='0' pixelValue='0' label='' />
<entry displayValue='10' pixelValue='6' label='BI' sample='Biological' />
<entry displayValue='20' pixelValue='16' label='GC' sample='Clutter' />
<entry displayValue='30' pixelValue='26' label='IC' sample='Ice Crystals' />
<entry displayValue='40' pixelValue='36' label='DS' sample='Dry Snow' />
<entry displayValue='50' pixelValue='47' label='WS' sample='Wet Snow' />
<entry displayValue='60' pixelValue='57' label='RA' sample='Rain' />
<entry displayValue='70' pixelValue='68' label='HR' sample='Heavy Rain' />
<entry displayValue='80' pixelValue='78' label='BD' sample='Big Drops' />
<entry displayValue='90' pixelValue='88' label='GR' sample='Graupel' />
<entry displayValue='100' pixelValue='98' label='HA' sample='Hail-Rain' />
<entry displayValue='140' pixelValue='127' label='UK' sample='Unknown' />
<entry displayValue='160' pixelValue='137' label='RF' />
<entry displayValue='255' pixelValue='255' label='' sample='TBD' />
</dataMapping>
</imageStyle>
</styleRule>
</styleRuleset>