X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.core%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fcore%2Ftypes%2FBitVectorFormatter.java;h=858f28a316f9437307669fd406a4fc51f8a6329f;hb=e2258789906b9be977a37669062d6a996be57e9c;hp=87483a70e12afaab379b44d7091805d652292fa5;hpb=9271e9f2d44fcc0498e0cd8a33e1bd224310e975;p=Mograsim.git 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 87483a70..858f28a3 100644 --- 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 @@ -2,8 +2,8 @@ package net.mograsim.logic.core.types; import net.mograsim.logic.core.wires.Wire.ReadEnd; import net.mograsim.preferences.ColorDefinition; -import net.mograsim.preferences.Preferences; import net.mograsim.preferences.ColorDefinition.BuiltInColor; +import net.mograsim.preferences.Preferences; public class BitVectorFormatter { @@ -30,20 +30,20 @@ public class BitVectorFormatter // TODO maybe find a color assignment for multiple-bit bit vectors? if (bitVector == null || bitVector.length() != 1) return new ColorDefinition(BuiltInColor.COLOR_BLACK); - switch (bitVector.getBit(0)) + switch (bitVector.getLSBit(0)) { case ONE: - return Preferences.current().getColor("net.mograsim.logic.ui.wire.bit.one"); + return Preferences.current().getColorDefinition("net.mograsim.logic.ui.color.bit.one"); case U: - return Preferences.current().getColor("net.mograsim.logic.ui.wire.bit.u"); + return Preferences.current().getColorDefinition("net.mograsim.logic.ui.color.bit.u"); case X: - return Preferences.current().getColor("net.mograsim.logic.ui.wire.bit.x"); + return Preferences.current().getColorDefinition("net.mograsim.logic.ui.color.bit.x"); case Z: - return Preferences.current().getColor("net.mograsim.logic.ui.wire.bit.z"); + return Preferences.current().getColorDefinition("net.mograsim.logic.ui.color.bit.z"); case ZERO: - return Preferences.current().getColor("net.mograsim.logic.ui.wire.bit.zero"); + return Preferences.current().getColorDefinition("net.mograsim.logic.ui.color.bit.zero"); default: - throw new IllegalArgumentException("Unknown enum constant: " + bitVector.getBit(0)); + throw new IllegalArgumentException("Unknown enum constant: " + bitVector.getLSBit(0)); } }