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

Issue #2016 - fix TS Trace toggle

Browse source 
Change-Id: I740c75861ac81daaac69a0c70ff050079d3bbaf4

Former-commit-id: 0babd4d9b4 [formerly 51de726e49] [formerly afbe294f4a] [formerly 5919687484 [formerly afbe294f4a [formerly f51f36cfc63a8e75f8a72bb202d1389594865466]]]
Former-commit-id: 5919687484
Former-commit-id: 22647bf8f0aa609c257a8ef84d9b763053337b5e [formerly 66f4e6fe87]
Former-commit-id: d9fd9d297b
This commit is contained in:
Mike Duff 2013-05-29 09:15:46 -05:00
parent 8c756705c5
commit d292cfcca0
1 changed files with 29 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayCanvas.java
View file

@ -137,7 +137,8 @@ import com.raytheon.viz.hydrocommon.util.DbUtils;
* 09 Jan 2012 15493 lbousaidi added code to delete data while zooming when you draw a box
* 16 Jan 2013 15695 wkwock Fix popup menu
* 24 Apr 2013 1921 mpduff Fix zoom reset to only reset the "active" graph
* 06 May 2013 1976 mpduff Refactored Hydro time series data access.
* 06 May 2013 1976 mpduff Refactored Hydro time series data access.
* 29 May 2013 2016 mpduff Fix TS Toggle Traces.
* @author lvenable
* @version 1.0
*
@ -2545,41 +2546,36 @@ public class TimeSeriesDisplayCanvas extends TimeSeriesGraphCanvas implements
}
if (basisTime.getTime() != prevBasisTime.getTime()) {
if (!this.latestFcstFlag) {
if (ntraces < MAX_FCST_TRACES) {
traceData.setXmin(beginDate);
traceData.setXmax(endDate);
n = 0; /* Reset npts in new forecast trace */
traceData.setBasistime(prevBasisTime);
ntraces++;
traceData.setTsData(points
.toArray(new TimeSeriesPoint[points
.size()]));
points = new ArrayList<TimeSeriesPoint>();
if (ntraces < MAX_FCST_TRACES) {
traceData.setXmin(beginDate);
traceData.setXmax(endDate);
n = 0; /* Reset npts in new forecast trace */
traceData.setBasistime(prevBasisTime);
ntraces++;
traceData.setTsData(points
.toArray(new TimeSeriesPoint[points
.size()]));
points = new ArrayList<TimeSeriesPoint>();
if (ntraces >= 1) {
traceDataList.add(traceData);
}
traceData = new TraceData();
traceData.setForecast(true);
traceData.setDur(dur);
traceData.setExtremum(extremum);
traceData.setLid(lid);
traceData.setPe(pe);
traceData.setTs(ts);
traceData.setName(name);
traceData.setBasistime(basisTime);
traceData.setProductTime(productTime);
traceData.setTraceOn(!this.latestFcstFlag);
} else {
/*
* reached max fcst traces, break out of
* loop
*/
break;
if (ntraces >= 1) {
traceDataList.add(traceData);
}
traceData = new TraceData();
traceData.setForecast(true);
traceData.setDur(dur);
traceData.setExtremum(extremum);
traceData.setLid(lid);
traceData.setPe(pe);
traceData.setTs(ts);
traceData.setName(name);
traceData.setBasistime(basisTime);
traceData.setProductTime(productTime);
traceData.setTraceOn(!this.latestFcstFlag);
} else {
/*
* reached max fcst traces, break out of loop
*/
break;
}
}