projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Created net.mograsim.preferences
[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
eb4e45f
..
87483a7
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;
\r
\r
package net.mograsim.logic.core.types;
\r
\r
-import net.mograsim.logic.core.types.ColorDefinition.BuiltInColor;
\r
import net.mograsim.logic.core.wires.Wire.ReadEnd;
\r
import net.mograsim.logic.core.wires.Wire.ReadEnd;
\r
+import net.mograsim.preferences.ColorDefinition;
\r
+import net.mograsim.preferences.Preferences;
\r
+import net.mograsim.preferences.ColorDefinition.BuiltInColor;
\r
\r
public class BitVectorFormatter
\r
{
\r
\r
public class BitVectorFormatter
\r
{
\r
@@
-17,6
+19,7
@@
public class BitVectorFormatter
return bitVector.toString();
\r
}
\r
\r
return bitVector.toString();
\r
}
\r
\r
+ // TODO doesn't this belong to logic.ui?
\r
public static ColorDefinition formatAsColor(ReadEnd end)
\r
{
\r
return formatAsColor(end == null ? null : end.getValues());
\r
public static ColorDefinition formatAsColor(ReadEnd end)
\r
{
\r
return formatAsColor(end == null ? null : end.getValues());
\r
@@
-30,15
+33,15
@@
public class BitVectorFormatter
switch (bitVector.getBit(0))
\r
{
\r
case ONE:
\r
switch (bitVector.getBit(0))
\r
{
\r
case ONE:
\r
- return
new ColorDefinition(BuiltInColor.COLOR_GREEN
);
\r
+ return
Preferences.current().getColor("net.mograsim.logic.ui.wire.bit.one"
);
\r
case U:
\r
case U:
\r
- return
new ColorDefinition(BuiltInColor.COLOR_CYAN
);
\r
+ return
Preferences.current().getColor("net.mograsim.logic.ui.wire.bit.u"
);
\r
case X:
\r
case X:
\r
- return
new ColorDefinition(BuiltInColor.COLOR_RED
);
\r
+ return
Preferences.current().getColor("net.mograsim.logic.ui.wire.bit.x"
);
\r
case Z:
\r
case Z:
\r
- return
new ColorDefinition(BuiltInColor.COLOR_YELLOW
);
\r
+ return
Preferences.current().getColor("net.mograsim.logic.ui.wire.bit.z"
);
\r
case ZERO:
\r
case ZERO:
\r
- return
new ColorDefinition(BuiltInColor.COLOR_GRAY
);
\r
+ return
Preferences.current().getColor("net.mograsim.logic.ui.wire.bit.zero"
);
\r
default:
\r
throw new IllegalArgumentException("Unknown enum constant: " + bitVector.getBit(0));
\r
}
\r
default:
\r
throw new IllegalArgumentException("Unknown enum constant: " + bitVector.getBit(0));
\r
}
\r