Tools/SCViewer
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cleans interfaces up

Browse Source
This commit is contained in:
Eyck Jentzsch
2023-02-27 13:07:10 +01:00
parent bba4349e1e
commit 299f76323f
16 changed files with 73 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/com.minres.scviewer.database.vcd/src/com/minres/scviewer/database/vcd/VCDDbLoader.java
View File

@@ -71,7 +71,7 @@ public class VCDDbLoader implements IWaveformDbLoader, IVCDDatabaseBuilder {
*/
@SuppressWarnings("unchecked")
@Override
public void load(IWaveformDb db, File file) throws InputFormatException {
public void load(File file) throws InputFormatException {
dispose();
this.maxTime=0;
boolean res = false;
@@ -176,7 +176,7 @@ public class VCDDbLoader implements IWaveformDbLoader, IVCDDatabaseBuilder {
@Override
public int getNetWidth(int intValue) {
VCDSignal<?> signal = (VCDSignal<?>) signals.get(intValue);
return signal.getRowCount();
return signal.getWidth();
}
/* (non-Javadoc)

32
plugins/com.minres.scviewer.database.vcd/src/com/minres/scviewer/database/vcd/VCDFileParser.java
View File

@@ -205,41 +205,17 @@ class VCDFileParser {
else
traceBuilder.appendTransition(net, currentTime, Double.parseDouble(value));
} else {
BitVector decodedValues = new BitVector(netWidth);
BitVector decodedValues;
if (value.equals("z") && netWidth > 1) {
decodedValues = new BitVector(netWidth);
for (int i = 0; i < netWidth; i++)
decodedValues.setValue(i, BitValue.Z);
} else if (value.equals("x") && netWidth > 1) {
decodedValues = new BitVector(netWidth);
for (int i = 0; i < netWidth; i++)
decodedValues.setValue(i, BitValue.X);
} else {
int stringIndex = 0;
for (int convertedIndex = netWidth -1; convertedIndex >=0; convertedIndex--) {
if(convertedIndex<value.length()) {
switch (value.charAt(stringIndex++)) {
case 'z':
decodedValues.setValue(convertedIndex, BitValue.Z);
break;
case '1':
decodedValues.setValue(convertedIndex, BitValue.ONE);
break;
case '0':
decodedValues.setValue(convertedIndex, BitValue.ZERO);
break;
case 'x':
decodedValues.setValue(convertedIndex, BitValue.X);
break;
default:
decodedValues.setValue(convertedIndex, BitValue.X);
}
} else {
decodedValues.setValue(convertedIndex, BitValue.ZERO);
}
}
decodedValues = BitVector.fromString(netWidth, value);
}
traceBuilder.appendTransition(net, currentTime, decodedValues);
}

6
plugins/com.minres.scviewer.database.vcd/src/com/minres/scviewer/database/vcd/VCDSignal.java
View File

@@ -100,9 +100,13 @@ public class VCDSignal<T extends IEvent> extends HierNode implements IWaveform {
}
@Override
public int getRowCount() {
public int getWidth() {
return width;
}
@Override
public int getRowCount() {
return 1;
}
@Override
public String getKind() {