diff --git a/cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/data/AbstractDataCubeAdapter.java b/cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/data/AbstractDataCubeAdapter.java index 43012a61f9..ce44406d41 100644 --- a/cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/data/AbstractDataCubeAdapter.java +++ b/cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/data/AbstractDataCubeAdapter.java @@ -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 { diff --git a/cave/com.raytheon.uf.viz.ui.menus/menus.xsd b/cave/com.raytheon.uf.viz.ui.menus/menus.xsd index adf74b2386..65a859390e 100644 --- a/cave/com.raytheon.uf.viz.ui.menus/menus.xsd +++ b/cave/com.raytheon.uf.viz.ui.menus/menus.xsd @@ -158,6 +158,7 @@ + diff --git a/cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/BundleContributionItem.java b/cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/BundleContributionItem.java index 7238abe22e..f111585083 100644 --- a/cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/BundleContributionItem.java +++ b/cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/BundleContributionItem.java @@ -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); diff --git a/cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/xml/SeparatorMenuContribution.java b/cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/xml/SeparatorMenuContribution.java index 9364466e09..89a95f0031 100644 --- a/cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/xml/SeparatorMenuContribution.java +++ b/cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/xml/SeparatorMenuContribution.java @@ -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 }; } } diff --git a/cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLCMTextureData.java b/cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLCMTextureData.java index 1a2ecb5f65..869765dcd9 100644 --- a/cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLCMTextureData.java +++ b/cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLCMTextureData.java @@ -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 texMap = new HashMap(); diff --git a/cave/com.raytheon.viz.satellite/localization/menus/satellite/baseDerivedProductPlots.xml b/cave/com.raytheon.viz.satellite/localization/menus/satellite/baseDerivedProductPlots.xml index 32b5afcbfd..5c60c8c7d0 100644 --- a/cave/com.raytheon.viz.satellite/localization/menus/satellite/baseDerivedProductPlots.xml +++ b/cave/com.raytheon.viz.satellite/localization/menus/satellite/baseDerivedProductPlots.xml @@ -19,293 +19,290 @@ further_licensing_information. --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + - - - - /bufrascat/% - - - - - - + + + + + - - - - /bufrssmi/% - - - - /bufrssmi/% - - - - - - /bufrssmi/% - - - - - - /bufrssmi/% - - - - + + + - - /goessounding/% - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + /bufrascat/% + + + + + + + + + + + /bufrssmi/% + + + + /bufrssmi/% + + - - /poessounding/% - - + + /bufrssmi/% + + - - - + + + /bufrssmi/% + + + + + + + /goessounding/% + + + + + + /poessounding/% + + + + \ No newline at end of file diff --git a/cave/com.raytheon.viz.satellite/localization/menus/satellite/baseNHemisphere.xml b/cave/com.raytheon.viz.satellite/localization/menus/satellite/baseNHemisphere.xml index dfa5ebcb52..403d3db4fb 100644 --- a/cave/com.raytheon.viz.satellite/localization/menus/satellite/baseNHemisphere.xml +++ b/cave/com.raytheon.viz.satellite/localization/menus/satellite/baseNHemisphere.xml @@ -19,6 +19,7 @@ further_licensing_information. --> + - diff --git a/edexOsgi/com.raytheon.uf.common.menus/src/com/raytheon/uf/common/menus/xml/CommonBundleMenuContribution.java b/edexOsgi/com.raytheon.uf.common.menus/src/com/raytheon/uf/common/menus/xml/CommonBundleMenuContribution.java index 45e1cb3a3b..17466457be 100644 --- a/edexOsgi/com.raytheon.uf.common.menus/src/com/raytheon/uf/common/menus/xml/CommonBundleMenuContribution.java +++ b/edexOsgi/com.raytheon.uf.common.menus/src/com/raytheon/uf/common/menus/xml/CommonBundleMenuContribution.java @@ -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) diff --git a/edexOsgi/com.raytheon.uf.common.menus/src/com/raytheon/uf/common/menus/xml/CommonSeparatorMenuContribution.java b/edexOsgi/com.raytheon.uf.common.menus/src/com/raytheon/uf/common/menus/xml/CommonSeparatorMenuContribution.java index aecf09dedd..466d6158d1 100644 --- a/edexOsgi/com.raytheon.uf.common.menus/src/com/raytheon/uf/common/menus/xml/CommonSeparatorMenuContribution.java +++ b/edexOsgi/com.raytheon.uf.common.menus/src/com/raytheon/uf/common/menus/xml/CommonSeparatorMenuContribution.java @@ -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; + }