From bf06b33c48015d70756cd2ffbd5e187dfa836106 Mon Sep 17 00:00:00 2001 From: Matthew Khouzam Date: Sun, 31 May 2015 22:30:36 -0400 Subject: [PATCH] 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 Reviewed-on: https://git.eclipse.org/r/49049 Reviewed-by: Marc-Andre Laperle Tested-by: Marc-Andre Laperle --- .../tmf/ui/viewers/xycharts/TmfXYChartViewer.java | 6 ++++++ .../xycharts/linecharts/TmfCommonXLineChartViewer.java | 6 ++++++ 2 files changed, 12 insertions(+) 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 6b2ca15d0e..605ae7b5fe 100644 --- 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 fe7d931417..63008452e2 100644 --- 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(); + } + } -- 2.34.1