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

Issue #189 a few fixes to grid resources for FFG Mosaic

Browse source 
Former-commit-id: dc0e75eb29 [formerly 64d4a1add7] [formerly dc0e75eb29 [formerly 64d4a1add7] [formerly 4b121fd7b3 [formerly f8420e7052145c856b12310776e6acd7362dc9cb]]]
Former-commit-id: 4b121fd7b3
Former-commit-id: ec68d0445e [formerly bde106e70d]
Former-commit-id: b830e7c9c2
This commit is contained in:
Ben Steffensmeier 2012-10-31 11:39:32 -05:00
parent 0d1b4baba6
commit 518644cc2f
2 changed files with 34 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/FFGVizGroupResource.java
View file

@ -18,6 +18,7 @@
* further licensing information. * further licensing information.
**/ **/
package com.raytheon.viz.grid.rsc; package com.raytheon.viz.grid.rsc;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Map; import java.util.Map;
@ -38,19 +39,19 @@ import com.raytheon.viz.core.rsc.VizGroupResourceData;
/** /**
* FFG Group Resource class. * FFG Group Resource class.
* *
* Based off VizGroupResource.java * Based off VizGroupResource.java
* *
* <pre> * <pre>
* *
* SOFTWARE HISTORY * SOFTWARE HISTORY
* *
* Date Ticket# Engineer Description * Date Ticket# Engineer Description
* ------------ ---------- ----------- -------------------------- * ------------ ---------- ----------- --------------------------
* Sep 19, 2012 1162 mpduff Initial creation. * Sep 19, 2012 1162 mpduff Initial creation.
* *
* </pre> * </pre>
* *
* @author mpduff * @author mpduff
* @version 1.0 * @version 1.0
*/ */
@ -63,7 +64,7 @@ public class FFGVizGroupResource extends
/** /**
* Constructor. * Constructor.
* *
* @param resourceData * @param resourceData
* @param loadProperties * @param loadProperties
*/ */
@ -75,7 +76,7 @@ public class FFGVizGroupResource extends
/* /*
* (non-Javadoc) * (non-Javadoc)
* *
* @see com.raytheon.uf.viz.core.rsc.AbstractVizResource#disposeInternal() * @see com.raytheon.uf.viz.core.rsc.AbstractVizResource#disposeInternal()
*/ */
@Override @Override
@ -89,7 +90,7 @@ public class FFGVizGroupResource extends
/* /*
* (non-Javadoc) * (non-Javadoc)
* *
* @see * @see
* com.raytheon.uf.viz.core.rsc.AbstractVizResource#paintInternal(com.raytheon * com.raytheon.uf.viz.core.rsc.AbstractVizResource#paintInternal(com.raytheon
* .uf.viz.core.IGraphicsTarget, * .uf.viz.core.IGraphicsTarget,
@ -107,7 +108,7 @@ public class FFGVizGroupResource extends
/* /*
* (non-Javadoc) * (non-Javadoc)
* *
* @see * @see
* com.raytheon.uf.viz.core.rsc.AbstractVizResource#inspect(com.raytheon * com.raytheon.uf.viz.core.rsc.AbstractVizResource#inspect(com.raytheon
* .uf.common.geospatial.ReferencedCoordinate) * .uf.common.geospatial.ReferencedCoordinate)
@ -116,11 +117,14 @@ public class FFGVizGroupResource extends
public String inspect(ReferencedCoordinate coord) throws VizException { public String inspect(ReferencedCoordinate coord) throws VizException {
ResourceList rl = resourceData.getResourceList(); ResourceList rl = resourceData.getResourceList();
String value = "No Data"; String value = "No Data";
Map<AbstractVizResource<?, ?>, DataTime[]> timeMap = descriptor
.getTimeMatchingMap();
for (ResourcePair pair : rl) { for (ResourcePair pair : rl) {
if (pair.getResource() != null) { if (pair.getResource() != null) {
AbstractVizResource<?,?> rsc = pair.getResource(); AbstractVizResource<?, ?> rsc = pair.getResource();
timeMap.put(rsc, timeMap.get(this));
value = rsc.inspect(coord); value = rsc.inspect(coord);
if (!value.equals(NO_DATA)) { if (!NO_DATA.equalsIgnoreCase(value)) {
return value; return value;
} }
} }
@ -131,7 +135,7 @@ public class FFGVizGroupResource extends
/* /*
* (non-Javadoc) * (non-Javadoc)
* *
* @see * @see
* com.raytheon.uf.viz.core.rsc.AbstractVizResource#interrogate(com.raytheon * com.raytheon.uf.viz.core.rsc.AbstractVizResource#interrogate(com.raytheon
* .uf.common.geospatial.ReferencedCoordinate) * .uf.common.geospatial.ReferencedCoordinate)
@ -145,7 +149,7 @@ public class FFGVizGroupResource extends
/* /*
* (non-Javadoc) * (non-Javadoc)
* *
* @see * @see
* com.raytheon.uf.viz.core.rsc.AbstractVizResource#initInternal(com.raytheon * com.raytheon.uf.viz.core.rsc.AbstractVizResource#initInternal(com.raytheon
* .uf.viz.core.IGraphicsTarget) * .uf.viz.core.IGraphicsTarget)
@ -179,7 +183,7 @@ public class FFGVizGroupResource extends
/* /*
* (non-Javadoc) * (non-Javadoc)
* *
* @see com.raytheon.uf.viz.core.rsc.IRefreshListener#refresh() * @see com.raytheon.uf.viz.core.rsc.IRefreshListener#refresh()
*/ */
@Override @Override
@ -190,7 +194,7 @@ public class FFGVizGroupResource extends
/* /*
* (non-Javadoc) * (non-Javadoc)
* *
* @see * @see
* com.raytheon.uf.viz.core.rsc.IResourceDataChanged#resourceChanged(com * com.raytheon.uf.viz.core.rsc.IResourceDataChanged#resourceChanged(com
* .raytheon.uf.viz.core.rsc.IResourceDataChanged.ChangeType, * .raytheon.uf.viz.core.rsc.IResourceDataChanged.ChangeType,

16
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/AbstractGridResource.java
View file

@ -584,8 +584,20 @@ public abstract class AbstractGridResource<T extends AbstractResourceData>
&& !criteria.getCreatingEntityNames().isEmpty()) { && !criteria.getCreatingEntityNames().isEmpty()) {
creatingEntity = criteria.getCreatingEntityNames().get(0); creatingEntity = criteria.getCreatingEntityNames().get(0);
} }
return ColorMapParameterFactory.build(data.getScalarData().array(), ColorMapParameters newParameters = ColorMapParameterFactory.build(data
parameter, parameterUnits, level, creatingEntity); .getScalarData().array(), parameter, parameterUnits, level,
creatingEntity);
ColorMapParameters oldParameters = this.getCapability(
ColorMapCapability.class).getColorMapParameters();
if (oldParameters != null
&& oldParameters.getDataMin() <= newParameters.getDataMin()
&& oldParameters.getDataMax() >= newParameters.getDataMax()) {
// if the oldParameters have a larger range than the new parameters,
// reuse the old parameters. This is useful when the resource is
// sharing capabilities, for example in an FFGVizGroupResource.
newParameters = oldParameters;
}
return newParameters;
} }
/** /**