X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.plugin.core%2Fsrc%2Fnet%2Fmograsim%2Fplugin%2Fviews%2FLogicUIPart.java;h=81707be26433f046526e0040931effd2a51445d9;hb=21ffb2a7f764069fb3c55b71647b43e8803e668c;hp=26d95cf7b98650211d1839a56b5dc7676ca80000;hpb=ca786d4adb85001128a2440154d028632a22e3b8;p=Mograsim.git diff --git a/net.mograsim.plugin.core/src/net/mograsim/plugin/views/LogicUIPart.java b/net.mograsim.plugin.core/src/net/mograsim/plugin/views/LogicUIPart.java index 26d95cf7..81707be2 100644 --- a/net.mograsim.plugin.core/src/net/mograsim/plugin/views/LogicUIPart.java +++ b/net.mograsim.plugin.core/src/net/mograsim/plugin/views/LogicUIPart.java @@ -22,6 +22,7 @@ import net.mograsim.logic.model.model.components.atomic.GUIBitDisplay; import net.mograsim.logic.model.model.components.atomic.GUIManualSwitch; import net.mograsim.logic.model.model.wires.GUIWire; import net.mograsim.logic.model.model.wires.Pin; +import net.mograsim.logic.model.model.wires.PinUsage; import net.mograsim.logic.model.modeladapter.LogicModelParameters; import net.mograsim.logic.model.modeladapter.ViewLogicModelAdapter; import net.mograsim.logic.model.serializing.IndirectGUIComponentCreator; @@ -85,11 +86,10 @@ public class LogicUIPart extends ViewPart { GUIComponent comp = IndirectGUIComponentCreator.createComponent(model, "GUIAm2901"); - // TODO this code exists four times... but it seems too "hacky" to put it in a helper class List inputPinNames = new ArrayList<>(); List outputPinNames = new ArrayList<>(); for (Pin p : comp.getPins().values()) - if (p.getRelX() == 0) + if (p.usage == PinUsage.INPUT) inputPinNames.add(p.name); else outputPinNames.add(p.name); @@ -100,13 +100,13 @@ public class LogicUIPart extends ViewPart comp.moveTo(100, 0); for (int i = 0; i < inputPinNames.size(); i++) { - GUIManualSwitch sw = new GUIManualSwitch(model); + GUIManualSwitch sw = new GUIManualSwitch(model, 1); sw.moveTo(0, 20 * i); new GUIWire(model, comp.getPin(inputPinNames.get(i)), sw.getOutputPin()); } for (int i = 0; i < outputPinNames.size(); i++) { - GUIBitDisplay bd = new GUIBitDisplay(model); + GUIBitDisplay bd = new GUIBitDisplay(model, 1); bd.moveTo(200, 20 * i); new GUIWire(model, comp.getPin(outputPinNames.get(i)), bd.getInputPin()); }