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

nexrcomp colormap support for n0c/n0x/n0k; sat vis default to linear

Browse source
This commit is contained in:
mjames-upc 2017-06-27 09:37:24 -06:00
parent 331f7f7694
commit 3e587741ae
12 changed files with 118 additions and 125 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cave/com.raytheon.viz.satellite/localization/bundles/VisibleTopo.xml
View file

@ -29,7 +29,7 @@
<loadProperties loadWithoutData="true">
<capabilities>
<capability xsi:type="colorMapCapability">
<colorMapParameters colorMapName="Sat/VIS/ZA (Vis Default)">
<colorMapParameters colorMapName="Sat/VIS/Linear">
<persisted>
<colorMapMin>0.0</colorMapMin>
<colorMapMax>255.0</colorMapMax>

2
cave/com.raytheon.viz.satellite/localization/menus/satellite/baseDerivedProductsImagery.xml
View file

@ -23,7 +23,7 @@
menuText="Blended Rain Rate" id="rainfallRate">
<substitute key="element" value="Rain fall rate"/>
<substitute key="entity" value="POES-NPOESS"/>
<substitute key="colormap" value="Sat/VIS/ZA (Vis Default)"/>
<substitute key="colormap" value="Sat/VIS/Linear"/>
</contribute>
<contribute xsi:type="titleItem" titleText="------ GOES ------"
id="GOESLine"/>

2
cave/com.raytheon.viz.satellite/localization/menus/satellite/baseFourSatComposite.xml
View file

@ -33,7 +33,7 @@
<contribute xsi:type="bundleItem" file="bundles/DefaultSatellite.xml"
menuText="Visible" id="visible">
<substitute key="element" value="Imager Visible"/>
<substitute key="colormap" value="Sat/VIS/ZA (Vis Default)"/>
<substitute key="colormap" value="Sat/VIS/Linear"/>
</contribute>
<contribute xsi:type="bundleItem" file="bundles/DerivedSatellite.xml"
menuText="WV/IR" id="WV/IR">

2
cave/com.raytheon.viz.satellite/localization/menus/satellite/baseNHemisphere.xml
View file

@ -35,7 +35,7 @@
<contribute xsi:type="satBundleItem" file="bundles/DefaultCompositeSatellite.xml"
menuText="Visible" id="visible">
<substitute key="element" value="Imager Visible"/>
<substitute key="colormap" value="Sat/VIS/ZA (Vis Default)"/>
<substitute key="colormap" value="Sat/VIS/Linear"/>
</contribute>
<contribute xsi:type="satBundleItem" file="bundles/DefaultCONUSSatellite.xml"
menuText="3.9u" id="3.9u">

2
cave/com.raytheon.viz.satellite/localization/menus/satellite/baseOCONUSBlendedDerivedProductsImagery.xml
View file

@ -23,7 +23,7 @@
menuText="Blended Rain Rate" id="rainfallRate">
<substitute key="element" value="Rain fall rate"/>
<substitute key="entity" value="POES-NPOESS"/>
<substitute key="colormap" value="Sat/VIS/ZA (Vis Default)"/>
<substitute key="colormap" value="Sat/VIS/Linear"/>
</contribute>
<contribute xsi:type="titleItem"
titleText="------ AMSU and SSM/I + GPS ------" id="blendedofAMSUAndSSMIDataLine"/>

10
cave/com.raytheon.viz.satellite/localization/menus/satellite/baseSatellite.xml
View file

