tmf.ui: hide title and legend in swtcharts by default

[deliverable/tracecompass.git] / tmf / org.eclipse.tracecompass.tmf.ui / src / org / eclipse / tracecompass / tmf / ui / viewers / xycharts / linecharts / TmfCommonXLineChartViewer.java

diff --git a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/viewers/xycharts/linecharts/TmfCommonXLineChartViewer.java b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/viewers/xycharts/linecharts/TmfCommonXLineChartViewer.java
index d8751fa55df4b25a377f0fa7d73f7796cdf26c62..72a89a297d2beeb6543b6e32bdfe940cb68bb909 100644 (file)
--- a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/viewers/xycharts/linecharts/TmfCommonXLineChartViewer.java
+++ b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/viewers/xycharts/linecharts/TmfCommonXLineChartViewer.java
@@ -80,7 +80,9 @@ public abstract class TmfCommonXLineChartViewer extends TmfXYChartViewer {
      */
     public TmfCommonXLineChartViewer(Composite parent, String title, String xLabel, String yLabel) {
         super(parent, title, xLabel, yLabel);
-
+        getSwtChart().getTitle().setVisible(false);
+        getSwtChart().getLegend().setPosition(SWT.BOTTOM);
+        getSwtChart().getAxisSet().getXAxes()[0].getTitle().setVisible(false);
         setResolution(RESOLUTION);
         setTooltipProvider(new TmfCommonXLineChartTooltipProvider(this));
     }
@@ -108,19 +110,22 @@ public abstract class TmfCommonXLineChartViewer extends TmfXYChartViewer {
     protected void reinitialize() {
         fSeriesValues.clear();
         Thread thread = new Thread() {
+            // Don't use TmfUiRefreshHandler (bug 467751)
             @Override
             public void run() {
                 initializeDataSource();
-                getDisplay().asyncExec(new Runnable() {
-                    @Override
-                    public void run() {
-                        if (!getSwtChart().isDisposed()) {
-                            /* Delete the old series */
-                            clearContent();
-                            createSeries();
+                if (!getSwtChart().isDisposed()) {
+                    getDisplay().asyncExec(new Runnable() {
+                        @Override
+                        public void run() {
+                            if (!getSwtChart().isDisposed()) {
+                                /* Delete the old series */
+                                clearContent();
+                                createSeries();
+                            }
                         }
-                    }
-                });
+                    });
+                }
             }
         };
         thread.start();
@@ -147,7 +152,12 @@ public abstract class TmfCommonXLineChartViewer extends TmfXYChartViewer {
 
         @Override
         public void run() {
-            updateData(getWindowStartTime(), getWindowEndTime(), fNumRequests, fMonitor);
+            Display.getDefault().syncExec(new Runnable() {
+                @Override
+                public void run() {
+                    updateData(getWindowStartTime(), getWindowEndTime(), fNumRequests, fMonitor);
+                }
+            });
             updateThreadFinished(this);
         }
 
@@ -158,9 +168,11 @@ public abstract class TmfCommonXLineChartViewer extends TmfXYChartViewer {
 
     private synchronized void newUpdateThread() {
         cancelUpdate();
-        final int numRequests = (int) (getSwtChart().getPlotArea().getBounds().width * fResolution);
-        fUpdateThread = new UpdateThread(numRequests);
-        fUpdateThread.start();
+        if (!getSwtChart().isDisposed()) {
+            final int numRequests = (int) (getSwtChart().getPlotArea().getBounds().width * fResolution);
+            fUpdateThread = new UpdateThread(numRequests);
+            fUpdateThread.start();
+        }
     }
 
     private synchronized void updateThreadFinished(UpdateThread thread) {
@@ -193,8 +205,9 @@ public abstract class TmfCommonXLineChartViewer extends TmfXYChartViewer {
 
     /**
      * Convenience method to compute the values of the X axis for a given time
-     * range. This method will return nb values depending, equally separated
-     * from start to end.
+     * range. This method will return at most nb values, equally separated from
+     * start to end. The step between values will be at least 1.0, so the number
+     * of values returned can be lower than nb.
      *
      * The returned time values are in internal time, ie to get trace time, the
      * time offset needs to be added to those values.
@@ -204,17 +217,23 @@ public abstract class TmfCommonXLineChartViewer extends TmfXYChartViewer {
      * @param end
      *            End time of the range
      * @param nb
-     *            The number of steps in the x axis.
+     *            The maximum number of steps in the x axis.
      * @return The time values (converted to double) to match every step.
      */
     protected static final double[] getXAxis(long start, long end, int nb) {
-
-        double timestamps[] = new double[nb];
         long steps = (end - start);
-        double step = steps / (double) nb;
+        int nbVals = nb;
+        if (steps < nb) {
+            nbVals = (int) steps;
+            if (nbVals <= 0) {
+                nbVals = 1;
+            }
+        }
+        double step = steps / (double) nbVals;
 
+        double timestamps[] = new double[nbVals];
         double curTime = 1;
-        for (int i = 0; i < nb; i++) {
+        for (int i = 0; i < nbVals; i++) {
             timestamps[i] = curTime;
             curTime += step;
         }
@@ -353,15 +372,14 @@ public abstract class TmfCommonXLineChartViewer extends TmfXYChartViewer {
                     int lastX = xValues.length - 1;
                     double end = (start == xValues[lastX]) ? start + 1 : xValues[lastX];
                     getSwtChart().getAxisSet().getXAxis(0).setRange(new Range(start, end));
-                    getSwtChart().getAxisSet().getXAxis(0).adjustRange();
                     if (maxy > miny) {
                         getSwtChart().getAxisSet().getYAxis(0).setRange(new Range(miny, maxy));
                     }
                     getSwtChart().redraw();
 
                     if (isSendTimeAlignSignals()) {
-                        // The width of the chart might have changed and its time
-                        // axis might be misaligned with the other views
+                        // The width of the chart might have changed and its
+                        // time axis might be misaligned with the other views
                         Point viewPos = TmfCommonXLineChartViewer.this.getParent().getParent().toDisplay(0, 0);
                         int axisPos = getSwtChart().toDisplay(0, 0).x + getPointAreaOffset();
                         int timeAxisOffset = axisPos - viewPos.x;