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=c4d8df3891f2cd48d0b42a9a7460af8ffc971c93;hb=f14ea37d69488dd51518a36413af7176916b8bd7;hp=fd2f736c50cb175651810fc0ec0702c84dc37b15;hpb=9c142c9ad59d2af070ebb6495b1ca48242da62d8;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 fd2f736c..c4d8df38 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,8 +8,11 @@ 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.ModelVisitor;
 import net.mograsim.logic.ui.model.ViewModelModifiable;
 import net.mograsim.logic.ui.model.wires.Pin;
+import net.mograsim.logic.ui.modeladapter.ViewLogicModelAdapter;
+import net.mograsim.logic.ui.modeladapter.componentadapters.BitDisplayAdapter;
 
 public class GUIBitDisplay extends GUIComponent
 {
@@ -28,24 +31,20 @@ public class GUIBitDisplay extends GUIComponent
 		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);
 	}
 
@@ -68,8 +67,24 @@ public class GUIBitDisplay extends GUIComponent
 			observable.deregisterObserver(logicObs);
 	}
 
+	public BitDisplay getBitDisplay()
+	{
+		return bitDisplay;
+	}
+
 	public Pin getInputPin()
 	{
 		return inputPin;
 	}
+
+	@Override
+	public void accept(ModelVisitor mv)
+	{
+		mv.visit(this);
+	}
+
+	static
+	{
+		ViewLogicModelAdapter.addComponentAdapter(new BitDisplayAdapter());
+	}
 }
\ No newline at end of file