X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.ui%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fui%2Fmodel%2Fcomponents%2FGUIBitDisplay.java;h=88ee120c2e86892b662453f70155a8a6ecec7033;hb=c223a9de7b0ef783bcb4f7612da350583ca29abd;hp=abaec56bf0597ee3a9c5d30c011cc2104bc4ab61;hpb=e7193d1fb16edc79e9cc3d8adcfb71caecd8463b;p=Mograsim.git

diff --git a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/GUIBitDisplay.java b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/GUIBitDisplay.java
index abaec56b..88ee120c 100644
--- a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/GUIBitDisplay.java
+++ b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/GUIBitDisplay.java
@@ -8,7 +8,7 @@ import net.mograsim.logic.core.LogicObservable;
 import net.mograsim.logic.core.LogicObserver;
 import net.mograsim.logic.core.components.BitDisplay;
 import net.mograsim.logic.core.types.BitVectorFormatter;
-import net.mograsim.logic.ui.model.ViewModel;
+import net.mograsim.logic.ui.model.ViewModelModifiable;
 import net.mograsim.logic.ui.model.wires.Pin;
 
 public class GUIBitDisplay extends GUIComponent
@@ -22,30 +22,26 @@ public class GUIBitDisplay extends GUIComponent
 	private final LogicObserver logicObs;
 	private BitDisplay bitDisplay;
 
-	public GUIBitDisplay(ViewModel model)
+	public GUIBitDisplay(ViewModelModifiable model)
 	{
 		super(model);
 		logicObs = (i) -> requestRedraw();
 
 		setSize(width, height);
-		addPin(this.inputPin = new Pin(this, 1, 0, height / 2));
+		addPin(this.inputPin = new Pin(this, "", 1, 0, height / 2));
 	}
 
 	@Override
 	public void render(GeneralGC gc, Rectangle visibleRegion)
 	{
-		double posX = getBounds().x;
-		double posY = getBounds().y;
-
-		// TODO maybe draw switch state too?
-		gc.drawRectangle(posX, posY, width, height);
+		gc.drawRectangle(getBounds());
 		String label = bitDisplay == null ? BitVectorFormatter.formatAsString(null)
 				: BitVectorFormatter.formatAsString(bitDisplay.getDisplayedValue());
 		Font oldFont = gc.getFont();
 		Font labelFont = new Font(oldFont.getName(), fontHeight, oldFont.getStyle());
 		gc.setFont(labelFont);
 		Point textExtent = gc.textExtent(label);
-		gc.drawText(label, posX + (width - textExtent.x) / 2, posY + (height - textExtent.y) / 2, true);
+		gc.drawText(label, getPosX() + (width - textExtent.x) / 2, getPosY() + (height - textExtent.y) / 2, true);
 		gc.setFont(oldFont);
 	}