@ -26,7 +26,7 @@
<substitute key="element" value="Imager Visible"/>
<substitute key="sector" value="GOES-East"/>
<substitute key="entity" value="GOES-13(N)"/>
<substitute key="colormap" value="Sat/VIS/ZA (Vis Default)"/>
<substitute key="colormap" value="Sat/VIS/Linear"/>
</contribute>
<contribute xsi:type="bundleItem" file="bundles/DefaultSatellite.xml"
menuText="Imager 11 micron IR" id="irWindow">
@ -64,7 +64,7 @@
<substitute key="element" value="Imager Visible"/>
<substitute key="sector" value="GOES-West"/>
<substitute key="entity" value="GOES-15(P)"/>
<substitute key="colormap" value="Sat/VIS/ZA (Vis Default)"/>
<substitute key="colormap" value="Sat/VIS/Linear"/>
</contribute>
<contribute xsi:type="bundleItem" file="bundles/DefaultSatellite.xml"
menuText="Imager 11 micron IR" id="irWindow">
@ -102,7 +102,7 @@
<substitute key="element" value="Imager Visible"/>
<substitute key="sector" value="GOES-East-West"/>
<substitute key="entity" value="GOES-13(N)"/>
<substitute key="colormap" value="Sat/VIS/ZA (Vis Default)"/>
<substitute key="colormap" value="Sat/VIS/Linear"/>
</contribute>
<contribute xsi:type="bundleItem" file="bundles/DefaultSatellite.xml"
menuText="Imager 11 micron IR" id="irWindow">
@ -141,7 +141,7 @@
<substitute key="element" value="Imager Visible"/>
<substitute key="sector" value="Northern Hemisphere Composite"/>
<substitute key="entity" value="GOES-15(P)"/>
<substitute key="colormap" value="Sat/VIS/ZA (Vis Default)"/>
<substitute key="colormap" value="Sat/VIS/Linear"/>
</contribute>
<contribute xsi:type="bundleItem" file="bundles/DefaultSatellite.xml"
menuText="Imager 11 micron IR" id="irWindow">
@ -165,7 +165,7 @@
<substitute key="element" value="Imager Visible"/>
<substitute key="sector" value="NH Composite - Meteosat-GOES E-GOES W-GMS"/>
<substitute key="entity" value="Composite"/>
<substitute key="colormap" value="Sat/VIS/ZA (Vis Default)"/>
<substitute key="colormap" value="Sat/VIS/Linear"/>
</contribute>
<contribute xsi:type="bundleItem" file="bundles/DefaultSatellite.xml"
menuText="Imager 11 micron IR" id="irWindow">

4
cave/com.raytheon.viz.satellite/localization/menus/satellite/baseUniwiscComposite.xml
View file

@ -25,7 +25,7 @@
<substitute key="element" value="Imager Visible"/>
<substitute key="sector" value="GOES-East"/>
<substitute key="entity" value="GOES-13(N)"/>
<substitute key="colormap" value="Sat/VIS/ZA (Vis Default)"/>
<substitute key="colormap" value="Sat/VIS/Linear"/>
</contribute>
<contribute xsi:type="bundleItem" file="bundles/DefaultSatellite.xml"
menuText="GOES Imager 11 micron IR" id="irWindow">
@ -69,4 +69,4 @@
<substitute key="entity" value="GOES-13(N)"/>
<substitute key="colormap" value="Sat/WV/RAMSDIS WV"/>
</contribute>
</menuTemplate>
</menuTemplate>

2
cave/com.raytheon.viz.satellite/localization/menus/satellite/hfoGoes.xml
View file

@ -32,7 +32,7 @@
<contribute xsi:type="bundleItem" file="bundles/HfoGoes.xml"
menuText="Visible" id="visible">
<substitute key="element" value="Imager Visible"/>
<substitute key="colormap" value="Sat/VIS/ZA (Vis Default)"/>
<substitute key="colormap" value="Sat/VIS/Linear"/>
</contribute>
<contribute xsi:type="bundleItem" file="bundles/HfoGoes.xml"
menuText="13u" id="13u">

12
cave/com.raytheon.viz.satellite/localization/menus/satellite/himawari/himawariByChannel.xml
View file

