/*******************************************************************************
- * Copyright (c) 2011, 2012 Ericsson
+ * Copyright (c) 2011, 2013 Ericsson
*
* All rights reserved. This program and the accompanying materials are
* made available under the terms of the Eclipse Public License v1.0 which
* Francois Chouinard - Initial API and implementation
* Bernd Hufmann - Changed to updated histogram data model
* Francois Chouinard - Reformat histogram labels on format change
+ * Patrick Tasse - Support selection range
*******************************************************************************/
package org.eclipse.linuxtools.tmf.ui.views.histogram;
-import org.eclipse.linuxtools.tmf.core.event.ITmfTimestamp;
-import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp;
-import org.eclipse.linuxtools.tmf.core.event.TmfTimestampFormat;
import org.eclipse.linuxtools.tmf.core.signal.TmfSignalHandler;
import org.eclipse.linuxtools.tmf.core.signal.TmfSignalManager;
import org.eclipse.linuxtools.tmf.core.signal.TmfTimestampFormatUpdateSignal;
+import org.eclipse.linuxtools.tmf.core.timestamp.ITmfTimestamp;
+import org.eclipse.linuxtools.tmf.core.timestamp.TmfTimestamp;
+import org.eclipse.linuxtools.tmf.core.timestamp.TmfTimestampFormat;
import org.eclipse.linuxtools.tmf.ui.views.TmfView;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ControlEvent;
import org.eclipse.swt.events.ControlListener;
+import org.eclipse.swt.events.FocusAdapter;
+import org.eclipse.swt.events.FocusEvent;
+import org.eclipse.swt.events.FocusListener;
import org.eclipse.swt.events.KeyEvent;
import org.eclipse.swt.events.KeyListener;
import org.eclipse.swt.events.MouseEvent;
import org.eclipse.swt.events.MouseListener;
import org.eclipse.swt.events.MouseTrackListener;
+import org.eclipse.swt.events.MouseWheelListener;
import org.eclipse.swt.events.PaintEvent;
import org.eclipse.swt.events.PaintListener;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.graphics.FontData;
import org.eclipse.swt.graphics.GC;
import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.graphics.Rectangle;
import org.eclipse.swt.layout.FillLayout;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Canvas;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Text;
/**
// Histogram colors
private final Color fBackgroundColor = Display.getCurrent().getSystemColor(SWT.COLOR_WHITE);
- private final Color fCurrentEventColor = Display.getCurrent().getSystemColor(SWT.COLOR_RED);
+ private final Color fSelectionForegroundColor = Display.getCurrent().getSystemColor(SWT.COLOR_BLUE);
+ private final Color fSelectionBackgroundColor = Display.getCurrent().getSystemColor(SWT.COLOR_WIDGET_BACKGROUND);
private final Color fLastEventColor = Display.getCurrent().getSystemColor(SWT.COLOR_DARK_RED);
private final Color fHistoBarColor = new Color(Display.getDefault(), 74, 112, 139);
*/
protected TmfView fParentView;
- private Composite fParent;
+ private Composite fComposite;
private Font fFont;
// Histogram text fields
*/
protected long fCurrentEventTime = 0L;
+ /**
+ * The current selection begin time
+ */
+ private long fSelectionBegin = 0L;
+
+ /**
+ * The current selection end time
+ */
+ private long fSelectionEnd = 0L;
+
// ------------------------------------------------------------------------
// Construction
// ------------------------------------------------------------------------
*/
public Histogram(final TmfView view, final Composite parent) {
fParentView = view;
- fParent = parent;
- createWidget(parent);
+ fComposite = createWidget(parent);
fDataModel = new HistogramDataModel();
fDataModel.addHistogramListener(this);
clear();
fDataModel.removeHistogramListener(this);
}
- private void createWidget(final Composite parent) {
+ private Composite createWidget(final Composite parent) {
final Color labelColor = parent.getBackground();
fFont = adjustFont(parent);
gridData = new GridData(initalWidth, SWT.DEFAULT);
gridData.horizontalAlignment = SWT.RIGHT;
gridData.verticalAlignment = SWT.BOTTOM;
- final Text dummyText = new Text(composite, SWT.READ_ONLY);
- dummyText.setFont(fFont);
- dummyText.setBackground(labelColor);
- dummyText.setEditable(false);
- dummyText.setText(""); //$NON-NLS-1$
- dummyText.setLayoutData(gridData);
+ final Label dummyLabel = new Label(composite, SWT.NONE);
+ dummyLabel.setLayoutData(gridData);
// Window range start time
gridData = new GridData();
fTimeRangeStartText = new Text(composite, SWT.READ_ONLY);
fTimeRangeStartText.setFont(fFont);
fTimeRangeStartText.setBackground(labelColor);
- fTimeRangeStartText.setText(TmfTimestamp.ZERO.toString());
fTimeRangeStartText.setLayoutData(gridData);
// Window range end time
fTimeRangeEndText = new Text(composite, SWT.READ_ONLY);
fTimeRangeEndText.setFont(fFont);
fTimeRangeEndText.setBackground(labelColor);
- fTimeRangeEndText.setText(TmfTimestamp.ZERO.toString());
fTimeRangeEndText.setLayoutData(gridData);
+
+ FocusListener listener = new FocusAdapter() {
+ @Override
+ public void focusGained(FocusEvent e) {
+ fCanvas.setFocus();
+ }
+ };
+ fMaxNbEventsText.addFocusListener(listener);
+ fMinNbEventsText.addFocusListener(listener);
+ fTimeRangeStartText.addFocusListener(listener);
+ fTimeRangeEndText.addFocusListener(listener);
+
+ return composite;
}
private static Font adjustFont(final Composite composite) {
*/
public void clear() {
fDataModel.clear();
- fScaledData = null;
+ synchronized (fDataModel) {
+ fScaledData = null;
+ }
}
/**
*
* @param timestamp
* The time of the current event
+ * @deprecated As of 2.1, use {@link #setSelection(long, long)}
*/
+ @Deprecated
public void setCurrentEvent(final long timestamp) {
- fCurrentEventTime = (timestamp > 0) ? timestamp : 0;
- fDataModel.setCurrentEventNotifyListeners(timestamp);
+ fSelectionBegin = (timestamp > 0) ? timestamp : 0;
+ fSelectionEnd = (timestamp > 0) ? timestamp : 0;
+ fDataModel.setSelectionNotifyListeners(timestamp, timestamp);
+ }
+
+ /**
+ * Sets the current selection time range and refresh the display
+ *
+ * @param beginTime
+ * The begin time of the current selection
+ * @param endTime
+ * The end time of the current selection
+ * @since 2.1
+ */
+ public void setSelection(final long beginTime, final long endTime) {
+ fSelectionBegin = (beginTime > 0) ? beginTime : 0;
+ fSelectionEnd = (endTime > 0) ? endTime : 0;
+ fDataModel.setSelectionNotifyListeners(beginTime, endTime);
}
/**
*/
protected void moveCursor(final int keyCode) {
- if (fScaledData.fCurrentBucket == HistogramScaledData.OUT_OF_RANGE_BUCKET) {
- return;
- }
-
int index;
switch (keyCode) {
index++;
}
if (index < fScaledData.fLastBucket) {
- fScaledData.fCurrentBucket = index;
+ fScaledData.fSelectionBeginBucket = index;
}
break;
case SWT.ARROW_RIGHT:
- index = fScaledData.fCurrentBucket + 1;
+ index = Math.max(0, fScaledData.fSelectionBeginBucket + 1);
while (index < fScaledData.fWidth && fScaledData.fData[index] == 0) {
index++;
}
if (index < fScaledData.fLastBucket) {
- fScaledData.fCurrentBucket = index;
+ fScaledData.fSelectionBeginBucket = index;
}
break;
index--;
}
if (index >= 0) {
- fScaledData.fCurrentBucket = index;
+ fScaledData.fSelectionBeginBucket = index;
}
break;
case SWT.ARROW_LEFT:
- index = fScaledData.fCurrentBucket - 1;
+ index = Math.min(fScaledData.fLastBucket - 1, fScaledData.fSelectionBeginBucket - 1);
while (index >= 0 && fScaledData.fData[index] == 0) {
index--;
}
if (index >= 0) {
- fScaledData.fCurrentBucket = index;
+ fScaledData.fSelectionBeginBucket = index;
}
break;
return;
}
- updateCurrentEventTime();
+ fScaledData.fSelectionEndBucket = fScaledData.fSelectionBeginBucket;
+ fSelectionBegin = getTimestamp(fScaledData.fSelectionBeginBucket);
+ fSelectionEnd = fSelectionBegin;
+ updateSelectionTime();
}
/**
if (canvasWidth <= 0 || canvasHeight <= 0) {
return;
}
- fDataModel.setCurrentEvent(fCurrentEventTime);
+ fDataModel.setSelection(fSelectionBegin, fSelectionEnd);
fScaledData = fDataModel.scaleTo(canvasWidth, canvasHeight, 1);
- synchronized(fScaledData) {
+ synchronized(fDataModel) {
if (fScaledData != null) {
fCanvas.redraw();
- // Display histogram and update X-,Y-axis labels
- fTimeRangeStartText.setText(TmfTimestampFormat.getDefaulTimeFormat().format(fDataModel.getFirstBucketTime()));
- fTimeRangeEndText.setText(TmfTimestampFormat.getDefaulTimeFormat().format(fDataModel.getEndTime()));
+ if (fDataModel.getNbEvents() != 0) {
+ // Display histogram and update X-,Y-axis labels
+ fTimeRangeStartText.setText(TmfTimestampFormat.getDefaulTimeFormat().format(fDataModel.getFirstBucketTime()));
+ fTimeRangeEndText.setText(TmfTimestampFormat.getDefaulTimeFormat().format(fDataModel.getEndTime()));
+ } else {
+ fTimeRangeStartText.setText(""); //$NON-NLS-1$
+ fTimeRangeEndText.setText(""); //$NON-NLS-1$
+ }
fMaxNbEventsText.setText(Long.toString(fScaledData.fMaxValue));
// The Y-axis area might need to be re-sized
fMaxNbEventsText.getParent().layout();
}
}
+ /**
+ * Add a mouse wheel listener to the histogram
+ * @param listener the mouse wheel listener
+ * @since 2.0
+ */
+ public void addMouseWheelListener(MouseWheelListener listener) {
+ fCanvas.addMouseWheelListener(listener);
+ }
+
+ /**
+ * Remove a mouse wheel listener from the histogram
+ * @param listener the mouse wheel listener
+ * @since 2.0
+ */
+ public void removeMouseWheelListener(MouseWheelListener listener) {
+ fCanvas.removeMouseWheelListener(listener);
+ }
+
// ------------------------------------------------------------------------
// Helper functions
// ------------------------------------------------------------------------
- private void updateCurrentEventTime() {
- final long bucketStartTime = getTimestamp(fScaledData.fCurrentBucket);
- ((HistogramView) fParentView).updateCurrentEventTime(bucketStartTime);
+ private void updateSelectionTime() {
+ ((HistogramView) fParentView).updateSelectionTime(fSelectionBegin, fSelectionEnd);
}
// ------------------------------------------------------------------------
// Draw the histogram bars
imageGC.setBackground(fHistoBarColor);
final int limit = width < scaledData.fWidth ? width : scaledData.fWidth;
- for (int i = 1; i < limit; i++) {
+ for (int i = 0; i < limit; i++) {
final int value = (int) Math.ceil(scaledData.fData[i] * scaledData.fScalingFactor);
imageGC.fillRectangle(i, height - value, 1, value);
}
- // Draw the current event bar
- final int currentBucket = scaledData.fCurrentBucket;
- if (currentBucket >= 0 && currentBucket < limit) {
- drawDelimiter(imageGC, fCurrentEventColor, height, currentBucket);
- }
-
// Add a dashed line as a delimiter (at the right of the last bar)
int lastEventIndex = limit - 1;
while (lastEventIndex >= 0 && scaledData.fData[lastEventIndex] == 0) {
}
lastEventIndex += (lastEventIndex < limit - 1) ? 1 : 0;
drawDelimiter(imageGC, fLastEventColor, height, lastEventIndex);
+
+ // Draw the selection bars
+ int alpha = imageGC.getAlpha();
+ imageGC.setAlpha(100);
+ imageGC.setForeground(fSelectionForegroundColor);
+ imageGC.setBackground(fSelectionBackgroundColor);
+ final int beginBucket = scaledData.fSelectionBeginBucket;
+ if (beginBucket >= 0 && beginBucket < limit) {
+ imageGC.drawLine(beginBucket, 0, beginBucket, height);
+ }
+ final int endBucket = Math.min(lastEventIndex, scaledData.fSelectionEndBucket);
+ if (endBucket >= 0 && endBucket < limit && endBucket != beginBucket) {
+ imageGC.drawLine(endBucket, 0, endBucket, height);
+ }
+ if (endBucket - beginBucket > 1) {
+ imageGC.fillRectangle(beginBucket + 1, 0, endBucket - beginBucket - 1, height);
+ }
+ imageGC.setAlpha(alpha);
} catch (final Exception e) {
// Do nothing
}
@Override
public void mouseDown(final MouseEvent event) {
if (fDataModel.getNbEvents() > 0 && fScaledData.fLastBucket >= event.x) {
- fScaledData.fCurrentBucket = event.x;
- updateCurrentEventTime();
+ if ((event.stateMask & SWT.MODIFIER_MASK) == 0) {
+ fScaledData.fSelectionBeginBucket = event.x;
+ fScaledData.fSelectionEndBucket = event.x;
+ fSelectionBegin = getTimestamp(event.x);
+ fSelectionEnd = fSelectionBegin;
+ } else if ((event.stateMask & SWT.MODIFIER_MASK) == SWT.SHIFT) {
+ if (fSelectionBegin == fSelectionEnd) {
+ if (event.x < fScaledData.fSelectionBeginBucket) {
+ fScaledData.fSelectionBeginBucket = event.x;
+ fSelectionBegin = getTimestamp(event.x);
+ } else {
+ fScaledData.fSelectionEndBucket = event.x;
+ fSelectionEnd = getTimestamp(event.x);
+ }
+ } else if (Math.abs(event.x - fScaledData.fSelectionBeginBucket) <= Math.abs(event.x - fScaledData.fSelectionEndBucket)) {
+ fScaledData.fSelectionBeginBucket = event.x;
+ fSelectionBegin = getTimestamp(event.x);
+ } else {
+ fScaledData.fSelectionEndBucket = event.x;
+ fSelectionEnd = getTimestamp(event.x);
+ }
+ }
+ updateSelectionTime();
}
}
if (fDataModel.getNbEvents() > 0 && fScaledData != null && fScaledData.fLastBucket >= event.x) {
final String tooltip = formatToolTipLabel(event.x);
fCanvas.setToolTipText(tooltip);
+ } else {
+ fCanvas.setToolTipText(null);
}
}
*/
@TmfSignalHandler
public void timestampFormatUpdated(TmfTimestampFormatUpdateSignal signal) {
- Point size = fTimeRangeStartText.getSize();
+ if (fDataModel.getNbEvents() == 0) {
+ return;
+ }
+
String newTS = TmfTimestampFormat.getDefaulTimeFormat().format(fDataModel.getFirstBucketTime());
- size.x = getTextSize(newTS);
- fTimeRangeStartText.setSize(size);
fTimeRangeStartText.setText(newTS);
newTS = TmfTimestampFormat.getDefaulTimeFormat().format(fDataModel.getEndTime());
- Rectangle rect = fTimeRangeEndText.getBounds();
- int newWidth = getTextSize(newTS);
- rect.x += rect.width - newWidth;
- rect.width = newWidth;
- fTimeRangeEndText.setBounds(rect);
fTimeRangeEndText.setText(newTS);
- }
-
- /**
- * Compute the width of a String.
- *
- * @param text the Text to measure
- * @return The result size
- * @since 2.0
- */
- private int getTextSize(final String text) {
- GC controlGC = new GC(fParent);
- controlGC.setFont(fFont);
-
- int textSize = 0;
- for (int pos = 0; pos < text.length(); pos++) {
- textSize += controlGC.getAdvanceWidth(text.charAt(pos));
- }
- // Add an extra space
- textSize += controlGC.getAdvanceWidth(' ');
-
- controlGC.dispose();
- return textSize;
+ fComposite.layout();
}
}
projects / deliverable / tracecompass.git / blobdiff