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

Merge "ASM #507 - Fix incorrect FFMP gap calculation" into asm_14.3.1

Browse source 
Former-commit-id: ef1c0313455700304e9dc8e130f2b8658fdd1ed7
This commit is contained in:
Matthew Howard 2014-05-01 16:07:11 -05:00 • committed by Gerrit Code Review
commit 55b1198186
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -176,6 +176,7 @@ import com.vividsolutions.jts.geom.Point;
* Jan 21, 2014 DR 15874 gzhang Use getValue() for QPFSCAN independent. * Jan 21, 2014 DR 15874 gzhang Use getValue() for QPFSCAN independent.
* Feb 19, 2014 2819 randerso Removed unnecessary .clone() call * Feb 19, 2014 2819 randerso Removed unnecessary .clone() call
* Mar 3, 2014 2804 mschenke Set back up clipping pane * Mar 3, 2014 2804 mschenke Set back up clipping pane
* Apr 30, 2014 DR 16148 gzhang Filter Basin Dates for Trend and Table Gap.
* </pre> * </pre>
* *
* @author dhladky * @author dhladky
@ -3102,6 +3103,9 @@ public class FFMPResource extends
boolean guid = false; boolean guid = false;
Date oldestRefTime = getOldestTime(); Date oldestRefTime = getOldestTime();
Date mostRecentRefTime = getPaintTime().getRefTime(); Date mostRecentRefTime = getPaintTime().getRefTime();
Date barrierTime = getTableTime();// DR 16148
Date minUriTime = getTimeOrderedKeys().get(0);// DR 16148
// grabs the basins we need // grabs the basins we need
try { try {
@ -3114,7 +3118,10 @@ public class FFMPResource extends
if (rateBasin != null) { if (rateBasin != null) {
for (Date date : rateBasin.getValues().keySet()) { for (Date date : rateBasin.getValues().keySet()) {
if (date.before(minUriTime) || date.before(barrierTime) || date.after(mostRecentRefTime))
continue;// DR 16148
double dtime = FFMPGuiUtils.getTimeDiff(mostRecentRefTime, double dtime = FFMPGuiUtils.getTimeDiff(mostRecentRefTime,
date); date);
fgd.setRate(dtime, (double) rateBasin.getValue(date)); fgd.setRate(dtime, (double) rateBasin.getValue(date));
@ -3139,6 +3146,9 @@ public class FFMPResource extends
if (qpeBasin != null) { if (qpeBasin != null) {
for (Date date : qpeBasin.getValues().keySet()) { for (Date date : qpeBasin.getValues().keySet()) {
if (date.before(minUriTime) || date.before(barrierTime) || date.after(mostRecentRefTime))
continue;// DR 16148
double dtime = FFMPGuiUtils.getTimeDiff(mostRecentRefTime, double dtime = FFMPGuiUtils.getTimeDiff(mostRecentRefTime,
date); date);