fix full name display of generators
This commit is contained in:
parent
da1701195d
commit
73f8d3d50a
|
@ -167,7 +167,9 @@ public class TextDbLoader implements IWaveformDbLoader {
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public Collection<IWaveform> getAllWaves() {
|
public Collection<IWaveform> getAllWaves() {
|
||||||
return new ArrayList<>(txStreams.values());
|
ArrayList<IWaveform> ret = new ArrayList<>(txStreams.values());
|
||||||
|
ret.addAll(txGenerators.values());
|
||||||
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -83,4 +83,14 @@ class TxGenerator extends AbstractTxStream {
|
||||||
return stream.getKind();
|
return stream.getKind();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets the full hierarchical name.
|
||||||
|
*
|
||||||
|
* @return the full name
|
||||||
|
*/
|
||||||
|
@Override
|
||||||
|
public String getFullName() {
|
||||||
|
return ((AbstractTxStream)parent).getFullName()+"."+name;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -189,6 +189,7 @@ public class WaveformDb extends HierNode implements IWaveformDb, PropertyChangeL
|
||||||
if (IWaveformDbLoader.SIGNAL_ADDED.equals(evt.getPropertyName())
|
if (IWaveformDbLoader.SIGNAL_ADDED.equals(evt.getPropertyName())
|
||||||
|| IWaveformDbLoader.STREAM_ADDED.equals(evt.getPropertyName())) {
|
|| IWaveformDbLoader.STREAM_ADDED.equals(evt.getPropertyName())) {
|
||||||
IWaveform waveform = (IWaveform) evt.getNewValue();
|
IWaveform waveform = (IWaveform) evt.getNewValue();
|
||||||
|
waveforms.put(waveform.getFullName(), waveform);
|
||||||
putInHierarchy(waveform);
|
putInHierarchy(waveform);
|
||||||
pcs.firePropertyChange(IHierNode.WAVEFORMS, null, waveforms);
|
pcs.firePropertyChange(IHierNode.WAVEFORMS, null, waveforms);
|
||||||
pcs.firePropertyChange(IHierNode.CHILDS, null, childNodes);
|
pcs.firePropertyChange(IHierNode.CHILDS, null, childNodes);
|
||||||
|
|
Loading…
Reference in New Issue