projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'development' of https://gitlab.lrz.de/lrr-tum/students/eragp-misim...
[Mograsim.git]
/
net.mograsim.logic.core
/
src
/
net
/
mograsim
/
logic
/
core
/
types
/
BitVectorFormatter.java
diff --git
a/net.mograsim.logic.core/src/net/mograsim/logic/core/types/BitVectorFormatter.java
b/net.mograsim.logic.core/src/net/mograsim/logic/core/types/BitVectorFormatter.java
index
2ea2ca4
..
4996dcb
100644
(file)
--- a/
net.mograsim.logic.core/src/net/mograsim/logic/core/types/BitVectorFormatter.java
+++ b/
net.mograsim.logic.core/src/net/mograsim/logic/core/types/BitVectorFormatter.java
@@
-1,7
+1,9
@@
package net.mograsim.logic.core.types;
package net.mograsim.logic.core.types;
-import net.mograsim.logic.core.types.ColorDefinition.BuiltInColor;
import net.mograsim.logic.core.wires.Wire.ReadEnd;
import net.mograsim.logic.core.wires.Wire.ReadEnd;
+import net.mograsim.preferences.ColorDefinition;
+import net.mograsim.preferences.ColorDefinition.BuiltInColor;
+import net.mograsim.preferences.Preferences;
public class BitVectorFormatter
{
public class BitVectorFormatter
{
@@
-17,6
+19,7
@@
public class BitVectorFormatter
return bitVector.toString();
}
return bitVector.toString();
}
+ // TODO doesn't this belong to logic.model?
public static ColorDefinition formatAsColor(ReadEnd end)
{
return formatAsColor(end == null ? null : end.getValues());
public static ColorDefinition formatAsColor(ReadEnd end)
{
return formatAsColor(end == null ? null : end.getValues());
@@
-25,22
+28,22
@@
public class BitVectorFormatter
public static ColorDefinition formatAsColor(BitVector bitVector)
{
// TODO maybe find a color assignment for multiple-bit bit vectors?
public static ColorDefinition formatAsColor(BitVector bitVector)
{
// TODO maybe find a color assignment for multiple-bit bit vectors?
- if (bitVector == null || bitVector.
leng
th() != 1)
+ if (bitVector == null || bitVector.
wid
th() != 1)
return new ColorDefinition(BuiltInColor.COLOR_BLACK);
return new ColorDefinition(BuiltInColor.COLOR_BLACK);
- switch (bitVector.getBit(0))
+ switch (bitVector.get
LS
Bit(0))
{
case ONE:
{
case ONE:
- return
new ColorDefinition(BuiltInColor.COLOR_GREEN
);
+ return
Preferences.current().getColorDefinition("net.mograsim.logic.model.color.bit.one"
);
case U:
case U:
- return
new ColorDefinition(BuiltInColor.COLOR_CYAN
);
+ return
Preferences.current().getColorDefinition("net.mograsim.logic.model.color.bit.u"
);
case X:
case X:
- return
new ColorDefinition(BuiltInColor.COLOR_RED
);
+ return
Preferences.current().getColorDefinition("net.mograsim.logic.model.color.bit.x"
);
case Z:
case Z:
- return
new ColorDefinition(BuiltInColor.COLOR_YELLOW
);
+ return
Preferences.current().getColorDefinition("net.mograsim.logic.model.color.bit.z"
);
case ZERO:
case ZERO:
- return
new ColorDefinition(BuiltInColor.COLOR_GRAY
);
+ return
Preferences.current().getColorDefinition("net.mograsim.logic.model.color.bit.zero"
);
default:
default:
- throw new IllegalArgumentException("Unknown enum constant: " + bitVector.getBit(0));
+ throw new IllegalArgumentException("Unknown enum constant: " + bitVector.get
LS
Bit(0));
}
}
}
}