Classify streams and generators consistently across database loaders
This commit is contained in:
1 parent
591fe2c4c7
commit
6668151a53
19 files changed
+149
-81
No files matched your search
+1
-2
@@ -17,7 +17,6 @@ import org.eclipse.jface.viewers.ISelection;
|
||||
import org.eclipse.jface.viewers.StructuredSelection;
|
||||
import org.eclipse.swt.widgets.Shell;
|
||||
|
||||
import com.minres.scviewer.database.WaveformType;
|
||||
import com.minres.scviewer.database.ui.TrackEntry;
|
||||
import com.minres.scviewer.e4.application.parts.WaveformViewer;
|
||||
public class SearchHandler {
|
||||
@@ -32,7 +31,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.STREAM;
|
||||
return e!=null && e.waveform.getType().isTransaction();
|
||||
}
|
||||
}
|
||||
return false;
|
||||
|
||||
+1
-2
@@ -35,7 +35,6 @@ import com.minres.scviewer.database.DataType;
|
||||
import com.minres.scviewer.database.EventEntry;
|
||||
import com.minres.scviewer.database.EventKind;
|
||||
import com.minres.scviewer.database.IWaveform;
|
||||
import com.minres.scviewer.database.WaveformType;
|
||||
import com.minres.scviewer.database.tx.ITx;
|
||||
import com.minres.scviewer.database.tx.ITxEvent;
|
||||
import com.minres.scviewer.database.ui.TrackEntry;
|
||||
@@ -237,7 +236,7 @@ public class TransactionList extends Composite {
|
||||
}
|
||||
|
||||
public void setInput(TrackEntry trackEntry) {
|
||||
if(trackEntry==null || trackEntry.waveform.getType()!=WaveformType.STREAM) {
|
||||
if(trackEntry==null || !trackEntry.waveform.getType().isTransaction()) {
|
||||
attrNames.clear();
|
||||
tableViewer.setInput(emptyList);
|
||||
} 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.STREAM).findFirst().isPresent());
|
||||
showTxDetails(waveformPane.getStreamList().stream().filter(t -> t.waveform.getType().isTransaction()).findFirst().isPresent());
|
||||
setFocus();
|
||||
}
|
||||
|
||||
public void removeSelectedStreamsFromList() {
|
||||
waveformPane.deleteSelectedTracks();
|
||||
showTxDetails(waveformPane.getStreamList().stream().filter(t -> t.waveform.getType() == WaveformType.STREAM).findFirst().isPresent());
|
||||
showTxDetails(waveformPane.getStreamList().stream().filter(t -> t.waveform.getType().isTransaction()).findFirst().isPresent());
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
+1
@@ -177,6 +177,7 @@ public class TxDbLabelProvider implements ILabelProvider {
|
||||
}else if(element instanceof IWaveform){
|
||||
switch(((IWaveform) element).getType()) {
|
||||
case STREAM:
|
||||
case GENERATOR:
|
||||
return stream;
|
||||
case FILTER:
|
||||
break;
|
||||
|
||||
Reference in new issue
Block a user