X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=net.mograsim.logic.ui%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fui%2Fmodel%2Fcomponents%2FSimpleRectangularSubmodelComponent.java;h=04a6fcc2aaf83c7409e5b3758d8063efffdd4a25;hb=f14ea37d69488dd51518a36413af7176916b8bd7;hp=0c0bf301e61bf408666f2ae326e31a87bf2f533b;hpb=19ee1a7fdb06a1df65cd7df78fed935124496707;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 0c0bf301..04a6fcc2 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
@@ -12,7 +12,9 @@ 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.ModelVisitor;
 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 SimpleRectangularSubmodelComponent extends SubmodelComponent
@@ -69,7 +71,7 @@ public class SimpleRectangularSubmodelComponent extends SubmodelComponent
 			String pinName = newPinNames[i];
 			int oldPinIndex = pinNamesListThisSide.indexOf(pinName);
 			if (oldPinIndex == -1)
-				super.addSubmodelInterface(pinName, logicWidth, relX, pinDistance / 2 + i * pinDistance);
+				super.addSubmodelInterface(new MovablePin(this, pinName, logicWidth, relX, pinDistance / 2 + i * pinDistance));
 			else
 				getSupermodelMovablePin(pinName).setRelPos(relX, pinDistance / 2 + i * pinDistance);
 		}
@@ -93,26 +95,23 @@ public class SimpleRectangularSubmodelComponent extends SubmodelComponent
 	@Override
 	protected void renderSymbol(GeneralGC gc, Rectangle visibleRegion)
 	{
-		double posX = getBounds().x;
-		double posY = getBounds().y;
-
 		Font oldFont = gc.getFont();
 		gc.setFont(new Font(oldFont.getName(), labelFontHeight, oldFont.getStyle()));
 		Point textExtent = gc.textExtent(label);
-		gc.drawText(label, posX + (getBounds().width - textExtent.x) / 2, posY + (getBounds().height - textExtent.y) / 2, true);
+		gc.drawText(label, getPosX() + (getWidth() - textExtent.x) / 2, getPosY() + (getHeight() - textExtent.y) / 2, true);
 		gc.setFont(new Font(oldFont.getName(), pinNameFontHeight, oldFont.getStyle()));
 		for (int i = 0; i < inputPinNames.size(); i++)
 		{
 			String pinName = inputPinNames.get(i);
 			textExtent = gc.textExtent(pinName);
-			gc.drawText(pinName, posX + pinNameMargin, posY + i * pinDistance + (pinDistance - textExtent.y) / 2, true);
+			gc.drawText(pinName, getPosX() + pinNameMargin, getPosY() + i * pinDistance + (pinDistance - textExtent.y) / 2, true);
 		}
 		for (int i = 0; i < outputPinNames.size(); i++)
 		{
 			String pinName = outputPinNames.get(i);
 			textExtent = gc.textExtent(pinName);
-			gc.drawText(pinName, posX + width - textExtent.x - pinNameMargin, posY + i * pinDistance + (pinDistance - textExtent.y) / 2,
-					true);
+			gc.drawText(pinName, getPosX() + width - textExtent.x - pinNameMargin,
+					getPosY() + i * pinDistance + (pinDistance - textExtent.y) / 2, true);
 		}
 		gc.setFont(oldFont);
 	}
@@ -138,7 +137,7 @@ public class SimpleRectangularSubmodelComponent extends SubmodelComponent
 	}
 
 	@Override
-	protected Pin addSubmodelInterface(String name, int logicWidth, double relX, double relY)
+	protected Pin addSubmodelInterface(MovablePin supermodelPin)
 	{
 		throw new UnsupportedOperationException(
 				"Can't add submodel interfaces to a SimpleRectangularSubmodelComponent directly, call setInputPins / setOutputPins instead");
@@ -157,4 +156,10 @@ public class SimpleRectangularSubmodelComponent extends SubmodelComponent
 		throw new UnsupportedOperationException(
 				"Can't set the size of a SimpleRectangularSubmodelComponent directly, call setInputPins / setOutputPins instead");
 	}
+
+	@Override
+	public void accept(ModelVisitor mv)
+	{
+		mv.visit(this);
+	}
 }
\ No newline at end of file