diff --git a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/ArrowPainter.java b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/ArrowPainter.java index 7b37009..92f0077 100644 --- a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/ArrowPainter.java +++ b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/ArrowPainter.java @@ -41,9 +41,9 @@ public class ArrowPainter implements IPainter { private ITx tx; - private List iRect; + private List iRect = new LinkedList<>(); - private List oRect; + private List oRect = new LinkedList<>(); private Rectangle txRectangle; @@ -56,7 +56,7 @@ public class ArrowPainter implements IPainter { public ArrowPainter(WaveformCanvas waveCanvas, RelationType relationType) { this.waveCanvas = waveCanvas; highlightType=relationType; - setTx(null); + updateSelection(); } public RelationType getHighlightType() { @@ -71,10 +71,8 @@ public class ArrowPainter implements IPainter { return tx; } - public void setTx(ITx newTx) { - this.tx = newTx; - iRect = new LinkedList<>(); - oRect = new LinkedList<>(); + public void updateSelection() { + tx = waveCanvas.currentSelectedTx; scaleFactor = waveCanvas.getScale(); if (tx != null) { calculateGeometries(); @@ -83,16 +81,18 @@ public class ArrowPainter implements IPainter { private int getConcurrencyIndex(ITx tx) { IEvent[] eventList = tx.getStream().getEventsBeforeTime(tx.getBeginTime()); - Optional res = Arrays.stream(eventList).map(e -> ((ITxEvent)e).getRowIndex()).findFirst(); + Optional res = Arrays.stream(eventList).filter(e -> ((ITxEvent)e).getTransaction()== tx).map(e -> ((ITxEvent)e).getRowIndex()).findFirst(); if(res.isPresent() && res.get()>0) { return res.get(); } else return 0; } - private Rectangle getBoundingBox(IWaveformPainter painter, ITx itx) { - int laneHeight = painter.getHeight() / itx.getStream().getRowCount(); - int laneOffset = laneHeight * getConcurrencyIndex(itx); + private Rectangle getBoundingBox(IWaveformPainter painter, ITx itx, IWaveform stream) { + int laneHeight = painter.getHeight() / stream.getRowCount(); + //TODO: it needs to take the concurrency index within the current waveform (stream or generator) into account + int concIdx=getConcurrencyIndex(itx); + int laneOffset = laneHeight * (concIdx>=stream.getRowCount()?stream.getRowCount()-1:concIdx); int rulerHeight = waveCanvas.rulerHeight; Rectangle bb = new Rectangle((int) (itx.getBeginTime() / scaleFactor), rulerHeight + painter.getVerticalOffset() + laneOffset, @@ -103,14 +103,17 @@ public class ArrowPainter implements IPainter { protected boolean calculateGeometries() { iRect.clear(); oRect.clear(); - IWaveformPainter painter = waveCanvas.wave2painterMap.get(tx.getStream()); + IWaveformPainter painter = null; + if(waveCanvas.currentSelectedTrack != null) + painter = waveCanvas.trackAreaPainter.getPainterFor(waveCanvas.currentSelectedTrack); if(painter == null) painter = waveCanvas.wave2painterMap.get(tx.getGenerator()); - if (painter == null) { // stream has been added but painter not yet - // created + if(painter==null) + painter = waveCanvas.wave2painterMap.get(tx.getStream()); + if (painter == null) { // stream has been added but painter not yet created return true; } - Rectangle bb = getBoundingBox(painter, tx); + Rectangle bb = getBoundingBox(painter, tx, painter instanceof StreamPainter? ((StreamPainter)painter).getStream() : tx.getStream()); txRectangle = bb; deriveGeom(tx.getIncomingRelations(), iRect, false); deriveGeom(tx.getOutgoingRelations(), oRect, true); @@ -120,13 +123,15 @@ public class ArrowPainter implements IPainter { protected void deriveGeom(Collection relations, List res, boolean useTarget) { for (ITxRelation iTxRelation : relations) { ITx otherTx = useTarget ? iTxRelation.getTarget() : iTxRelation.getSource(); - if(otherTx!=null && otherTx.getBeginTime()>=0) - for(IWaveform iWaveform: new IWaveform[]{otherTx.getStream(), otherTx.getGenerator()}) { + if (otherTx != null && otherTx.getBeginTime() >= 0) + for (IWaveform iWaveform : new IWaveform[] { otherTx.getStream(), otherTx.getGenerator() }) { if (waveCanvas.wave2painterMap.containsKey(iWaveform)) { IWaveformPainter painter = waveCanvas.wave2painterMap.get(iWaveform); - if(painter!=null) { - Rectangle bb = getBoundingBox(painter, otherTx); - res.add(new LinkEntry(bb, iTxRelation.getRelationType())); + if (painter != null) { + Rectangle bb = getBoundingBox(painter, otherTx, + painter instanceof StreamPainter ? ((StreamPainter) painter).getStream() + : otherTx.getStream()); + res.add(new LinkEntry(bb, iTxRelation.getRelationType())); } } } diff --git a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/StreamPainter.java b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/StreamPainter.java index 8074549..b5b07f6 100644 --- a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/StreamPainter.java +++ b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/StreamPainter.java @@ -82,7 +82,7 @@ public class StreamPainter extends TrackPainter{ for (ITxEvent event : getIntervalIndex().overlapping(beginTime, endTime)) { ITx tx = event.getTransaction(); drawTx(proj, area, tx, event.getRowIndex(), false); - if (waveCanvas.currentSelection != null && waveCanvas.currentSelection.getId() == tx.getId()) + if (waveCanvas.currentSelectedTx != null && waveCanvas.currentSelectedTx.getId() == tx.getId()) highlighted = event; } if (highlighted != null) { diff --git a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/TrackAreaPainter.java b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/TrackAreaPainter.java index 300c7be..595762c 100644 --- a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/TrackAreaPainter.java +++ b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/TrackAreaPainter.java @@ -10,12 +10,14 @@ *******************************************************************************/ package com.minres.scviewer.database.ui.swt.internal; +import java.util.Iterator; import java.util.Map.Entry; import java.util.TreeMap; import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.Rectangle; +import com.minres.scviewer.database.ui.TrackEntry; import com.minres.scviewer.database.ui.WaveformColors; public class TrackAreaPainter implements IPainter { @@ -60,6 +62,14 @@ public class TrackAreaPainter implements IPainter { } } + public IWaveformPainter getPainterFor(TrackEntry e) { + for (Entry entry : trackVerticalOffset.entrySet()) { + if(entry.getValue().getTrackEntry() == e) + return entry.getValue(); + } + return null; + } + public void addTrackPainter(IWaveformPainter trackPainter){ trackVerticalOffset.put(trackPainter.getVerticalOffset()+waveCanvas.rulerHeight, trackPainter); diff --git a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/WaveformCanvas.java b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/WaveformCanvas.java index 59c3a74..9fde08a 100644 --- a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/WaveformCanvas.java +++ b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/WaveformCanvas.java @@ -18,6 +18,8 @@ import java.util.List; import java.util.Map.Entry; import java.util.Optional; +import org.eclipse.jface.viewers.ISelection; +import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.swt.SWT; import org.eclipse.swt.events.ControlAdapter; import org.eclipse.swt.events.ControlEvent; @@ -72,13 +74,15 @@ public class WaveformCanvas extends Canvas implements IWaveformZoom{ protected List painterList; - ITx currentSelection; + ITx currentSelectedTx; + + TrackEntry currentSelectedTrack; private List selectionListeners; private RulerPainter rulerPainter; - private TrackAreaPainter trackAreaPainter; + TrackAreaPainter trackAreaPainter; private ArrowPainter arrowPainter; @@ -214,8 +218,9 @@ public class WaveformCanvas extends Canvas implements IWaveformZoom{ factor=maxFactor; if(factor!=getScale() || (getMaxVisibleTime()+getMinVisibleTime()/2) != centerTime) { updateScaleFactor(factor); - ITx tx = arrowPainter.getTx(); - arrowPainter.setTx(null); + ITx tx = currentSelectedTx; + currentSelectedTx=null; + arrowPainter.updateSelection(); /* * xc = tc/oldScaleFactor * xoffs = xc+origin.x @@ -231,7 +236,8 @@ public class WaveformCanvas extends Canvas implements IWaveformZoom{ origin.x=0; } syncSb(); - arrowPainter.setTx(tx); + currentSelectedTx=tx; + arrowPainter.updateSelection(); redraw(); } } @@ -451,13 +457,19 @@ public class WaveformCanvas extends Canvas implements IWaveformZoom{ return result; } - public void setSelected(ITx currentSelection) { - this.currentSelection = currentSelection; - if (currentSelection != null) - reveal(currentSelection); - arrowPainter.setTx(currentSelection); - if(!isDisposed()) - redraw(); + public void setSelected(ISelection selection) { + if(selection instanceof IStructuredSelection) { + IStructuredSelection structuredSelection = (IStructuredSelection)selection; + Object[] selList = structuredSelection.toArray(); + currentSelectedTrack = (selList.length> 1 && selList[1] instanceof TrackEntry) ? (TrackEntry) selList[1] : null; + currentSelectedTx = (selList.length> 0 && selList[0] instanceof ITx)? (ITx) selList[0] : null; + if(currentSelectedTx != null) + reveal(currentSelectedTx); + if(currentSelectedTrack!=null && currentSelectedTx!=null) + arrowPainter.updateSelection(); + if(!isDisposed()) + redraw(); + } } public void reveal(ITx tx) { @@ -471,20 +483,30 @@ public class WaveformCanvas extends Canvas implements IWaveformZoom{ } else if (higher > (size.x - origin.x)) { setOrigin(size.x - higher, origin.y); } - for (IWaveformPainter painter : wave2painterMap.values()) { - if (painter instanceof StreamPainter && ((StreamPainter) painter).getStream() == tx.getStream()) { - EventEntry entry = tx.getStream().getEvents().floorEntry(tx.getBeginTime()); - Optional res = Arrays.stream(entry.events).filter(e -> ((ITxEvent)e).getTransaction().equals(tx)).findFirst(); - if(res.isPresent()) { - int top = painter.getVerticalOffset() + styleProvider.getTrackHeight() * ((ITxEvent)res.get()).getRowIndex(); - int bottom = top + styleProvider.getTrackHeight(); - if (top < -origin.y) { - setOrigin(origin.x, -(top-styleProvider.getTrackHeight())); - } else if (bottom > (size.y - origin.y)) { - setOrigin(origin.x, size.y - bottom); - } + if(currentSelectedTrack != null) { + EventEntry entry = currentSelectedTrack.waveform.getEvents().floorEntry(tx.getBeginTime()); + IWaveformPainter painter = trackAreaPainter.getPainterFor(currentSelectedTrack); + if (painter != null && painter instanceof StreamPainter) + reveal(tx, size, painter, entry); + } else + for (IWaveformPainter painter : wave2painterMap.values()) { + if (painter instanceof StreamPainter && ((StreamPainter) painter).getStream() == tx.getStream()) { + EventEntry entry = tx.getStream().getEvents().floorEntry(tx.getBeginTime()); + reveal(tx, size, painter, entry); } } + } + + private void reveal(ITx tx, Point size, IWaveformPainter painter, EventEntry entry) { + Optional res = Arrays.stream(entry.events).filter(e -> ((ITxEvent)e).getTransaction().equals(tx)).findFirst(); + if(res.isPresent()) { + int top = painter.getVerticalOffset() + styleProvider.getTrackHeight() * ((ITxEvent)res.get()).getRowIndex(); + int bottom = top + styleProvider.getTrackHeight(); + if (top < -origin.y) { + setOrigin(origin.x, -(top-styleProvider.getTrackHeight())); + } else if (bottom > (size.y - origin.y)) { + setOrigin(origin.x, size.y - bottom); + } } } diff --git a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/WaveformView.java b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/WaveformView.java index 0ef13fc..6ff6985 100644 --- a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/WaveformView.java +++ b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/WaveformView.java @@ -902,7 +902,7 @@ public class WaveformView implements IWaveformView { currentWaveformSelection.forEach(e -> {if(e!=null)e.selected = true;}); if (selectionChanged) { currentWaveformSelection.forEach(e -> waveformCanvas.reveal(e.waveform)); - waveformCanvas.setSelected(currentTxSelection); + waveformCanvas.setSelected(selection); valueList.redraw(); nameList.redraw(); fireSelectionChanged(); diff --git a/releng/com.minres.scviewer.target/com.minres.scviewer.target.target b/releng/com.minres.scviewer.target/com.minres.scviewer.target.target index 534836c..3d3ae45 100644 --- a/releng/com.minres.scviewer.target/com.minres.scviewer.target.target +++ b/releng/com.minres.scviewer.target/com.minres.scviewer.target.target @@ -3,7 +3,7 @@ - + @@ -20,14 +20,14 @@ - + - + @@ -36,7 +36,7 @@ - +