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

ASM #14130 Satellite: Derived Products Plots problems for SSM/I Point Data

Browse source 
Change-Id: Id3c2189c017bf6341bc09236dbd39aaff937e2c8

Former-commit-id: 5f7e529f37 [formerly 7f731a767f] [formerly 5f7e529f37 [formerly 7f731a767f] [formerly 10de233231 [formerly 56ff684e6425b43883603f46ef16127e8356450a]]]
Former-commit-id: 10de233231
Former-commit-id: dbf9c9fc4c [formerly 9061406068]
Former-commit-id: 6586802ea5
This commit is contained in:
Kiran.Shrestha 2014-12-17 21:03:18 +00:00
parent 984036b781
commit f1d6cff7a5
3 changed files with 24 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cave/com.raytheon.viz.pointdata/localization/plotModels/ssmiVILPlotDesign.svg
View file

@ -29,7 +29,7 @@ xmlns:xlink="http://www.w3.org/1999/xlink" style="stroke: rgb(255,255,255);">
<text id="lat" plotMode="sample" class="text" plotParam="latitude" plotSymbol="deg" plotFormat="%3.2f">0</text> <text id="lat" plotMode="sample" class="text" plotParam="latitude" plotSymbol="deg" plotFormat="%3.2f">0</text>
<text id="lon" plotMode="sample" class="text" plotParam="longitude" plotSymbol="deg" plotFormat="%3.2f">0</text> <text id="lon" plotMode="sample" class="text" plotParam="longitude" plotSymbol="deg" plotFormat="%3.2f">0</text>
<text id="sample5" plotMode="sample" class="text" plotLookupTable="output_formats.txt" plotParam="vertIntegWater" plotFormat="%2.1f" plotSymbol="kg/(m**2)">75</text> <text id="sample5" plotMode="sample" class="text" plotLookupTable="output_formats.txt" plotParam="vertIntegWater" plotFormat="%2.1f" plotSymbol="kg/(m**2)">75</text>
<text id="vilText" plotMode="range" class="text" plotLookupTable="output_formats.txt" plotParam="vertIntegWater" plotFormat="%2.1f">0</text> <text id="vilText" plotMode="range" class="text" plotLookupTable="output_formats.txt" plotParam="vertIntegWater" plotFormat="%2.2f">0</text>
</symbol> </symbol>

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

15
cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/PlotModelFactory.java
View file

@ -93,6 +93,7 @@ import com.raytheon.viz.pointdata.rsc.PlotResourceData;
* Mar 21, 2014 2868 njensen Refactored python usage to PythonJobCoordinator * Mar 21, 2014 2868 njensen Refactored python usage to PythonJobCoordinator
* Jun 06, 2014 2061 bsteffen Rename and add support for data formats in sampling. * Jun 06, 2014 2061 bsteffen Rename and add support for data formats in sampling.
* Aug 07, 2014 3478 bclement removed PointDataDescription.Type.Double * Aug 07, 2014 3478 bclement removed PointDataDescription.Type.Double
* Dec 16, 2014 16193 kshrestha Updated range limits
* *
* </pre> * </pre>
* *
@ -1096,7 +1097,9 @@ public class PlotModelFactory {
if (element.lookup != null && sValue != null) { if (element.lookup != null && sValue != null) {
String lu = null; String lu = null;
if (!sValue.equals("?")){
lu = element.lookup.lookup(sValue); lu = element.lookup.lookup(sValue);
}
if (lu != null) { if (lu != null) {
sValue = lu.trim(); sValue = lu.trim();
} }
@ -1119,8 +1122,6 @@ public class PlotModelFactory {
case LONG: case LONG:
Number value = ob.getNumber(element.parameter); Number value = ob.getNumber(element.parameter);
if (value != null && value.doubleValue() != -9999.0) { if (value != null && value.doubleValue() != -9999.0) {
if (value.doubleValue() >= lowerLimit
&& value.doubleValue() <= upperLimit) {
double displayValue = 0.0; double displayValue = 0.0;
if (element.unit != null) { if (element.unit != null) {
if (element.converter == null) { if (element.converter == null) {
@ -1139,6 +1140,8 @@ public class PlotModelFactory {
} else { } else {
displayValue = value.doubleValue(); displayValue = value.doubleValue();
} }
if (isValidValue(displayValue)){
if (element.format != null) { if (element.format != null) {
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
Formatter testing = new Formatter(sb); Formatter testing = new Formatter(sb);
@ -1157,14 +1160,18 @@ public class PlotModelFactory {
default: default:
element.plotNode.setNodeValue(" "); element.plotNode.setNodeValue(" ");
} }
if (element.lookup != null) { if (element.lookup != null && sValue != null) {
sValue = element.lookup.lookup(sValue); String lu = null;
lu = element.lookup.lookup(sValue);
if (!lu.equals(""))
sValue = lu;
} }
if (sValue != null) { if (sValue != null) {
element.plotNode.setNodeValue(sValue.substring(element.trim)); element.plotNode.setNodeValue(sValue.substring(element.trim));
return !sValue.trim().isEmpty(); return !sValue.trim().isEmpty();
} else if (plotMissingData) { } else if (plotMissingData) {
element.plotNode.setNodeValue("m"); element.plotNode.setNodeValue("m");
setPlotMissingData(false);
return true; return true;
} else { } else {
element.plotNode.setNodeValue(" "); element.plotNode.setNodeValue(" ");

4
cave/com.raytheon.viz.satellite/localization/bundles/SSMIWindPlot.xml
View file

@ -36,7 +36,7 @@
plotModelFile="${svg}" plotModelFile="${svg}"
retrieveData="false" isUpdatingOnMetadataOnly="false" retrieveData="false" isUpdatingOnMetadataOnly="false"
isRequeryNecessaryOnTimeMatch="true" isRequeryNecessaryOnTimeMatch="true"
lowerLimit="0" upperLimit="34" plotMissingData="true"> lowerLimit="0" upperLimit="34">
<binOffset posOffset="1800" negOffset="1800" virtualOffset="0"/> <binOffset posOffset="1800" negOffset="1800" virtualOffset="0"/>
<metadataMap> <metadataMap>
<mapping key="pluginName"> <mapping key="pluginName">
@ -102,7 +102,7 @@
plotModelFile="${svg}" plotModelFile="${svg}"
retrieveData="false" isUpdatingOnMetadataOnly="false" retrieveData="false" isUpdatingOnMetadataOnly="false"
isRequeryNecessaryOnTimeMatch="true" isRequeryNecessaryOnTimeMatch="true"
lowerLimit="-1.1" upperLimit="-0.9"> lowerLimit="-1.1" upperLimit="-0.9" plotMissingData="true">
<binOffset posOffset="1800" negOffset="1800" virtualOffset="0"/> <binOffset posOffset="1800" negOffset="1800" virtualOffset="0"/>
<metadataMap> <metadataMap>
<mapping key="pluginName"> <mapping key="pluginName">