X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.ui%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fui%2Fmodel%2Fcomponents%2FGUIManualSwitch.java;h=bb68d2645c3200ce4383dcec08adb9706e4826f2;hb=a84700145147c263ad6692c99117a7cf37832378;hp=0342350828af7404e98577c0668bbde90ea2552a;hpb=a93901091c018edc992828e3a23817e97a98e4ca;p=Mograsim.git diff --git a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/GUIManualSwitch.java b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/GUIManualSwitch.java index 03423508..bb68d264 100644 --- a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/GUIManualSwitch.java +++ b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/GUIManualSwitch.java @@ -11,6 +11,8 @@ import net.mograsim.logic.core.types.BitVectorFormatter; import net.mograsim.logic.core.wires.Wire.ReadEnd; 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.ManualSwitchAdapter; public class GUIManualSwitch extends GUIComponent { @@ -36,9 +38,6 @@ public class GUIManualSwitch 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 = BitVectorFormatter.formatValueAsString(end); @@ -46,7 +45,7 @@ public class GUIManualSwitch 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); } @@ -84,4 +83,9 @@ public class GUIManualSwitch extends GUIComponent { return outputPin; } + + static + { + ViewLogicModelAdapter.addComponentAdapter(new ManualSwitchAdapter()); + } } \ No newline at end of file