From 15844a4e331135e0b707cfeab22c289898b65615 Mon Sep 17 00:00:00 2001 From: Patrick Tasse Date: Wed, 5 Dec 2012 11:17:09 -0500 Subject: [PATCH] Fix mouse wheel zoom in time range histogram Change-Id: I4739526671a7835fdb420313bbdb9f8e81e79b5f Reviewed-on: https://git.eclipse.org/r/9026 Reviewed-by: Bernd Hufmann IP-Clean: Bernd Hufmann Tested-by: Bernd Hufmann Tested-by: Hudson CI --- .../tmf/ui/views/histogram/HistogramView.java | 14 ++------------ .../tmf/ui/views/histogram/TimeRangeHistogram.java | 4 +++- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/HistogramView.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/HistogramView.java index d905d2d95f..617d2d0434 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/HistogramView.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/HistogramView.java @@ -446,7 +446,6 @@ public class HistogramView extends TmfView { return; } - boolean drawTimeRangeHistogram = fTraceStartTime == 0; TmfTimeRange fullRange = signal.getRange(); fTraceStartTime = fullRange.getStartTime().normalize(0, ITmfTimestamp.NANOSECOND_SCALE).getValue(); @@ -455,17 +454,6 @@ public class HistogramView extends TmfView { fFullTraceHistogram.setFullRange(fTraceStartTime, fTraceEndTime); fTimeRangeHistogram.setFullRange(fTraceStartTime, fTraceEndTime); - if (drawTimeRangeHistogram) { - long startTime = fTrace.getCurrentRange().getStartTime().normalize(0, ITmfTimestamp.NANOSECOND_SCALE).getValue(); - long duration = fTrace.getCurrentRange().getEndTime().normalize(0, ITmfTimestamp.NANOSECOND_SCALE).getValue() - startTime; - fCurrentTimestamp = fTrace.getCurrentTime().normalize(0, ITmfTimestamp.NANOSECOND_SCALE).getValue(); - fCurrentEventTimeControl.setValue(fCurrentTimestamp); - fTimeSpanControl.setValue(duration); - fFullTraceHistogram.setTimeRange(startTime, duration); - fTimeRangeHistogram.setTimeRange(startTime, duration); - sendTimeRangeRequest(startTime, startTime + duration); - } - sendFullRangeRequest(fullRange); } @@ -487,6 +475,7 @@ public class HistogramView extends TmfView { fTimeRangeHistogram.setFullRange(fTraceStartTime, fTraceEndTime); fFullTraceHistogram.setTimeRange(fTimeRangeHistogram.getStartTime(), fWindowSpan); + fTimeRangeHistogram.setTimeRange(fTimeRangeHistogram.getStartTime(), fWindowSpan); if ((fFullTraceRequest != null) && fFullTraceRequest.getRange().getEndTime().compareTo(signal.getRange().getEndTime()) < 0) { sendFullRangeRequest(fullRange); @@ -605,6 +594,7 @@ public class HistogramView extends TmfView { TmfTimeRange timeRange = new TmfTimeRange(startTS, endTS); fTimeRangeHistogram.clear(); + fTimeRangeHistogram.setFullRange(fTraceStartTime, fTraceEndTime); fTimeRangeHistogram.setTimeRange(startTime, endTime - startTime); int cacheSize = fTrace.getCacheSize(); diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/TimeRangeHistogram.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/TimeRangeHistogram.java index b79fbaffb4..cb1e2c9c3f 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/TimeRangeHistogram.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/histogram/TimeRangeHistogram.java @@ -82,7 +82,9 @@ public class TimeRangeHistogram extends Histogram { */ public synchronized void setTimeRange(long startTime, long duration) { fZoom.setNewRange(startTime, duration); - getDataModel().setTimeRange(startTime, startTime + duration); + if (getDataModel().getNbEvents() == 0) { + getDataModel().setTimeRange(startTime, startTime + duration); + } } /** -- 2.34.1