Splits TRANSACTION waveform type into STEEAM and GENERATOR
This commit is contained in:
1 parent
1f861cefb8
commit
591fe2c4c7
14 files changed
+22
-20
No files matched your search
+1
-1
@@ -113,7 +113,7 @@ abstract class AbstractTxStream extends HierNode implements IWaveform {
|
|||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public WaveformType getType() {
|
public WaveformType getType() {
|
||||||
return WaveformType.TRANSACTION;
|
return WaveformType.STREAM;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
+1
-1
@@ -76,7 +76,7 @@ class TxEvent implements ITxEvent {
|
|||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public WaveformType getType() {
|
public WaveformType getType() {
|
||||||
return WaveformType.TRANSACTION;
|
return WaveformType.STREAM;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
+1
-1
@@ -132,7 +132,7 @@ abstract class AbstractTxStream extends HierNode implements IWaveform {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public WaveformType getType() {
|
public WaveformType getType() {
|
||||||
return WaveformType.TRANSACTION;
|
return WaveformType.STREAM;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
+1
-1
@@ -59,7 +59,7 @@ public class TxEvent implements ITxEvent {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public WaveformType getType() {
|
public WaveformType getType() {
|
||||||
return WaveformType.TRANSACTION;
|
return WaveformType.STREAM;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
+1
-1
@@ -124,7 +124,7 @@ abstract class AbstractTxStream extends HierNode implements IWaveform {
|
|||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public WaveformType getType() {
|
public WaveformType getType() {
|
||||||
return WaveformType.TRANSACTION;
|
return WaveformType.STREAM;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
+1
-1
@@ -76,7 +76,7 @@ class TxEvent implements ITxEvent {
|
|||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public WaveformType getType() {
|
public WaveformType getType() {
|
||||||
return WaveformType.TRANSACTION;
|
return WaveformType.STREAM;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
+5
-5
@@ -633,7 +633,7 @@ public class WaveformView implements IWaveformView {
|
|||||||
private void addPainter(boolean even, TrackEntry streamEntry) {
|
private void addPainter(boolean even, TrackEntry streamEntry) {
|
||||||
streamEntry.height = styleProvider.getTrackHeight();
|
streamEntry.height = styleProvider.getTrackHeight();
|
||||||
streamEntry.vOffset = tracksVerticalHeight;
|
streamEntry.vOffset = tracksVerticalHeight;
|
||||||
if (streamEntry.waveform.getType() == WaveformType.TRANSACTION) {
|
if (streamEntry.waveform.getType() == WaveformType.STREAM) {
|
||||||
streamEntry.currentValue = "";
|
streamEntry.currentValue = "";
|
||||||
streamEntry.height *= streamEntry.waveform.getRowCount();
|
streamEntry.height *= streamEntry.waveform.getRowCount();
|
||||||
IWaveformPainter painter = new StreamPainter(waveformCanvas, even, streamEntry);
|
IWaveformPainter painter = new StreamPainter(waveformCanvas, even, streamEntry);
|
||||||
@@ -690,7 +690,7 @@ public class WaveformView implements IWaveformView {
|
|||||||
else
|
else
|
||||||
entry.currentValue = Double.toString(val);
|
entry.currentValue = Double.toString(val);
|
||||||
}
|
}
|
||||||
} else if (entry.waveform.getType() == WaveformType.TRANSACTION) {
|
} else if (entry.waveform.getType() == WaveformType.STREAM) {
|
||||||
ITx[] resultsList = new ITx[entry.waveform.getRowCount()];
|
ITx[] resultsList = new ITx[entry.waveform.getRowCount()];
|
||||||
EventEntry firstTx = entry.waveform.getEvents().floorEntry(time);
|
EventEntry firstTx = entry.waveform.getEvents().floorEntry(time);
|
||||||
if (firstTx != null) {
|
if (firstTx != null) {
|
||||||
@@ -956,7 +956,7 @@ public class WaveformView implements IWaveformView {
|
|||||||
return;
|
return;
|
||||||
TrackEntry selectedWaveform = currentWaveformSelection.size() == 1 ? currentWaveformSelection.get(0)
|
TrackEntry selectedWaveform = currentWaveformSelection.size() == 1 ? currentWaveformSelection.get(0)
|
||||||
: getEntryFor(currentTxSelection);
|
: getEntryFor(currentTxSelection);
|
||||||
if (selectedWaveform.waveform.getType() == WaveformType.TRANSACTION && currentTxSelection != null) {
|
if (selectedWaveform.waveform.getType() == WaveformType.STREAM && currentTxSelection != null) {
|
||||||
if (relationType.equals(IWaveformView.NEXT_PREV_IN_STREAM)) {
|
if (relationType.equals(IWaveformView.NEXT_PREV_IN_STREAM)) {
|
||||||
ITx transaction = null;
|
ITx transaction = null;
|
||||||
if (direction == GotoDirection.NEXT) {
|
if (direction == GotoDirection.NEXT) {
|
||||||
@@ -1078,7 +1078,7 @@ public class WaveformView implements IWaveformView {
|
|||||||
TrackEntry sel = currentWaveformSelection.get(0);
|
TrackEntry sel = currentWaveformSelection.get(0);
|
||||||
long time = getCursorTime();
|
long time = getCursorTime();
|
||||||
IEventList map = null;
|
IEventList map = null;
|
||||||
if (sel.waveform.getType() == WaveformType.TRANSACTION || sel.waveform.getType() == WaveformType.SIGNAL) {
|
if (sel.waveform.getType() == WaveformType.STREAM || sel.waveform.getType() == WaveformType.SIGNAL) {
|
||||||
map = sel.waveform.getEvents();
|
map = sel.waveform.getEvents();
|
||||||
}
|
}
|
||||||
if (map != null) {
|
if (map != null) {
|
||||||
@@ -1634,7 +1634,7 @@ public class WaveformView implements IWaveformView {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public boolean waveformsContainsTx() {
|
public boolean waveformsContainsTx() {
|
||||||
return streams.stream().filter(e -> e.waveform.getType() == WaveformType.TRANSACTION).findFirst().isPresent();
|
return streams.stream().filter(e -> e.waveform.getType() == WaveformType.STREAM).findFirst().isPresent();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
+4
-2
@@ -17,8 +17,10 @@ public enum WaveformType {
|
|||||||
|
|
||||||
/** The signal. */
|
/** The signal. */
|
||||||
SIGNAL,
|
SIGNAL,
|
||||||
/** The transaction. */
|
/** The transaction stream. */
|
||||||
TRANSACTION,
|
STREAM,
|
||||||
|
/** The transaction stream. */
|
||||||
|
GENERATOR,
|
||||||
/** The filter. */
|
/** The filter. */
|
||||||
FILTER,
|
FILTER,
|
||||||
/** The blank line. */
|
/** The blank line. */
|
||||||
|
|||||||
+1
-1
@@ -32,7 +32,7 @@ public class SearchHandler {
|
|||||||
Object[] elem = ((StructuredSelection)sel).toArray();
|
Object[] elem = ((StructuredSelection)sel).toArray();
|
||||||
if(elem.length ==0) return false;
|
if(elem.length ==0) return false;
|
||||||
TrackEntry e = findTrackEntry(elem);
|
TrackEntry e = findTrackEntry(elem);
|
||||||
return e!=null && e.waveform.getType()==WaveformType.TRANSACTION;
|
return e!=null && e.waveform.getType()==WaveformType.STREAM;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
|
|||||||
+1
-1
@@ -237,7 +237,7 @@ public class TransactionList extends Composite {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void setInput(TrackEntry trackEntry) {
|
public void setInput(TrackEntry trackEntry) {
|
||||||
if(trackEntry==null || trackEntry.waveform.getType()!=WaveformType.TRANSACTION) {
|
if(trackEntry==null || trackEntry.waveform.getType()!=WaveformType.STREAM) {
|
||||||
attrNames.clear();
|
attrNames.clear();
|
||||||
tableViewer.setInput(emptyList);
|
tableViewer.setInput(emptyList);
|
||||||
} else if(stream != trackEntry.waveform) {
|
} else if(stream != trackEntry.waveform) {
|
||||||
|
|||||||
+2
-2
@@ -1030,13 +1030,13 @@ public class WaveformViewer implements IFileChangeListener, IPreferenceChangeLis
|
|||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
showTxDetails(waveformPane.getStreamList().stream().filter(t -> t.waveform.getType() == WaveformType.TRANSACTION).findFirst().isPresent());
|
showTxDetails(waveformPane.getStreamList().stream().filter(t -> t.waveform.getType() == WaveformType.STREAM).findFirst().isPresent());
|
||||||
setFocus();
|
setFocus();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void removeSelectedStreamsFromList() {
|
public void removeSelectedStreamsFromList() {
|
||||||
waveformPane.deleteSelectedTracks();
|
waveformPane.deleteSelectedTracks();
|
||||||
showTxDetails(waveformPane.getStreamList().stream().filter(t -> t.waveform.getType() == WaveformType.TRANSACTION).findFirst().isPresent());
|
showTxDetails(waveformPane.getStreamList().stream().filter(t -> t.waveform.getType() == WaveformType.STREAM).findFirst().isPresent());
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
+1
-1
@@ -176,7 +176,7 @@ public class TxDbLabelProvider implements ILabelProvider {
|
|||||||
return ((IWaveformDb)element).isLoaded()?database:loadinDatabase;
|
return ((IWaveformDb)element).isLoaded()?database:loadinDatabase;
|
||||||
}else if(element instanceof IWaveform){
|
}else if(element instanceof IWaveform){
|
||||||
switch(((IWaveform) element).getType()) {
|
switch(((IWaveform) element).getType()) {
|
||||||
case TRANSACTION:
|
case STREAM:
|
||||||
return stream;
|
return stream;
|
||||||
case FILTER:
|
case FILTER:
|
||||||
break;
|
break;
|
||||||
|
|||||||
+1
-1
@@ -62,7 +62,7 @@ public class TxDbTreeLabelProvider implements ILabelProvider {
|
|||||||
return database;
|
return database;
|
||||||
}else if(element instanceof IWaveform){
|
}else if(element instanceof IWaveform){
|
||||||
switch(((IWaveform) element).getType()) {
|
switch(((IWaveform) element).getType()) {
|
||||||
case TRANSACTION:
|
case STREAM:
|
||||||
return stream;
|
return stream;
|
||||||
case FILTER:
|
case FILTER:
|
||||||
break;
|
break;
|
||||||
|
|||||||
+1
-1
@@ -47,7 +47,7 @@ final class TxTestSupport {
|
|||||||
public ITx getTransaction() { return tx; }
|
public ITx getTransaction() { return tx; }
|
||||||
public EventKind getKind() { return kind; }
|
public EventKind getKind() { return kind; }
|
||||||
public int getRowIndex() { return row; }
|
public int getRowIndex() { return row; }
|
||||||
public WaveformType getType() { return WaveformType.TRANSACTION; }
|
public WaveformType getType() { return WaveformType.STREAM; }
|
||||||
public ITxEvent duplicate() { return new Event(tx, kind); }
|
public ITxEvent duplicate() { return new Event(tx, kind); }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Reference in new issue
Block a user