Fix FullRangeHistogram initialization glitch

diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/FullTraceHistogram.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/FullTraceHistogram.java
index 9cebbd4bbd3e254aa32c76ec11d25ebbb8baedcc..171e4c945b04a0af5fea4f1b0b4a8bf7a44e5d9e 100644 (file)
--- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/FullTraceHistogram.java
+++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/FullTraceHistogram.java
@@ -67,10 +67,13 @@ public class FullTraceHistogram extends Histogram implements MouseMoveListener {
     // Operations
     // ------------------------------------------------------------------------
 
+    public void setFullRange(long startTime, long endTime) {
+        fZoom.setFullRange(startTime, endTime);
+    }
+
     public void setTimeRange(long startTime, long duration) {
         fRangeStartTime = startTime;
         fRangeDuration = duration;
-        fZoom.setFullRange(getStartTime(), getEndTime());
         fZoom.setNewRange(fRangeStartTime, fRangeDuration);
         refresh();
     }

diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/HistogramView.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/HistogramView.java
index 9bbb86f3484ed52c8fb220ebe53012db3bfeb627..769680b1cd010572701bc1a2a48421881a90db73 100644 (file)
--- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/HistogramView.java
+++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/histogram/HistogramView.java
@@ -101,9 +101,10 @@ public class HistogramView extends TmfView {
         super(ID);
     }
 
+    @Override
     public void dispose() {
-       fFullTraceHistogram.dispose();
-       fTimeRangeHistogram.dispose();
+        fFullTraceHistogram.dispose();
+        fTimeRangeHistogram.dispose();
     }
 
     // ------------------------------------------------------------------------
@@ -275,7 +276,7 @@ public class HistogramView extends TmfView {
             // Build the new time range; keep the current time
             TmfTimeRange timeRange = new TmfTimeRange(new TmfTimestamp(startTime, TIME_SCALE), new TmfTimestamp(endTime, TIME_SCALE));
             TmfTimestamp currentTime = new TmfTimestamp(fCurrentTimestamp, TIME_SCALE);
-            
+
             fTimeSpanControl.setValue(endTime - startTime);
 
             // Send the FW signal
@@ -286,24 +287,24 @@ public class HistogramView extends TmfView {
 
     public synchronized void updateTimeRange(long newDuration) {
         if (fCurrentExperiment != null) {
-               long delta = newDuration - fWindowSpan;
-               long newStartTime = fWindowStartTime + delta / 2;
-               setNewRange(newStartTime, newDuration);
+            long delta = newDuration - fWindowSpan;
+            long newStartTime = fWindowStartTime + delta / 2;
+            setNewRange(newStartTime, newDuration);
         }
     }
 
     private void setNewRange(long startTime, long duration) {
         if (startTime < fExperimentStartTime)
-               startTime = fExperimentStartTime;
+            startTime = fExperimentStartTime;
 
         long endTime = startTime + duration;
         if (endTime > fExperimentEndTime) {
-               endTime = fExperimentEndTime;
-               if (endTime - duration > fExperimentStartTime)
-                       startTime = endTime - duration;
-               else {
-                       startTime = fExperimentStartTime;
-               }
+            endTime = fExperimentEndTime;
+            if (endTime - duration > fExperimentStartTime)
+                startTime = endTime - duration;
+            else {
+                startTime = fExperimentStartTime;
+            }
         }
         updateTimeRange(startTime, endTime);
     }
@@ -380,16 +381,17 @@ public class HistogramView extends TmfView {
         fTimeRangeHistogram.setTimeRange(fExperimentStartTime, INITIAL_WINDOW_SPAN);
         fTimeRangeHistogram.setCurrentEvent(fExperimentStartTime);
 
+        fFullTraceHistogram.setFullRange(fExperimentStartTime, fExperimentEndTime);
         fFullTraceHistogram.setTimeRange(fExperimentStartTime, INITIAL_WINDOW_SPAN);
         fFullTraceHistogram.setCurrentEvent(fExperimentStartTime);
 
         fWindowStartTime = fExperimentStartTime;
         fWindowSpan = INITIAL_WINDOW_SPAN;
         fWindowEndTime = fWindowStartTime + fWindowSpan;
-        
+
         fCurrentEventTimeControl.setValue(fExperimentStartTime);
         fTimeSpanControl.setValue(fWindowSpan);
-        
+
         sendTimeRangeRequest(fExperimentStartTime, fExperimentStartTime + fWindowSpan);
         sendFullRangeRequest();
     }