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=0ca249ee7f719fa8ad6b07eb528aa4e595197b0d;hpb=7de4f2b3d61f8801459645d4bd337a91405e107a;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 0ca249ee..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 { @@ -34,9 +37,6 @@ public class GUIBitDisplay extends GUIComponent @Override public void render(GeneralGC gc, Rectangle visibleRegion) { - double posX = getBounds().x; - double posY = getBounds().y; - gc.drawRectangle(getBounds()); String label = bitDisplay == null ? BitVectorFormatter.formatAsString(null) : BitVectorFormatter.formatAsString(bitDisplay.getDisplayedValue()); @@ -44,7 +44,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); } @@ -67,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