X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fexamples%2FClickableSubmodelComponentsTest.java;h=14073bd1938267b376e975cb5a68f5fab3ec7a95;hb=8bed58cd47f4e53a0a83e066d38864aa6875502f;hp=4ac98e3fbb9d4c9abdb3728d64d4aae56722a1b2;hpb=b5d8c2d71e27350ea7c9314e40df5bb0584271cd;p=Mograsim.git diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/examples/ClickableSubmodelComponentsTest.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/examples/ClickableSubmodelComponentsTest.java index 4ac98e3f..14073bd1 100644 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/examples/ClickableSubmodelComponentsTest.java +++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/examples/ClickableSubmodelComponentsTest.java @@ -1,11 +1,11 @@ package net.mograsim.logic.model.examples; import net.mograsim.logic.model.SimpleLogicUIStandalone; -import net.mograsim.logic.model.model.ViewModelModifiable; -import net.mograsim.logic.model.model.components.atomic.GUIBitDisplay; -import net.mograsim.logic.model.model.components.atomic.GUIManualSwitch; +import net.mograsim.logic.model.model.LogicModelModifiable; +import net.mograsim.logic.model.model.components.atomic.ModelBitDisplay; +import net.mograsim.logic.model.model.components.atomic.ModelManualSwitch; import net.mograsim.logic.model.model.components.submodels.SimpleRectangularSubmodelComponent; -import net.mograsim.logic.model.model.wires.GUIWire; +import net.mograsim.logic.model.model.wires.ModelWire; public class ClickableSubmodelComponentsTest { @@ -14,22 +14,22 @@ public class ClickableSubmodelComponentsTest SimpleLogicUIStandalone.executeVisualisation(ClickableSubmodelComponentsTest::createExample); } - public static void createExample(ViewModelModifiable model) + public static void createExample(LogicModelModifiable model) { - @SuppressWarnings("unused") // GUIWire + @SuppressWarnings("unused") // Wire SimpleRectangularSubmodelComponent comp = new SimpleRectangularSubmodelComponent(model, 1, "") { { setSubmodelScale(.4); setOutputPins("O0"); - GUIManualSwitch sw = new GUIManualSwitch(submodelModifiable); - GUIBitDisplay bd = new GUIBitDisplay(submodelModifiable); + ModelManualSwitch sw = new ModelManualSwitch(submodelModifiable, 1); + ModelBitDisplay bd = new ModelBitDisplay(submodelModifiable, 1); sw.moveTo(10, 5); bd.moveTo(50, 5); - new GUIWire(submodelModifiable, sw.getOutputPin(), bd.getInputPin()); + new ModelWire(submodelModifiable, sw.getOutputPin(), bd.getInputPin()); } };