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

Merge "Issue #1896 Make FFMPResource work better with D2D time matcher." into omaha_13.4.1

Browse source 
Former-commit-id: db2d869900335634e9976370b7154baad4415ab2
This commit is contained in:
Nate Jensen 2013-04-10 14:57:43 -05:00 • committed by Gerrit Code Review
commit e6c7729470
1 changed files with 21 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
View file

@ -163,6 +163,8 @@ import com.vividsolutions.jts.geom.Point;
* Feb 20, 2013 1635 dhladky Fixed multiple guidance display
* Feb 28, 2013 1729 dhladky Changed the way the loaders are managed via the status updates.
* Mar 6, 2013 1769 dhladky Changed threading to use count down latch.
* Apr 10, 2013 1896 bsteffen Make FFMPResource work better with D2D
* time matcher.
* </pre>
*
* @author dhladky
@ -242,10 +244,10 @@ public class FFMPResource extends
private final FFMPShapeContainer shadedShapes = new FFMPShapeContainer();
/** Basin shaded shape **/
protected ConcurrentHashMap<DataTime, FFMPDrawable> drawables = new ConcurrentHashMap<DataTime, FFMPDrawable>();
protected Map<DataTime, FFMPDrawable> drawables = new ConcurrentHashMap<DataTime, FFMPDrawable>();
/** VGB drawables **/
protected HashMap<String, PixelCoverage> vgbDrawables = new HashMap<String, PixelCoverage>();
protected Map<String, PixelCoverage> vgbDrawables = new HashMap<String, PixelCoverage>();
/** used to create the wireframes for the streams **/
private Set<Long> streamPfafIds = null;
@ -2886,7 +2888,7 @@ public class FFMPResource extends
private void generateShapes(FFMPTemplates templates, String huc,
Long pfaf, Map<Long, Geometry> geomMap, Request req,
IColormapShadedShape shape, HashMap<Object, RGB> colorMap) {
IColormapShadedShape shape, Map<Object, RGB> colorMap) {
// my logic
Geometry g = geomMap.get(pfaf);
@ -4194,6 +4196,12 @@ public class FFMPResource extends
});
}
}
if (event.getSource() instanceof FFMPLoaderStatus) {
FFMPLoaderStatus status = (FFMPLoaderStatus) event.getSource();
if (status.isDone()) {
issueRefresh();
}
}
}
/**
@ -4383,4 +4391,14 @@ public class FFMPResource extends
}
}
@Override
public DataTime[] getDataTimes() {
List<Date> dates = getTimeOrderedKeys();
DataTime[] dataTimes = new DataTime[dates.size()];
for (int i = 0; i < dataTimes.length; i += 1) {
dataTimes[i] = new DataTime(dates.get(i));
}
return dataTimes;
}
}