X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.ui%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fui%2Fmodel%2Fcomponents%2FSimpleRectangularGUIGate.java;h=cbb8ab7eab47e83be7a2e0ee0e63e423430d9208;hb=20aa3391efe7ae7d99861741f8b5594f88eae1d9;hp=a2875c6a0b54859336d86a2f24ad03fe0350013c;hpb=07faf07e3acb8b2afdc2bf65a46bc868faaed0f8;p=Mograsim.git

diff --git a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/SimpleRectangularGUIGate.java b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/SimpleRectangularGUIGate.java
index a2875c6a..cbb8ab7e 100644
--- a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/SimpleRectangularGUIGate.java
+++ b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/SimpleRectangularGUIGate.java
@@ -4,13 +4,13 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import net.mograsim.logic.ui.model.ViewModel;
-import net.mograsim.logic.ui.model.wires.MovablePin;
-import net.mograsim.logic.ui.model.wires.Pin;
 import net.haspamelodica.swt.helper.gcs.GeneralGC;
 import net.haspamelodica.swt.helper.swtobjectwrappers.Font;
 import net.haspamelodica.swt.helper.swtobjectwrappers.Point;
 import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle;
+import net.mograsim.logic.ui.model.ViewModelModifiable;
+import net.mograsim.logic.ui.model.wires.MovablePin;
+import net.mograsim.logic.ui.model.wires.Pin;
 
 public class SimpleRectangularGUIGate extends GUIComponent
 {
@@ -28,14 +28,14 @@ public class SimpleRectangularGUIGate extends GUIComponent
 	private final List<Pin> inputPins;
 	private final List<Pin> inputPinsUnmodifiable;
 
-	protected SimpleRectangularGUIGate(ViewModel model, int logicWidth, String label, boolean isInverted)
+	protected SimpleRectangularGUIGate(ViewModelModifiable model, int logicWidth, String label, boolean isInverted)
 	{
 		super(model);
 		this.label = label;
 		this.logicWidth = logicWidth;
 		this.isInverted = isInverted;
 		this.rectWidth = width - (isInverted ? invertedCircleDiam : 0);
-		this.outputPin = new MovablePin(this, logicWidth, width, 0);
+		this.outputPin = new MovablePin(this, "Y", logicWidth, width, 0);
 		addPin(outputPin);
 		this.inputPins = new ArrayList<>();
 		this.inputPinsUnmodifiable = Collections.unmodifiableList(inputPins);
@@ -48,11 +48,12 @@ public class SimpleRectangularGUIGate extends GUIComponent
 		setSize(width, inputCount * pinDistance);
 		if (oldInputCount > inputCount)
 			while (inputPins.size() > inputCount)
-				removePin(inputPins.get(inputCount));
+				removePin(inputPins.remove(inputCount));
 		else if (oldInputCount < inputCount)
 			for (int i = oldInputCount; i < inputCount; i++)
 			{
-				Pin pin = new Pin(this, logicWidth, 0, pinDistance / 2 + i * pinDistance);
+				// TODO what for more than 26 input pins?
+				Pin pin = new Pin(this, "A" + i, logicWidth, 0, pinDistance / 2 + i * pinDistance);
 				inputPins.add(pin);
 				addPin(pin);
 			}