@ -22,32 +22,32 @@
<contribute xsi:type="bundleItem" file="bundles/DefaultSatellite.xml"
menuText="Channel 1(0.47u)" id="himawari-ch1">
<substitute key="element" value="CH-01-0.47um" />
<substitute key="colormap" value="Sat/VIS/ZA (Vis Default)" />
<substitute key="colormap" value="Sat/VIS/Linear" />
</contribute>
<contribute xsi:type="bundleItem" file="bundles/DefaultSatellite.xml"
menuText="Channel 2(0.51u)" id="himawari-ch2">
<substitute key="element" value="CH-02-0.51um" />
<substitute key="colormap" value="Sat/VIS/ZA (Vis Default)" />
<substitute key="colormap" value="Sat/VIS/Linear" />
</contribute>
<contribute xsi:type="bundleItem" file="bundles/DefaultSatellite.xml"
menuText="Channel 3(0.64u)" id="himawari-ch3">
<substitute key="element" value="CH-03-0.64um" />
<substitute key="colormap" value="Sat/VIS/ZA (Vis Default)" />
<substitute key="colormap" value="Sat/VIS/Linear" />
</contribute>
<contribute xsi:type="bundleItem" file="bundles/DefaultSatellite.xml"
menuText="Channel 4(0.86u)" id="himawari-ch4">
<substitute key="element" value="CH-04-0.86um" />
<substitute key="colormap" value="Sat/VIS/ZA (Vis Default)" />
<substitute key="colormap" value="Sat/VIS/Linear" />
</contribute>
<contribute xsi:type="bundleItem" file="bundles/DefaultSatellite.xml"
menuText="Channel 5(1.61u)" id="himawari-ch5">
<substitute key="element" value="CH-05-1.61um" />
<substitute key="colormap" value="Sat/VIS/ZA (Vis Default)" />
<substitute key="colormap" value="Sat/VIS/Linear" />
</contribute>
<contribute xsi:type="bundleItem" file="bundles/DefaultSatellite.xml"
menuText="Channel 6(2.26u)" id="himawari-ch6">
<substitute key="element" value="CH-06-2.26um" />
<substitute key="colormap" value="Sat/VIS/ZA (Vis Default)" />
<substitute key="colormap" value="Sat/VIS/Linear" />
</contribute>
<contribute xsi:type="bundleItem" file="bundles/DefaultSatellite.xml"
menuText="Channel 7(3.89u)" id="himawari-ch7">

16
cave/com.raytheon.viz.satellite/localization/menus/satellite/regionalSatellite.xml
View file

