From 4d17e05653a666d122c7d49b771b5adc2a3d9312 Mon Sep 17 00:00:00 2001 From: Mike Duff Date: Thu, 24 Jan 2013 11:37:23 -0600 Subject: [PATCH] Issue #1357 - fix for data plotting in the x direction. Former-commit-id: b283362a2fd9f4be6b5df477e05be5c3b92c8b60 [formerly da22ae4a5f0f3b8e4482d9937968c588cbc689e7 [formerly 862ca86596fb59ce5c0b6cbcce320303f6cda3b3]] Former-commit-id: da22ae4a5f0f3b8e4482d9937968c588cbc689e7 Former-commit-id: d4d80b02065a4ad185d8ec2aeb3bc8f2dccb04e4 --- .../com/raytheon/uf/viz/stats/ui/StatsDisplayCanvas.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/cave/com.raytheon.uf.viz.stats/src/com/raytheon/uf/viz/stats/ui/StatsDisplayCanvas.java b/cave/com.raytheon.uf.viz.stats/src/com/raytheon/uf/viz/stats/ui/StatsDisplayCanvas.java index bb343de1d6..20bb6fa534 100644 --- a/cave/com.raytheon.uf.viz.stats/src/com/raytheon/uf/viz/stats/ui/StatsDisplayCanvas.java +++ b/cave/com.raytheon.uf.viz.stats/src/com/raytheon/uf/viz/stats/ui/StatsDisplayCanvas.java @@ -81,12 +81,8 @@ import com.raytheon.uf.viz.stats.display.ScaleManager; * * Date Ticket# Engineer Description * ------------ ---------- ----------- -------------------------- - * <<<<<<< HEAD - * Oct 3, 2012 728 mpduff Initial creation - * ======= * Oct 03, 2012 728 mpduff Initial creation. * Jan 17, 2013 1357 mpduff Added mouse listeners. - * >>>>>>> Issue #1357 - Remaining stats items implemented. * * * @@ -752,8 +748,7 @@ public class StatsDisplayCanvas extends Canvas { long diff = x - startMillis; if (diff == 0) { - xPix = Math - .round((x / millisPerPixelX + GRAPH_BORDER)); + xPix = GRAPH_BORDER; } else { xPix = Math .round((diff / millisPerPixelX + GRAPH_BORDER));