Tools/SCViewer
Tools
/
SCViewer
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- added conext menu 

- added option to remove waves
- fixed painting errors
This commit is contained in:
ejentzsx 2015-01-29 11:02:03 +01:00
parent 8c60a53ebe
commit 310c9bbb8f
9 changed files with 537 additions and 219 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

425
com.minres.scviewer.database.swt/src/com/minres/scviewer/database/swt/TxDisplay.java
View File

@ -10,6 +10,7 @@
*******************************************************************************/
package com.minres.scviewer.database.swt;
import java.awt.PageAttributes.OriginType;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.util.HashMap;
@ -29,6 +30,15 @@ import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.CLabel;
import org.eclipse.swt.custom.SashForm;
import org.eclipse.swt.custom.ScrolledComposite;
import org.eclipse.swt.dnd.DND;
import org.eclipse.swt.dnd.DragSource;
import org.eclipse.swt.dnd.DragSourceEvent;
import org.eclipse.swt.dnd.DragSourceListener;
import org.eclipse.swt.dnd.DropTarget;
import org.eclipse.swt.dnd.DropTargetEvent;
import org.eclipse.swt.dnd.DropTargetListener;
import org.eclipse.swt.dnd.TextTransfer;
import org.eclipse.swt.dnd.Transfer;
import org.eclipse.swt.events.ControlAdapter;
import org.eclipse.swt.events.ControlEvent;
import org.eclipse.swt.events.MouseEvent;
@ -50,6 +60,7 @@ import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Listener;
import org.eclipse.swt.widgets.ScrollBar;
import org.eclipse.swt.widgets.Text;
import org.eclipse.wb.swt.SWTResourceManager;
import swing2swt.layout.BorderLayout;
@ -69,10 +80,10 @@ import com.minres.scviewer.database.swt.internal.StreamPainter;
import com.minres.scviewer.database.swt.internal.TrackPainter;
import com.minres.scviewer.database.swt.internal.WaveformCanvas;
public class TxDisplay implements PropertyChangeListener, ISelectionProvider, MouseListener{
public class TxDisplay implements PropertyChangeListener, ISelectionProvider, MouseListener {
private ListenerList listeners = new ListenerList();
private static final String SELECTION="selection";
private static final String SELECTION = "selection";
private ITx currentSelection;
private IWaveform<? extends IWaveformEvent> currentWaveformSelection;
@ -92,51 +103,56 @@ public class TxDisplay implements PropertyChangeListener, ISelectionProvider, Mo
private Ruler ruler;
TreeMap<Integer, IWaveform<? extends IWaveformEvent>> trackVerticalOffset;
HashMap<IWaveform<? extends IWaveformEvent>, String> actualValues;
// private long maxTime=0;
// private long maxTime=0;
private Font nameFont, nameFontB;
public TxDisplay(Composite parent) {
trackVerticalOffset = new TreeMap<Integer, IWaveform<? extends IWaveformEvent>>();
actualValues= new HashMap<IWaveform<? extends IWaveformEvent>, String>();
cursorPainters=new Vector<CursorPainter>();
actualValues = new HashMap<IWaveform<? extends IWaveformEvent>, String>();
cursorPainters = new Vector<CursorPainter>();
nameFont = parent.getDisplay().getSystemFont();
nameFontB = SWTResourceManager.getBoldFont(nameFont);
streams=new ObservableList<IWaveform<? extends IWaveformEvent>>();
streams = new ObservableList<IWaveform<? extends IWaveformEvent>>();
streams.addPropertyChangeListener(this);
top = new Composite(parent, SWT.NONE);
top.setLayout(new FillLayout(SWT.HORIZONTAL));
SashForm topSash = new SashForm(top, SWT.SMOOTH);
topSash.setBackground(topSash.getDisplay().getSystemColor( SWT.COLOR_GRAY));
topSash.setBackground(topSash.getDisplay().getSystemColor(
SWT.COLOR_GRAY));
Composite composite = new Composite(topSash, SWT.NONE);
composite.setLayout(new FillLayout(SWT.HORIZONTAL));
SashForm leftSash = new SashForm(composite, SWT.SMOOTH);
leftSash.setBackground(leftSash.getDisplay().getSystemColor( SWT.COLOR_GRAY));
leftSash.setBackground(leftSash.getDisplay().getSystemColor(
SWT.COLOR_GRAY));
Composite namePane = createTextPane(leftSash, "Name");
namePane.setBackground(namePane.getDisplay().getSystemColor( SWT.COLOR_WIDGET_BACKGROUND));
namePane.setBackground(namePane.getDisplay().getSystemColor(
SWT.COLOR_WIDGET_BACKGROUND));
nameListScrolled = new ScrolledComposite(namePane, SWT.H_SCROLL | SWT.V_SCROLL);
nameListScrolled.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 1, 1));
nameListScrolled = new ScrolledComposite(namePane, SWT.H_SCROLL
| SWT.V_SCROLL);
nameListScrolled.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true,
true, 1, 1));
nameListScrolled.setExpandHorizontal(true);
nameListScrolled.setExpandVertical(true);
nameListScrolled.setAlwaysShowScrollBars(true);
nameListScrolled.addControlListener(new ControlAdapter(){
nameListScrolled.addControlListener(new ControlAdapter() {
@Override
public void controlResized(ControlEvent e) {
nameListScrolled.getVerticalBar().setVisible(false);
}
});
nameList = new Canvas(nameListScrolled, SWT.NONE){
nameList = new Canvas(nameListScrolled, SWT.NONE) {
@Override
public Point computeSize(int wHint, int hHint, boolean changed) {
Rectangle bounds= super.getClientArea();
Rectangle bounds = super.getClientArea();
return new Point(bounds.width, bounds.height);
}
};
@ -144,7 +160,7 @@ public class TxDisplay implements PropertyChangeListener, ISelectionProvider, Mo
@Override
public void handleEvent(Event event) {
GC gc = event.gc;
Rectangle rect = ((Canvas)event.widget).getClientArea();
Rectangle rect = ((Canvas) event.widget).getClientArea();
paintNames(gc, rect);
}
});
@ -152,23 +168,26 @@ public class TxDisplay implements PropertyChangeListener, ISelectionProvider, Mo
nameListScrolled.setContent(nameList);
Composite valuePane = createTextPane(leftSash, "Value");
valuePane.setBackground(valuePane.getDisplay().getSystemColor( SWT.COLOR_WIDGET_BACKGROUND));
valueListScrolled = new ScrolledComposite(valuePane, SWT.H_SCROLL | SWT.V_SCROLL);
valueListScrolled.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 1, 1));
valuePane.setBackground(valuePane.getDisplay().getSystemColor(
SWT.COLOR_WIDGET_BACKGROUND));
valueListScrolled = new ScrolledComposite(valuePane, SWT.H_SCROLL
| SWT.V_SCROLL);
valueListScrolled.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true,
true, 1, 1));
valueListScrolled.setExpandHorizontal(true);
valueListScrolled.setExpandVertical(true);
valueListScrolled.setAlwaysShowScrollBars(true);
valueListScrolled.addControlListener(new ControlAdapter(){
valueListScrolled.addControlListener(new ControlAdapter() {
@Override
public void controlResized(ControlEvent e) {
valueListScrolled.getVerticalBar().setVisible(false);
}
});
valueList = new Canvas(valueListScrolled, SWT.NONE){
valueList = new Canvas(valueListScrolled, SWT.NONE) {
@Override
public Point computeSize(int wHint, int hHint, boolean changed) {
Rectangle bounds= super.getClientArea();
Rectangle bounds = super.getClientArea();
return new Point(bounds.width, bounds.height);
}
};
@ -176,7 +195,7 @@ public class TxDisplay implements PropertyChangeListener, ISelectionProvider, Mo
@Override
public void handleEvent(Event event) {
GC gc = event.gc;
Rectangle rect = ((Canvas)event.widget).getClientArea();
Rectangle rect = ((Canvas) event.widget).getClientArea();
paintValues(gc, rect);
}
});
@ -193,23 +212,28 @@ public class TxDisplay implements PropertyChangeListener, ISelectionProvider, Mo
trackList.setStreams(streams);
trackList.setRuler(ruler);
trackList.addPainter(new TrackPainter(trackList));
CursorPainter cp = new CursorPainter(trackList, trackList.getScaleFactor()*10);
CursorPainter cp = new CursorPainter(trackList,
trackList.getScaleFactor() * 10);
trackList.addPainter(cp);
cursorPainters.add(cp);
trackList.setMaxTime(1);
trackList.addMouseListener(this);
nameListScrolled.getVerticalBar().addSelectionListener(new SelectionAdapter() {
nameListScrolled.getVerticalBar().addSelectionListener(
new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) {
int y = ((ScrollBar) e.widget).getSelection();
valueListScrolled.setOrigin(valueListScrolled.getOrigin().x, y);
valueListScrolled.setOrigin(
valueListScrolled.getOrigin().x, y);
trackList.scrollToY(y);
}
});
valueListScrolled.getVerticalBar().addSelectionListener(new SelectionAdapter() {
valueListScrolled.getVerticalBar().addSelectionListener(
new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) {
int y = ((ScrollBar) e.widget).getSelection();
nameListScrolled.setOrigin(nameListScrolled.getOrigin().x, y);
nameListScrolled.setOrigin(
nameListScrolled.getOrigin().x, y);
trackList.scrollToY(y);
}
});
@ -220,12 +244,15 @@ public class TxDisplay implements PropertyChangeListener, ISelectionProvider, Mo
valueListScrolled.setOrigin(valueListScrolled.getOrigin().x, y);
}
});
topSash.setWeights(new int[] {30, 70});
leftSash.setWeights(new int[] {75, 25});
topSash.setWeights(new int[] { 30, 70 });
leftSash.setWeights(new int[] { 75, 25 });
createDragSource(nameList);
createDragSource(valueList);
createDropTarget(nameList);
createDropTarget(valueList);
}
private Composite createTextPane(SashForm leftSash, String text) {
Composite namePane = new Composite(leftSash, SWT.NONE);
GridLayout gl_namePane = new GridLayout(1, false);
@ -236,15 +263,17 @@ public class TxDisplay implements PropertyChangeListener, ISelectionProvider, Mo
namePane.setLayout(gl_namePane);
CLabel nameLabel = new CLabel(namePane, SWT.NONE);
GridData gd_nameLabel = new GridData(SWT.CENTER, SWT.CENTER, true, false, 1, 1);
gd_nameLabel.heightHint = Ruler.height-2;
GridData gd_nameLabel = new GridData(SWT.CENTER, SWT.CENTER, true,
false, 1, 1);
gd_nameLabel.heightHint = Ruler.height - 2;
nameLabel.setLayoutData(gd_nameLabel);
nameLabel.setText(text);
Label nameSep = new Label(namePane, SWT.SEPARATOR | SWT.HORIZONTAL);
nameSep.setBackground(SWTResourceManager.getColor(SWT.COLOR_DARK_GRAY));
nameSep.setForeground(SWTResourceManager.getColor(SWT.COLOR_BLACK));
GridData gd_nameSep = new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1);
GridData gd_nameSep = new GridData(SWT.FILL, SWT.CENTER, true, false,
1, 1);
gd_nameSep.heightHint = 2;
nameSep.setLayoutData(gd_nameSep);
return namePane;
@ -252,59 +281,64 @@ public class TxDisplay implements PropertyChangeListener, ISelectionProvider, Mo
@Override
public void propertyChange(PropertyChangeEvent pce) {
if("size".equals(pce.getPropertyName())) {
if ("size".equals(pce.getPropertyName())) {
updateTracklist();
}
}
@SuppressWarnings("unchecked")
protected void updateTracklist() {
int yoffs=0;
int nameMaxWidth=0;
IWaveformPainter painter=null;
int yoffs = 0;
int nameMaxWidth = 0;
int previousHeight=trackVerticalOffset.size()==0?0: trackVerticalOffset.lastKey();
IWaveformPainter painter = null;
trackVerticalOffset.clear();
actualValues.clear();
trackList.clearAllWavefromPainter();
boolean even=true;
boolean even = true;
TextLayout tl = new TextLayout(trackList.getDisplay());
tl.setFont(nameFontB);
for(IWaveform<? extends IWaveformEvent> waveform:streams){
int height=trackList.getTrackHeight();
if(waveform instanceof ITxStream<?>){
height*=((ITxStream<? extends ITxEvent>)waveform).getMaxConcurrency();
painter= new StreamPainter(trackList, even, height, (ITxStream<? extends ITxEvent>) waveform);
for (IWaveform<? extends IWaveformEvent> waveform : streams) {
int height = trackList.getTrackHeight();
if (waveform instanceof ITxStream<?>) {
height *= ((ITxStream<? extends ITxEvent>) waveform).getMaxConcurrency();
painter = new StreamPainter(trackList, even, height, (ITxStream<? extends ITxEvent>) waveform);
actualValues.put(waveform, "");
} else if(waveform instanceof ISignal<?>){
painter= new SignalPainter(trackList, even, height, (ISignal<?>) waveform);
} else if (waveform instanceof ISignal<?>) {
painter = new SignalPainter(trackList, even, height,
(ISignal<?>) waveform);
actualValues.put(waveform, "---");
}
trackList.addWavefromPainter(yoffs, painter);
trackVerticalOffset.put(yoffs, waveform);
tl.setText(waveform.getFullName());
nameMaxWidth=Math.max(nameMaxWidth, tl.getBounds().width);
yoffs+=height;
even=!even;
nameMaxWidth = Math.max(nameMaxWidth, tl.getBounds().width);
yoffs += height;
even = !even;
}
nameList.setSize(nameMaxWidth+15, yoffs);
nameListScrolled.setMinSize(nameMaxWidth+15, yoffs);
nameList.setSize(nameMaxWidth + 15, yoffs);
nameListScrolled.setMinSize(nameMaxWidth + 15, yoffs);
valueList.setSize(calculateValueWidth(), yoffs);
valueListScrolled.setMinSize(calculateValueWidth(), yoffs);
nameList.redraw();
valueList.redraw();
trackList.redraw();
top.layout(new Control[]{valueList, nameList, trackList});
top.layout(new Control[] { valueList, nameList, trackList });
if(previousHeight>trackVerticalOffset.lastKey()){
trackList.scrollToY(trackList.getOrigin().y-(previousHeight-trackVerticalOffset.lastKey()));
}
setSelection(new StructuredSelection());
}
private int calculateValueWidth() {
TextLayout tl = new TextLayout(trackList.getDisplay());
tl.setFont(nameFontB);
int valueMaxWidth=0;
for(String v:actualValues.values()){
int valueMaxWidth = 0;
for (String v : actualValues.values()) {
tl.setText(v);
valueMaxWidth=Math.max(valueMaxWidth, tl.getBounds().width);
valueMaxWidth = Math.max(valueMaxWidth, tl.getBounds().width);
}
return valueMaxWidth+15;
return valueMaxWidth + 15;
}
@Override
@ -313,15 +347,20 @@ public class TxDisplay implements PropertyChangeListener, ISelectionProvider, Mo
}
@Override
public void removeSelectionChangedListener(ISelectionChangedListener listener) {
public void removeSelectionChangedListener(
ISelectionChangedListener listener) {
listeners.remove(listener);
}
public Control getControl(){
return top;
}
@Override
public ISelection getSelection() {
if(currentSelection!=null)
if (currentSelection != null)
return new StructuredSelection(currentSelection);
else if(currentWaveformSelection!=null)
else if (currentWaveformSelection != null)
return new StructuredSelection(currentWaveformSelection);
else
return null;
@ -330,24 +369,29 @@ public class TxDisplay implements PropertyChangeListener, ISelectionProvider, Mo
@SuppressWarnings("unchecked")
@Override
public void setSelection(ISelection selection) {
boolean selectionChanged=false;
if(selection instanceof IStructuredSelection){
Object sel =((IStructuredSelection)selection).getFirstElement();
if(sel instanceof ITx && currentSelection!=sel){
currentSelection=(ITx) sel;
boolean selectionChanged = false;
if (selection instanceof IStructuredSelection) {
Object sel = ((IStructuredSelection) selection).getFirstElement();
if (sel instanceof ITx && currentSelection != sel) {
currentSelection = (ITx) sel;
currentWaveformSelection = currentSelection.getStream();
selectionChanged=true;
} else if(sel instanceof IWaveform<?> && currentWaveformSelection!=sel){
currentSelection=null;
selectionChanged = true;
} else if (sel instanceof IWaveform<?>
&& currentWaveformSelection != sel) {
currentSelection = null;
currentWaveformSelection = (IWaveform<? extends IWaveformEvent>) sel;
selectionChanged=true;
selectionChanged = true;
}
} else {
if(currentSelection!=null || currentWaveformSelection!=null) selectionChanged=true;
currentSelection=null;
if (currentSelection != null || currentWaveformSelection != null)
selectionChanged = true;
currentSelection = null;
currentWaveformSelection = null;
}
if(selectionChanged){
if(currentWaveformSelection!=null && !streams.contains(currentWaveformSelection)){
streams.add(currentWaveformSelection);
}
if (selectionChanged) {
trackList.setSelected(currentSelection, currentWaveformSelection);
nameList.setData(SELECTION, currentWaveformSelection);
valueList.redraw();
@ -361,36 +405,36 @@ public class TxDisplay implements PropertyChangeListener, ISelectionProvider, Mo
@SuppressWarnings("unchecked")
public void moveSelection(GotoDirection direction) {
if(currentWaveformSelection instanceof ITxStream<?>){
if (currentWaveformSelection instanceof ITxStream<?>) {
ITxStream<ITxEvent> stream = (ITxStream<ITxEvent>) currentWaveformSelection;
ITx transaction=null;
if(direction==GotoDirection.NEXT){
ITx transaction = null;
if (direction == GotoDirection.NEXT) {
Entry<Long, List<ITxEvent>> entry = stream.getEvents().higherEntry(currentSelection.getBeginTime());
if(entry!=null)
if (entry != null)
do {
for(ITxEvent evt:entry.getValue()){
if(evt.getType()==ITxEvent.Type.BEGIN){
transaction=evt.getTransaction();
for (ITxEvent evt : entry.getValue()) {
if (evt.getType() == ITxEvent.Type.BEGIN) {
transaction = evt.getTransaction();
break;
}
}
if(transaction==null)
entry=stream.getEvents().higherEntry(entry.getKey());
}while(entry!=null && transaction==null);
}else if(direction==GotoDirection.PREV){
if (transaction == null)
entry = stream.getEvents().higherEntry(entry.getKey());
} while (entry != null && transaction == null);
} else if (direction == GotoDirection.PREV) {
Entry<Long, List<ITxEvent>> entry = stream.getEvents().lowerEntry(currentSelection.getBeginTime());
if(entry!=null)
if (entry != null)
do {
for(ITxEvent evt:entry.getValue()){
if(evt.getType()==ITxEvent.Type.BEGIN)
transaction=evt.getTransaction();
for (ITxEvent evt : entry.getValue()) {
if (evt.getType() == ITxEvent.Type.BEGIN)
transaction = evt.getTransaction();
break;
}
if(transaction==null)
entry=stream.getEvents().lowerEntry(entry.getKey());
}while(entry!=null && transaction==null);
if (transaction == null)
entry = stream.getEvents().lowerEntry(entry.getKey());
} while (entry != null && transaction == null);
}
if(transaction!=null){
if (transaction != null) {
setSelection(new StructuredSelection(transaction));
}
}
@ -402,45 +446,61 @@ public class TxDisplay implements PropertyChangeListener, ISelectionProvider, Mo
@Override
public void mouseDown(MouseEvent e) {
if(e.widget==trackList){
if(e.button==1 || e.button==3){
if (e.widget == trackList) {
Object o = trackList.getClicked(new Point(e.x, e.y));
if(o !=null)
if (o != null)
setSelection(new StructuredSelection(o));
}else if(e.widget==valueList || e.widget==nameList){
Entry<Integer, IWaveform<? extends IWaveformEvent>> entry = trackVerticalOffset.floorEntry(e.y);
if(entry!=null)
} else if (e.widget == valueList || e.widget == nameList) {
Entry<Integer, IWaveform<? extends IWaveformEvent>> entry = trackVerticalOffset
.floorEntry(e.y);
if (entry != null)
setSelection(new StructuredSelection(entry.getValue()));
}
}
if(e.button==3){
top.getMenu().setVisible(true);
}
}
@Override
public void mouseUp(MouseEvent e) {
}
public List<IWaveform<? extends IWaveformEvent>> getStreamList(){
public List<IWaveform<? extends IWaveformEvent>> getStreamList() {
return streams;
}
protected void paintNames(GC gc, Rectangle rect) {
if(streams.size()>0){
if (streams.size() > 0) {
@SuppressWarnings("unchecked")
IWaveform<? extends IWaveformEvent> wave = (IWaveform<? extends IWaveformEvent>) nameList.getData(SELECTION);
Integer firstKey=trackVerticalOffset.floorKey(rect.y);
if(firstKey==null) firstKey=trackVerticalOffset.firstKey();
Integer lastKey = trackVerticalOffset.floorKey(rect.y+rect.height);
Rectangle subArea = new Rectangle(rect.x, 0, rect.width, trackList.getTrackHeight());
if(lastKey==firstKey){
IWaveform<? extends IWaveformEvent> w = trackVerticalOffset.get(firstKey);
if(w instanceof ITxStream<?>)
subArea.height*=((ITxStream<?>)w).getMaxConcurrency();
drawTextFormat(gc, subArea, firstKey, w.getFullName(), wave!=null && w.getId()==wave.getId());
}else{
for(Entry<Integer, IWaveform<? extends IWaveformEvent>> entry : trackVerticalOffset.subMap(firstKey, true, lastKey, true).entrySet()){
IWaveform<? extends IWaveformEvent> wave = (IWaveform<? extends IWaveformEvent>) nameList
.getData(SELECTION);
Integer firstKey = trackVerticalOffset.floorKey(rect.y);
if (firstKey == null)
firstKey = trackVerticalOffset.firstKey();
Integer lastKey = trackVerticalOffset
.floorKey(rect.y + rect.height);
Rectangle subArea = new Rectangle(rect.x, 0, rect.width,
trackList.getTrackHeight());
if (lastKey == firstKey) {
IWaveform<? extends IWaveformEvent> w = trackVerticalOffset
.get(firstKey);
if (w instanceof ITxStream<?>)
subArea.height *= ((ITxStream<?>) w).getMaxConcurrency();
drawTextFormat(gc, subArea, firstKey, w.getFullName(),
wave != null && w.getId() == wave.getId());
} else {
for (Entry<Integer, IWaveform<? extends IWaveformEvent>> entry : trackVerticalOffset
.subMap(firstKey, true, lastKey, true).entrySet()) {
IWaveform<? extends IWaveformEvent> w = entry.getValue();
subArea.height=trackList.getTrackHeight();
if(w instanceof ITxStream<?>)
subArea.height*=((ITxStream<?>)w).getMaxConcurrency();
drawTextFormat(gc, subArea, entry.getKey(), w.getFullName(), wave!=null && w.getId()==wave.getId());
subArea.height = trackList.getTrackHeight();
if (w instanceof ITxStream<?>)
subArea.height *= ((ITxStream<?>) w)
.getMaxConcurrency();
drawTextFormat(gc, subArea, entry.getKey(),
w.getFullName(),
wave != null && w.getId() == wave.getId());
}
}
}
@ -448,42 +508,62 @@ public class TxDisplay implements PropertyChangeListener, ISelectionProvider, Mo
@SuppressWarnings("unchecked")
protected void paintValues(GC gc, Rectangle rect) {
if(streams.size()>0){
IWaveform<? extends IWaveformEvent> wave = (IWaveform<? extends IWaveformEvent>) nameList.getData(SELECTION);
Integer firstKey=trackVerticalOffset.floorKey(rect.y);
if(firstKey==null) firstKey=trackVerticalOffset.firstKey();
Integer lastKey = trackVerticalOffset.floorKey(rect.y+rect.height);
Rectangle subArea = new Rectangle(rect.x, 0, rect.width, trackList.getTrackHeight());
if(lastKey==firstKey){
IWaveform<? extends IWaveformEvent> w = trackVerticalOffset.get(firstKey);
if(w instanceof ITxStream<?>)
subArea.height*=((ITxStream<?>)w).getMaxConcurrency();
drawTextFormat(gc, subArea, firstKey, actualValues.get(w), wave!=null && w.getId()==wave.getId());
}else{
for(Entry<Integer, IWaveform<? extends IWaveformEvent>> entry : trackVerticalOffset.subMap(firstKey, true, lastKey, true).entrySet()){
if (streams.size() > 0) {
IWaveform<? extends IWaveformEvent> wave = (IWaveform<? extends IWaveformEvent>) nameList
.getData(SELECTION);
Integer firstKey = trackVerticalOffset.floorKey(rect.y);
if (firstKey == null)
firstKey = trackVerticalOffset.firstKey();
Integer lastKey = trackVerticalOffset
.floorKey(rect.y + rect.height);
Rectangle subArea = new Rectangle(rect.x, 0, rect.width,
trackList.getTrackHeight());
if (lastKey == firstKey) {
IWaveform<? extends IWaveformEvent> w = trackVerticalOffset
.get(firstKey);
if (w instanceof ITxStream<?>)
subArea.height *= ((ITxStream<?>) w).getMaxConcurrency();
drawTextFormat(gc, subArea, firstKey, actualValues.get(w),
wave != null && w.getId() == wave.getId());
} else {
for (Entry<Integer, IWaveform<? extends IWaveformEvent>> entry : trackVerticalOffset
.subMap(firstKey, true, lastKey, true).entrySet()) {
IWaveform<? extends IWaveformEvent> w = entry.getValue();
subArea.height=trackList.getTrackHeight();
if(w instanceof ITxStream<?>)
subArea.height*=((ITxStream<?>)w).getMaxConcurrency();
drawTextFormat(gc, subArea, entry.getKey(), actualValues.get(w), wave!=null && w.getId()==wave.getId());
subArea.height = trackList.getTrackHeight();
if (w instanceof ITxStream<?>)
subArea.height *= ((ITxStream<?>) w)
.getMaxConcurrency();
drawTextFormat(gc, subArea, entry.getKey(),
actualValues.get(w), wave != null
&& w.getId() == wave.getId());
}
}
}
}
protected void drawTextFormat(GC gc, Rectangle subArea, int yOffset, String value, boolean highlite) {
protected void drawTextFormat(GC gc, Rectangle subArea, int yOffset,
String value, boolean highlite) {
Point size = gc.textExtent(value);
if(highlite){
gc.setBackground(SWTResourceManager.getColor(SWT.COLOR_LIST_SELECTION));
gc.setForeground(SWTResourceManager.getColor(SWT.COLOR_LIST_SELECTION_TEXT));
gc.fillRectangle(subArea.x, subArea.y+yOffset, subArea.width, subArea.height);
if (highlite) {
gc.setBackground(SWTResourceManager
.getColor(SWT.COLOR_LIST_SELECTION));
gc.setForeground(SWTResourceManager
.getColor(SWT.COLOR_LIST_SELECTION_TEXT));
gc.fillRectangle(subArea.x, subArea.y + yOffset, subArea.width,
subArea.height);
gc.setFont(nameFontB);
}else{
gc.setBackground(SWTResourceManager.getColor(SWT.COLOR_LIST_BACKGROUND));
gc.setForeground(SWTResourceManager.getColor(SWT.COLOR_LIST_FOREGROUND));
} else {
gc.setBackground(SWTResourceManager
.getColor(SWT.COLOR_LIST_BACKGROUND));
gc.setForeground(SWTResourceManager
.getColor(SWT.COLOR_LIST_FOREGROUND));
gc.setFont(nameFont);
}
gc.drawText(value, subArea.x+5, subArea.y + yOffset+(trackList.getTrackHeight()-size.y)/2, true);
gc.drawText(
value,
subArea.x + 5,
subArea.y + yOffset + (trackList.getTrackHeight() - size.y) / 2,
true);
}
public long getMaxTime() {
@ -501,7 +581,66 @@ public class TxDisplay implements PropertyChangeListener, ISelectionProvider, Mo
public int getZoomLevel() {
return trackList.getZoomLevel();
}
// public long getScaleFactor(){
// return trackList.getScaleFactor();
// }
private void createDragSource(final Canvas sourceText) {
Transfer[] types = new Transfer[] { TextTransfer.getInstance() };
DragSource dragSource = new DragSource(sourceText, DND.DROP_MOVE);
dragSource.setTransfer(types);
dragSource.addDragListener(new DragSourceListener() {
public void dragStart(DragSourceEvent event) {
if (event.y < trackVerticalOffset.lastKey() + trackList.getTrackHeight()) {
// event.data = trackVerticalOffset.floorEntry(event.y).getValue().getFullName();
event.doit = true;
// System.out.println("dragStart at location "+new Point(event.x, event.y));
}
}
public void dragSetData(DragSourceEvent event) {
event.data = trackVerticalOffset.floorEntry(event.y).getValue().getFullName();
// System.out.println("dragSetData with data " + event.data);
}
public void dragFinished(DragSourceEvent event) {
// do nothing
}
});
}
private void createDropTarget(final Canvas targetText) {
Transfer[] types = new Transfer[] { TextTransfer.getInstance() };
DropTarget dropTarget = new DropTarget(targetText, DND.DROP_MOVE);
dropTarget.setTransfer(types);
dropTarget.addDropListener(new DropTargetListener() {
public void dragEnter(DropTargetEvent event) {
}
public void dragLeave(DropTargetEvent event) {
}
public void dragOperationChanged(DropTargetEvent event) {
}
public void dragOver(DropTargetEvent event) {
}
public void drop(DropTargetEvent event) {
Object data = event.data;
DropTarget tgt = (DropTarget) event.widget;
Point dropPoint = ((Canvas)tgt.getControl()).toControl(event.x, event.y);
String fullname1 = trackVerticalOffset.floorEntry(dropPoint.y).getValue().getFullName();
// System.out.println("drop with data '" + event.data +"' at location "+dropPoint + " and origin " + nameListScrolled.getOrigin());
// System.out.println("drop on " + fullname1);
}
public void dropAccept(DropTargetEvent event) {
if (event.detail != DND.DROP_MOVE || event.y > trackVerticalOffset.lastKey() + trackList.getTrackHeight()) {
event.detail = DND.DROP_NONE;
}
}
});
}
}

12
com.minres.scviewer.database.swt/src/com/minres/scviewer/database/swt/internal/StreamPainter.java
View File

@ -102,7 +102,9 @@ public class StreamPainter implements IWaveformPainter{
(int)(tx.getBeginTime()/this.waveCanvas.getScaleFactor()), area.y+offset+upper,
(int)((tx.getEndTime()-tx.getBeginTime())/this.waveCanvas.getScaleFactor()), txHeight);
if(bb.x+bb.width<area.x || bb.x>area.x+area.width) return;
if(bb.width<10){
if(bb.width==0){
gc.drawLine(bb.x, bb.y, bb.x, bb.y+bb.height);
} else if(bb.width<10){
gc.fillRectangle(bb);
gc.drawRectangle(bb);
} else {
@ -129,6 +131,14 @@ public class StreamPainter implements IWaveformPainter{
return stream;
}
public ITxStream<? extends ITxEvent> getStream() {
return stream;
}
public void setStream(ITxStream<? extends ITxEvent> stream) {
this.stream = stream;
}
protected ITx getTxFromEntry(int lane, Entry<Long, List<ITxEvent>> firstTx) {
for(ITxEvent evt:firstTx.getValue()){
if(evt.getType()==ITxEvent.Type.BEGIN && evt.getTransaction().getConcurrencyIndex()==lane){

4
com.minres.scviewer.database.swt/src/com/minres/scviewer/database/swt/internal/TrackPainter.java
View File

@ -12,6 +12,7 @@ package com.minres.scviewer.database.swt.internal;
import java.util.Map.Entry;
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.GC;
import org.eclipse.swt.graphics.Rectangle;
@ -30,6 +31,9 @@ public class TrackPainter implements IPainter {
}
public void paintArea(GC gc, Rectangle area) {
gc.setBackground(this.waveCanvas.colors[WaveformCanvas.Colors.TRACK_BG_EVEN.ordinal()]);
gc.setFillRule(SWT.FILL_EVEN_ODD);
gc.fillRectangle(area);
if(this.waveCanvas.streams.size()>0){
Integer firstKey=this.waveCanvas.trackVerticalOffset.floorKey(area.y);
if(firstKey==null) firstKey=this.waveCanvas.trackVerticalOffset.firstKey();

22
com.minres.scviewer.database.swt/src/com/minres/scviewer/database/swt/internal/WaveformCanvas.java
View File

@ -144,7 +144,7 @@ public class WaveformCanvas extends Canvas {
this.ruler=ruler;
}
public Object getOrigin() {
public Point getOrigin() {
return origin;
}
@ -350,19 +350,31 @@ public class WaveformCanvas extends Canvas {
public void setSelected(ITx currentSelection, IWaveform<? extends IWaveformEvent> currentWaveformSelection) {
this.currentSelection=currentSelection;
this.currentWaveformSelection=currentWaveformSelection;
if(currentSelection!=null) reveal(currentSelection.getBeginTime(), currentSelection.getEndTime());
if(currentSelection!=null) reveal(currentSelection);
redraw();
}
public void reveal(Long beginTime, Long endTime) {
int lower = (int) (beginTime/scaleFactor);
int higher=(int) (endTime/scaleFactor);
public void reveal(ITx tx){
int lower = (int) (tx.getBeginTime()/scaleFactor);
int higher=(int) (tx.getEndTime()/scaleFactor);
Point size = getSize();
if(lower<-origin.x){
scrollToX(lower);
} else if(higher>(size.x-origin.x)){
scrollToX(higher-size.x);
}
for(Entry<Integer, IWaveformPainter> entry:trackVerticalOffset.entrySet()){
if(entry.getValue() instanceof StreamPainter && ((StreamPainter)entry.getValue()).getStream()==tx.getStream()){
int top = entry.getKey()+trackHeight*tx.getConcurrencyIndex();
int bottom = top+trackHeight*(tx.getConcurrencyIndex()+1);
if(top<-origin.y){
scrollToY(bottom);
} else if(bottom>(size.y-origin.y)){
scrollToY(bottom-size.y);
}
}
}
}
}

1
com.minres.scviewer.database.text/.settings/org.eclipse.jdt.core.prefs
View File

@ -4,4 +4,5 @@ org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
org.eclipse.jdt.core.compiler.compliance=1.7
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.source=1.7

102
com.minres.scviewer.ui/plugin.xml
View File

@ -289,6 +289,70 @@
</parameter>
</command>
</menuContribution>
<menuContribution
allPopups="false"
locationURI="popup:com.minres.scviewer.ui.TxEditorPart">
<command
commandId="com.minres.scviewer.ui.removeWave"
label="Remove"
style="push"
tooltip="Go to next event">
<visibleWhen
checkEnabled="false">
<reference
definitionId="com.minres.scviewer.ui.waveEditorActive">
</reference>
</visibleWhen>
</command>
<command
commandId="com.minres.scviewer.ui.zoomin"
label="Zoom in"
style="push"
tooltip="Zoom into">
<visibleWhen
checkEnabled="false">
<reference
definitionId="com.minres.scviewer.ui.waveEditorActive">
</reference>
</visibleWhen>
</command>
<command
commandId="com.minres.scviewer.ui.zoomout"
label="Zoom out"
style="push"
tooltip="Zoom out of">
<visibleWhen
checkEnabled="false">
<reference
definitionId="com.minres.scviewer.ui.waveEditorActive">
</reference>
</visibleWhen>
</command>
<command
commandId="com.minres.scviewer.ui.gotoPrev"
label="Prev"
style="push"
tooltip="Go to previous event">
<visibleWhen
checkEnabled="false">
<reference
definitionId="com.minres.scviewer.ui.waveEditorActive">
</reference>
</visibleWhen>
</command>
<command
commandId="com.minres.scviewer.ui.gotoNext"
label="Next"
style="push"
tooltip="Go to next event">
<visibleWhen
checkEnabled="false">
<reference
definitionId="com.minres.scviewer.ui.waveEditorActive">
</reference>
</visibleWhen>
</command>
</menuContribution>
</extension>
<extension
point="org.eclipse.ui.commands">
@ -321,6 +385,10 @@
id="com.minres.scviewer.ui.zoomout"
name="Zoom out">
</command>
<command
id="com.minres.scviewer.ui.removeWave"
name="Remove wave">
</command>
</extension>
<extension
point="org.eclipse.ui.handlers">
@ -329,7 +397,7 @@
commandId="com.minres.scviewer.ui.gotoPrev">
<enabledWhen>
<reference
definitionId="com.minres.scviewer.ui.oneElementSeleted">
definitionId="com.minres.scviewer.ui.oneTxSeleted">
</reference>
</enabledWhen>
</handler>
@ -338,7 +406,7 @@
commandId="com.minres.scviewer.ui.gotoNext">
<enabledWhen>
<reference
definitionId="com.minres.scviewer.ui.oneElementSeleted">
definitionId="com.minres.scviewer.ui.oneTxSeleted">
</reference>
</enabledWhen>
</handler>
@ -360,11 +428,35 @@
</reference>
</enabledWhen>
</handler>
<handler
class="com.minres.scviewer.ui.handler.RemoveHandler"
commandId="com.minres.scviewer.ui.removeWave">
<enabledWhen>
<reference
definitionId="com.minres.scviewer.ui.oneWaveSeleted">
</reference>
</enabledWhen>
</handler>
</extension>
<extension
point="org.eclipse.core.expressions.definitions">
<definition
id="com.minres.scviewer.ui.oneElementSeleted">
id="com.minres.scviewer.ui.oneWaveSeleted">
<with
variable="selection">
<and>
<count
value="1">
</count>
<iterate
operator="or">
<instanceof value="com.minres.scviewer.database.IWaveform"/>
</iterate>
</and>
</with>
</definition>
<definition
id="com.minres.scviewer.ui.oneTxSeleted">
<with
variable="selection">
<and>
@ -412,6 +504,10 @@
commandId="com.minres.scviewer.ui.zoomout"
icon="res/images/zoom_out.png">
</image>
<image
commandId="com.minres.scviewer.ui.removeWave"
icon="res/images/cross.png">
</image>
</extension>
</plugin>

BIN
com.minres.scviewer.ui/res/images/cross.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 655 B

23
com.minres.scviewer.ui/src/com/minres/scviewer/ui/TxEditorPart.java
View File

@ -22,11 +22,13 @@ import java.util.regex.Pattern;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jface.action.IStatusLineManager;
import org.eclipse.jface.action.MenuManager;
import org.eclipse.jface.action.StatusLineContributionItem;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.operation.IRunnableWithProgress;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Menu;
import org.eclipse.ui.IActionBars;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.IEditorSite;
@ -110,6 +112,18 @@ public class TxEditorPart extends EditorPart implements ITabbedPropertySheetPage
}
}).run();
zoomStatusLineItem.setText("Zoom level: "+zoomLevel[txDisplay.getZoomLevel()]);
MenuManager menuMgr = new MenuManager("#PopupMenu");
// menuMgr.setRemoveAllWhenShown(true);
// menuMgr.addMenuListener(new IMenuListener() {
// public void menuAboutToShow(IMenuManager manager) {
// fillContextMenu(manager);
// }
// });
Menu menu = menuMgr.createContextMenu(txDisplay.getControl());
txDisplay.getControl().setMenu(menu);
getSite().registerContextMenu(menuMgr, txDisplay);
}
/*
@ -332,6 +346,10 @@ public class TxEditorPart extends EditorPart implements ITabbedPropertySheetPage
});
}
public ISelection getSelection(){
return txDisplay.getSelection();
}
@Override
public String getContributorId() {
return getSite().getId();
@ -353,4 +371,9 @@ public class TxEditorPart extends EditorPart implements ITabbedPropertySheetPage
return txDisplay.getZoomLevel();
}
public void removeSelected() {
// TODO Auto-generated method stub
}
}

33
com.minres.scviewer.ui/src/com/minres/scviewer/ui/handler/RemoveHandler.java Normal file
View File

@ -0,0 +1,33 @@
package com.minres.scviewer.ui.handler;
import org.eclipse.core.commands.AbstractHandler;
import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.commands.ExecutionException;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.handlers.HandlerUtil;
import org.eclipse.ui.internal.misc.StringMatcher;
import com.minres.scviewer.database.IWaveform;
import com.minres.scviewer.database.IWaveformEvent;
import com.minres.scviewer.ui.TxEditorPart;
public class RemoveHandler extends AbstractHandler {
@SuppressWarnings("unchecked")
@Override
public Object execute(ExecutionEvent event) throws ExecutionException {
IEditorPart editor = HandlerUtil.getActiveEditor(event);
if(editor instanceof TxEditorPart){
TxEditorPart editorPart = (TxEditorPart) editor;
ISelection selection =editorPart.getSelection();
if(selection instanceof StructuredSelection && ((StructuredSelection)selection).getFirstElement() instanceof IWaveform<?>){
editorPart.removeStreamFromList((IWaveform<? extends IWaveformEvent>) ((StructuredSelection)selection).getFirstElement());
editorPart.setSelection(new StructuredSelection());
}
}
return null;
}
}