From 0a36669c0caec19dcabb2d853af978e3a043f636 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Genevi=C3=A8ve=20Bastien?= Date: Fri, 6 Jun 2014 14:38:43 -0400 Subject: [PATCH] TMF: Bug 436877: Set initial range in XY chart to the current range MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Instead of using the trace's initial range, which may not correspond to the currently visible range if the trace was already opened. Change-Id: Iad5c8e7a579223d4c2c7d98d56c8ae7fb81c5743 Signed-off-by: Geneviève Bastien Reviewed-on: https://git.eclipse.org/r/28154 Tested-by: Hudson CI Reviewed-by: Matthew Khouzam --- .../eclipse/linuxtools/tmf/ui/viewers/TmfTimeViewer.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/TmfTimeViewer.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/TmfTimeViewer.java index 0de95d5ee1..63915c89ba 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/TmfTimeViewer.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/TmfTimeViewer.java @@ -274,7 +274,10 @@ public abstract class TmfTimeViewer extends TmfViewer implements ITmfTimeProvide fTrace = trace; long timestamp = TmfTraceManager.getInstance().getSelectionBeginTime().normalize(0, ITmfTimestamp.NANOSECOND_SCALE).getValue(); - long windowStartTime = TmfTraceManager.getInstance().getCurrentRange().getStartTime().normalize(0, ITmfTimestamp.NANOSECOND_SCALE).getValue(); + TmfTimeRange currentRange = TmfTraceManager.getInstance().getCurrentRange(); + long windowStartTime = currentRange.getStartTime().normalize(0, ITmfTimestamp.NANOSECOND_SCALE).getValue(); + long windowEndTime = currentRange.getEndTime().normalize(0, ITmfTimestamp.NANOSECOND_SCALE).getValue(); + long windowDuration = windowEndTime - windowStartTime; long startTime = fTrace.getStartTime().normalize(0, ITmfTimestamp.NANOSECOND_SCALE).getValue(); long endTime = fTrace.getEndTime().normalize(0, ITmfTimestamp.NANOSECOND_SCALE).getValue(); @@ -282,9 +285,9 @@ public abstract class TmfTimeViewer extends TmfViewer implements ITmfTimeProvide setSelectionEndTime(timestamp); setStartTime(startTime); setWindowStartTime(windowStartTime); - setWindowDuration(fTrace.getInitialRangeOffset().getValue()); + setWindowEndTime(windowEndTime); + setWindowDuration(windowDuration); setEndTime(endTime); - setWindowEndTime(windowStartTime + getWindowDuration()); } /** -- 2.34.1