fixes arrow drawing for transactions
This commit is contained in:
1 parent
2b913d0e94
commit
889dee0b87
6 files changed
+86
-49
No files matched your search
+24
-19
@@ -41,9 +41,9 @@ public class ArrowPainter implements IPainter {
|
||||
|
||||
private ITx tx;
|
||||
|
||||
private List<LinkEntry> iRect;
|
||||
private List<LinkEntry> iRect = new LinkedList<>();
|
||||
|
||||
private List<LinkEntry> oRect;
|
||||
private List<LinkEntry> 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<Integer> res = Arrays.stream(eventList).map(e -> ((ITxEvent)e).getRowIndex()).findFirst();
|
||||
Optional<Integer> 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,12 +123,14 @@ public class ArrowPainter implements IPainter {
|
||||
protected void deriveGeom(Collection<ITxRelation> relations, List<LinkEntry> 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);
|
||||
if (painter != null) {
|
||||
Rectangle bb = getBoundingBox(painter, otherTx,
|
||||
painter instanceof StreamPainter ? ((StreamPainter) painter).getStream()
|
||||
: otherTx.getStream());
|
||||
res.add(new LinkEntry(bb, iTxRelation.getRelationType()));
|
||||
}
|
||||
}
|
||||
|
||||
+1
-1
@@ -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) {
|
||||
|
||||
+10
@@ -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<Integer,IWaveformPainter> 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);
|
||||
|
||||
|
||||
+46
-24
@@ -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<IPainter> painterList;
|
||||
|
||||
ITx currentSelection;
|
||||
ITx currentSelectedTx;
|
||||
|
||||
TrackEntry currentSelectedTrack;
|
||||
|
||||
private List<SelectionAdapter> 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<IEvent> 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<IEvent> 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);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -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();
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
<target name="com.minres.scviewer.target" sequenceNumber="138">
|
||||
<locations>
|
||||
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
|
||||
<repository location="http://download.eclipse.org/releases/2022-12/"/>
|
||||
<repository location="https://download.eclipse.org/releases/2022-12/"/>
|
||||
<unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
|
||||
<unit id="org.eclipse.equinox.p2.sdk.feature.jar" version="0.0.0"/> <!-- needed by Linux exectable-->
|
||||
<unit id="org.eclipse.equinox.sdk.feature.group" version="0.0.0"/>
|
||||
@@ -20,14 +20,14 @@
|
||||
<unit id="com.opcoach.e4.preferences.feature.feature.group" version="0.0.0"/>
|
||||
</location>
|
||||
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
|
||||
<repository location="http://download.eclipse.org/nattable/releases/1.6.0/repository/"/>
|
||||
<repository location="https://download.eclipse.org/nattable/releases/1.6.0/repository/"/>
|
||||
<unit id="org.eclipse.nebula.widgets.nattable.core.feature.feature.group" version="1.6.0.201909181823"/>
|
||||
<unit id="org.eclipse.nebula.widgets.nattable.extension.e4.feature.feature.group" version="1.2.0.201909181823"/>
|
||||
<unit id="org.eclipse.nebula.widgets.nattable.extension.glazedlists.feature.feature.group" version="1.6.0.201909181823"/>
|
||||
<unit id="org.eclipse.nebula.widgets.nattable.extension.poi.feature.feature.group" version="1.5.1.201909181823"/>
|
||||
</location>
|
||||
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
|
||||
<repository location="http://download.eclipse.org/collections/10.4.0/repository"/>
|
||||
<repository location="https://download.eclipse.org/collections/10.4.0/repository"/>
|
||||
<unit id="org.eclipse.collections.feature.feature.group" version="0.0.0"/>
|
||||
<unit id="org.eclipse.collections.feature.source.feature.group" version="0.0.0"/>
|
||||
</location>
|
||||
@@ -36,7 +36,7 @@
|
||||
<unit id="org.eclipse.justj.openjdk.hotspot.jre.minimal.stripped.feature.group" version="0.0.0"/>
|
||||
</location>
|
||||
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
|
||||
<repository location="https://download.eclipse.org/tools/orbit/downloads/2022-12"/>
|
||||
<repository location="https://download.eclipse.org/tools/orbit/downloads/2022-12/"/>
|
||||
<unit id="org.apache.commons.compress" version="0.0.0"/>
|
||||
<unit id="org.apache.commons.compress.source" version="0.0.0"/>
|
||||
<unit id="ch.qos.logback.slf4j" version="0.0.0"/>
|
||||
|
||||
Reference in new issue
Block a user