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=0ca249ee7f719fa8ad6b07eb528aa4e595197b0d;hb=7de4f2b3d61f8801459645d4bd337a91405e107a;hp=4a75f541b5d3c14836a543c4645c84a35b8b3d7d;hpb=41d70703ef1579e85a0965bd1e09cac4b47d52c1;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 4a75f541..0ca249ee 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,13 +22,13 @@ public class GUIBitDisplay extends GUIComponent private final LogicObserver logicObs; private BitDisplay bitDisplay; - public GUIBitDisplay(ViewModel model) + public GUIBitDisplay(ViewModelModifiable model) { super(model); - logicObs = (i) -> callComponentLookChangedListeners(); + 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 @@ -37,8 +37,7 @@ public class GUIBitDisplay extends GUIComponent 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();