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
Former-commit-id:127feeb545
[formerlybad816a50e
] [formerly127feeb545
[formerlybad816a50e
] [formerly0fd6c7d56c
[formerly 3786f2c0a7add2d36b27b92e2a8efd235b65e147]]] Former-commit-id:0fd6c7d56c
Former-commit-id:abc8a39763
[formerly33611406a4
] Former-commit-id:bc5e7cfa9f
This commit is contained in:
commit
7999e5bbab
10 changed files with 302 additions and 293 deletions
|
@ -178,7 +178,8 @@ public abstract class AbstractDataCubeAdapter implements IDataCubeAdapter {
|
||||||
TimeQueryRequest myQ = req.getTimeQuery(originalRequest,
|
TimeQueryRequest myQ = req.getTimeQuery(originalRequest,
|
||||||
latestOnly, cache, latestOnlyCache);
|
latestOnly, cache, latestOnlyCache);
|
||||||
if (myQ != null) {
|
if (myQ != null) {
|
||||||
// no need to merge timeQueries
|
// Make sure simulated time gets set
|
||||||
|
myQ.setSimDate(originalRequest.getSimDate());
|
||||||
queries.put(req, myQ);
|
queries.put(req, myQ);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -158,6 +158,7 @@
|
||||||
<xs:complexContent>
|
<xs:complexContent>
|
||||||
<xs:extension base="abstractMenuContribution">
|
<xs:extension base="abstractMenuContribution">
|
||||||
<xs:sequence/>
|
<xs:sequence/>
|
||||||
|
<xs:attribute name="visible" type="xs:boolean"/>
|
||||||
</xs:extension>
|
</xs:extension>
|
||||||
</xs:complexContent>
|
</xs:complexContent>
|
||||||
</xs:complexType>
|
</xs:complexType>
|
||||||
|
|
|
@ -226,8 +226,7 @@ public class BundleContributionItem extends ContributionItem {
|
||||||
|
|
||||||
String dateStr = UNKNOWN;
|
String dateStr = UNKNOWN;
|
||||||
|
|
||||||
boolean useReferenceTime = (this.menuContribution.xml.useReferenceTime != null) ? this.menuContribution.xml.useReferenceTime
|
boolean useReferenceTime = this.menuContribution.xml.useReferenceTime;
|
||||||
: true;
|
|
||||||
|
|
||||||
if (lastUsedTime != null) {
|
if (lastUsedTime != null) {
|
||||||
// We have a
|
// We have a
|
||||||
|
@ -261,8 +260,7 @@ public class BundleContributionItem extends ContributionItem {
|
||||||
BundleContributionItem.this.queryPerformed = true;
|
BundleContributionItem.this.queryPerformed = true;
|
||||||
|
|
||||||
if (time != null) {
|
if (time != null) {
|
||||||
boolean useReferenceTime = (BundleContributionItem.this.menuContribution.xml.useReferenceTime != null) ? BundleContributionItem.this.menuContribution.xml.useReferenceTime
|
boolean useReferenceTime = BundleContributionItem.this.menuContribution.xml.useReferenceTime;
|
||||||
: true;
|
|
||||||
|
|
||||||
if (offset != null) {
|
if (offset != null) {
|
||||||
time = offset.getNormalizedTime(time);
|
time = offset.getNormalizedTime(time);
|
||||||
|
|
|
@ -66,7 +66,9 @@ public class SeparatorMenuContribution extends
|
||||||
if (removals.contains(item.id))
|
if (removals.contains(item.id))
|
||||||
return new IContributionItem[0];
|
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 };
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -204,6 +204,7 @@ public class GLCMTextureData implements IImageCacheable {
|
||||||
}
|
}
|
||||||
|
|
||||||
public double getValue(int x, int y) {
|
public double getValue(int x, int y) {
|
||||||
|
double value = Double.NaN;
|
||||||
if (!isStaged() && isLoaded()) {
|
if (!isStaged() && isLoaded()) {
|
||||||
GLContextBridge.makeMasterContextCurrent();
|
GLContextBridge.makeMasterContextCurrent();
|
||||||
GL gl = GLU.getCurrentGL();
|
GL gl = GLU.getCurrentGL();
|
||||||
|
@ -223,8 +224,11 @@ public class GLCMTextureData implements IImageCacheable {
|
||||||
data.setData(copybackBuffer);
|
data.setData(copybackBuffer);
|
||||||
GLContextBridge.releaseMasterContext();
|
GLContextBridge.releaseMasterContext();
|
||||||
}
|
}
|
||||||
|
if (data != null) {
|
||||||
ImageCache.getInstance(CacheType.MEMORY).put(this);
|
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>();
|
private static Map<IColorMapDataRetrievalCallback, GLCMTextureData> texMap = new HashMap<IColorMapDataRetrievalCallback, GLCMTextureData>();
|
||||||
|
|
|
@ -19,7 +19,6 @@
|
||||||
further_licensing_information.
|
further_licensing_information.
|
||||||
-->
|
-->
|
||||||
<menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
|
<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="subMenu" menuText="GOES High Density Winds">
|
||||||
<contribute xsi:type="titleItem"
|
<contribute xsi:type="titleItem"
|
||||||
titleText="------ Satellite-Derived Winds ------" id="SatDerivedWindLine" />
|
titleText="------ Satellite-Derived Winds ------" id="SatDerivedWindLine" />
|
||||||
|
@ -306,6 +305,4 @@
|
||||||
<substitute key="plotSource" value="POES Sounding Availability"/>
|
<substitute key="plotSource" value="POES Sounding Availability"/>
|
||||||
<substitute key="offset" value="1800"/>
|
<substitute key="offset" value="1800"/>
|
||||||
</contribute>
|
</contribute>
|
||||||
</contribute>
|
|
||||||
<contribute xsi:type="separator" id="belowDerivedProductPlots" />
|
|
||||||
</menuTemplate>
|
</menuTemplate>
|
|
@ -19,6 +19,7 @@
|
||||||
further_licensing_information.
|
further_licensing_information.
|
||||||
-->
|
-->
|
||||||
<menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
|
<menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
|
||||||
|
<contribute xsi:type="separator" id="beforeNHemisphere" />
|
||||||
<contribute xsi:type="titleItem"
|
<contribute xsi:type="titleItem"
|
||||||
titleText="------ NH/NA/US every image------" id="NHLine"/>
|
titleText="------ NH/NA/US every image------" id="NHLine"/>
|
||||||
<contribute xsi:type="satBundleItem" file="bundles/DefaultCompositeSatellite.xml"
|
<contribute xsi:type="satBundleItem" file="bundles/DefaultCompositeSatellite.xml"
|
||||||
|
|
|
@ -34,7 +34,7 @@
|
||||||
fileName="menus/satellite/baseDerivedProductsImagery.xml">
|
fileName="menus/satellite/baseDerivedProductsImagery.xml">
|
||||||
<substitute key="sector" value="Supernational"/>
|
<substitute key="sector" value="Supernational"/>
|
||||||
</include>
|
</include>
|
||||||
<include installTo="menu:satellite?after=GROUP4"
|
<include subMenu="Derived Products Plots" installTo="menu:satellite?after=GROUP4"
|
||||||
fileName="menus/satellite/baseDerivedProductPlots.xml"/>
|
fileName="menus/satellite/baseDerivedProductPlots.xml"/>
|
||||||
<include installTo="menu:satellite?after=GROUP5"
|
<include installTo="menu:satellite?after=GROUP5"
|
||||||
fileName="menus/satellite/baseNHemisphere.xml">
|
fileName="menus/satellite/baseNHemisphere.xml">
|
||||||
|
|
|
@ -95,10 +95,10 @@ public class CommonBundleMenuContribution extends
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Indicates whether reference time should be used, instead of valid time
|
* Indicates whether reference time should be used, instead of valid time
|
||||||
* (optional)
|
* (optional, defaults to true)
|
||||||
*/
|
*/
|
||||||
@XmlAttribute(name = "useReferenceTime", required = false)
|
@XmlAttribute(name = "useReferenceTime", required = false)
|
||||||
public Boolean useReferenceTime;
|
public boolean useReferenceTime = true;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The product offset in seconds (optional)
|
* The product offset in seconds (optional)
|
||||||
|
|
|
@ -21,6 +21,7 @@ package com.raytheon.uf.common.menus.xml;
|
||||||
|
|
||||||
import javax.xml.bind.annotation.XmlAccessType;
|
import javax.xml.bind.annotation.XmlAccessType;
|
||||||
import javax.xml.bind.annotation.XmlAccessorType;
|
import javax.xml.bind.annotation.XmlAccessorType;
|
||||||
|
import javax.xml.bind.annotation.XmlAttribute;
|
||||||
import javax.xml.bind.annotation.XmlType;
|
import javax.xml.bind.annotation.XmlType;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -43,4 +44,8 @@ import javax.xml.bind.annotation.XmlType;
|
||||||
public class CommonSeparatorMenuContribution extends
|
public class CommonSeparatorMenuContribution extends
|
||||||
CommonAbstractMenuContribution {
|
CommonAbstractMenuContribution {
|
||||||
|
|
||||||
|
/** Specifies if the separator should be visible or not */
|
||||||
|
@XmlAttribute(name = "visible", required = false)
|
||||||
|
public boolean visible = true;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue