Merge branch 'fusebug' into development

[Mograsim.git] / net.mograsim.logic.model / src / net / mograsim / logic / model / model / components / atomic / GUIMerger.java

diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUIMerger.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUIMerger.java
index d1eac5e..656c91f 100644 (file)
--- a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUIMerger.java
+++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUIMerger.java
@@ -12,6 +12,7 @@ import net.mograsim.logic.core.wires.Wire.ReadEnd;
 import net.mograsim.logic.model.model.ViewModelModifiable;
 import net.mograsim.logic.model.model.components.GUIComponent;
 import net.mograsim.logic.model.model.wires.Pin;
+import net.mograsim.logic.model.model.wires.PinUsage;
 import net.mograsim.logic.model.modeladapter.ViewLogicModelAdapter;
 import net.mograsim.logic.model.modeladapter.componentadapters.MergerAdapter;
 import net.mograsim.logic.model.serializing.IdentifierGetter;
@@ -26,10 +27,16 @@ public class GUIMerger extends GUIComponent
        private static final double heightPerPin = 10;
 
        public final int logicWidth;
+       private final Pin outputPin;
 
        private final ReadEnd[] inputEnds;
        private ReadEnd outputEnd;
 
+       public GUIMerger(ViewModelModifiable model, int logicWidth)
+       {
+               this(model, logicWidth, null);
+       }
+
        public GUIMerger(ViewModelModifiable model, int logicWidth, String name)
        {
                super(model, name);
@@ -37,8 +44,8 @@ public class GUIMerger extends GUIComponent
                setSize(width, logicWidth * heightPerPin);
                double inputHeight = 0;
                for (int i = 0; i < logicWidth; i++, inputHeight += 10)
-                       addPin(new Pin(this, "I" + i, 1, 0, inputHeight));
-               addPin(new Pin(this, "O", logicWidth, width, (logicWidth - 1) * heightPerPin / 2));
+                       addPin(new Pin(this, "I" + i, 1, PinUsage.TRISTATE, 0, inputHeight));
+               addPin(this.outputPin = new Pin(this, "O", logicWidth, PinUsage.TRISTATE, width, (logicWidth - 1) * heightPerPin / 2));
                inputEnds = new ReadEnd[logicWidth];
        }
 
@@ -82,6 +89,11 @@ public class GUIMerger extends GUIComponent
                this.outputEnd = outputEnd;
        }
 
+       public Pin getOutputPin()
+       {
+               return outputPin;
+       }
+
        static
        {
                ViewLogicModelAdapter.addComponentAdapter(new MergerAdapter());