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

- fixed scrolling sync issue 

- fixed duplicate db entries
This commit is contained in:
ejentzsx 2015-02-04 16:20:59 +01:00
parent 310c9bbb8f
commit ac942481e3
11 changed files with 849 additions and 844 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/Tx.java
View File

@ -179,7 +179,11 @@ public class Tx implements ITx {
@Override
public int compareTo(ITx o) {
return this.getBeginTime().compareTo(o.getBeginTime());
int res = this.getBeginTime().compareTo(o.getBeginTime());
if(res!=0)
return res;
else
return this.getId().compareTo(o.getId());
}
@Override

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

@ -121,24 +121,19 @@ public class TxDisplay implements PropertyChangeListener, ISelectionProvider, Mo
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);
@ -168,12 +163,9 @@ 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);
@ -212,32 +204,27 @@ 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);
trackList.scrollToY(y);
valueListScrolled.setOrigin(valueListScrolled.getOrigin().x, y);
trackList.setOrigin(trackList.getOrigin().x, 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);
trackList.scrollToY(y);
nameListScrolled.setOrigin(nameListScrolled.getOrigin().x, y);
trackList.setOrigin(trackList.getOrigin().x, y);
}
});
trackList.getVerticalBar().addSelectionListener(new SelectionAdapter() {
trackList.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) {
int y = trackList.getVerticalBar().getSelection();
nameListScrolled.setOrigin(nameListScrolled.getOrigin().x, y);
@ -263,8 +250,7 @@ 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);
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);
@ -272,8 +258,7 @@ public class TxDisplay implements PropertyChangeListener, ISelectionProvider, Mo
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;
@ -305,8 +290,7 @@ public class TxDisplay implements PropertyChangeListener, ISelectionProvider, Mo
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);
painter = new SignalPainter(trackList, even, height, (ISignal<?>) waveform);
actualValues.put(waveform, "---");
}
trackList.addWavefromPainter(yoffs, painter);
@ -325,7 +309,8 @@ public class TxDisplay implements PropertyChangeListener, ISelectionProvider, Mo
trackList.redraw();
top.layout(new Control[] { valueList, nameList, trackList });
if (previousHeight > trackVerticalOffset.lastKey()) {
trackList.scrollToY(trackList.getOrigin().y-(previousHeight-trackVerticalOffset.lastKey()));
Point o = trackList.getOrigin();
trackList.setOrigin(o.x, o.y - (previousHeight - trackVerticalOffset.lastKey()));
}
setSelection(new StructuredSelection());
}
@ -347,8 +332,7 @@ public class TxDisplay implements PropertyChangeListener, ISelectionProvider, Mo
}
@Override
public void removeSelectionChangedListener(
ISelectionChangedListener listener) {
public void removeSelectionChangedListener(ISelectionChangedListener listener) {
listeners.remove(listener);
}
@ -376,8 +360,7 @@ public class TxDisplay implements PropertyChangeListener, ISelectionProvider, Mo
currentSelection = (ITx) sel;
currentWaveformSelection = currentSelection.getStream();
selectionChanged = true;
} else if (sel instanceof IWaveform<?>
&& currentWaveformSelection != sel) {
} else if (sel instanceof IWaveform<?> && currentWaveformSelection != sel) {
currentSelection = null;
currentWaveformSelection = (IWaveform<? extends IWaveformEvent>) sel;
selectionChanged = true;
@ -425,11 +408,14 @@ public class TxDisplay implements PropertyChangeListener, ISelectionProvider, Mo
Entry<Long, List<ITxEvent>> entry = stream.getEvents().lowerEntry(currentSelection.getBeginTime());
if (entry != null)
do {
System.out.println(currentSelection.getBeginTime() + " -> " + entry.getKey());
for (ITxEvent evt : entry.getValue()) {
if (evt.getType() == ITxEvent.Type.BEGIN)
System.out.println("\t-> " + evt.toString());
if (evt.getType() == ITxEvent.Type.BEGIN) {
transaction = evt.getTransaction();
break;
}
}
if (transaction == null)
entry = stream.getEvents().lowerEntry(entry.getKey());
} while (entry != null && transaction == null);
@ -452,8 +438,7 @@ public class TxDisplay implements PropertyChangeListener, ISelectionProvider, Mo
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);
Entry<Integer, IWaveform<? extends IWaveformEvent>> entry = trackVerticalOffset.floorEntry(e.y);
if (entry != null)
setSelection(new StructuredSelection(entry.getValue()));
}
@ -474,33 +459,25 @@ public class TxDisplay implements PropertyChangeListener, ISelectionProvider, Mo
protected void paintNames(GC gc, Rectangle rect) {
if (streams.size() > 0) {
@SuppressWarnings("unchecked")
IWaveform<? extends IWaveformEvent> wave = (IWaveform<? extends IWaveformEvent>) nameList
.getData(SELECTION);
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());
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);
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());
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()) {
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 *= ((ITxStream<?>) w).getMaxConcurrency();
drawTextFormat(gc, subArea, entry.getKey(), w.getFullName(), wave != null && w.getId() == wave.getId());
}
}
}
@ -509,61 +486,43 @@ 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);
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());
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);
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());
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()) {
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 *= ((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);
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));
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() {
@ -590,9 +549,11 @@ public class TxDisplay implements PropertyChangeListener, ISelectionProvider, Mo
public void dragStart(DragSourceEvent event) {
if (event.y < trackVerticalOffset.lastKey() + trackList.getTrackHeight()) {
// event.data = trackVerticalOffset.floorEntry(event.y).getValue().getFullName();
// event.data =
// trackVerticalOffset.floorEntry(event.y).getValue().getFullName();
event.doit = true;
// System.out.println("dragStart at location "+new Point(event.x, event.y));
// System.out.println("dragStart at location "+new
// Point(event.x, event.y));
}
}
@ -631,7 +592,9 @@ public class TxDisplay implements PropertyChangeListener, ISelectionProvider, Mo
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 with data '" + event.data
// +"' at location "+dropPoint + " and origin " +
// nameListScrolled.getOrigin());
// System.out.println("drop on " + fullname1);
}

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

