import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Map.Entry;
+import java.util.concurrent.atomic.AtomicInteger;
import java.util.logging.Logger;
import org.eclipse.core.runtime.IProgressMonitor;
private UpdateThread fUpdateThread;
+ private final AtomicInteger fDirty = new AtomicInteger();
+
/**
* Constructor
*
*/
protected void reinitialize() {
fSeriesValues.clear();
+ /* Initializing data: the content is not current */
+ fDirty.incrementAndGet();
Thread thread = new Thread() {
// Don't use TmfUiRefreshHandler (bug 467751)
@Override
public void run() {
if (!getSwtChart().isDisposed()) {
/* Delete the old series */
- clearContent();
- createSeries();
+ try {
+ clearContent();
+ createSeries();
+ } finally {
+ /* View is cleared, decrement fDirty */
+ fDirty.decrementAndGet();
+ }
}
}
});
@Override
public void run() {
LOGGER.info(() -> getLogMessage("UpdateDataStart", "tid=" + getId())); //$NON-NLS-1$ //$NON-NLS-2$
- updateData(getWindowStartTime(), getWindowEndTime(), fNumRequests, fMonitor);
- LOGGER.info(() -> getLogMessage("UpdateDataEnd", "tid=" + getId())); //$NON-NLS-1$ //$NON-NLS-2$
+ try {
+ updateData(getWindowStartTime(), getWindowEndTime(), fNumRequests, fMonitor);
+ } finally {
+ /*
+ * fDirty should have been incremented before creating
+ * the thread, so we decrement it once it is finished
+ */
+ fDirty.decrementAndGet();
+ LOGGER.info(() -> getLogMessage("UpdateDataEnd", "tid=" + getId())); //$NON-NLS-1$ //$NON-NLS-2$
+ }
}
});
updateThreadFinished(this);
@Override
protected void updateContent() {
+ /*
+ * Content is not up to date, so we increment fDirty. It will be
+ * decremented at the end of the update thread
+ */
+ fDirty.incrementAndGet();
getDisplay().asyncExec(new Runnable() {
@Override
public void run() {
* The array of values for the series
*/
protected void setSeries(String seriesName, double[] seriesValues) {
- if (fXValues.length > seriesValues.length) {
- throw new IllegalStateException();
+ if (fXValues.length != seriesValues.length) {
+ throw new IllegalStateException("All series in list must be of length : " + fXValues.length); //$NON-NLS-1$
}
fSeriesValues.put(seriesName, seriesValues);
}
* Update the chart's values before refreshing the viewer
*/
protected void updateDisplay() {
+ /* Content is not up to date, increment dirtiness */
+ fDirty.incrementAndGet();
Display.getDefault().asyncExec(new Runnable() {
final TmfChartTimeStampFormat tmfChartTimeStampFormat = new TmfChartTimeStampFormat(getTimeOffset());
@Override
public void run() {
- if (!getSwtChart().isDisposed()) {
- double[] xValues = fXValues;
- if (xValues.length < 1) {
- return;
- }
- double maxy = DEFAULT_MAXY;
- double miny = DEFAULT_MINY;
- for (Entry<String, double[]> entry : fSeriesValues.entrySet()) {
- ILineSeries series = (ILineSeries) getSwtChart().getSeriesSet().getSeries(entry.getKey());
- if (series == null) {
- series = addSeries(entry.getKey());
+ try {
+ if (!getSwtChart().isDisposed()) {
+ double[] xValues = fXValues;
+ double maxy = DEFAULT_MAXY;
+ double miny = DEFAULT_MINY;
+ for (Entry<String, double[]> entry : fSeriesValues.entrySet()) {
+ ILineSeries series = (ILineSeries) getSwtChart().getSeriesSet().getSeries(entry.getKey());
+ if (series == null) {
+ series = addSeries(entry.getKey());
+ }
+ series.setXSeries(xValues);
+ /*
+ * Find the minimal and maximum values in this
+ * series
+ */
+ for (double value : entry.getValue()) {
+ maxy = Math.max(maxy, value);
+ miny = Math.min(miny, value);
+ }
+ series.setYSeries(entry.getValue());
}
- series.setXSeries(xValues);
- /* Find the minimal and maximum values in this series */
- for (double value : entry.getValue()) {
- maxy = Math.max(maxy, value);
- miny = Math.min(miny, value);
+ if (maxy == DEFAULT_MAXY) {
+ maxy = 1.0;
}
- series.setYSeries(entry.getValue());
- }
- if (maxy == DEFAULT_MAXY) {
- maxy = 1.0;
- }
- IAxisTick xTick = getSwtChart().getAxisSet().getXAxis(0).getTick();
- xTick.setFormat(tmfChartTimeStampFormat);
+ IAxisTick xTick = getSwtChart().getAxisSet().getXAxis(0).getTick();
+ xTick.setFormat(tmfChartTimeStampFormat);
- final double start = xValues[0];
- int lastX = xValues.length - 1;
- double end = (start == xValues[lastX]) ? start + 1 : xValues[lastX];
- getSwtChart().getAxisSet().getXAxis(0).setRange(new Range(start, end));
- 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
- Point viewPos = TmfCommonXLineChartViewer.this.getParent().getParent().toDisplay(0, 0);
- int axisPos = getSwtChart().toDisplay(0, 0).x + getPointAreaOffset();
- int timeAxisOffset = axisPos - viewPos.x;
- TmfTimeViewAlignmentInfo timeAlignmentInfo = new TmfTimeViewAlignmentInfo(getControl().getShell(), viewPos, timeAxisOffset);
- TmfSignalManager.dispatchSignal(new TmfTimeViewAlignmentSignal(TmfCommonXLineChartViewer.this, timeAlignmentInfo, true));
+ final double start = 0.0;
+ double end = getWindowEndTime() - getWindowStartTime();
+ getSwtChart().getAxisSet().getXAxis(0).setRange(new Range(start, end));
+ 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
+ Point viewPos = TmfCommonXLineChartViewer.this.getParent().getParent().toDisplay(0, 0);
+ int axisPos = getSwtChart().toDisplay(0, 0).x + getPointAreaOffset();
+ int timeAxisOffset = axisPos - viewPos.x;
+ TmfTimeViewAlignmentInfo timeAlignmentInfo = new TmfTimeViewAlignmentInfo(getControl().getShell(), viewPos, timeAxisOffset);
+ TmfSignalManager.dispatchSignal(new TmfTimeViewAlignmentSignal(TmfCommonXLineChartViewer.this, timeAlignmentInfo, true));
+ }
}
+ } finally {
+ /* Content has been updated, decrement dirtiness */
+ fDirty.decrementAndGet();
}
}
});
super.clearContent();
}
+ @Override
+ public boolean isDirty() {
+ /* Check the parent's or this view's own dirtiness */
+ return super.isDirty() || (fDirty.get() != 0);
+ }
+
}
projects / deliverable / tracecompass.git / blobdiff