Completely changed the structure and switched to Eclipse Plugin.

[Mograsim.git] / net.mograsim.logic.ui / src / net / mograsim / logic / ui / model / components / GUIManualSwitch.java

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 dbeabd2..563f928 100644 (file)
--- 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
@@ -1,7 +1,5 @@
 package net.mograsim.logic.ui.model.components;
 
-import net.mograsim.logic.ui.model.ViewModel;
-import net.mograsim.logic.ui.model.wires.Pin;
 import net.haspamelodica.swt.helper.gcs.GeneralGC;
 import net.haspamelodica.swt.helper.swtobjectwrappers.Font;
 import net.haspamelodica.swt.helper.swtobjectwrappers.Point;
@@ -11,6 +9,11 @@ import net.mograsim.logic.core.LogicObserver;
 import net.mograsim.logic.core.components.ManualSwitch;
 import net.mograsim.logic.core.types.BitVectorFormatter;
 import net.mograsim.logic.core.wires.Wire.ReadEnd;
+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.ManualSwitchAdapter;
 
 public class GUIManualSwitch extends GUIComponent
 {
@@ -24,29 +27,26 @@ public class GUIManualSwitch extends GUIComponent
        private ManualSwitch logicSwitch;
        private ReadEnd end;
 
-       public GUIManualSwitch(ViewModel model)
+       public GUIManualSwitch(ViewModelModifiable model)
        {
                super(model);
                logicObs = (i) -> requestRedraw();
 
                setSize(width, height);
-               addPin(this.outputPin = new Pin(this, 1, width, height / 2));
+               addPin(this.outputPin = new Pin(this, "", 1, width, 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 = BitVectorFormatter.formatValueAsString(end);
                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);
        }
 
@@ -80,8 +80,24 @@ public class GUIManualSwitch extends GUIComponent
                return true;
        }
 
+       public ManualSwitch getManualSwitch()
+       {
+               return logicSwitch;
+       }
+
        public Pin getOutputPin()
        {
                return outputPin;
        }
+
+       @Override
+       public void accept(ModelVisitor mv)
+       {
+               mv.visit(this);
+       }
+
+       static
+       {
+               ViewLogicModelAdapter.addComponentAdapter(new ManualSwitchAdapter());
+       }
 }
\ No newline at end of file