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=e2af6f1a0819b1b225a7456e233718a81a01d3dc;hpb=c1a8e2103a1a79039163ad2e414c0650f8cee3ea;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 e2af6f1a..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
@@ -3,18 +3,22 @@ package net.mograsim.logic.ui.model.components;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
 
 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.Pin;
 
 public class SimpleRectangularSubmodelComponent extends SubmodelComponent
 {
+	public static String kLabel = "label", kInCount = "input_count", kOutCount = "output_count", kLogicWidth = "logic_width";
+
 	private static final double width = 35;
 	private static final double pinDistance = 10;
-	private static final double minHeight = 25;
 	private static final double fontHeight = 5;
 
 	private final String label;
@@ -58,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));
 			}
@@ -77,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));
 			}
@@ -104,7 +110,7 @@ public class SimpleRectangularSubmodelComponent extends SubmodelComponent
 	}
 
 	@Override
-	protected void renderSymbol(GeneralGC gc)
+	protected void renderSymbol(GeneralGC gc, Rectangle visibleRegion)
 	{
 		double posX = getBounds().x;
 		double posY = getBounds().y;
@@ -115,11 +121,26 @@ 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
-	protected void renderOutline(GeneralGC gc)
+	protected void renderOutline(GeneralGC gc, Rectangle visibleRegion)
 	{
 		gc.drawRectangle(getBounds());
 	}
+
+	@Override
+	public SubmodelComponentParams calculateParams()
+	{
+		SubmodelComponentParams ret = super.calculateParams();
+		ret.type = SimpleRectangularSubmodelComponent.class.getSimpleName();
+		Map<String, Object> m = new TreeMap<>();
+		m.put(kLabel, label);
+		m.put(kInCount, inputSupermodelPins.size());
+		m.put(kOutCount, outputSupermodelPins.size());
+		m.put(kLogicWidth, logicWidth);
+		ret.specialized = m;
+		return ret;
+	}
 }
\ No newline at end of file