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

Issue #626 Moved menu changes required for NPP to be in satellite menu from old repo into common/core. Fixed AbstractDataCubeAdapter to add System date to time request and fixed GLCMTextureData race condition if sampling a texture that has been created but not staged

Browse source 
Change-Id: I845caf8bedb4b27d16874c2a0a633554412d6dd4

Former-commit-id: fb323d9e48c7f35f68d188d4f8fbb677971ebbb1
This commit is contained in:
Max Schenkelberg 2012-07-19 11:45:01 -05:00
parent 95d0565b6d
commit d8971a72fd
10 changed files with 302 additions and 293 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/data/AbstractDataCubeAdapter.java
View file

@ -178,7 +178,8 @@ public abstract class AbstractDataCubeAdapter implements IDataCubeAdapter {
TimeQueryRequest myQ = req.getTimeQuery(originalRequest,
latestOnly, cache, latestOnlyCache);
if (myQ != null) {
// no need to merge timeQueries
// Make sure simulated time gets set
myQ.setSimDate(originalRequest.getSimDate());
queries.put(req, myQ);
}
} else {

1
cave/com.raytheon.uf.viz.ui.menus/menus.xsd
View file

@ -158,6 +158,7 @@
<xs:complexContent>
<xs:extension base="abstractMenuContribution">
<xs:sequence/>
<xs:attribute name="visible" type="xs:boolean"/>
</xs:extension>
</xs:complexContent>
</xs:complexType>

6
cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/BundleContributionItem.java
View file

@ -226,8 +226,7 @@ public class BundleContributionItem extends ContributionItem {
String dateStr = UNKNOWN;
boolean useReferenceTime = (this.menuContribution.xml.useReferenceTime != null) ? this.menuContribution.xml.useReferenceTime
: true;
boolean useReferenceTime = this.menuContribution.xml.useReferenceTime;
if (lastUsedTime != null) {
// We have a
@ -261,8 +260,7 @@ public class BundleContributionItem extends ContributionItem {
BundleContributionItem.this.queryPerformed = true;
if (time != null) {
boolean useReferenceTime = (BundleContributionItem.this.menuContribution.xml.useReferenceTime != null) ? BundleContributionItem.this.menuContribution.xml.useReferenceTime
: true;
boolean useReferenceTime = BundleContributionItem.this.menuContribution.xml.useReferenceTime;
if (offset != null) {
time = offset.getNormalizedTime(time);

4
cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/xml/SeparatorMenuContribution.java
View file

@ -66,7 +66,9 @@ public class SeparatorMenuContribution extends
if (removals.contains(item.id))
return new IContributionItem[0];
return new IContributionItem[] { new Separator(item.id) };
Separator s = new Separator(item.id);
s.setVisible(item.visible);
return new IContributionItem[] { s };
}
}

8
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLCMTextureData.java
View file

@ -204,6 +204,7 @@ public class GLCMTextureData implements IImageCacheable {
}
public double getValue(int x, int y) {
double value = Double.NaN;
if (!isStaged() && isLoaded()) {
GLContextBridge.makeMasterContextCurrent();
GL gl = GLU.getCurrentGL();
@ -223,8 +224,11 @@ public class GLCMTextureData implements IImageCacheable {
data.setData(copybackBuffer);
GLContextBridge.releaseMasterContext();
}
ImageCache.getInstance(CacheType.MEMORY).put(this);
return data.getValue(x, y).doubleValue();
if (data != null) {
ImageCache.getInstance(CacheType.MEMORY).put(this);
value = data.getValue(x, y).doubleValue();
}
return value;
}
private static Map<IColorMapDataRetrievalCallback, GLCMTextureData> texMap = new HashMap<IColorMapDataRetrievalCallback, GLCMTextureData>();

561
cave/com.raytheon.viz.satellite/localization/menus/satellite/baseDerivedProductPlots.xml
View file

@ -19,293 +19,290 @@
further_licensing_information.
-->
<menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<contribute xsi:type="subMenu" menuText="Derived Products Plots">
<contribute xsi:type="subMenu" menuText="GOES High Density Winds">
<contribute xsi:type="titleItem"
titleText="------ Satellite-Derived Winds ------" id="SatDerivedWindLine" />
<contribute xsi:type="bundleItem" file="bundles/SatelliteWindPlots.xml"
menuText="IR Plot" id="irPlot" productInterval="3600" productOffset="1800">
<substitute key="pluginName" value="bufrhdw" />
<substitute key="source" value="GOES"/>
<substitute key="satType" value="IR" />
<substitute key="legend" value="IR" />
</contribute>
<contribute xsi:type="bundleItem" file="bundles/SatelliteWindPlots.xml"
menuText="Water Vapor Plot" id="waterVaporPlot" productInterval="3600"
productOffset="1800">
<substitute key="pluginName" value="bufrhdw" />
<substitute key="source" value="GOES"/>
<substitute key="satType" value="WV" />
<substitute key="legend" value="Water Vapor" />
</contribute>
<contribute xsi:type="bundleItem" file="bundles/SatelliteWindPlots.xml"
menuText="Visible Plot" id="visiblePlot" productInterval="3600"
productOffset="1800">
<substitute key="pluginName" value="bufrhdw" />
<substitute key="source" value="GOES"/>
<substitute key="satType" value="Vis" />
<substitute key="legend" value="Visible" />
</contribute>
<contribute xsi:type="bundleItem" file="bundles/Satellite3_9WindPlots.xml"
menuText="IR 3.9u Plot" id="ir3.9uPlot" productInterval="3600"
productOffset="1800">
<substitute key="pluginName" value="bufrhdw" />
<substitute key="source" value="GOES"/>
</contribute>
<contribute xsi:type="bundleItem" file="bundles/SatelliteWV7_0WindPlots.xml"
menuText="Water Vapor 7.0u Plot" id="waterVapor7.0uPlot"
productInterval="3600" productOffset="1800">
<substitute key="pluginName" value="bufrhdw" />
<substitute key="source" value="GOES"/>
</contribute>
<contribute xsi:type="bundleItem" file="bundles/SatelliteWV7_4WindPlots.xml"
menuText="Water Vapor 7.4u Plot" id="waterVapor7.4uPlot"
productInterval="3600" productOffset="1800">
<substitute key="pluginName" value="bufrhdw" />
<substitute key="source" value="GOES"/>
</contribute>
<contribute xsi:type="separator" id="MySeparatorId" />
<contribute xsi:type="titleItem"
titleText="------ Satellite Layer Winds ------" id="SatLayerdWindLine" />
<contribute xsi:type="bundleItem" file="bundles/SatelliteLayerPlot.xml"
menuText="200hPa Layer Plot" id="200hPaLayerPlot" productInterval="3600"
productOffset="1800">
<substitute key="pluginName" value="bufrhdw" />
<substitute key="source" value="GOES"/>
<substitute key="legend" value="225mb-100mb" />
<substitute key="between" value="10000--22600" />
</contribute>
<contribute xsi:type="bundleItem" file="bundles/SatelliteLayerPlot.xml"
menuText="250hPa Layer Plot" id="250hPaLayerPlot" productInterval="3600"
productOffset="1800">
<substitute key="pluginName" value="bufrhdw" />
<substitute key="source" value="GOES"/>
<substitute key="legend" value="275mb-225mb" />
<substitute key="between" value="22600--27500" />
</contribute>
<contribute xsi:type="bundleItem" file="bundles/SatelliteLayerPlot.xml"
menuText="300hPa Layer Plot" id="300hPaLayerPlot" productInterval="3600"
productOffset="1800">
<substitute key="pluginName" value="bufrhdw" />
<substitute key="source" value="GOES"/>
<substitute key="legend" value="350mb-275mb" />
<substitute key="between" value="27600--35000" />
</contribute>
<contribute xsi:type="bundleItem" file="bundles/SatelliteLayerPlot.xml"
menuText="400hPa Layer Plot" id="400hPaLayerPlot" productInterval="3600"
productOffset="1800">
<substitute key="pluginName" value="bufrhdw" />
<substitute key="source" value="GOES"/>
<substitute key="legend" value="450mb-350mb" />
<substitute key="between" value="35100--45000" />
</contribute>
<contribute xsi:type="bundleItem" file="bundles/SatelliteLayerPlot.xml"
menuText="500hPa Layer Plot" id="500hPaLayerPlot" productInterval="3600"
productOffset="1800">
<substitute key="pluginName" value="bufrhdw" />
<substitute key="source" value="GOES"/>
<substitute key="legend" value="600mb-450mb" />
<substitute key="between" value="45100--60000" />
</contribute>
<contribute xsi:type="bundleItem" file="bundles/SatelliteLayerPlot.xml"
menuText="700hPa Layer Plot" id="700hPaLayerPlot" productInterval="3600"
productOffset="1800">
<substitute key="pluginName" value="bufrhdw" />
<substitute key="source" value="GOES"/>
<substitute key="legend" value="775mb-600mb" />
<substitute key="between" value="60100--77500" />
</contribute>
<contribute xsi:type="bundleItem" file="bundles/SatelliteLayerPlot.xml"
menuText="850hPa Layer Plot" id="850hPaLayerPlot" productInterval="3600"
productOffset="1800">
<substitute key="pluginName" value="bufrhdw" />
<substitute key="source" value="GOES"/>
<substitute key="legend" value="900mb-775mb" />
<substitute key="between" value="77600--90000" />
</contribute>
<contribute xsi:type="bundleItem" file="bundles/SatelliteLayerPlot.xml"
menuText="925hPa Layer Plot" id="925hPaLayerPlot" productInterval="3600"
productOffset="1800">
<substitute key="pluginName" value="bufrhdw" />
<substitute key="source" value="GOES"/>
<substitute key="legend" value="1050mb-900mb" />
<substitute key="between" value="90100--105000" />
</contribute>
<contribute xsi:type="subMenu" menuText="GOES High Density Winds">
<contribute xsi:type="titleItem"
titleText="------ Satellite-Derived Winds ------" id="SatDerivedWindLine" />
<contribute xsi:type="bundleItem" file="bundles/SatelliteWindPlots.xml"
menuText="IR Plot" id="irPlot" productInterval="3600" productOffset="1800">
<substitute key="pluginName" value="bufrhdw" />
<substitute key="source" value="GOES"/>
<substitute key="satType" value="IR" />
<substitute key="legend" value="IR" />
</contribute>
<contribute xsi:type="subMenu" menuText="MTSAT High Density Winds">
<contribute xsi:type="titleItem"
titleText="------ Satellite-Derived Winds ------" id="SatDerivedWindLine" />
<contribute xsi:type="bundleItem" file="bundles/SatelliteWindPlots.xml"
menuText="IR Plot" id="irPlot" productInterval="3600" productOffset="1800">
<substitute key="pluginName" value="bufrmthdw" />
<substitute key="source" value="MTSAT"/>
<substitute key="satType" value="IR" />
<substitute key="legend" value="IR" />
</contribute>
<contribute xsi:type="bundleItem" file="bundles/SatelliteWindPlots.xml"
menuText="Water Vapor Plot" id="waterVaporPlot" productInterval="3600"
productOffset="1800">
<substitute key="pluginName" value="bufrmthdw" />
<substitute key="source" value="MTSAT"/>
<substitute key="satType" value="WV" />
<substitute key="legend" value="Water Vapor" />
</contribute>
<contribute xsi:type="bundleItem" file="bundles/SatelliteWindPlots.xml"
menuText="Visible Plot" id="visiblePlot" productInterval="3600"
productOffset="1800">
<substitute key="pluginName" value="bufrmthdw" />
<substitute key="source" value="MTSAT"/>
<substitute key="satType" value="Vis" />
<substitute key="legend" value="Visible" />
</contribute>
<contribute xsi:type="bundleItem" file="bundles/Satellite3_9WindPlots.xml"
menuText="IR 3.9u Plot" id="ir3.9uPlot" productInterval="3600"
productOffset="1800">
<substitute key="pluginName" value="bufrmthdw" />
<substitute key="source" value="MTSAT"/>
</contribute>
<contribute xsi:type="separator" id="MySeparatorId" />
<contribute xsi:type="titleItem"
titleText="------ Satellite Layer Winds ------" id="SatLayerdWindLine" />
<contribute xsi:type="bundleItem" file="bundles/SatelliteLayerPlot.xml"
menuText="200hPa Layer Plot" id="200hPaLayerPlot" productInterval="3600"
productOffset="1800">
<substitute key="pluginName" value="bufrmthdw" />
<substitute key="source" value="MTSAT"/>
<substitute key="legend" value="225mb-100mb" />
<substitute key="between" value="10000--22600" />
</contribute>
<contribute xsi:type="bundleItem" file="bundles/SatelliteLayerPlot.xml"
menuText="250hPa Layer Plot" id="250hPaLayerPlot" productInterval="3600"
productOffset="1800">
<substitute key="pluginName" value="bufrmthdw" />
<substitute key="source" value="MTSAT"/>
<substitute key="legend" value="275mb-225mb" />
<substitute key="between" value="22600--27500" />
</contribute>
<contribute xsi:type="bundleItem" file="bundles/SatelliteLayerPlot.xml"
menuText="300hPa Layer Plot" id="300hPaLayerPlot" productInterval="3600"
productOffset="1800">
<substitute key="pluginName" value="bufrmthdw" />
<substitute key="source" value="MTSAT"/>
<substitute key="legend" value="350mb-275mb" />
<substitute key="between" value="27600--35000" />
</contribute>
<contribute xsi:type="bundleItem" file="bundles/SatelliteLayerPlot.xml"
menuText="400hPa Layer Plot" id="400hPaLayerPlot" productInterval="3600"
productOffset="1800">
<substitute key="pluginName" value="bufrmthdw" />
<substitute key="source" value="MTSAT"/>
<substitute key="legend" value="450mb-350mb" />
<substitute key="between" value="35100--45000" />
</contribute>
<contribute xsi:type="bundleItem" file="bundles/SatelliteLayerPlot.xml"
menuText="500hPa Layer Plot" id="500hPaLayerPlot" productInterval="3600"
productOffset="1800">
<substitute key="pluginName" value="bufrmthdw" />
<substitute key="source" value="MTSAT"/>
<substitute key="legend" value="600mb-450mb" />
<substitute key="between" value="45100--60000" />
</contribute>
<contribute xsi:type="bundleItem" file="bundles/SatelliteLayerPlot.xml"
menuText="700hPa Layer Plot" id="700hPaLayerPlot" productInterval="3600"
productOffset="1800">
<substitute key="pluginName" value="bufrmthdw" />
<substitute key="source" value="MTSAT"/>
<substitute key="legend" value="775mb-600mb" />
<substitute key="between" value="60100--77500" />
</contribute>
<contribute xsi:type="bundleItem" file="bundles/SatelliteLayerPlot.xml"
menuText="850hPa Layer Plot" id="850hPaLayerPlot" productInterval="3600"
productOffset="1800">
<substitute key="pluginName" value="bufrmthdw" />
<substitute key="source" value="MTSAT"/>
<substitute key="legend" value="900mb-775mb" />
<substitute key="between" value="77600--90000" />
</contribute>
<contribute xsi:type="bundleItem" file="bundles/SatelliteLayerPlot.xml"
menuText="925hPa Layer Plot" id="925hPaLayerPlot" productInterval="3600"
productOffset="1800">
<substitute key="pluginName" value="bufrmthdw" />
<substitute key="source" value="MTSAT"/>
<substitute key="legend" value="1050mb-900mb" />
<substitute key="between" value="90100--105000" />
</contribute>
<contribute xsi:type="bundleItem" file="bundles/SatelliteWindPlots.xml"
menuText="Water Vapor Plot" id="waterVaporPlot" productInterval="3600"
productOffset="1800">
<substitute key="pluginName" value="bufrhdw" />
<substitute key="source" value="GOES"/>
<substitute key="satType" value="WV" />
<substitute key="legend" value="Water Vapor" />
</contribute>
<contribute xsi:type="subMenu" menuText="Scatterometer Winds">
<!--
<contribute xsi:type="bundleItem" file="bundles/Scatterometer_quikscat.xml"
menuText="QuikSCAT 12.5 km" id="QuikSCAT" productInterval="3600"
productOffset="1800">
<dataURI>/bufrquikscat/%</dataURI>
<substitute key="legend" value="QUIKSCAT"/>
<substitute key="svg" value="quikScatPlotDesign.svg"/>
<substitute key="plugin" value="bufrquikscat"/>
<substitute key="posOffset" value="0"/>
<substitute key="negOffset" value="5400"/>
</contribute>
-->
<contribute xsi:type="bundleItem" file="bundles/Scatterometer.xml"
menuText="ASCAT Winds 25 km" id="ASCATWinds"
productInterval="3600" productOffset="1800">
<dataURI>/bufrascat/%</dataURI>
<substitute key="legend" value="ASCAT"/>
<substitute key="svg" value="ascatPlotDesign.svg"/>
<substitute key="plugin" value="bufrascat"/>
<substitute key="posOffset" value="2650"/>
<substitute key="negOffset" value="2650"/>
</contribute>
<contribute xsi:type="bundleItem" file="bundles/SatelliteWindPlots.xml"
menuText="Visible Plot" id="visiblePlot" productInterval="3600"
productOffset="1800">
<substitute key="pluginName" value="bufrhdw" />
<substitute key="source" value="GOES"/>
<substitute key="satType" value="Vis" />
<substitute key="legend" value="Visible" />
</contribute>
<contribute xsi:type="subMenu" menuText="SSM/I Point Data">
<contribute xsi:type="titleItem"
titleText="------ SSM/I Data ------" id="SSMIDataLine"/>
<contribute xsi:type="bundleItem" file="bundles/SSMIWindPlot.xml"
menuText="SSM/I Wind Speeds" id="SSMIDataLine"
productInterval="3600" productOffset="1800">
<dataURI>/bufrssmi/%</dataURI>
<substitute key="svg" value="ssmiWindPlotDesign.svg"/>
</contribute>
<contribute xsi:type="bundleItem" file="bundles/SSMIPlot.xml"
menuText="SSM/I Precip. Water" id="SSMIDataLine"
productInterval="3600" productOffset="1800">
<dataURI>/bufrssmi/%</dataURI>
<substitute key="svg" value="ssmiPWPlotDesign.svg"/>
<substitute key="legend" value="SSM/I Precipitable Water (kg/m**2)"/>
<substitute key="offset" value="1800"/>
</contribute>
<contribute xsi:type="bundleItem" file="bundles/SSMIPlot.xml"
menuText="SSM/I Sea Temperature" id="SSMIDataLine"
productInterval="3600" productOffset="1800">
<dataURI>/bufrssmi/%</dataURI>
<substitute key="svg" value="ssmiSTPlotDesign.svg"/>
<substitute key="legend" value="SSM/I Sea Temperature (C)"/>
<substitute key="offset" value="1800"/>
</contribute>
<contribute xsi:type="bundleItem" file="bundles/SSMIPlot.xml"
menuText="SSM/I VIL" id="SSMIDataLine"
productInterval="3600" productOffset="1800">
<dataURI>/bufrssmi/%</dataURI>
<substitute key="svg" value="ssmiVILPlotDesign.svg"/>
<substitute key="legend" value="SSM/I Vert. Integ. Water (kg/(m**2))"/>
<substitute key="offset" value="1800"/>
</contribute>
<contribute xsi:type="bundleItem" file="bundles/Satellite3_9WindPlots.xml"
menuText="IR 3.9u Plot" id="ir3.9uPlot" productInterval="3600"
productOffset="1800">
<substitute key="pluginName" value="bufrhdw" />
<substitute key="source" value="GOES"/>
</contribute>
<contribute xsi:type="bundleItem" file="bundles/SoundingAvailability.xml"
menuText="GOES Sounding Availability" id="goesSoundingAvailability"
productInterval="3600" productOffset="1800">
<dataURI>/goessounding/%</dataURI>
<substitute key="pluginName" value="goessounding"/>
<substitute key="plotSource" value="GOES Sounding Availability"/>
<contribute xsi:type="bundleItem" file="bundles/SatelliteWV7_0WindPlots.xml"
menuText="Water Vapor 7.0u Plot" id="waterVapor7.0uPlot"
productInterval="3600" productOffset="1800">
<substitute key="pluginName" value="bufrhdw" />
<substitute key="source" value="GOES"/>
</contribute>
<contribute xsi:type="bundleItem" file="bundles/SatelliteWV7_4WindPlots.xml"
menuText="Water Vapor 7.4u Plot" id="waterVapor7.4uPlot"
productInterval="3600" productOffset="1800">
<substitute key="pluginName" value="bufrhdw" />
<substitute key="source" value="GOES"/>
</contribute>
<contribute xsi:type="separator" id="MySeparatorId" />
<contribute xsi:type="titleItem"
titleText="------ Satellite Layer Winds ------" id="SatLayerdWindLine" />
<contribute xsi:type="bundleItem" file="bundles/SatelliteLayerPlot.xml"
menuText="200hPa Layer Plot" id="200hPaLayerPlot" productInterval="3600"
productOffset="1800">
<substitute key="pluginName" value="bufrhdw" />
<substitute key="source" value="GOES"/>
<substitute key="legend" value="225mb-100mb" />
<substitute key="between" value="10000--22600" />
</contribute>
<contribute xsi:type="bundleItem" file="bundles/SatelliteLayerPlot.xml"
menuText="250hPa Layer Plot" id="250hPaLayerPlot" productInterval="3600"
productOffset="1800">
<substitute key="pluginName" value="bufrhdw" />
<substitute key="source" value="GOES"/>
<substitute key="legend" value="275mb-225mb" />
<substitute key="between" value="22600--27500" />
</contribute>
<contribute xsi:type="bundleItem" file="bundles/SatelliteLayerPlot.xml"
menuText="300hPa Layer Plot" id="300hPaLayerPlot" productInterval="3600"
productOffset="1800">
<substitute key="pluginName" value="bufrhdw" />
<substitute key="source" value="GOES"/>
<substitute key="legend" value="350mb-275mb" />
<substitute key="between" value="27600--35000" />
</contribute>
<contribute xsi:type="bundleItem" file="bundles/SatelliteLayerPlot.xml"
menuText="400hPa Layer Plot" id="400hPaLayerPlot" productInterval="3600"
productOffset="1800">
<substitute key="pluginName" value="bufrhdw" />
<substitute key="source" value="GOES"/>
<substitute key="legend" value="450mb-350mb" />
<substitute key="between" value="35100--45000" />
</contribute>
<contribute xsi:type="bundleItem" file="bundles/SatelliteLayerPlot.xml"
menuText="500hPa Layer Plot" id="500hPaLayerPlot" productInterval="3600"
productOffset="1800">
<substitute key="pluginName" value="bufrhdw" />
<substitute key="source" value="GOES"/>
<substitute key="legend" value="600mb-450mb" />
<substitute key="between" value="45100--60000" />
</contribute>
<contribute xsi:type="bundleItem" file="bundles/SatelliteLayerPlot.xml"
menuText="700hPa Layer Plot" id="700hPaLayerPlot" productInterval="3600"
productOffset="1800">
<substitute key="pluginName" value="bufrhdw" />
<substitute key="source" value="GOES"/>
<substitute key="legend" value="775mb-600mb" />
<substitute key="between" value="60100--77500" />
</contribute>
<contribute xsi:type="bundleItem" file="bundles/SatelliteLayerPlot.xml"
menuText="850hPa Layer Plot" id="850hPaLayerPlot" productInterval="3600"
productOffset="1800">
<substitute key="pluginName" value="bufrhdw" />
<substitute key="source" value="GOES"/>
<substitute key="legend" value="900mb-775mb" />
<substitute key="between" value="77600--90000" />
</contribute>
<contribute xsi:type="bundleItem" file="bundles/SatelliteLayerPlot.xml"
menuText="925hPa Layer Plot" id="925hPaLayerPlot" productInterval="3600"
productOffset="1800">
<substitute key="pluginName" value="bufrhdw" />
<substitute key="source" value="GOES"/>
<substitute key="legend" value="1050mb-900mb" />
<substitute key="between" value="90100--105000" />
</contribute>
</contribute>
<contribute xsi:type="subMenu" menuText="MTSAT High Density Winds">
<contribute xsi:type="titleItem"
titleText="------ Satellite-Derived Winds ------" id="SatDerivedWindLine" />
<contribute xsi:type="bundleItem" file="bundles/SatelliteWindPlots.xml"
menuText="IR Plot" id="irPlot" productInterval="3600" productOffset="1800">
<substitute key="pluginName" value="bufrmthdw" />
<substitute key="source" value="MTSAT"/>
<substitute key="satType" value="IR" />
<substitute key="legend" value="IR" />
</contribute>
<contribute xsi:type="bundleItem" file="bundles/SatelliteWindPlots.xml"
menuText="Water Vapor Plot" id="waterVaporPlot" productInterval="3600"
productOffset="1800">
<substitute key="pluginName" value="bufrmthdw" />
<substitute key="source" value="MTSAT"/>
<substitute key="satType" value="WV" />
<substitute key="legend" value="Water Vapor" />
</contribute>
<contribute xsi:type="bundleItem" file="bundles/SatelliteWindPlots.xml"
menuText="Visible Plot" id="visiblePlot" productInterval="3600"
productOffset="1800">
<substitute key="pluginName" value="bufrmthdw" />
<substitute key="source" value="MTSAT"/>
<substitute key="satType" value="Vis" />
<substitute key="legend" value="Visible" />
</contribute>
<contribute xsi:type="bundleItem" file="bundles/Satellite3_9WindPlots.xml"
menuText="IR 3.9u Plot" id="ir3.9uPlot" productInterval="3600"
productOffset="1800">
<substitute key="pluginName" value="bufrmthdw" />
<substitute key="source" value="MTSAT"/>
</contribute>
<contribute xsi:type="separator" id="MySeparatorId" />
<contribute xsi:type="titleItem"
titleText="------ Satellite Layer Winds ------" id="SatLayerdWindLine" />
<contribute xsi:type="bundleItem" file="bundles/SatelliteLayerPlot.xml"
menuText="200hPa Layer Plot" id="200hPaLayerPlot" productInterval="3600"
productOffset="1800">
<substitute key="pluginName" value="bufrmthdw" />
<substitute key="source" value="MTSAT"/>
<substitute key="legend" value="225mb-100mb" />
<substitute key="between" value="10000--22600" />
</contribute>
<contribute xsi:type="bundleItem" file="bundles/SatelliteLayerPlot.xml"
menuText="250hPa Layer Plot" id="250hPaLayerPlot" productInterval="3600"
productOffset="1800">
<substitute key="pluginName" value="bufrmthdw" />
<substitute key="source" value="MTSAT"/>
<substitute key="legend" value="275mb-225mb" />
<substitute key="between" value="22600--27500" />
</contribute>
<contribute xsi:type="bundleItem" file="bundles/SatelliteLayerPlot.xml"
menuText="300hPa Layer Plot" id="300hPaLayerPlot" productInterval="3600"
productOffset="1800">
<substitute key="pluginName" value="bufrmthdw" />
<substitute key="source" value="MTSAT"/>
<substitute key="legend" value="350mb-275mb" />
<substitute key="between" value="27600--35000" />
</contribute>
<contribute xsi:type="bundleItem" file="bundles/SatelliteLayerPlot.xml"
menuText="400hPa Layer Plot" id="400hPaLayerPlot" productInterval="3600"
productOffset="1800">
<substitute key="pluginName" value="bufrmthdw" />
<substitute key="source" value="MTSAT"/>
<substitute key="legend" value="450mb-350mb" />
<substitute key="between" value="35100--45000" />
</contribute>
<contribute xsi:type="bundleItem" file="bundles/SatelliteLayerPlot.xml"
menuText="500hPa Layer Plot" id="500hPaLayerPlot" productInterval="3600"
productOffset="1800">
<substitute key="pluginName" value="bufrmthdw" />
<substitute key="source" value="MTSAT"/>
<substitute key="legend" value="600mb-450mb" />
<substitute key="between" value="45100--60000" />
</contribute>
<contribute xsi:type="bundleItem" file="bundles/SatelliteLayerPlot.xml"
menuText="700hPa Layer Plot" id="700hPaLayerPlot" productInterval="3600"
productOffset="1800">
<substitute key="pluginName" value="bufrmthdw" />
<substitute key="source" value="MTSAT"/>
<substitute key="legend" value="775mb-600mb" />
<substitute key="between" value="60100--77500" />
</contribute>
<contribute xsi:type="bundleItem" file="bundles/SatelliteLayerPlot.xml"
menuText="850hPa Layer Plot" id="850hPaLayerPlot" productInterval="3600"
productOffset="1800">
<substitute key="pluginName" value="bufrmthdw" />
<substitute key="source" value="MTSAT"/>
<substitute key="legend" value="900mb-775mb" />
<substitute key="between" value="77600--90000" />
</contribute>
<contribute xsi:type="bundleItem" file="bundles/SatelliteLayerPlot.xml"
menuText="925hPa Layer Plot" id="925hPaLayerPlot" productInterval="3600"
productOffset="1800">
<substitute key="pluginName" value="bufrmthdw" />
<substitute key="source" value="MTSAT"/>
<substitute key="legend" value="1050mb-900mb" />
<substitute key="between" value="90100--105000" />
</contribute>
</contribute>
<contribute xsi:type="subMenu" menuText="Scatterometer Winds">
<!--
<contribute xsi:type="bundleItem" file="bundles/Scatterometer_quikscat.xml"
menuText="QuikSCAT 12.5 km" id="QuikSCAT" productInterval="3600"
productOffset="1800">
<dataURI>/bufrquikscat/%</dataURI>
<substitute key="legend" value="QUIKSCAT"/>
<substitute key="svg" value="quikScatPlotDesign.svg"/>
<substitute key="plugin" value="bufrquikscat"/>
<substitute key="posOffset" value="0"/>
<substitute key="negOffset" value="5400"/>
</contribute>
-->
<contribute xsi:type="bundleItem" file="bundles/Scatterometer.xml"
menuText="ASCAT Winds 25 km" id="ASCATWinds"
productInterval="3600" productOffset="1800">
<dataURI>/bufrascat/%</dataURI>
<substitute key="legend" value="ASCAT"/>
<substitute key="svg" value="ascatPlotDesign.svg"/>
<substitute key="plugin" value="bufrascat"/>
<substitute key="posOffset" value="2650"/>
<substitute key="negOffset" value="2650"/>
</contribute>
</contribute>
<contribute xsi:type="subMenu" menuText="SSM/I Point Data">
<contribute xsi:type="titleItem"
titleText="------ SSM/I Data ------" id="SSMIDataLine"/>
<contribute xsi:type="bundleItem" file="bundles/SSMIWindPlot.xml"
menuText="SSM/I Wind Speeds" id="SSMIDataLine"
productInterval="3600" productOffset="1800">
<dataURI>/bufrssmi/%</dataURI>
<substitute key="svg" value="ssmiWindPlotDesign.svg"/>
</contribute>
<contribute xsi:type="bundleItem" file="bundles/SSMIPlot.xml"
menuText="SSM/I Precip. Water" id="SSMIDataLine"
productInterval="3600" productOffset="1800">
<dataURI>/bufrssmi/%</dataURI>
<substitute key="svg" value="ssmiPWPlotDesign.svg"/>
<substitute key="legend" value="SSM/I Precipitable Water (kg/m**2)"/>
<substitute key="offset" value="1800"/>
</contribute>
<contribute xsi:type="bundleItem" file="bundles/SoundingAvailability.xml"
menuText="POES Sounding Availability" id="poesSoundingAvailability"
productInterval="3600" productOffset="1800">
<dataURI>/poessounding/%</dataURI>
<substitute key="pluginName" value="poessounding"/>
<substitute key="plotSource" value="POES Sounding Availability"/>
<contribute xsi:type="bundleItem" file="bundles/SSMIPlot.xml"
menuText="SSM/I Sea Temperature" id="SSMIDataLine"
productInterval="3600" productOffset="1800">
<dataURI>/bufrssmi/%</dataURI>
<substitute key="svg" value="ssmiSTPlotDesign.svg"/>
<substitute key="legend" value="SSM/I Sea Temperature (C)"/>
<substitute key="offset" value="1800"/>
</contribute>
</contribute>
<contribute xsi:type="separator" id="belowDerivedProductPlots" />
</contribute>
<contribute xsi:type="bundleItem" file="bundles/SSMIPlot.xml"
menuText="SSM/I VIL" id="SSMIDataLine"
productInterval="3600" productOffset="1800">
<dataURI>/bufrssmi/%</dataURI>
<substitute key="svg" value="ssmiVILPlotDesign.svg"/>
<substitute key="legend" value="SSM/I Vert. Integ. Water (kg/(m**2))"/>
<substitute key="offset" value="1800"/>
</contribute>
</contribute>
<contribute xsi:type="bundleItem" file="bundles/SoundingAvailability.xml"
menuText="GOES Sounding Availability" id="goesSoundingAvailability"
productInterval="3600" productOffset="1800">
<dataURI>/goessounding/%</dataURI>
<substitute key="pluginName" value="goessounding"/>
<substitute key="plotSource" value="GOES Sounding Availability"/>
<substitute key="offset" value="1800"/>
</contribute>
<contribute xsi:type="bundleItem" file="bundles/SoundingAvailability.xml"
menuText="POES Sounding Availability" id="poesSoundingAvailability"
productInterval="3600" productOffset="1800">
<dataURI>/poessounding/%</dataURI>
<substitute key="pluginName" value="poessounding"/>
<substitute key="plotSource" value="POES Sounding Availability"/>
<substitute key="offset" value="1800"/>
</contribute>
</menuTemplate>

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

@ -19,6 +19,7 @@
further_licensing_information.
-->
<menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<contribute xsi:type="separator" id="beforeNHemisphere" />
<contribute xsi:type="titleItem"
titleText="------ NH/NA/US every image------" id="NHLine"/>
<contribute xsi:type="satBundleItem" file="bundles/DefaultCompositeSatellite.xml"

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

@ -34,7 +34,7 @@
fileName="menus/satellite/baseDerivedProductsImagery.xml">
<substitute key="sector" value="Supernational"/>
</include>
<include installTo="menu:satellite?after=GROUP4"
<include subMenu="Derived Products Plots" installTo="menu:satellite?after=GROUP4"
fileName="menus/satellite/baseDerivedProductPlots.xml"/>
<include installTo="menu:satellite?after=GROUP5"
fileName="menus/satellite/baseNHemisphere.xml">

4
edexOsgi/com.raytheon.uf.common.menus/src/com/raytheon/uf/common/menus/xml/CommonBundleMenuContribution.java
View file

@ -95,10 +95,10 @@ public class CommonBundleMenuContribution extends
/**
* Indicates whether reference time should be used, instead of valid time
* (optional)
* (optional, defaults to true)
*/
@XmlAttribute(name = "useReferenceTime", required = false)
public Boolean useReferenceTime;
public boolean useReferenceTime = true;
/**
* The product offset in seconds (optional)

5
edexOsgi/com.raytheon.uf.common.menus/src/com/raytheon/uf/common/menus/xml/CommonSeparatorMenuContribution.java
View file

@ -21,6 +21,7 @@ package com.raytheon.uf.common.menus.xml;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlType;
/**
@ -43,4 +44,8 @@ import javax.xml.bind.annotation.XmlType;
public class CommonSeparatorMenuContribution extends
CommonAbstractMenuContribution {
/** Specifies if the separator should be visible or not */
@XmlAttribute(name = "visible", required = false)
public boolean visible = true;
}