/*****************************************************************************
- * Copyright (c) 2007, 2015 Intel Corporation, Ericsson, others
+ * Copyright (c) 2007, 2016 Intel Corporation, Ericsson, others
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
import java.util.List;
import java.util.Set;
+import org.eclipse.jdt.annotation.NonNull;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.action.ActionContributionItem;
import org.eclipse.jface.action.IAction;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.graphics.RGBA;
import org.eclipse.swt.graphics.Rectangle;
import org.eclipse.swt.layout.FillLayout;
import org.eclipse.tracecompass.tmf.ui.widgets.timegraph.widgets.TimeDataProviderCyclesConverter;
import org.eclipse.tracecompass.tmf.ui.widgets.timegraph.widgets.TimeGraphColorScheme;
import org.eclipse.tracecompass.tmf.ui.widgets.timegraph.widgets.TimeGraphControl;
+import org.eclipse.tracecompass.tmf.ui.widgets.timegraph.widgets.TimeGraphMarkerAxis;
import org.eclipse.tracecompass.tmf.ui.widgets.timegraph.widgets.TimeGraphScale;
import org.eclipse.tracecompass.tmf.ui.widgets.timegraph.widgets.TimeGraphTooltipHandler;
import org.eclipse.tracecompass.tmf.ui.widgets.timegraph.widgets.Utils;
private static final long DEFAULT_FREQUENCY = 1000000000L;
private static final int H_SCROLLBAR_MAX = Integer.MAX_VALUE - 1;
- private static ImageDescriptor ADD_BOOKMARK = Activator.getDefault().getImageDescripterFromPath(ITmfImageConstants.IMG_UI_ADD_BOOKMARK);
- private static ImageDescriptor NEXT_BOOKMARK = Activator.getDefault().getImageDescripterFromPath(ITmfImageConstants.IMG_UI_NEXT_BOOKMARK);
- private static ImageDescriptor PREVIOUS_BOOKMARK = Activator.getDefault().getImageDescripterFromPath(ITmfImageConstants.IMG_UI_PREVIOUS_BOOKMARK);
- private static ImageDescriptor REMOVE_BOOKMARK = Activator.getDefault().getImageDescripterFromPath(ITmfImageConstants.IMG_UI_REMOVE_BOOKMARK);
+ private static final ImageDescriptor ADD_BOOKMARK = Activator.getDefault().getImageDescripterFromPath(ITmfImageConstants.IMG_UI_ADD_BOOKMARK);
+ private static final ImageDescriptor NEXT_BOOKMARK = Activator.getDefault().getImageDescripterFromPath(ITmfImageConstants.IMG_UI_NEXT_BOOKMARK);
+ private static final ImageDescriptor PREVIOUS_BOOKMARK = Activator.getDefault().getImageDescripterFromPath(ITmfImageConstants.IMG_UI_PREVIOUS_BOOKMARK);
+ private static final ImageDescriptor REMOVE_BOOKMARK = Activator.getDefault().getImageDescripterFromPath(ITmfImageConstants.IMG_UI_REMOVE_BOOKMARK);
private long fMinTimeInterval;
private ITimeGraphEntry fSelectedEntry;
private TimeGraphControl fTimeGraphCtrl;
private TimeGraphScale fTimeScaleCtrl;
+ private TimeGraphMarkerAxis fMarkerAxisCtrl;
private Slider fHorizontalScrollBar;
private Slider fVerticalScrollBar;
- private TimeGraphColorScheme fColorScheme;
+ private @NonNull TimeGraphColorScheme fColorScheme = new TimeGraphColorScheme();
private Object fInputElement;
private ITimeGraphContentProvider fTimeGraphContentProvider;
private ITimeGraphPresentationProvider fTimeGraphProvider;
- private ITimeDataProvider fTimeDataProvider = this;
+ private @NonNull ITimeDataProvider fTimeDataProvider = this;
private TimeGraphTooltipHandler fToolTipHandler;
private List<ITimeGraphSelectionListener> fSelectionListeners = new ArrayList<>();
/** The list of markers */
private final List<IMarkerEvent> fMarkers = new ArrayList<>();
- /** The list of color resources created by this viewer */
- private final List<Color> fColors = new ArrayList<>();
-
private ListenerNotifier fListenerNotifier;
private Composite fTimeAlignedComposite;
*/
protected Control createDataViewer(Composite parent, int style) {
loadOptions();
- fColorScheme = new TimeGraphColorScheme();
fDataViewer = new Composite(parent, style) {
@Override
public void redraw() {
fTimeScaleCtrl.redraw();
fTimeGraphCtrl.redraw();
+ fMarkerAxisCtrl.redraw();
super.redraw();
}
};
fDataViewer.addDisposeListener(new DisposeListener() {
@Override
public void widgetDisposed(DisposeEvent e) {
- for (Color color : fColors) {
- color.dispose();
- }
if (fMarkersMenu != null) {
fMarkersMenu.dispose();
}
fTimeGraphCtrl.addKeyListener(new KeyAdapter() {
@Override
public void keyPressed(KeyEvent e) {
- if (e.character == '+') {
+ if ((e.character == '+' || e.character == '=') && ((e.stateMask & SWT.CTRL) == 0)) {
zoomIn();
- } else if (e.character == '-') {
+ } else if (e.character == '-' && ((e.stateMask & SWT.CTRL) == 0)) {
zoomOut();
} else if (e.keyCode == '.') {
boolean extend = (e.stateMask & SWT.SHIFT) != 0;
}
});
+ fMarkerAxisCtrl = createTimeGraphMarkerAxis(fTimeAlignedComposite, fColorScheme, this);
+ fMarkerAxisCtrl.setLayoutData(new GridData(SWT.FILL, SWT.DEFAULT, true, false));
+ fMarkerAxisCtrl.addMouseWheelListener(new MouseWheelListener() {
+ @Override
+ public void mouseScrolled(MouseEvent e) {
+ fTimeGraphCtrl.zoom(e.count > 0);
+ }
+ });
+
fVerticalScrollBar = new Slider(fDataViewer, SWT.VERTICAL | SWT.NO_FOCUS);
fVerticalScrollBar.setLayoutData(new GridData(SWT.DEFAULT, SWT.FILL, false, true, 1, 1));
fVerticalScrollBar.addSelectionListener(new SelectionAdapter() {
return new TimeGraphControl(parent, colors);
}
+ /**
+ * Create a new time graph marker axis.
+ *
+ * @param parent
+ * The parent composite object
+ * @param colorScheme
+ * The color scheme to use
+ * @param timeProvider
+ * The time data provider
+ * @return The new TimeGraphMarkerAxis
+ * @since 2.0
+ */
+ protected TimeGraphMarkerAxis createTimeGraphMarkerAxis(Composite parent,
+ @NonNull TimeGraphColorScheme colorScheme, @NonNull ITimeDataProvider timeProvider) {
+ return new TimeGraphMarkerAxis(parent, colorScheme, timeProvider);
+ }
+
/**
* Resize the controls
*/
}
fTimeGraphCtrl.refreshData(traces);
fTimeScaleCtrl.redraw();
+ fMarkerAxisCtrl.redraw();
updateMarkerActions();
adjustVerticalScrollBar();
}
}
fTimeGraphCtrl.redraw();
fTimeScaleCtrl.redraw();
+ fMarkerAxisCtrl.redraw();
+ /* force update the controls to keep them aligned */
+ fTimeScaleCtrl.update();
+ fMarkerAxisCtrl.update();
+ fTimeGraphCtrl.update();
}
@Override
adjustHorizontalScrollBar();
fTimeGraphCtrl.redraw();
fTimeScaleCtrl.redraw();
+ fMarkerAxisCtrl.redraw();
+ /* force update the controls to keep them aligned */
+ fTimeScaleCtrl.update();
+ fMarkerAxisCtrl.update();
+ fTimeGraphCtrl.update();
}
@Override
setSelectedTimeInt(time, ensureVisible, false);
}
+ private void setSelectedTimeInt(long time, boolean ensureVisible, boolean doNotify) {
+ setSelectionRangeInt(time, time, ensureVisible, doNotify);
+ }
+
+ /**
+ * @since 2.0
+ */
@Override
- public void setSelectionRangeNotify(long beginTime, long endTime) {
- long time0 = fTime0;
- long time1 = fTime1;
- long selectionBegin = fSelectionBegin;
- long selectionEnd = fSelectionEnd;
- fSelectionBegin = Math.max(fTime0Bound, Math.min(fTime1Bound, beginTime));
- fSelectionEnd = Math.max(fTime0Bound, Math.min(fTime1Bound, endTime));
- boolean changed = (selectionBegin != fSelectionBegin || selectionEnd != fSelectionEnd);
- ensureVisible(fSelectionEnd);
- fTimeGraphCtrl.redraw();
- fTimeScaleCtrl.redraw();
- updateMarkerActions();
- if ((time0 != fTime0) || (time1 != fTime1)) {
- notifyRangeListeners();
- }
- if (changed) {
- notifyTimeListeners();
- }
+ public void setSelectionRangeNotify(long beginTime, long endTime, boolean ensureVisible) {
+ setSelectionRangeInt(beginTime, endTime, ensureVisible, true);
}
+ /**
+ * @since 2.0
+ */
@Override
- public void setSelectionRange(long beginTime, long endTime) {
+ public void setSelectionRange(long beginTime, long endTime, boolean ensureVisible) {
/* if there is a pending time selection, ignore this one */
if (fListenerNotifier != null && fListenerNotifier.hasTimeSelected()) {
return;
}
- fSelectionBegin = Math.max(fTime0Bound, Math.min(fTime1Bound, beginTime));
- fSelectionEnd = Math.max(fTime0Bound, Math.min(fTime1Bound, endTime));
- fTimeGraphCtrl.redraw();
- fTimeScaleCtrl.redraw();
- updateMarkerActions();
+ setSelectionRangeInt(beginTime, endTime, ensureVisible, false);
}
- private void setSelectedTimeInt(long time, boolean ensureVisible, boolean doNotify) {
- long selection = Math.max(fTime0Bound, Math.min(fTime1Bound, time));
+ private void setSelectionRangeInt(long beginTime, long endTime, boolean ensureVisible, boolean doNotify) {
long time0 = fTime0;
long time1 = fTime1;
+ long selectionBegin = fSelectionBegin;
+ long selectionEnd = fSelectionEnd;
+ fSelectionBegin = Math.max(fTime0Bound, Math.min(fTime1Bound, beginTime));
+ fSelectionEnd = Math.max(fTime0Bound, Math.min(fTime1Bound, endTime));
+ boolean changed = (selectionBegin != fSelectionBegin || selectionEnd != fSelectionEnd);
+
if (ensureVisible) {
- ensureVisible(selection);
+ ensureVisible(selectionBegin != fSelectionBegin ? fSelectionBegin : fSelectionEnd);
}
+
fTimeGraphCtrl.redraw();
fTimeScaleCtrl.redraw();
-
- boolean notifySelectedTime = (selection != fSelectionBegin || selection != fSelectionEnd);
- fSelectionBegin = selection;
- fSelectionEnd = selection;
+ fMarkerAxisCtrl.redraw();
updateMarkerActions();
if ((time0 != fTime0) || (time1 != fTime1)) {
notifyRangeListeners();
}
- if (doNotify && notifySelectedTime) {
+ if (doNotify && changed) {
notifyTimeListeners();
}
}
* @since 2.0
*/
public void setBookmarks(List<IMarkerEvent> bookmarks) {
- for (IMarkerEvent bookmark : fBookmarks) {
- checkDisposeColor(bookmark.getColor());
- }
fBookmarks.clear();
if (bookmarks != null) {
fBookmarks.addAll(bookmarks);
*/
public void setMarkerCategories(List<String> categories) {
fMarkerCategories.clear();
- fMarkerCategories.add(IMarkerEvent.BOOKMARKS);
if (categories != null) {
fMarkerCategories.addAll(categories);
}
- Collections.sort(fMarkerCategories);
+ fMarkerCategories.add(IMarkerEvent.BOOKMARKS);
+ fMarkerAxisCtrl.setMarkerCategories(fMarkerCategories);
}
/**
return Collections.unmodifiableList(fMarkers);
}
- /**
- * Dispose the color resource if and only if it was created by this viewer.
- *
- * @param color
- * the color
- */
- private void checkDisposeColor(Color color) {
- for (int i = 0; i < fColors.size(); i++) {
- /* check for identity, not equality */
- if (fColors.get(i) == color) {
- color.dispose();
- fColors.remove(i);
- break;
- }
- }
- }
-
/**
* Callback to set a selected event in the view
*
if (dialog.open() == Window.OK) {
final String label = dialog.getValue();
final RGBA rgba = dialog.getColorValue();
- Color color = new Color(Display.getDefault(), rgba.rgb.red, rgba.rgb.green, rgba.rgb.blue, rgba.alpha);
- fColors.add(color);
- IMarkerEvent bookmark = new MarkerEvent(null, time, duration, IMarkerEvent.BOOKMARKS, color, label, true);
+ IMarkerEvent bookmark = new MarkerEvent(null, time, duration, IMarkerEvent.BOOKMARKS, rgba, label, true);
fBookmarks.add(bookmark);
updateMarkerList();
updateMarkerActions();
fireBookmarkAdded(bookmark);
}
} else {
- checkDisposeColor(selectedBookmark.getColor());
fBookmarks.remove(selectedBookmark);
updateMarkerList();
updateMarkerActions();
if ((marker.getTime() > time ||
(marker.getTime() == time && marker.getDuration() > duration))
&& !fSkippedMarkerCategories.contains(marker.getCategory())) {
- setSelectionRangeNotify(marker.getTime(), marker.getTime() + marker.getDuration());
+ setSelectionRangeNotify(marker.getTime(), marker.getTime() + marker.getDuration(), true);
fTimeGraphCtrl.updateStatusLine();
return;
}
if ((marker.getTime() < time ||
(marker.getTime() == time && marker.getDuration() < duration))
&& !fSkippedMarkerCategories.contains(marker.getCategory())) {
- setSelectionRangeNotify(marker.getTime(), marker.getTime() + marker.getDuration());
+ setSelectionRangeNotify(marker.getTime(), marker.getTime() + marker.getDuration(), true);
fTimeGraphCtrl.updateStatusLine();
return;
}
}
}
if (nextMarker != null) {
- setSelectionRangeNotify(fSelectionBegin, nextMarker.getTime() + nextMarker.getDuration());
+ setSelectionRangeNotify(fSelectionBegin, nextMarker.getTime() + nextMarker.getDuration(), true);
fTimeGraphCtrl.updateStatusLine();
}
}
IMarkerEvent marker = markers.get(i);
if (marker.getTime() < fSelectionEnd
&& !fSkippedMarkerCategories.contains(marker.getCategory())) {
- setSelectionRangeNotify(fSelectionBegin, marker.getTime());
+ setSelectionRangeNotify(fSelectionBegin, marker.getTime(), true);
fTimeGraphCtrl.updateStatusLine();
return;
}
markers.addAll(fBookmarks);
}
Collections.sort(markers, new MarkerComparator());
- getTimeGraphControl().setMarkers(markers);
+ fTimeGraphCtrl.setMarkers(markers);
+ fMarkerAxisCtrl.setMarkers(markers);
}
private void adjustHorizontalScrollBar() {
* @param filter
* The filter object to be attached to the view
*/
- public void addFilter(ViewerFilter filter) {
+ public void addFilter(@NonNull ViewerFilter filter) {
fTimeGraphCtrl.addFilter(filter);
refresh();
}
* @param filter
* The filter object to be attached to the view
*/
- public void removeFilter(ViewerFilter filter) {
+ public void removeFilter(@NonNull ViewerFilter filter) {
fTimeGraphCtrl.removeFilter(filter);
refresh();
}
* @return an array of viewer filters
* @since 2.0
*/
- public ViewerFilter[] getFilters() {
+ public @NonNull ViewerFilter[] getFilters() {
return fTimeGraphCtrl.getFilters();
}
* an array of viewer filters, or null
* @since 2.0
*/
- public void setFilters(ViewerFilter[] filters) {
+ public void setFilters(@NonNull ViewerFilter[] filters) {
fTimeGraphCtrl.setFilters(filters);
refresh();
}
projects / deliverable / tracecompass.git / blobdiff