X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.ui%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fui%2FLogicUICanvas.java;h=0ea2680d16705e2ceae372f5c2ce1915ee6b7000;hb=150c5385bc4605d568bac31138b23562b8f19fce;hp=73c1f06b2f63a6b5550e5afb5e0995f7aeed6f2f;hpb=8638004215f29625847ea345f1cfadb446417c1f;p=Mograsim.git diff --git a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/LogicUICanvas.java b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/LogicUICanvas.java index 73c1f06b..0ea2680d 100644 --- a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/LogicUICanvas.java +++ b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/LogicUICanvas.java @@ -23,8 +23,8 @@ import net.mograsim.logic.core.types.Bit; import net.mograsim.logic.core.types.BitVector; import net.mograsim.logic.ui.model.ViewModel; import net.mograsim.logic.ui.model.components.GUIComponent; -import net.mograsim.logic.ui.model.components.SubmodelComponent; -import net.mograsim.logic.ui.model.components.SubmodelInterface; +import net.mograsim.logic.ui.model.components.submodels.SubmodelComponent; +import net.mograsim.logic.ui.model.components.submodels.SubmodelInterface; import net.mograsim.logic.ui.model.wires.WireCrossPoint; import net.mograsim.preferences.Preferences; @@ -122,7 +122,7 @@ public class LogicUICanvas extends ZoomableCanvas if (radioBit.getSelection()) value = Bit.parse(valueString); else if (radioBitVector.getSelection()) - value = BitVector.parse(new StringBuilder(valueString).reverse().toString()); + value = BitVector.parseMSBFirst(valueString); else throw new RuntimeException("No value type selected"); target.setHighLevelState(stateIDText.getText(), value); @@ -166,7 +166,7 @@ public class LogicUICanvas extends ZoomableCanvas for (GUIComponent c : model.getComponents()) if (!(c instanceof WireCrossPoint || c instanceof SubmodelInterface)) { - String item = base + c.getIdentifier(); + String item = base + c.getClass().getSimpleName(); componentsByItemIndex.add(c); componentSelector.add(item); if (c instanceof SubmodelComponent)