SimpleRectangularHardcodedGUIComponent now supports HighLevelStates

[Mograsim.git] / net.mograsim.logic.model / src / net / mograsim / logic / model / modeladapter / componentadapters / SimpleRectangularHardcodedGUIComponentAdapter.java

diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/modeladapter/componentadapters/SimpleRectangularHardcodedGUIComponentAdapter.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/modeladapter/componentadapters/SimpleRectangularHardcodedGUIComponentAdapter.java
index 04d0736..8ca38c0 100644 (file)
--- a/net.mograsim.logic.model/src/net/mograsim/logic/model/modeladapter/componentadapters/SimpleRectangularHardcodedGUIComponentAdapter.java
+++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/modeladapter/componentadapters/SimpleRectangularHardcodedGUIComponentAdapter.java
@@ -3,7 +3,6 @@ package net.mograsim.logic.model.modeladapter.componentadapters;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicReference;
-import java.util.function.Function;
 
 import net.mograsim.logic.core.LogicObserver;
 import net.mograsim.logic.core.timeline.Timeline;
@@ -11,21 +10,12 @@ import net.mograsim.logic.core.wires.Wire;
 import net.mograsim.logic.core.wires.Wire.ReadEnd;
 import net.mograsim.logic.core.wires.Wire.ReadWriteEnd;
 import net.mograsim.logic.model.model.components.atomic.SimpleRectangularHardcodedGUIComponent;
-import net.mograsim.logic.model.model.components.atomic.SimpleRectangularHardcodedGUIComponent.Usage;
 import net.mograsim.logic.model.model.wires.Pin;
+import net.mograsim.logic.model.model.wires.PinUsage;
 import net.mograsim.logic.model.modeladapter.LogicModelParameters;
 
-//TODO support HighLevelStates
 public class SimpleRectangularHardcodedGUIComponentAdapter implements ComponentAdapter<SimpleRectangularHardcodedGUIComponent>
 {
-       private final Function<SimpleRectangularHardcodedGUIComponent, RecalculateFunction> recalculateFunctionGenerator;
-
-       public SimpleRectangularHardcodedGUIComponentAdapter(
-                       Function<SimpleRectangularHardcodedGUIComponent, RecalculateFunction> recalculateFunctionGenerator)
-       {
-               this.recalculateFunctionGenerator = recalculateFunctionGenerator;
-       }
-
        @Override
        public Class<SimpleRectangularHardcodedGUIComponent> getSupportedClass()
        {
@@ -36,19 +26,21 @@ public class SimpleRectangularHardcodedGUIComponentAdapter implements ComponentA
        public void createAndLinkComponent(Timeline timeline, LogicModelParameters params, SimpleRectangularHardcodedGUIComponent guiComponent,
                        Map<Pin, Wire> logicWiresPerPin)
        {
-               RecalculateFunction recalculate = recalculateFunctionGenerator.apply(guiComponent);
                Map<String, ReadEnd> readEnds = new HashMap<>();
                Map<String, ReadWriteEnd> readWriteEnds = new HashMap<>();
 
                AtomicReference<Object> state = new AtomicReference<>();
 
-               LogicObserver logicObs = c -> state.set(recalculate.recalculate(state.get(), readEnds, readWriteEnds));
+               Runnable recalculate = () -> state.updateAndGet(s -> guiComponent.recalculate(s, readEnds, readWriteEnds));
+               LogicObserver logicObs = c -> timeline.addEvent(e -> recalculate.run(), params.gateProcessTime);
+
+               guiComponent.setLogicModelBindingAndResetState(state, recalculate);
 
                for (Pin pin : guiComponent.getPins().values())
                {
                        Wire wire = logicWiresPerPin.get(pin);
                        ReadEnd end;
-                       if (guiComponent.getPinUsage(pin) != Usage.INPUT)
+                       if (pin.usage != PinUsage.INPUT)
                        {
                                ReadWriteEnd rwEnd = wire.createReadWriteEnd();
                                readWriteEnds.put(pin.name, rwEnd);
@@ -56,13 +48,8 @@ public class SimpleRectangularHardcodedGUIComponentAdapter implements ComponentA
                        } else
                                end = wire.createReadOnlyEnd();
                        readEnds.put(pin.name, end);
-                       if (guiComponent.getPinUsage(pin) != Usage.OUTPUT)
+                       if (pin.usage != PinUsage.OUTPUT)
                                end.registerObserver(logicObs);
                }
        }
-
-       public static interface RecalculateFunction
-       {
-               public Object recalculate(Object lastState, Map<String, ReadEnd> readEnds, Map<String, ReadWriteEnd> readWriteEnds);
-       }
 }
\ No newline at end of file