tmf.ui: Bug 469644: Clear axises of chart when trace is closed

It should be investigated if people would rather have NO axises
when they are cleared.

Change-Id: I566ba5abe15ad9cc5f7f2df5ed7ed74589e1cebb
Signed-off-by: Matthew Khouzam <matthew.khouzam@ericsson.com>
Reviewed-on: https://git.eclipse.org/r/49049
Reviewed-by: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>
Tested-by: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>

diff --git a/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/viewers/xycharts/TmfXYChartViewer.java b/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/viewers/xycharts/TmfXYChartViewer.java
index 6b2ca15d0e1b6f1b81c6f6d638d2595830cb00e0..605ae7b5fe91d8c8f9b9e96d316f6eec1ff544ad 100644 (file)
--- a/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/viewers/xycharts/TmfXYChartViewer.java
+++ b/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/viewers/xycharts/TmfXYChartViewer.java
@@ -29,6 +29,7 @@ import org.swtchart.Chart;
 import org.swtchart.IAxis;
 import org.swtchart.ISeries;
 import org.swtchart.ISeriesSet;
+import org.swtchart.Range;
 
 /**
  * Base class for a XY-Chart based on SWT chart. It provides a methods to define
@@ -286,6 +287,8 @@ public abstract class TmfXYChartViewer extends TmfTimeViewer implements ITmfChar
     @Override
     public void reset() {
         super.reset();
+        setStartTime(0);
+        setEndTime(0);
         clearContent();
     }
 
@@ -356,6 +359,9 @@ public abstract class TmfXYChartViewer extends TmfTimeViewer implements ITmfChar
             for (int i = 0; i < series.length; i++) {
                 set.deleteSeries(series[i].getId());
             }
+            for (IAxis axis: fSwtChart.getAxisSet().getAxes()){
+                axis.setRange(new Range(0,1));
+            }
             fSwtChart.redraw();
         }
     }

diff --git a/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/viewers/xycharts/linecharts/TmfCommonXLineChartViewer.java b/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/viewers/xycharts/linecharts/TmfCommonXLineChartViewer.java
index fe7d931417dc89beaf10965d83bc103c77442747..63008452e23fb785cb338e3b2dc8225add016605 100644 (file)
--- a/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/viewers/xycharts/linecharts/TmfCommonXLineChartViewer.java
+++ b/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/viewers/xycharts/linecharts/TmfCommonXLineChartViewer.java
@@ -379,4 +379,10 @@ public abstract class TmfCommonXLineChartViewer extends TmfXYChartViewer {
 
     }
 
+    @Override
+    protected void clearContent() {
+        getSwtChart().getAxisSet().getXAxis(0).getTick().setFormat(null);
+        super.clearContent();
+    }
+
 }