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

Issue #449. Fixed problem with simulated time for trend plots in FSS

Browse source 
monitors.

Former-commit-id: f02da69ff5 [formerly 79b81f2a734142d212d7bc0ad3686c7b64f433c5]
Former-commit-id: 8d29726365
This commit is contained in:
Slav Korolev 2012-04-09 14:50:19 -04:00
parent 21ff4bf657
commit bf5cf6a903
3 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/trendplot/TrendPlotCanvas.java
View file

@ -46,6 +46,7 @@ import com.raytheon.uf.common.monitor.data.CommonConfig.AppName;
import com.raytheon.uf.common.monitor.data.ObConst; import com.raytheon.uf.common.monitor.data.ObConst;
import com.raytheon.uf.viz.monitor.data.ObMultiHrsReports; import com.raytheon.uf.viz.monitor.data.ObMultiHrsReports;
import com.raytheon.uf.viz.monitor.data.ObTrendDataSet; import com.raytheon.uf.viz.monitor.data.ObTrendDataSet;
import com.raytheon.uf.viz.monitor.util.ObUtil;
/** /**
* The Trend Canvas * The Trend Canvas
@ -75,7 +76,7 @@ public class TrendPlotCanvas {
private Canvas canvas; private Canvas canvas;
Calendar curdate; private Calendar curdate;
private SortedMap<Date, Float> trendData; private SortedMap<Date, Float> trendData;
@ -200,7 +201,8 @@ public class TrendPlotCanvas {
if (!Float.isNaN(thresholds[1])) { if (!Float.isNaN(thresholds[1])) {
yellowThreshold = thresholds[1]; yellowThreshold = thresholds[1];
} }
curdate = Calendar.getInstance(); curdate = ObUtil.getTimeNow(); // Calendar.getInstance();
if (trendDataSet.getYAxisMinMaxIncrement() != null) { if (trendDataSet.getYAxisMinMaxIncrement() != null) {
float[] minMaxIncr = trendDataSet.getYAxisMinMaxIncrement(); float[] minMaxIncr = trendDataSet.getYAxisMinMaxIncrement();
if (!Float.isNaN(minMaxIncr[0])) { if (!Float.isNaN(minMaxIncr[0])) {

3
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/ZoneTableDlg.java
View file

@ -68,6 +68,7 @@ import com.raytheon.uf.viz.monitor.listeners.IMonitorListener;
import com.raytheon.uf.viz.monitor.trendplot.TrendPlotDlg; import com.raytheon.uf.viz.monitor.trendplot.TrendPlotDlg;
import com.raytheon.uf.viz.monitor.util.MonitorConfigConstants; import com.raytheon.uf.viz.monitor.util.MonitorConfigConstants;
import com.raytheon.viz.ui.EditorUtil; import com.raytheon.viz.ui.EditorUtil;
import com.raytheon.uf.viz.monitor.util.ObUtil;
/** /**
* Abstrct Zone table dialog that is the foundation for all Zone dialogs. * Abstrct Zone table dialog that is the foundation for all Zone dialogs.
@ -760,7 +761,7 @@ public abstract class ZoneTableDlg extends Dialog implements IMonitorListener,
HodographDlg hodographDlg = new HodographDlg(shell, HodographDlg hodographDlg = new HodographDlg(shell,
varName.name(), station, "METAR"); varName.name(), station, "METAR");
hodographDlg.setCurrentTime(Calendar.getInstance()); hodographDlg.setCurrentTime(ObUtil.getTimeNow()); //Calendar.getInstance());
if (thresholds[0] == Float.NaN || thresholds[1] == Float.NaN if (thresholds[0] == Float.NaN || thresholds[1] == Float.NaN
|| thresholds[2] == Float.NaN || thresholds[2] == Float.NaN
|| thresholds[3] == Float.NaN) { || thresholds[3] == Float.NaN) {

13
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/util/ObUtil.java
View file

@ -82,6 +82,19 @@ public final class ObUtil {
dropTime.add(Calendar.HOUR, -(ObConst.THREAT_INTERVAL_HOURS)); dropTime.add(Calendar.HOUR, -(ObConst.THREAT_INTERVAL_HOURS));
return dropTime.getTime(); return dropTime.getTime();
} }
/**
* Method that gets the current time.
*
* @return current time.
*/
public static Calendar getTimeNow() {
Date now = SimulatedTime.getSystemTime().getTime();
Calendar nowTime = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
nowTime.setTime(now);
return nowTime;
}
/** /**
* Checks for the existence of a localization-created flag file which * Checks for the existence of a localization-created flag file which