X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.machine%2Fsrc%2Fnet%2Fmograsim%2Fmachine%2FModelMemory.java;h=d0459dc18189352209573ee88ca504ca2c134cf4;hb=8bed58cd47f4e53a0a83e066d38864aa6875502f;hp=415031898cccb29d5164f9ff847c909eac589d61;hpb=91f076c44a4f00786343beb923ab01894672416f;p=Mograsim.git

diff --git a/net.mograsim.machine/src/net/mograsim/machine/ModelMemory.java b/net.mograsim.machine/src/net/mograsim/machine/ModelMemory.java
index 41503189..d0459dc1 100644
--- a/net.mograsim.machine/src/net/mograsim/machine/ModelMemory.java
+++ b/net.mograsim.machine/src/net/mograsim/machine/ModelMemory.java
@@ -9,24 +9,22 @@ import net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer
 import net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer;
 import net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer.SimpleRectangularLikeParams;
 
-public abstract class ModelMemory extends ModelComponent
+public abstract class ModelMemory<M extends Machine> extends ModelComponent
 {
 	private Renderer symbolRenderer;
 	private Renderer outlineRenderer;
-	protected final int width, height;
+	private M machine;
 
 	protected ModelMemory(LogicModelModifiable model, int width, int height, String name, String centerText, boolean callInit)
 	{
 		super(model, name, false);
-		this.width = width;
-		this.height = height;
 
 		SimpleRectangularLikeParams rendererParams = new SimpleRectangularLikeParams();
 		rendererParams.centerText = centerText;
-		rendererParams.centerTextHeight = 24;
-		rendererParams.horizontalComponentCenter = width / 100;
-		rendererParams.pinLabelHeight = 17.5;
-		rendererParams.pinLabelMargin = 2.5;
+		rendererParams.centerTextHeight = 5;
+		rendererParams.horizontalComponentCenter = width / 2;
+		rendererParams.pinLabelHeight = 2.5;
+		rendererParams.pinLabelMargin = 0.5;
 		this.symbolRenderer = new SimpleRectangularLikeSymbolRenderer(this, rendererParams);
 		this.outlineRenderer = new DefaultOutlineRenderer(this);
 
@@ -42,4 +40,14 @@ public abstract class ModelMemory extends ModelComponent
 		symbolRenderer.render(gc, visibleRegion);
 		outlineRenderer.render(gc, visibleRegion);
 	}
+
+	public void setMachine(M machine)
+	{
+		this.machine = machine;
+	}
+
+	public M getMachine()
+	{
+		return machine;
+	}
 }