Added an visual-only text component and modelling helper class

[Mograsim.git] / net.mograsim.logic.ui / src / net / mograsim / logic / ui / modeladapter / ViewLogicModelAdapter.java

diff --git a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/modeladapter/ViewLogicModelAdapter.java b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/modeladapter/ViewLogicModelAdapter.java
index 80c2898..cedb127 100644 (file)
--- a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/modeladapter/ViewLogicModelAdapter.java
+++ b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/modeladapter/ViewLogicModelAdapter.java
@@ -10,44 +10,25 @@ import java.util.Set;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
-import net.mograsim.logic.core.components.Component;
-import net.mograsim.logic.core.components.gates.AndGate;
-import net.mograsim.logic.core.components.gates.NotGate;
-import net.mograsim.logic.core.components.gates.OrGate;
 import net.mograsim.logic.core.timeline.Timeline;
 import net.mograsim.logic.core.wires.Wire;
 import net.mograsim.logic.core.wires.Wire.ReadEnd;
 import net.mograsim.logic.ui.model.ViewModel;
-import net.mograsim.logic.ui.model.components.GUIAndGate;
 import net.mograsim.logic.ui.model.components.GUIComponent;
-import net.mograsim.logic.ui.model.components.GUINotGate;
-import net.mograsim.logic.ui.model.components.GUIOrGate;
 import net.mograsim.logic.ui.model.components.SubmodelComponent;
 import net.mograsim.logic.ui.model.components.SubmodelInterface;
 import net.mograsim.logic.ui.model.wires.GUIWire;
 import net.mograsim.logic.ui.model.wires.Pin;
 import net.mograsim.logic.ui.model.wires.WireCrossPoint;
-import net.mograsim.logic.ui.modeladapter.componentadapters.Am2901NANDBasedAdapter;
-import net.mograsim.logic.ui.modeladapter.componentadapters.BitDisplayAdapter;
 import net.mograsim.logic.ui.modeladapter.componentadapters.ComponentAdapter;
-import net.mograsim.logic.ui.modeladapter.componentadapters.ManualSwitchAdapter;
-import net.mograsim.logic.ui.modeladapter.componentadapters.SimpleGateAdapter;
 
 public class ViewLogicModelAdapter
 {
-       private final static Map<Class<? extends GUIComponent>, ComponentAdapter<? extends GUIComponent>> componentAdapters;
-       static
+       private final static Map<Class<? extends GUIComponent>, ComponentAdapter<? extends GUIComponent>> componentAdapters = new HashMap<>();
+
+       public static void addComponentAdapter(ComponentAdapter<? extends GUIComponent> componentAdapter)
        {
-               Set<ComponentAdapter<? extends GUIComponent>> componentAdaptersModifiable = new HashSet<>();
-               componentAdaptersModifiable.add(new SimpleGateAdapter<>(GUIOrGate.class, OrGate::new));
-               componentAdaptersModifiable.add(new SimpleGateAdapter<>(GUIAndGate.class, AndGate::new));
-               componentAdaptersModifiable.add(new SimpleGateAdapter<>(GUINotGate.class, (t, p, o, i) -> new NotGate(t, p, i[0], o)));
-               componentAdaptersModifiable.add(new ManualSwitchAdapter());
-               componentAdaptersModifiable.add(new BitDisplayAdapter());
-               componentAdaptersModifiable.add(new Am2901NANDBasedAdapter());
-               // TODO list all adapters here
-               componentAdapters = Collections.unmodifiableMap(
-                               componentAdaptersModifiable.stream().collect(Collectors.toMap(ComponentAdapter::getSupportedClass, Function.identity())));
+               componentAdapters.put(componentAdapter.getSupportedClass(), componentAdapter);
        }
 
        public static Timeline convert(ViewModel viewModel, LogicModelParameters params)
@@ -70,9 +51,9 @@ public class ViewLogicModelAdapter
                        if (guiComp instanceof SubmodelComponent)
                        {
                                SubmodelComponent guiCompCasted = (SubmodelComponent) guiComp;
-                               Map<Pin, Pin> supermodelPinsPerSubmodelPin = guiCompCasted.getSupermodelPinsPerSubmodelPin();
-                               Map<Pin, Wire> externalWiresForSubmodel = supermodelPinsPerSubmodelPin.entrySet().stream()
-                                               .collect(Collectors.toMap(Entry::getKey, e -> logicWiresPerPin.get(e.getValue())));
+                               Map<String, Pin> supermodelPins = guiCompCasted.getSupermodelPins();
+                               Map<Pin, Wire> externalWiresForSubmodel = supermodelPins.entrySet().stream()
+                                               .collect(Collectors.toMap(e -> guiCompCasted.getSubmodelPin(e.getKey()), e -> logicWiresPerPin.get(e.getValue())));
                                convert(guiCompCasted.submodel, params, timeline, externalWiresForSubmodel);
                        } else if (guiComp instanceof WireCrossPoint)
                        {
@@ -85,7 +66,7 @@ public class ViewLogicModelAdapter
 
        private static Set<Pin> getAllPins(ViewModel viewModel)
        {
-               return viewModel.getComponents().stream().flatMap(component -> component.getPins().stream()).collect(Collectors.toSet());
+               return viewModel.getComponents().stream().flatMap(component -> component.getPins().values().stream()).collect(Collectors.toSet());
        }
 
        private static Map<Pin, Wire> convertWires(Set<Pin> allPins, List<GUIWire> wires, Map<Pin, Wire> externalWires,
@@ -112,10 +93,13 @@ public class ViewLogicModelAdapter
                                        if (externalWireCandidate != null)
                                                if (externalWire == null)
                                                        externalWire = externalWireCandidate;
+                                               else if (externalWire.length == externalWireCandidate.length)
+                                                       Wire.fuse(externalWire, externalWireCandidate);
                                                else
-                                                       throw new IllegalArgumentException("Two pins to external wires can't be connected directly");
+                                                       throw new IllegalArgumentException(
+                                                                       "Two pins to external wires with different logicWidths can't be connected directly");
                                }
-                               return new Wire(timeline, e.getKey().logicWidth, params.wireTravelTime);
+                               return externalWire == null ? new Wire(timeline, e.getKey().logicWidth, params.wireTravelTime) : externalWire;
                        }));
                return logicWiresPerPin;
        }
@@ -157,12 +141,12 @@ public class ViewLogicModelAdapter
        }
 
        @SuppressWarnings("unchecked")
-       private static <G extends GUIComponent> Component createAndLinkComponent(Timeline timeline, LogicModelParameters params,
+       private static <G extends GUIComponent> void createAndLinkComponent(Timeline timeline, LogicModelParameters params,
                        GUIComponent guiComponent, Map<Pin, Wire> logicWiresPerPin, ComponentAdapter<G> adapter)
        {
                if (adapter == null)
                        throw new IllegalArgumentException("Unknown component class: " + guiComponent.getClass());
-               return adapter.createAndLinkComponent(timeline, params, (G) guiComponent, logicWiresPerPin);
+               adapter.createAndLinkComponent(timeline, params, (G) guiComponent, logicWiresPerPin);
        }
 
        private ViewLogicModelAdapter()