From 591fe2c4c7f27b7a702c313f0f77f2681509b91c Mon Sep 17 00:00:00 2001 From: Eyck Jentzsch Date: Sat, 14 Nov 2026 18:17:04 +0100 Subject: [PATCH] Splits TRANSACTION waveform type into STEEAM and GENERATOR --- .../minres/scviewer/database/ftr/AbstractTxStream.java | 2 +- .../src/com/minres/scviewer/database/ftr/TxEvent.java | 2 +- .../scviewer/database/sqlite/AbstractTxStream.java | 2 +- .../com/minres/scviewer/database/sqlite/TxEvent.java | 2 +- .../scviewer/database/text/AbstractTxStream.java | 2 +- .../src/com/minres/scviewer/database/text/TxEvent.java | 2 +- .../database/ui/swt/internal/WaveformView.java | 10 +++++----- .../src/com/minres/scviewer/database/WaveformType.java | 6 ++++-- .../e4/application/handlers/SearchHandler.java | 2 +- .../scviewer/e4/application/parts/TransactionList.java | 2 +- .../scviewer/e4/application/parts/WaveformViewer.java | 4 ++-- .../e4/application/provider/TxDbLabelProvider.java | 2 +- .../ui/views/provider/TxDbTreeLabelProvider.java | 2 +- .../minres/scviewer/database/test/TxTestSupport.java | 2 +- 14 files changed, 22 insertions(+), 20 deletions(-) diff --git a/plugins/com.minres.scviewer.database.ftr/src/com/minres/scviewer/database/ftr/AbstractTxStream.java b/plugins/com.minres.scviewer.database.ftr/src/com/minres/scviewer/database/ftr/AbstractTxStream.java index 1f85a11..90b26c8 100644 --- a/plugins/com.minres.scviewer.database.ftr/src/com/minres/scviewer/database/ftr/AbstractTxStream.java +++ b/plugins/com.minres.scviewer.database.ftr/src/com/minres/scviewer/database/ftr/AbstractTxStream.java @@ -113,7 +113,7 @@ abstract class AbstractTxStream extends HierNode implements IWaveform { */ @Override public WaveformType getType() { - return WaveformType.TRANSACTION; + return WaveformType.STREAM; } /** diff --git a/plugins/com.minres.scviewer.database.ftr/src/com/minres/scviewer/database/ftr/TxEvent.java b/plugins/com.minres.scviewer.database.ftr/src/com/minres/scviewer/database/ftr/TxEvent.java index 1146cc1..6b5e33a 100644 --- a/plugins/com.minres.scviewer.database.ftr/src/com/minres/scviewer/database/ftr/TxEvent.java +++ b/plugins/com.minres.scviewer.database.ftr/src/com/minres/scviewer/database/ftr/TxEvent.java @@ -76,7 +76,7 @@ class TxEvent implements ITxEvent { */ @Override public WaveformType getType() { - return WaveformType.TRANSACTION; + return WaveformType.STREAM; } /** diff --git a/plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/AbstractTxStream.java b/plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/AbstractTxStream.java index 9927603..0e66de6 100644 --- a/plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/AbstractTxStream.java +++ b/plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/AbstractTxStream.java @@ -132,7 +132,7 @@ abstract class AbstractTxStream extends HierNode implements IWaveform { @Override public WaveformType getType() { - return WaveformType.TRANSACTION; + return WaveformType.STREAM; } /** diff --git a/plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/TxEvent.java b/plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/TxEvent.java index 5eeebd8..509a730 100644 --- a/plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/TxEvent.java +++ b/plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/TxEvent.java @@ -59,7 +59,7 @@ public class TxEvent implements ITxEvent { @Override public WaveformType getType() { - return WaveformType.TRANSACTION; + return WaveformType.STREAM; } @Override diff --git a/plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/AbstractTxStream.java b/plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/AbstractTxStream.java index cb36f03..2985d48 100644 --- a/plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/AbstractTxStream.java +++ b/plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/AbstractTxStream.java @@ -124,7 +124,7 @@ abstract class AbstractTxStream extends HierNode implements IWaveform { */ @Override public WaveformType getType() { - return WaveformType.TRANSACTION; + return WaveformType.STREAM; } /** diff --git a/plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TxEvent.java b/plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TxEvent.java index 607b25f..8a183e4 100644 --- a/plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TxEvent.java +++ b/plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TxEvent.java @@ -76,7 +76,7 @@ class TxEvent implements ITxEvent { */ @Override public WaveformType getType() { - return WaveformType.TRANSACTION; + return WaveformType.STREAM; } /** 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 6ff6985..8c47ac4 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 @@ -633,7 +633,7 @@ public class WaveformView implements IWaveformView { private void addPainter(boolean even, TrackEntry streamEntry) { streamEntry.height = styleProvider.getTrackHeight(); streamEntry.vOffset = tracksVerticalHeight; - if (streamEntry.waveform.getType() == WaveformType.TRANSACTION) { + if (streamEntry.waveform.getType() == WaveformType.STREAM) { streamEntry.currentValue = ""; streamEntry.height *= streamEntry.waveform.getRowCount(); IWaveformPainter painter = new StreamPainter(waveformCanvas, even, streamEntry); @@ -690,7 +690,7 @@ public class WaveformView implements IWaveformView { else 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()]; EventEntry firstTx = entry.waveform.getEvents().floorEntry(time); if (firstTx != null) { @@ -956,7 +956,7 @@ public class WaveformView implements IWaveformView { return; TrackEntry selectedWaveform = currentWaveformSelection.size() == 1 ? currentWaveformSelection.get(0) : 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)) { ITx transaction = null; if (direction == GotoDirection.NEXT) { @@ -1078,7 +1078,7 @@ public class WaveformView implements IWaveformView { TrackEntry sel = currentWaveformSelection.get(0); long time = getCursorTime(); 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(); } if (map != null) { @@ -1634,7 +1634,7 @@ public class WaveformView implements IWaveformView { } 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 diff --git a/plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/WaveformType.java b/plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/WaveformType.java index 4ca0753..33cfba4 100644 --- a/plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/WaveformType.java +++ b/plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/WaveformType.java @@ -17,8 +17,10 @@ public enum WaveformType { /** The signal. */ SIGNAL, - /** The transaction. */ - TRANSACTION, + /** The transaction stream. */ + STREAM, + /** The transaction stream. */ + GENERATOR, /** The filter. */ FILTER, /** The blank line. */ diff --git a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/SearchHandler.java b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/SearchHandler.java index dfa24e3..4ca18ca 100644 --- a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/SearchHandler.java +++ b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/SearchHandler.java @@ -32,7 +32,7 @@ public class SearchHandler { Object[] elem = ((StructuredSelection)sel).toArray(); if(elem.length ==0) return false; TrackEntry e = findTrackEntry(elem); - return e!=null && e.waveform.getType()==WaveformType.TRANSACTION; + return e!=null && e.waveform.getType()==WaveformType.STREAM; } } return false; diff --git a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/TransactionList.java b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/TransactionList.java index 3461777..a6aec5a 100644 --- a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/TransactionList.java +++ b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/TransactionList.java @@ -237,7 +237,7 @@ public class TransactionList extends Composite { } public void setInput(TrackEntry trackEntry) { - if(trackEntry==null || trackEntry.waveform.getType()!=WaveformType.TRANSACTION) { + if(trackEntry==null || trackEntry.waveform.getType()!=WaveformType.STREAM) { attrNames.clear(); tableViewer.setInput(emptyList); } else if(stream != trackEntry.waveform) { diff --git a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/WaveformViewer.java b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/WaveformViewer.java index 42ce78e..396c549 100644 --- a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/WaveformViewer.java +++ b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/WaveformViewer.java @@ -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(); } public void removeSelectedStreamsFromList() { 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()); } /** diff --git a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/provider/TxDbLabelProvider.java b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/provider/TxDbLabelProvider.java index e76d0b0..7229d39 100644 --- a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/provider/TxDbLabelProvider.java +++ b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/provider/TxDbLabelProvider.java @@ -176,7 +176,7 @@ public class TxDbLabelProvider implements ILabelProvider { return ((IWaveformDb)element).isLoaded()?database:loadinDatabase; }else if(element instanceof IWaveform){ switch(((IWaveform) element).getType()) { - case TRANSACTION: + case STREAM: return stream; case FILTER: break; diff --git a/plugins/com.minres.scviewer.ui/src/com/minres/scviewer/ui/views/provider/TxDbTreeLabelProvider.java b/plugins/com.minres.scviewer.ui/src/com/minres/scviewer/ui/views/provider/TxDbTreeLabelProvider.java index f18ee14..2477450 100644 --- a/plugins/com.minres.scviewer.ui/src/com/minres/scviewer/ui/views/provider/TxDbTreeLabelProvider.java +++ b/plugins/com.minres.scviewer.ui/src/com/minres/scviewer/ui/views/provider/TxDbTreeLabelProvider.java @@ -62,7 +62,7 @@ public class TxDbTreeLabelProvider implements ILabelProvider { return database; }else if(element instanceof IWaveform){ switch(((IWaveform) element).getType()) { - case TRANSACTION: + case STREAM: return stream; case FILTER: break; diff --git a/tests/com.minres.scviewer.database.test/src/com/minres/scviewer/database/test/TxTestSupport.java b/tests/com.minres.scviewer.database.test/src/com/minres/scviewer/database/test/TxTestSupport.java index d921428..6a60ff8 100644 --- a/tests/com.minres.scviewer.database.test/src/com/minres/scviewer/database/test/TxTestSupport.java +++ b/tests/com.minres.scviewer.database.test/src/com/minres/scviewer/database/test/TxTestSupport.java @@ -47,7 +47,7 @@ final class TxTestSupport { public ITx getTransaction() { return tx; } public EventKind getKind() { return kind; } 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); } } }