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

Merge "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" into development

Browse source 
Former-commit-id: bad816a50e [formerly 3786f2c0a7add2d36b27b92e2a8efd235b65e147]
Former-commit-id: 0fd6c7d56c
This commit is contained in:
Nate Jensen 2012-07-19 15:31:55 -05:00 • committed by Gerrit Code Review
commit 33611406a4
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 };
}
}

6
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();
}
if (data != null) {
ImageCache.getInstance(CacheType.MEMORY).put(this);
return data.getValue(x, y).doubleValue();
value = data.getValue(x, y).doubleValue();
}
return value;
}
private static Map<IColorMapDataRetrievalCallback, GLCMTextureData> texMap = new HashMap<IColorMapDataRetrievalCallback, GLCMTextureData>();

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

@ -19,7 +19,6 @@
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" />
@ -306,6 +305,4 @@
<substitute key="plotSource" value="POES Sounding Availability"/>
<substitute key="offset" value="1800"/>
</contribute>
</contribute>
<contribute xsi:type="separator" id="belowDerivedProductPlots" />
</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;
}