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

Merge "Issue #1484 - Fix for half timestep changes for 3 hours or less duration. Peer Review comments." into 13.2.1_delivery

Browse source 
Former-commit-id: b945ce9e6e [formerly 619349b140 [formerly ef3d4c5b19c6482ec2ac2d38f90d975b7df1e295]]
Former-commit-id: 619349b140
Former-commit-id: aecd00423a
This commit is contained in:
Lee Venable 2013-01-22 16:26:48 -06:00 • committed by Gerrit Code Review
commit f5ac31bcde
2 changed files with 49 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
cave/com.raytheon.uf.viz.stats/src/com/raytheon/uf/viz/stats/ui/StatsDisplayCanvas.java
View file

@ -61,17 +61,17 @@ import com.raytheon.uf.viz.stats.display.ScaleManager;
/**
* Statistics graph canvas.
*
*
* <pre>
*
*
* SOFTWARE HISTORY
*
*
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Oct 3, 2012 728 mpduff Initial creation
*
*
* </pre>
*
*
* @author mpduff
* @version 1.0
*/
@ -199,7 +199,7 @@ public class StatsDisplayCanvas extends Canvas {
/**
* Constructor
*
*
* @param parent
* Parent composite
* @param callback
@ -262,7 +262,7 @@ public class StatsDisplayCanvas extends Canvas {
/**
* Initialize drawing settings.
*
*
* @param gc
* The Graphics Context
*/
@ -280,7 +280,7 @@ public class StatsDisplayCanvas extends Canvas {
/**
* Draw on the canvas.
*
*
* @param gc
* The Graphics Context
*/
@ -327,7 +327,7 @@ public class StatsDisplayCanvas extends Canvas {
/**
* Draw the X axis.
*
*
* @param gc
* The Graphics Context
*/
@ -364,7 +364,8 @@ public class StatsDisplayCanvas extends Canvas {
GRAPH_BORDER + GRAPH_HEIGHT,
(int) (GRAPH_BORDER + (i - startMillis) / millisPerPixelX),
GRAPH_BORDER + GRAPH_HEIGHT + height };
if (cal.get(Calendar.HOUR_OF_DAY) == 0) {
if (cal.get(Calendar.HOUR_OF_DAY) == 0
&& cal.get(Calendar.MINUTE) == 0) {
gc.setLineWidth(3);
} else {
gc.setLineWidth(1);
@ -406,9 +407,12 @@ public class StatsDisplayCanvas extends Canvas {
buffer.setLength(0); // Clear the buffer
int y = GRAPH_BORDER + GRAPH_HEIGHT + 20;
int hr = cal.get(Calendar.HOUR_OF_DAY);
int minute = cal.get(Calendar.MINUTE);
if ((numHours <= 24) || (hour % 6 == 0 && numHours <= 168)) {
if (numHours <= 3) {
for (int j = 0; j < 60; j += 15) {
for (int j = 0; j < TimeUtil.MINUTES_PER_HOUR; j += 15) {
buffer.setLength(0);
int x = (int) (GRAPH_BORDER + (i - startMillis + j
* TimeUtil.MILLIS_PER_MINUTE)
@ -417,11 +421,12 @@ public class StatsDisplayCanvas extends Canvas {
|| (numHours == 3 && (j == 0 || j == 30))) {
String hrStr = (hr < 10) ? ZERO.concat(String
.valueOf(hr)) : String.valueOf(hr);
if (j == 0) {
if (minute == 0) {
buffer.append(hrStr).append(COLON)
.append(MINUTE_00);
} else {
buffer.append(hrStr).append(COLON).append(j);
buffer.append(hrStr).append(COLON)
.append(minute);
}
int adjustment = buffer.length() * fontAveWidth / 2
- 1;
@ -437,9 +442,24 @@ public class StatsDisplayCanvas extends Canvas {
* j)
/ millisPerPixelX),
GRAPH_BORDER };
if (hr == 0 && minute == 0) {
gc.setLineWidth(3);
}
gc.drawPolyline(gridLineArray);
gc.setLineWidth(1);
}
minute += 15;
// Roll the minutes and hours, account for rolling
// to the next hour/minute
if (minute >= TimeUtil.MINUTES_PER_HOUR) {
minute = 0;
hr++;
if (hr == TimeUtil.HOURS_PER_DAY) {
hr = 0;
}
}
}
int[] minorTickArray = {
(int) (GRAPH_BORDER + (i - startMillis + TimeUtil.MILLIS_PER_MINUTE
* j)
@ -462,7 +482,7 @@ public class StatsDisplayCanvas extends Canvas {
if (callback.drawGridLines()) {
if ((numHours == 24 && hr % 6 == 0)
|| (numHours == 168 && hr == 0)) {
|| (numHours == TimeUtil.HOURS_PER_WEEK && hr == 0)) {
int[] gridLineArray = {
(int) (GRAPH_BORDER + (i - startMillis)
@ -556,7 +576,7 @@ public class StatsDisplayCanvas extends Canvas {
/**
* Draw the Y axis.
*
*
* @param gc
* The Graphics Context
*/
@ -607,7 +627,7 @@ public class StatsDisplayCanvas extends Canvas {
/**
* Draw the YAxis label.
*
*
* @param gc
* The Graphics Context
*/
@ -639,7 +659,7 @@ public class StatsDisplayCanvas extends Canvas {
/**
* Draw the data on the canvas.
*
*
* @param gc
* The Graphics Context
*/
@ -727,7 +747,7 @@ public class StatsDisplayCanvas extends Canvas {
/**
* Y Value to pixel conversion.
*
*
* @param yMin
* The smallest y value
* @param yMax
@ -744,7 +764,7 @@ public class StatsDisplayCanvas extends Canvas {
/**
* Mouse move event hanler.
*
*
* @param e
* MouseEvent object
*/
@ -792,7 +812,7 @@ public class StatsDisplayCanvas extends Canvas {
/**
* Show the "tooltip" mouseover.
*
*
* @param parent
* @param x
* @param y
@ -824,7 +844,7 @@ public class StatsDisplayCanvas extends Canvas {
/*
* (non-Javadoc)
*
*
* @see org.eclipse.swt.widgets.Widget#dispose()
*/
@Override
@ -837,7 +857,7 @@ public class StatsDisplayCanvas extends Canvas {
/**
* Set the graph data.
*
*
* @param graphData
* The GraphData object
*/
@ -847,7 +867,9 @@ public class StatsDisplayCanvas extends Canvas {
/**
* Set the view type.
* @param view The view type
*
* @param view
* The view type
*/
public void setView(String view) {
this.view = view;

4
edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/TimeUtil.java
View file

@ -44,6 +44,7 @@ import com.raytheon.uf.common.time.domain.api.ITimePoint;
* Nov 09, 2012 1322 djohnson Add SECONDS_PER_MINUTE.
* Nov 21, 2012 728 mpduff Added MILLIS_PER_MONTH.
* Jan 07, 2013 1451 djohnson Add newGmtCalendar() and time constants.
* Jan 22, 2013 1484 mpduff Add HOURS_PER_WEEK.
*
* </pre>
*
@ -67,6 +68,7 @@ public class TimeUtil {
private static class NullClock extends AbstractTimer {
private static final ITimePoint CONSTANT_TIME = TimePoints
.fromMillis(1L);
@Override
protected ITimePoint getCurrentTime() {
return CONSTANT_TIME;
@ -97,6 +99,8 @@ public class TimeUtil {
private static final int DAYS_PER_WEEK = 7;
public static final int HOURS_PER_WEEK = HOURS_PER_DAY * DAYS_PER_WEEK;
// Util.java has a few of these constants, but that is located in an EDEX
// plugin and this is a more appropriate place for them anyways
public static final long MILLIS_PER_SECOND = 1000;