@ -23,7 +23,7 @@
<substitute key="element" value="Imager Visible"/>
<substitute key="sector" value="Alaska National"/>
<substitute key="entity" value="GOES-15(P)" />
<substitute key="colormap" value="Sat/VIS/ZA (Vis Default)"/>
<substitute key="colormap" value="Sat/VIS/Linear"/>
</contribute>
<contribute xsi:type="separator" id="MySeparatorId"/>
<!-- ALASKA REGIONAL -->
@ -53,7 +53,7 @@
<substitute key="element" value="Imager Visible"/>
<substitute key="sector" value="Alaska Regional"/>
<substitute key="entity" value="GOES-15(P)" />
<substitute key="colormap" value="Sat/VIS/ZA (Vis Default)"/>
<substitute key="colormap" value="Sat/VIS/Linear"/>
</contribute>
<contribute xsi:type="separator" id="MySeparatorId"/>
<!-- HAWAII NATIONAL -->
@ -76,7 +76,7 @@
<substitute key="element" value="Imager Visible"/>
<substitute key="sector" value="Hawaii National"/>
<substitute key="entity" value="GOES-15(P)" />
<substitute key="colormap" value="Sat/VIS/ZA (Vis Default)"/>
<substitute key="colormap" value="Sat/VIS/Linear"/>
</contribute>
<contribute xsi:type="separator" id="MySeparatorId"/>
<!-- HAWAII REGIONAL -->
@ -106,7 +106,7 @@
<substitute key="element" value="Imager Visible"/>
<substitute key="sector" value="Hawaii Regional"/>
<substitute key="entity" value="GOES-15(P)" />
<substitute key="colormap" value="Sat/VIS/ZA (Vis Default)"/>
<substitute key="colormap" value="Sat/VIS/Linear"/>
</contribute>
<contribute xsi:type="separator" id="MySeparatorId"/>
<!-- PUERTO RICO NATIONAL -->
@ -129,7 +129,7 @@
<substitute key="element" value="Imager Visible"/>
<substitute key="sector" value="Puerto Rico National"/>
<substitute key="entity" value="GOES-13(N)" />
<substitute key="colormap" value="Sat/VIS/ZA (Vis Default)"/>
<substitute key="colormap" value="Sat/VIS/Linear"/>
</contribute>
<contribute xsi:type="separator" id="MySeparatorId"/>
<!-- PUERTO RICO REGIONAL -->
@ -166,7 +166,7 @@
<substitute key="element" value="Imager Visible"/>
<substitute key="sector" value="Puerto Rico Regional"/>
<substitute key="entity" value="GOES-13(N)" />
<substitute key="colormap" value="Sat/VIS/ZA (Vis Default)"/>
<substitute key="colormap" value="Sat/VIS/Linear"/>
</contribute>
<contribute xsi:type="separator" id="MySeparatorId"/>
<!-- Arctic -->
@ -203,7 +203,7 @@
<substitute key="element" value="Imager Visible"/>
<substitute key="sector" value="Arctic"/>
<substitute key="entity" value="COMP" />
<substitute key="colormap" value="Sat/VIS/ZA (Vis Default)"/>
<substitute key="colormap" value="Sat/VIS/Linear"/>
</contribute>
<contribute xsi:type="separator" id="MySeparatorId"/>
<!-- Antarctica -->
@ -219,7 +219,7 @@
<substitute key="element" value="Imager Visible"/>
<substitute key="sector" value="Antarctic" />
<substitute key="entity" value="COMP" />
<substitute key="colormap" value="Sat/VIS/ZA (Vis Default)"/>
<substitute key="colormap" value="Sat/VIS/Linear"/>
</contribute>
<contribute xsi:type="bundleItem" file="bundles/DefaultSatellite.xml"
menuText="Antarctica WV" id="Arctic-WV">

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

