Merge branch 'fusebug' into development

[Mograsim.git] / net.mograsim.plugin.core / src / net / mograsim / plugin / views / LogicUIPart.java

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 26d95cf..81707be 100644 (file)
--- 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<String> inputPinNames = new ArrayList<>();
                List<String> 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());
                }