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=82b3bbba4dfeb1c7f9484960bddf2c93c06dafcd;hb=74868b10728aee0e85e4ff8af4073516b7590268;hp=82399c130b9a0742c21d2632c40569831150ce71;hpb=7aa6eab72deba89dbc22ae9c90ffb5df53f9d496;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 82399c13..82b3bbba 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
@@ -10,6 +10,8 @@ import net.mograsim.logic.core.components.BitDisplay;
 import net.mograsim.logic.core.types.BitVectorFormatter;
 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
 {
@@ -34,10 +36,6 @@ public class GUIBitDisplay extends GUIComponent
 	@Override
 	public void render(GeneralGC gc, Rectangle visibleRegion)
 	{
-		double posX = getBounds().x;
-		double posY = getBounds().y;
-
-		// TODO maybe draw switch state too?
 		gc.drawRectangle(getBounds());
 		String label = bitDisplay == null ? BitVectorFormatter.formatAsString(null)
 				: BitVectorFormatter.formatAsString(bitDisplay.getDisplayedValue());
@@ -45,7 +43,7 @@ public class GUIBitDisplay extends GUIComponent
 		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 +66,18 @@ public class GUIBitDisplay extends GUIComponent
 			observable.deregisterObserver(logicObs);
 	}
 
+	public BitDisplay getBitDisplay()
+	{
+		return bitDisplay;
+	}
+
 	public Pin getInputPin()
 	{
 		return inputPin;
 	}
+
+	static
+	{
+		ViewLogicModelAdapter.addComponentAdapter(new BitDisplayAdapter());
+	}
 }
\ No newline at end of file