Fix mouse wheel zoom in time range histogram

Change-Id: I4739526671a7835fdb420313bbdb9f8e81e79b5f
Reviewed-on: https://git.eclipse.org/r/9026
Reviewed-by: Bernd Hufmann <bhufmann@gmail.com>
IP-Clean: Bernd Hufmann <bhufmann@gmail.com>
Tested-by: Bernd Hufmann <bhufmann@gmail.com>
Tested-by: Hudson CI

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 d905d2d95f18fb9f9082882f8823a01e02bf227d..617d2d0434fa64a5b55d99b5d74a0f36d230a95c 100644 (file)
--- 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 b79fbaffb4d6eab1b2f6f90e80ddb43ce45f4bfe..cb1e2c9c3f87a2927dbfc3ef7aac0277c8026103 100644 (file)
--- 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);
+        }
     }
 
     /**