ASM #507 - Fix incorrect FFMP gap calculation

Change-Id: Iecfdcaa07aca79b0e17396a794851cec0e6cba25

Former-commit-id: 74dc7a5d7c [formerly 9b33d5187b4535d5500762e15e35e89ccbf5f5da]
Former-commit-id: 090ed29386
This commit is contained in:
Gang.Zhang 2014-05-01 15:44:44 +01:00
parent 6282dd45cb
commit 7c7adbd77d

View file

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