@ -68,35 +68,37 @@ public class StreamPainter implements IWaveformPainter{
for(int y1=area.y+this.waveCanvas.getTrackHeight()/2; y1<area.y+totalHeight; y1+=this.waveCanvas.getTrackHeight())
gc.drawLine(area.x, y1, area.x+area.width, y1);
if(firstTx==lastTx)
for(ITxEvent x:(Collection<? extends ITxEvent>)firstTx.getValue())
drawTx(gc, area, x.getTransaction());
for(ITxEvent txEvent:(Collection<? extends ITxEvent>)firstTx.getValue())
drawTx(gc, area, txEvent.getTransaction());
else{
seenTx.clear();
NavigableMap<Long,?> entries = stream.getEvents().subMap(firstTx.getKey(), true, lastTx.getKey(), true);
for(Entry<Long, ?> tx: entries.entrySet())
for(ITxEvent x:(Collection<? extends ITxEvent>)tx.getValue()){
if(x.getType()==ITxEvent.Type.BEGIN)
seenTx.add(x.getTransaction());
if(x.getType()==ITxEvent.Type.END){
drawTx(gc, area, x.getTransaction());
seenTx.remove(x.getTransaction());
boolean highlighed=false;
gc.setForeground(this.waveCanvas.colors[WaveformCanvas.Colors.LINE.ordinal()]);
gc.setBackground(this.waveCanvas.colors[WaveformCanvas.Colors.TX_BG.ordinal()]);
for(Entry<Long, ?> entry: entries.entrySet())
for(ITxEvent txEvent:(Collection<? extends ITxEvent>)entry.getValue()){
if(txEvent.getType()==ITxEvent.Type.BEGIN)
seenTx.add(txEvent.getTransaction());
if(txEvent.getType()==ITxEvent.Type.END){
ITx tx = txEvent.getTransaction();
highlighed|=waveCanvas.currentSelection!=null && waveCanvas.currentSelection.getId()==tx.getId();
drawTx(gc, area, tx);
seenTx.remove(tx);
}
}
for(ITx tx:seenTx){
drawTx(gc, area, tx);
}
if(highlighed){
gc.setForeground(this.waveCanvas.colors[WaveformCanvas.Colors.LINE_HIGHLITE.ordinal()]);
gc.setBackground(this.waveCanvas.colors[WaveformCanvas.Colors.TX_BG_HIGHLITE.ordinal()]);
drawTx(gc, area, waveCanvas.currentSelection);
}
}
}
protected void drawTx(GC gc, Rectangle area, ITx tx) {
if(waveCanvas.currentSelection!=null && waveCanvas.currentSelection.getId()==tx.getId()){
gc.setForeground(this.waveCanvas.colors[WaveformCanvas.Colors.LINE_HIGHLITE.ordinal()]);
gc.setBackground(this.waveCanvas.colors[WaveformCanvas.Colors.TX_BG_HIGHLITE.ordinal()]);
}else {
gc.setForeground(this.waveCanvas.colors[WaveformCanvas.Colors.LINE.ordinal()]);
gc.setBackground(this.waveCanvas.colors[WaveformCanvas.Colors.TX_BG.ordinal()]);
}
int offset = tx.getConcurrencyIndex()*this.waveCanvas.getTrackHeight();
Rectangle bb = new Rectangle(
(int)(tx.getBeginTime()/this.waveCanvas.getScaleFactor()), area.y+offset+upper,

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

@ -32,6 +32,7 @@ import org.eclipse.swt.graphics.Transform;
import org.eclipse.swt.widgets.Canvas;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.ScrollBar;
import org.eclipse.wb.swt.SWTResourceManager;
@ -42,20 +43,7 @@ import com.minres.scviewer.database.IWaveformEvent;
public class WaveformCanvas extends Canvas {
public enum Colors {
LINE,
LINE_HIGHLITE,
TRACK_BG_EVEN,
TRACK_BG_HIGHLITE,
TRACK_BG_ODD,
TX_BG,
TX_BG_HIGHLITE,
TX_BORDER,
SIGNAL0,
SIGNAL1,
SIGNALZ,
SIGNALX,
SIGNAL_TEXT,
CURSOR
LINE, LINE_HIGHLITE, TRACK_BG_EVEN, TRACK_BG_HIGHLITE, TRACK_BG_ODD, TX_BG, TX_BG_HIGHLITE, TX_BORDER, SIGNAL0, SIGNAL1, SIGNALZ, SIGNALX, SIGNAL_TEXT, CURSOR
}
Color[] colors = new Color[Colors.values().length];
@ -75,11 +63,15 @@ public class WaveformCanvas extends Canvas {
ITx currentSelection;
IWaveform<? extends IWaveformEvent> currentWaveformSelection;
private List<SelectionAdapter> selectionListeners;
/**
* Constructor for ScrollableCanvas.
* @param parent the parent of this control.
* @param style the style of this control.
*
* @param parent
* the parent of this control.
* @param style
* the style of this control.
*/
public WaveformCanvas(final Composite parent, int style) {
super(parent, style | SWT.DOUBLE_BUFFERED | SWT.NO_BACKGROUND | SWT.NO_REDRAW_RESIZE | SWT.V_SCROLL | SWT.H_SCROLL);
@ -97,6 +89,7 @@ public class WaveformCanvas extends Canvas {
origin = new Point(0, 0);
transform = new Transform(getDisplay());
trackVerticalOffset = new TreeMap<Integer, IWaveformPainter>();
selectionListeners = new LinkedList<>();
initScrollBars();
initColors(null);
}
@ -148,6 +141,23 @@ public class WaveformCanvas extends Canvas {
return origin;
}
public void setOrigin(Point origin) {
setOrigin(origin.x, origin.y);
}
public void setOrigin(int x, int y) {
checkWidget();
ScrollBar hBar = getHorizontalBar();
hBar.setSelection(-x);
x = -hBar.getSelection();
ScrollBar vBar = getVerticalBar();
vBar.setSelection(-y);
y = -vBar.getSelection();
origin.x = x;
origin.y = y;
syncScrollBars();
}
public long getMaxTime() {
return maxTime;
}
@ -169,7 +179,8 @@ public class WaveformCanvas extends Canvas {
public void setZoomLevel(int level) {
this.level = level;
this.scaleFactor = (long) Math.pow(10, level);
if(ruler!=null) ruler.setStartPoint(-origin.x*scaleFactor);
if (ruler != null)
ruler.setStartPoint(-origin.x * scaleFactor);
syncScrollBars();
}
@ -206,37 +217,11 @@ public class WaveformCanvas extends Canvas {
*/
public void dispose() {
transform.dispose();
for(Colors c:Colors.values()) colors[c.ordinal()].dispose();
for (Colors c : Colors.values())
colors[c.ordinal()].dispose();
super.dispose();
}
public void scrollToY(int y){
ScrollBar vBar = getVerticalBar();
vBar.setSelection(y);
scrollVertically(vBar);
}
public void scrollToX(int x){
ScrollBar hBar = getHorizontalBar();
hBar.setSelection(x);
scrollHorizontally(hBar);
}
/* Scroll horizontally */
private void scrollHorizontally(ScrollBar scrollBar) {
if (painterList.size()==0) return;
origin.x= -scrollBar.getSelection();
if(ruler!=null) ruler.setStartPoint(-origin.x*scaleFactor);
syncScrollBars();
}
/* Scroll vertically */
private void scrollVertically(ScrollBar scrollBar) {
if (painterList.size()==0) return;
origin.y = -scrollBar.getSelection();
syncScrollBars();
}
/* Initalize the scrollbar and register listeners. */
private void initScrollBars() {
ScrollBar horizontal = getHorizontalBar();
@ -244,7 +229,11 @@ public class WaveformCanvas extends Canvas {
horizontal.setVisible(true);
horizontal.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent event) {
scrollHorizontally((ScrollBar) event.widget);
if (painterList.size() == 0)
return;
setOrigin(-((ScrollBar) event.widget).getSelection(), origin.y);
if (ruler != null)
ruler.setStartPoint(-origin.x * scaleFactor);
}
});
ScrollBar vertical = getVerticalBar();
@ -252,15 +241,17 @@ public class WaveformCanvas extends Canvas {
vertical.setVisible(true);
vertical.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent event) {
scrollVertically((ScrollBar) event.widget);
if (painterList.size() == 0)
return;
setOrigin(origin.x, -((ScrollBar) event.widget).getSelection());
}
});
}
/**
* Synchronize the scrollbar with the image. If the transform is out
* of range, it will correct it. This function considers only following
* factors :<b> transform, image size, client area</b>.
* Synchronize the scrollbar with the image. If the transform is out of
* range, it will correct it. This function considers only following factors
* :<b> transform, image size, client area</b>.
*/
private void syncScrollBars() {
if (painterList.size() == 0) {
@ -304,6 +295,15 @@ public class WaveformCanvas extends Canvas {
vertical.setThumb(ch);
ruler.setScaleFactor(scaleFactor);
redraw();
Event e = new Event();
e.widget = this;
SelectionEvent ev = new SelectionEvent(e);
ev.x = origin.x;
ev.y = origin.y;
for (SelectionAdapter a : selectionListeners) {
a.widgetSelected(ev);
}
}
/* Paint function */
@ -350,7 +350,8 @@ 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);
if (currentSelection != null)
reveal(currentSelection);
redraw();
}
@ -358,23 +359,31 @@ public class WaveformCanvas extends Canvas {
int lower = (int) (tx.getBeginTime() / scaleFactor);
int higher = (int) (tx.getEndTime() / scaleFactor);
Point size = getSize();
size.x -= getVerticalBar().getSize().x + 2;
size.y -= getHorizontalBar().getSize().y;
if (lower < -origin.x) {
scrollToX(lower);
setOrigin(-lower, origin.y);
} else if (higher > (size.x - origin.x)) {
scrollToX(higher-size.x);
setOrigin(size.x - higher, origin.y);
}
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);
int bottom = top + trackHeight;
if (top < -origin.y) {
scrollToY(bottom);
setOrigin(origin.x, -top);
} else if (bottom > (size.y - origin.y)) {
scrollToY(bottom-size.y);
setOrigin(origin.x, size.y - bottom);
}
}
}
}
public void addSelectionListener(SelectionAdapter selectionAdapter) {
selectionListeners.add(selectionAdapter);
}
public void removeSelectionListener(SelectionAdapter selectionAdapter) {
selectionListeners.remove(selectionAdapter);
}
}

1
com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TextDbLoader.groovy
View File

@ -53,6 +53,7 @@ public class TextDbLoader implements IWaveformDbLoader{
@Override
boolean load(IWaveformDb db, File file) throws Exception {
this.db=db
this.streams=[]
FileInputStream fis = new FileInputStream(file)
byte[] buffer = new byte[x.size()]
def readCnt = fis.read(buffer, 0, x.size())

6
com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/Tx.groovy
View File

@ -51,7 +51,11 @@ class Tx implements ITx {
@Override
public int compareTo(ITx o) {
return beginTime.compareTo(o.beginTime)
def res =beginTime.compareTo(o.beginTime)
if(res!=0)
return res
else
return id.compareTo(o.id)
}
}

13
com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TxEvent.groovy
View File

@ -8,12 +8,15 @@ class TxEvent implements ITxEvent {
final ITxEvent.Type type;
Tx transaction;
final Tx transaction;
final Long time
TxEvent(ITxEvent.Type type, ITx transaction) {
super();
this.type = type;
this.transaction = transaction;
this.time = type==ITxEvent.Type.BEGIN?transaction.beginTime:transaction.endTime
}
@Override
@ -23,15 +26,11 @@ class TxEvent implements ITxEvent {
@Override
int compareTo(IWaveformEvent o) {
time.compareTo(o.getTime())
}
Long getTime(){
type==ITxEvent.Type.BEGIN?transaction.beginTime:transaction.endTime
time.compareTo(o.time)
}
@Override
String toString() {
type.toString()+"@"+getTime()+" of tx #"+transaction.id;
type.toString()+"@"+time+" of tx #"+transaction.id;
}
}

4
com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TxStream.groovy
View File

@ -92,7 +92,9 @@ class TxStream extends HierNode implements ITxStream {
}
private putEvent(ITxEvent event){
if(!events.containsKey(event.time)) events.put(event.time, [])
if(!events.containsKey(event.time))
events.put(event.time, [event])
else
events[event.time]<<event
}

3
com.minres.scviewer.database/META-INF/MANIFEST.MF
View File

@ -8,3 +8,6 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Export-Package: com.minres.scviewer.database
Bundle-ActivationPolicy: lazy
Service-Component: OSGI-INF/component.xml
Require-Bundle: org.eclipse.equinox.ds;bundle-version="1.4.200",
org.eclipse.equinox.util;bundle-version="1.0.500",
org.eclipse.osgi.services;bundle-version="3.4.0"

2
com.minres.scviewer.database/OSGI-INF/component.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="com.minres.scviewer.database">
<implementation class="com.minres.scviewer.database.WaveformDb"/>
<reference bind="bind" cardinality="0..n" interface="com.minres.scviewer.database.IWaveformDbLoader" name="IWaveformDbLoader" policy="dynamic" unbind="unbind"/>
<reference bind="bind" cardinality="1..n" interface="com.minres.scviewer.database.IWaveformDbLoader" name="IWaveformDbLoader" policy="dynamic" unbind="unbind"/>
</scr:component>

26
com.minres.scviewer.feature/feature.xml
View File

@ -29,11 +29,11 @@ http://www.eclipse.org/legal/epl-v10.html
</url>
<requires>
<import plugin="org.eclipse.equinox.ds" version="1.4.200" match="greaterOrEqual"/>
<import plugin="org.eclipse.equinox.util" version="1.0.500" match="greaterOrEqual"/>
<import plugin="org.eclipse.osgi.services" version="3.4.0" match="greaterOrEqual"/>
<import plugin="com.minres.scviewer.database" version="1.0.0" match="greaterOrEqual"/>
<import plugin="org.codehaus.groovy" version="1.8.6" match="greaterOrEqual"/>
<import plugin="org.eclipse.equinox.util" version="1.0.500" match="greaterOrEqual"/>
<import plugin="org.eclipse.equinox.ds" version="1.4.200" match="greaterOrEqual"/>
<import plugin="org.eclipse.osgi.services" version="3.4.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.osgi"/>
<import plugin="org.eclipse.core.runtime"/>
<import plugin="org.eclipse.core.resources"/>
@ -43,9 +43,14 @@ http://www.eclipse.org/legal/epl-v10.html
<import plugin="org.eclipse.ui.ide"/>
<import plugin="org.eclipse.ui.views.properties.tabbed"/>
<import plugin="org.eclipse.swt"/>
<import plugin="org.eclipse.ui.views"/>
<import plugin="org.apache.ant"/>
<import plugin="com.google.guava" version="15.0.0" match="greaterOrEqual"/>
<import plugin="com.minres.scviewer.database.swt" version="1.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.core.expressions" version="3.4.600" match="greaterOrEqual"/>
<import plugin="org.eclipse.jface"/>
<import plugin="org.junit"/>
<import plugin="org.eclipse.swt" version="3.103.1" match="greaterOrEqual"/>
<import plugin="org.eclipse.equinox.registry"/>
</requires>
<plugin
@ -96,4 +101,17 @@ http://www.eclipse.org/legal/epl-v10.html
version="0.0.0"
unpack="false"/>
<plugin
id="org.junit"
download-size="0"
install-size="0"
version="0.0.0"/>
<plugin
id="org.hamcrest.core"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
</feature>