@ -143,6 +143,7 @@ import com.raytheon.viz.satellite.tileset.SatRenderable.InterrogationResult;
* Jul 13, 2016 DCS 18781 jburks Added ability to mask incomplete frames.
* Aug 03, 2016 5786 bsteffen Schedule the loading of all frames on
* initialization
* Jun 26, 2017 mjames Set default viz colormap to linear.
*
* </pre>
*
@ -338,7 +339,7 @@ public class SatResource extends
if (unit != null && unit.isCompatible(Temperature.UNIT)) {
preferences.setDefaultColormap("Sat/IR/CIRA (IR Default)");
} else {
preferences.setDefaultColormap("Sat/VIS/ZA (Vis Default)");
preferences.setDefaultColormap("Sat/VIS/Linear");
}
DataScale range = new DataScale();
range.setScaleType(DataScale.Type.LINEAR);
@ -372,7 +373,7 @@ public class SatResource extends
// Load colormap into parameters
if (colorMap == null) {
if (cmName == null) {
cmName = "Sat/VIS/ZA (Vis Default)";
cmName = "Sat/VIS/Linear";
}
try {
colorMap = ColorMapLoader.loadColorMap(cmName);

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

@ -398,6 +398,63 @@
</dataMapping>
</imageStyle>
</styleRule>
<styleRule>
<paramLevelMatches>
<parameter>N0X</parameter>
</paramLevelMatches>
<imageStyle>
<displayUnits>dB</displayUnits>
<samplePrefs>
<!-- Number of decimal places to format the sample string to -->
<formatString>2</formatString>
</samplePrefs>
<defaultColormap>Radar/DualPol/Differential Refl</defaultColormap>
<dataMapping>
<entry displayValue='-3.5' pixelValue='16' />
<entry displayValue='-2' pixelValue='32' />
<entry displayValue='-0.5' pixelValue='48' />
<entry displayValue='0.0' pixelValue='64' />
<entry displayValue='0.25' pixelValue='80' />
<entry displayValue='0.5' pixelValue='96' />
<entry displayValue='1.0' pixelValue='112' />
<entry displayValue='1.5' pixelValue='128' />
<entry displayValue='2.0' pixelValue='144' />
<entry displayValue='2.5' pixelValue='160' />
<entry displayValue='3.0' pixelValue='176' />
<entry displayValue='4.0' pixelValue='192' />
<entry displayValue='5.0' pixelValue='208' />
<entry displayValue='6.0' pixelValue='224' />
<entry displayValue='8.0' pixelValue='240' />
</dataMapping>
</imageStyle>
</styleRule>
<styleRule>
<paramLevelMatches>
<parameter>N0K</parameter>
</paramLevelMatches>
<imageStyle>
<displayUnits>deg/km</displayUnits>
<defaultColormap>Radar/DualPol/Spec Differential Phase</defaultColormap>
<dataMapping>
<entry displayValue='-3' pixelValue='1' sample='RF' label='' />
<entry displayValue='-2' pixelValue='16' />
<entry displayValue='-1' pixelValue='32' />
<entry displayValue='-0.5' pixelValue='48' />
<entry displayValue='0.0' pixelValue='64' />
<entry displayValue='0.25' pixelValue='80' />
<entry displayValue='0.5' pixelValue='96' />
<entry displayValue='1.0' pixelValue='112' />
<entry displayValue='1.5' pixelValue='128' />
<entry displayValue='2.0' pixelValue='144' />
<entry displayValue='2.5' pixelValue='160' />
<entry displayValue='3.0' pixelValue='176' />
<entry displayValue='4.0' pixelValue='192' />
<entry displayValue='5.0' pixelValue='208' />
<entry displayValue='7.0' pixelValue='224' />
<entry displayValue='10.0' pixelValue='240' label='' />
</dataMapping>
</imageStyle>
</styleRule>
<styleRule>
<paramLevelMatches>
<parameter>DHR</parameter>
@ -405,7 +462,7 @@
</paramLevelMatches>
<imageStyle>
<displayUnits>dBZ</displayUnits>
<defaultColormap>Radar/Hi-Res Ref (SGF)</defaultColormap>
<defaultColormap>Radar/DHR</defaultColormap>
<dataMapping>
<entry displayValue='-32.5' pixelValue='16' label="" />
<entry displayValue='-20.0' pixelValue='33' />
@ -450,101 +507,36 @@
</imageStyle>
</styleRule>
<styleRule>
<paramLevelMatches>
<parameter>N0X</parameter>
</paramLevelMatches>
<imageStyle>
<displayUnits>dB</displayUnits>
<samplePrefs>
<!-- Number of decimal places to format the sample string to -->
<formatString>2</formatString>
</samplePrefs>
<defaultColormap>Radar/DualPol/Differential Refl</defaultColormap>
<dataMapping>
<entry displayValue='' pixelValue="1" sample="RF" label="" />
<entry displayValue='-4' pixelValue='16' />
<entry displayValue='-2' pixelValue='32' />
<entry displayValue='-0.5' pixelValue='48' />
<entry displayValue='0.0' pixelValue='64' />
<entry displayValue='0.25' pixelValue='80' />
<entry displayValue='0.5' pixelValue='96' />
<entry displayValue='1.0' pixelValue='112' />
<entry displayValue='1.5' pixelValue='128' />
<entry displayValue='2.0' pixelValue='144' />
<entry displayValue='2.5' pixelValue='160' />
<entry displayValue='3.0' pixelValue='176' />
<entry displayValue='4.0' pixelValue='192' />
<entry displayValue='5.0' pixelValue='208' />
<entry displayValue='6.0' pixelValue='224' />
<entry displayValue='8.0' pixelValue='240' label='' />
<entry pixelValue='248' label='RF' />
</dataMapping>
</imageStyle>
</styleRule>
<styleRule>
<paramLevelMatches>
<parameter>N0K</parameter>
</paramLevelMatches>
<imageStyle>
<displayUnits>deg/km</displayUnits>
<samplePrefs>
<!-- Number of decimal places to format the sample string to -->
<formatString>2</formatString>
</samplePrefs>
<defaultColormap>Radar/DualPol/Spec Differential Phase</defaultColormap>
<dataMapping>
<entry displayValue='' pixelValue="1" sample="RF" label="" />
<entry displayValue='-2' pixelValue='16' />
<entry displayValue='-1' pixelValue='32' />
<entry displayValue='-0.5' pixelValue='48' />
<entry displayValue='0.0' pixelValue='64' />
<entry displayValue='0.25' pixelValue='80' />
<entry displayValue='0.5' pixelValue='96' />
<entry displayValue='1.0' pixelValue='112' />
<entry displayValue='1.5' pixelValue='128' />
<entry displayValue='2.0' pixelValue='144' />
<entry displayValue='2.5' pixelValue='160' />
<entry displayValue='3.0' pixelValue='176' />
<entry displayValue='4.0' pixelValue='192' />
<entry displayValue='5.0' pixelValue='208' />
<entry displayValue='7.0' pixelValue='224' />
<entry displayValue='10.0' pixelValue='240' label='' />
<entry displayValue='' pixelValue='248' label='RF' />
</dataMapping>
</imageStyle>
</styleRule>
<styleRule>
<paramLevelMatches>
<parameter>N0C</parameter>
</paramLevelMatches>
<imageStyle>
<displayUnits>*1</displayUnits>
<defaultColormap>Radar/DualPol/Correlation Coeff</defaultColormap>
<samplePrefs>
<!-- Number of decimal places to format the sample string to -->
<formatString>4</formatString>
</samplePrefs>
<dataMapping>
<entry displayValue='' pixelValue="1" sample="RF" label="" />
<entry displayValue='0.20' pixelValue='16' />
<entry displayValue='0.45' pixelValue='32' />
<entry displayValue='0.65' pixelValue='48' />
<entry displayValue='0.75' pixelValue='64' />
<entry displayValue='0.80' pixelValue='80' />
<entry displayValue='0.85' pixelValue='96' />
<entry displayValue='0.90' pixelValue='112' />
<entry displayValue='0.93' pixelValue='128' />
<entry displayValue='0.95' pixelValue='144' />
<entry displayValue='0.96' pixelValue='160' />
<entry displayValue='0.97' pixelValue='176' />
<entry displayValue='0.98' pixelValue='192' />
<entry displayValue='0.99' pixelValue='208' />
<entry displayValue='1.0' pixelValue='224' />
<entry displayValue='1.05' pixelValue='240' label='' />
<entry displayValue='' pixelValue='248' label='RF' />
</dataMapping>
</imageStyle>
</styleRule>
<paramLevelMatches>
<parameter>N0C</parameter>
</paramLevelMatches>
<imageStyle>
<displayUnits>*1</displayUnits>
<defaultColormap>Radar/DualPol/Correlation Coeff</defaultColormap>
<samplePrefs>
<!-- Number of decimal places to format the sample string to -->
<formatString>4</formatString>
</samplePrefs>
<dataMapping>
<entry displayValue='0' pixelValue="1" sample="RF" label="" />
<entry displayValue='0.20' pixelValue='16' />
<entry displayValue='0.45' pixelValue='32' />
<entry displayValue='0.65' pixelValue='48' />
<entry displayValue='0.75' pixelValue='64' />
<entry displayValue='0.80' pixelValue='80' />
<entry displayValue='0.85' pixelValue='96' />
<entry displayValue='0.90' pixelValue='112' />
<entry displayValue='0.93' pixelValue='128' />
<entry displayValue='0.95' pixelValue='144' />
<entry displayValue='0.96' pixelValue='160' />
<entry displayValue='0.97' pixelValue='176' />
<entry displayValue='0.98' pixelValue='192' />
<entry displayValue='0.99' pixelValue='208' />
<entry displayValue='1.0' pixelValue='224' />
<entry displayValue='1.05' pixelValue='240' label='' />
</dataMapping>
</imageStyle>
</styleRule>
<styleRule>
<paramLevelMatches>
<parameter>N1P</parameter>