X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.ui%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fui%2Fmodel%2Fcomponents%2FSimpleRectangularSubmodelComponent.java;h=44b402d3acb9fc561eb1545eb3b8c7e898458908;hb=7aa6eab72deba89dbc22ae9c90ffb5df53f9d496;hp=0e6e3268b99ac1c291d40e245714b2a47ca3f206;hpb=b555e4c29e14f455d8ffbc810284c7bb44b459f9;p=Mograsim.git

diff --git a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/SimpleRectangularSubmodelComponent.java b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/SimpleRectangularSubmodelComponent.java
index 0e6e3268..44b402d3 100644
--- a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/SimpleRectangularSubmodelComponent.java
+++ b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/SimpleRectangularSubmodelComponent.java
@@ -11,7 +11,6 @@ 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.components.params.SubComponentParams;
 import net.mograsim.logic.ui.model.wires.Pin;
 
 public class SimpleRectangularSubmodelComponent extends SubmodelComponent
@@ -63,7 +62,8 @@ public class SimpleRectangularSubmodelComponent extends SubmodelComponent
 		else if (oldInputCount < inputCount)
 			for (int i = oldInputCount; i < inputCount; i++)
 			{
-				Pin submodelPin = addSubmodelInterface(logicWidth, 0, pinDistance / 2 + i * pinDistance);
+				// TODO pin names
+				Pin submodelPin = addSubmodelInterface("Input pin #" + i, logicWidth, 0, pinDistance / 2 + i * pinDistance);
 				inputSubmodelPins.add(submodelPin);
 				inputSupermodelPins.add(getSupermodelPin(submodelPin));
 			}
@@ -82,7 +82,8 @@ public class SimpleRectangularSubmodelComponent extends SubmodelComponent
 		else if (oldOutputCount < outputCount)
 			for (int i = oldOutputCount; i < outputCount; i++)
 			{
-				Pin submodelPin = addSubmodelInterface(logicWidth, width, pinDistance / 2 + i * pinDistance);
+				// TODO pin names
+				Pin submodelPin = addSubmodelInterface("Output pin #" + i, logicWidth, width, pinDistance / 2 + i * pinDistance);
 				outputSubmodelPins.add(submodelPin);
 				outputSupermodelPins.add(getSupermodelPin(submodelPin));
 			}
@@ -120,6 +121,7 @@ public class SimpleRectangularSubmodelComponent extends SubmodelComponent
 		Point textExtent = gc.textExtent(label);
 		gc.drawText(label, posX + (getBounds().width - textExtent.x) / 2, posY + (getBounds().height - textExtent.y) / 2, true);
 		gc.setFont(oldFont);
+		// TODO draw pin names
 	}
 
 	@Override
@@ -129,9 +131,9 @@ public class SimpleRectangularSubmodelComponent extends SubmodelComponent
 	}
 
 	@Override
-	public SubComponentParams calculateParams()
+	public SubmodelComponentParams calculateParams()
 	{
-		SubComponentParams ret = super.calculateParams();
+		SubmodelComponentParams ret = super.calculateParams();
 		ret.type = SimpleRectangularSubmodelComponent.class.getSimpleName();
 		Map<String, Object> m = new TreeMap<>();
 		m.put(kLabel, label);