From 93b398d6271a538a2a4c9f4de07a3b4a8a2a7fd4 Mon Sep 17 00:00:00 2001 From: Daniel Kirschten Date: Thu, 5 Sep 2019 17:47:07 +0200 Subject: [PATCH] Renamed GUI to Model: -Renamed GUIComponents to have the common prefix Model instead of GUI. -Renamed JSONs to have no prefix -Rename IDs to have no prefix --- .../GUIAm2904Testbench.json | 408 ++++++------ .../{GUIAm2900.json => Am2900.json} | 356 +++++------ .../{GUI_rsLatch.json => _rsLatch.json} | 20 +- .../am2901/{GUIAm2901.json => Am2901.json} | 402 ++++++------ ...ncDecode.json => Am2901ALUFuncDecode.json} | 74 +-- ...clDecode.json => Am2901ALUInclDecode.json} | 138 ++-- ...LUInclSourceDecodeInclFunctionDecode.json} | 136 ++-- ...901ALUOneBit.json => Am2901ALUOneBit.json} | 88 +-- ...1DestDecode.json => Am2901DestDecode.json} | 132 ++-- ...rceDecode.json => Am2901SourceDecode.json} | 150 ++--- .../am2904/{GUIAm2904.json => Am2904.json} | 598 +++++++++--------- .../{GUIAm2904MSR.json => Am2904MSR.json} | 128 ++-- ...904TestLogic.json => Am2904TestLogic.json} | 76 +-- .../{GUIAm2904muSR.json => Am2904muSR.json} | 120 ++-- .../am2910/{GUIAm2910.json => Am2910.json} | 226 +++---- .../components/{GUIand.json => and.json} | 22 +- .../components/{GUIand41.json => and41.json} | 42 +- .../{GUIandor414.json => andor414.json} | 52 +- .../{GUIdemux2.json => demux2.json} | 62 +- .../components/{GUIdff.json => dff.json} | 48 +- .../{GUIdff12_we.json => dff12_we.json} | 86 +-- .../{GUIdff16_invwe.json => dff16_invwe.json} | 110 ++-- .../components/{GUIdff4.json => dff4.json} | 50 +- .../{GUIdff4_invwe.json => dff4_invwe.json} | 50 +- .../{GUIdlatch.json => dlatch.json} | 36 +- .../{GUIdlatch4.json => dlatch4.json} | 50 +- .../{GUIfulladder.json => fulladder.json} | 36 +- .../{GUIhalfadder.json => halfadder.json} | 42 +- .../components/{GUImux1.json => mux1.json} | 42 +- .../{GUImux1_12.json => mux1_12.json} | 124 ++-- .../{GUImux1_16.json => mux1_16.json} | 156 ++--- .../{GUImux1_4.json => mux1_4.json} | 50 +- .../components/{GUImux2.json => mux2.json} | 18 +- .../{GUImux2_4.json => mux2_4.json} | 78 +-- .../components/{GUImux3.json => mux3.json} | 8 +- .../components/{GUInand3.json => nand3.json} | 32 +- .../components/{GUInot4.json => not4.json} | 42 +- .../components/{GUIor4.json => or4.json} | 92 +-- .../components/{GUIor_4.json => or_4.json} | 122 ++-- .../components/{GUIram2.json => ram2.json} | 376 +++++------ .../components/{GUIram4.json => ram4.json} | 472 +++++++------- .../components/{GUIsel1.json => sel1.json} | 32 +- .../{GUIsel2_4.json => sel2_4.json} | 122 ++-- .../{GUIsel3_4.json => sel3_4.json} | 134 ++-- .../components/{GUIxor.json => xor.json} | 42 +- .../logic/model/am2900/Am2900Loader.java | 6 +- .../{GUIdff12.java => Modeldff12.java} | 12 +- ...dff4_finewe.java => Modeldff4_finewe.java} | 13 +- .../{GUIinc12.java => Modelinc12.java} | 14 +- .../{GUInor12.java => Modelnor12.java} | 12 +- .../{GUIram5_12.java => Modelram5_12.java} | 12 +- .../{GUIsel4_12.java => Modelsel4_12.java} | 12 +- ....java => ModelAm2904RegCTInstrDecode.java} | 14 +- ....java => ModelAm2904ShiftInstrDecode.java} | 14 +- ...InstrPLA.java => ModelAm2910InstrPLA.java} | 14 +- ...10RegCntr.java => ModelAm2910RegCntr.java} | 16 +- .../{GUIAm2910SP.java => ModelAm2910SP.java} | 12 +- .../model/am2900/machine/Am2900Machine.java | 6 +- .../am2900/standardComponentIDMapping.json | 108 ++-- ...ench.java => ModelComponentTestbench.java} | 28 +- .../ReserializeJSONsSettingUsages.java | 10 +- .../model/am2900/am2901/Am2901Testbench.java | 46 +- .../am2900/am2901/TestableAm2901Impl.java | 6 +- .../model/am2900/am2904/Am2904Testbench.java | 12 +- .../am2900/am2904/TestableAm2904Impl.java | 6 +- .../model/am2900/am2910/Am2910Testbench.java | 74 +-- .../am2900/am2910/TestableAm2910Impl.java | 6 +- .../model/am2900/util/SwitchWithDisplay.java | 36 +- .../am2900/util/TestEnvironmentHelper.java | 28 +- .../mograsim/logic/model/editor/Editor.java | 20 +- .../logic/model/editor/SaveLoadManager.java | 4 +- .../model/editor/handles/ComponentHandle.java | 6 +- .../model/editor/handles/HandleManager.java | 42 +- .../model/editor/handles/WireHandle.java | 8 +- .../model/editor/handles/WirePointHandle.java | 6 +- .../logic/model/editor/ui/EditorGUI.java | 4 +- .../mograsim/logic/model/LogicUICanvas.java | 18 +- .../mograsim/logic/model/LogicUIRenderer.java | 4 +- .../ClickableSubmodelComponentsTest.java | 14 +- .../logic/model/examples/RSLatchExample.java | 52 +- .../mograsim/logic/model/model/ViewModel.java | 58 +- .../model/model/ViewModelModifiable.java | 14 +- ...{GUIComponent.java => ModelComponent.java} | 26 +- .../components/OrientationCalculator.java | 4 +- .../model/components/atomic/GUIAndGate.java | 28 - .../model/components/atomic/GUINandGate.java | 28 - .../model/components/atomic/GUINotGate.java | 28 - .../model/components/atomic/GUIOrGate.java | 28 - .../model/components/atomic/ModelAndGate.java | 28 + ...UIBitDisplay.java => ModelBitDisplay.java} | 16 +- .../atomic/{GUIClock.java => ModelClock.java} | 26 +- ...FixedOutput.java => ModelFixedOutput.java} | 14 +- ...nualSwitch.java => ModelManualSwitch.java} | 16 +- .../{GUIMerger.java => ModelMerger.java} | 16 +- .../components/atomic/ModelNandGate.java | 28 + .../model/components/atomic/ModelNotGate.java | 29 + .../model/components/atomic/ModelOrGate.java | 28 + .../{GUISplitter.java => ModelSplitter.java} | 16 +- ...Component.java => ModelTextComponent.java} | 16 +- ...teBuffer.java => ModelTriStateBuffer.java} | 26 +- ...leRectangularHardcodedModelComponent.java} | 16 +- ...e.java => SimpleRectangularModelGate.java} | 10 +- .../submodels/SubmodelComponent.java | 12 +- .../submodels/SubmodelInterface.java | 8 +- .../wires/{GUIWire.java => ModelWire.java} | 92 +-- ...ossPoint.java => ModelWireCrossPoint.java} | 27 +- .../logic/model/model/wires/MovablePin.java | 4 +- .../mograsim/logic/model/model/wires/Pin.java | 21 +- .../modeladapter/ViewLogicModelAdapter.java | 68 +- .../componentadapters/BitDisplayAdapter.java | 14 +- .../componentadapters/ClockAdapter.java | 17 +- .../componentadapters/ComponentAdapter.java | 7 +- .../componentadapters/FixedOutputAdapter.java | 12 +- .../ManualSwitchAdapter.java | 14 +- .../componentadapters/MergerAdapter.java | 20 +- .../componentadapters/NoLogicAdapter.java | 17 +- .../componentadapters/SimpleGateAdapter.java | 13 +- ...ngularHardcodedModelComponentAdapter.java} | 18 +- .../componentadapters/SplitterAdapter.java | 20 +- .../TriStateBufferAdapter.java | 16 +- ...ava => IndirectModelComponentCreator.java} | 18 +- .../LegacySubmodelComponentSerializer.java | 24 +- .../model/serializing/ResourceLoader.java | 4 +- .../SubmodelComponentSerializer.java | 2 +- .../serializing/ViewModelSerializer.java | 24 +- .../standardComponentIDMapping.json | 24 +- .../model/snippets/HighLevelStateHandler.java | 6 +- .../SubmodelComponentSnippetSuppliers.java | 6 +- ...DelegatingAtomicHighLevelStateHandler.java | 8 +- ...ireForcingAtomicHighLevelStateHandler.java | 30 +- ...tingSubcomponentHighLevelStateHandler.java | 8 +- .../DefaultOutlineRenderer.java | 8 +- .../CenteredTextSymbolRenderer.java | 6 +- .../DefaultSymbolRenderer.java | 8 +- .../PinNamesSymbolRenderer.java | 6 +- .../SimpleRectangularLikeSymbolRenderer.java | 6 +- .../logic/model/util/ModellingTool.java | 44 +- .../{GUIMemoryWA.java => ModelMemoryWA.java} | 24 +- .../memory/WordAddressableMemoryAdapter.java | 16 +- .../mograsim/plugin/SimulationPreview.java | 50 +- 140 files changed, 3802 insertions(+), 3794 deletions(-) rename net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/{GUIAm2900.json => Am2900.json} (87%) rename net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/{GUI_rsLatch.json => _rsLatch.json} (92%) rename net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/{GUIAm2901.json => Am2901.json} (88%) rename net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/{GUIAm2901ALUFuncDecode.json => Am2901ALUFuncDecode.json} (90%) rename net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/{GUIAm2901ALUInclDecode.json => Am2901ALUInclDecode.json} (90%) rename net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/{GUIAm2901ALUInclSourceDecodeInclFunctionDecode.json => Am2901ALUInclSourceDecodeInclFunctionDecode.json} (89%) rename net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/{GUIAm2901ALUOneBit.json => Am2901ALUOneBit.json} (86%) rename net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/{GUIAm2901DestDecode.json => Am2901DestDecode.json} (89%) rename net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/{GUIAm2901SourceDecode.json => Am2901SourceDecode.json} (88%) rename net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/{GUIAm2904.json => Am2904.json} (87%) rename net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/{GUIAm2904MSR.json => Am2904MSR.json} (94%) rename net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/{GUIAm2904TestLogic.json => Am2904TestLogic.json} (91%) rename net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/{GUIAm2904muSR.json => Am2904muSR.json} (90%) rename net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2910/{GUIAm2910.json => Am2910.json} (83%) rename net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/{GUIand.json => and.json} (87%) rename net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/{GUIand41.json => and41.json} (90%) rename net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/{GUIandor414.json => andor414.json} (90%) rename net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/{GUIdemux2.json => demux2.json} (90%) rename net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/{GUIdff.json => dff.json} (88%) rename net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/{GUIdff12_we.json => dff12_we.json} (94%) rename net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/{GUIdff16_invwe.json => dff16_invwe.json} (93%) rename net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/{GUIdff4.json => dff4.json} (94%) rename net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/{GUIdff4_invwe.json => dff4_invwe.json} (94%) rename net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/{GUIdlatch.json => dlatch.json} (87%) rename net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/{GUIdlatch4.json => dlatch4.json} (88%) rename net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/{GUIfulladder.json => fulladder.json} (83%) rename net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/{GUIhalfadder.json => halfadder.json} (88%) rename net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/{GUImux1.json => mux1.json} (84%) rename net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/{GUImux1_12.json => mux1_12.json} (94%) rename net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/{GUImux1_16.json => mux1_16.json} (94%) rename net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/{GUImux1_4.json => mux1_4.json} (91%) rename net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/{GUImux2.json => mux2.json} (96%) rename net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/{GUImux2_4.json => mux2_4.json} (90%) rename net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/{GUImux3.json => mux3.json} (98%) rename net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/{GUInand3.json => nand3.json} (86%) rename net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/{GUInot4.json => not4.json} (90%) rename net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/{GUIor4.json => or4.json} (85%) rename net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/{GUIor_4.json => or_4.json} (87%) rename net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/{GUIram2.json => ram2.json} (88%) rename net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/{GUIram4.json => ram4.json} (87%) rename net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/{GUIsel1.json => sel1.json} (86%) rename net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/{GUIsel2_4.json => sel2_4.json} (86%) rename net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/{GUIsel3_4.json => sel3_4.json} (86%) rename net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/{GUIxor.json => xor.json} (86%) rename net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/{GUIdff12.java => Modeldff12.java} (84%) rename net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/{GUIdff4_finewe.java => Modeldff4_finewe.java} (88%) rename net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/{GUIinc12.java => Modelinc12.java} (77%) rename net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/{GUInor12.java => Modelnor12.java} (79%) rename net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/{GUIram5_12.java => Modelram5_12.java} (90%) rename net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/{GUIsel4_12.java => Modelsel4_12.java} (86%) rename net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/am2904/{GUIAm2904RegCTInstrDecode.java => ModelAm2904RegCTInstrDecode.java} (95%) rename net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/am2904/{GUIAm2904ShiftInstrDecode.java => ModelAm2904ShiftInstrDecode.java} (93%) rename net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/am2910/{GUIAm2910InstrPLA.java => ModelAm2910InstrPLA.java} (93%) rename net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/am2910/{GUIAm2910RegCntr.java => ModelAm2910RegCntr.java} (85%) rename net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/am2910/{GUIAm2910SP.java => ModelAm2910SP.java} (89%) rename net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/examples/{GUIComponentTestbench.java => ModelComponentTestbench.java} (59%) rename net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/{GUIComponent.java => ModelComponent.java} (87%) delete mode 100644 net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUIAndGate.java delete mode 100644 net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUINandGate.java delete mode 100644 net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUINotGate.java delete mode 100644 net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUIOrGate.java create mode 100644 net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/ModelAndGate.java rename net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/{GUIBitDisplay.java => ModelBitDisplay.java} (85%) rename net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/{GUIClock.java => ModelClock.java} (83%) rename net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/{GUIFixedOutput.java => ModelFixedOutput.java} (81%) rename net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/{GUIManualSwitch.java => ModelManualSwitch.java} (90%) rename net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/{GUIMerger.java => ModelMerger.java} (88%) create mode 100644 net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/ModelNandGate.java create mode 100644 net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/ModelNotGate.java create mode 100644 net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/ModelOrGate.java rename net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/{GUISplitter.java => ModelSplitter.java} (87%) rename net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/{TextComponent.java => ModelTextComponent.java} (75%) rename net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/{GUITriStateBuffer.java => ModelTriStateBuffer.java} (75%) rename net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/{SimpleRectangularHardcodedGUIComponent.java => SimpleRectangularHardcodedModelComponent.java} (88%) rename net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/{SimpleRectangularGUIGate.java => SimpleRectangularModelGate.java} (88%) rename net.mograsim.logic.model/src/net/mograsim/logic/model/model/wires/{GUIWire.java => ModelWire.java} (71%) rename net.mograsim.logic.model/src/net/mograsim/logic/model/model/wires/{WireCrossPoint.java => ModelWireCrossPoint.java} (69%) rename net.mograsim.logic.model/src/net/mograsim/logic/model/modeladapter/componentadapters/{SimpleRectangularHardcodedGUIComponentAdapter.java => SimpleRectangularHardcodedModelComponentAdapter.java} (68%) rename net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/{IndirectGUIComponentCreator.java => IndirectModelComponentCreator.java} (90%) rename net.mograsim.machine/src/net/mograsim/machine/standard/memory/{GUIMemoryWA.java => ModelMemoryWA.java} (76%) diff --git a/net.mograsim.logic.model.am2900/GUIAm2904Testbench.json b/net.mograsim.logic.model.am2900/GUIAm2904Testbench.json index b96609a8..2146f401 100644 --- a/net.mograsim.logic.model.am2900/GUIAm2904Testbench.json +++ b/net.mograsim.logic.model.am2900/GUIAm2904Testbench.json @@ -6,7 +6,7 @@ "submodel": { "components": [ { - "id": "GUIAm2904", + "id": "Am2904", "name": "Am2904", "pos": { "x": 220.0, @@ -14,8 +14,8 @@ } }, { - "id": "GUIBitDisplay", - "name": "GUIBitDisplay#0", + "id": "BitDisplay", + "name": "BitDisplay#0", "pos": { "x": 391.0, "y": 150.0 @@ -23,8 +23,8 @@ "params": 1 }, { - "id": "GUIBitDisplay", - "name": "GUIBitDisplay#1", + "id": "BitDisplay", + "name": "BitDisplay#1", "pos": { "x": 391.0, "y": 165.0 @@ -32,8 +32,8 @@ "params": 1 }, { - "id": "GUIBitDisplay", - "name": "GUIBitDisplay#2", + "id": "BitDisplay", + "name": "BitDisplay#2", "pos": { "x": 391.0, "y": 180.0 @@ -41,8 +41,8 @@ "params": 1 }, { - "id": "GUIBitDisplay", - "name": "GUIBitDisplay#3", + "id": "BitDisplay", + "name": "BitDisplay#3", "pos": { "x": 391.0, "y": 195.0 @@ -50,8 +50,8 @@ "params": 1 }, { - "id": "GUIBitDisplay", - "name": "GUIBitDisplay#4", + "id": "BitDisplay", + "name": "BitDisplay#4", "pos": { "x": 365.0, "y": 240.0 @@ -59,8 +59,8 @@ "params": 1 }, { - "id": "GUIBitDisplay", - "name": "GUIBitDisplay#5", + "id": "BitDisplay", + "name": "BitDisplay#5", "pos": { "x": 365.0, "y": 275.0 @@ -68,8 +68,8 @@ "params": 1 }, { - "id": "GUIBitDisplay", - "name": "GUIBitDisplay#6", + "id": "BitDisplay", + "name": "BitDisplay#6", "pos": { "x": 365.0, "y": 370.0 @@ -77,8 +77,8 @@ "params": 1 }, { - "id": "GUIBitDisplay", - "name": "GUIBitDisplay#7", + "id": "BitDisplay", + "name": "BitDisplay#7", "pos": { "x": 365.0, "y": 385.0 @@ -86,8 +86,8 @@ "params": 1 }, { - "id": "GUIBitDisplay", - "name": "GUIBitDisplay#8", + "id": "BitDisplay", + "name": "BitDisplay#8", "pos": { "x": 365.0, "y": 330.0 @@ -95,8 +95,8 @@ "params": 1 }, { - "id": "GUIBitDisplay", - "name": "GUIBitDisplay#9", + "id": "BitDisplay", + "name": "BitDisplay#9", "pos": { "x": 365.0, "y": 315.0 @@ -104,8 +104,8 @@ "params": 1 }, { - "id": "GUIManualSwitch", - "name": "GUIManualSwitch#0", + "id": "ManualSwitch", + "name": "ManualSwitch#0", "pos": { "x": 255.0, "y": 152.5 @@ -113,8 +113,8 @@ "params": 1 }, { - "id": "GUIManualSwitch", - "name": "GUIManualSwitch#1", + "id": "ManualSwitch", + "name": "ManualSwitch#1", "pos": { "x": 170.0, "y": 82.5 @@ -122,8 +122,8 @@ "params": 1 }, { - "id": "GUIManualSwitch", - "name": "GUIManualSwitch#10", + "id": "ManualSwitch", + "name": "ManualSwitch#10", "pos": { "x": 160.0, "y": 247.5 @@ -131,8 +131,8 @@ "params": 1 }, { - "id": "GUIManualSwitch", - "name": "GUIManualSwitch#11", + "id": "ManualSwitch", + "name": "ManualSwitch#11", "pos": { "x": 160.0, "y": 217.5 @@ -140,8 +140,8 @@ "params": 1 }, { - "id": "GUIManualSwitch", - "name": "GUIManualSwitch#12", + "id": "ManualSwitch", + "name": "ManualSwitch#12", "pos": { "x": 160.0, "y": 202.5 @@ -149,8 +149,8 @@ "params": 1 }, { - "id": "GUIManualSwitch", - "name": "GUIManualSwitch#13", + "id": "ManualSwitch", + "name": "ManualSwitch#13", "pos": { "x": 60.0, "y": 132.5 @@ -158,8 +158,8 @@ "params": 1 }, { - "id": "GUIManualSwitch", - "name": "GUIManualSwitch#14", + "id": "ManualSwitch", + "name": "ManualSwitch#14", "pos": { "x": 165.0, "y": 287.5 @@ -167,8 +167,8 @@ "params": 1 }, { - "id": "GUIManualSwitch", - "name": "GUIManualSwitch#15", + "id": "ManualSwitch", + "name": "ManualSwitch#15", "pos": { "x": 140.0, "y": 317.5 @@ -176,8 +176,8 @@ "params": 1 }, { - "id": "GUIManualSwitch", - "name": "GUIManualSwitch#16", + "id": "ManualSwitch", + "name": "ManualSwitch#16", "pos": { "x": 140.0, "y": 332.5 @@ -185,8 +185,8 @@ "params": 1 }, { - "id": "GUIManualSwitch", - "name": "GUIManualSwitch#17", + "id": "ManualSwitch", + "name": "ManualSwitch#17", "pos": { "x": 140.0, "y": 387.5 @@ -194,8 +194,8 @@ "params": 1 }, { - "id": "GUIManualSwitch", - "name": "GUIManualSwitch#18", + "id": "ManualSwitch", + "name": "ManualSwitch#18", "pos": { "x": 140.0, "y": 372.5 @@ -203,8 +203,8 @@ "params": 1 }, { - "id": "GUIManualSwitch", - "name": "GUIManualSwitch#19", + "id": "ManualSwitch", + "name": "ManualSwitch#19", "pos": { "x": 140.0, "y": 357.5 @@ -212,8 +212,8 @@ "params": 1 }, { - "id": "GUIManualSwitch", - "name": "GUIManualSwitch#2", + "id": "ManualSwitch", + "name": "ManualSwitch#2", "pos": { "x": 170.0, "y": 112.5 @@ -221,8 +221,8 @@ "params": 1 }, { - "id": "GUIManualSwitch", - "name": "GUIManualSwitch#20", + "id": "ManualSwitch", + "name": "ManualSwitch#20", "pos": { "x": 140.0, "y": 302.5 @@ -230,8 +230,8 @@ "params": 1 }, { - "id": "GUIManualSwitch", - "name": "GUIManualSwitch#21", + "id": "ManualSwitch", + "name": "ManualSwitch#21", "pos": { "x": 55.0, "y": 142.5 @@ -239,8 +239,8 @@ "params": 1 }, { - "id": "GUIManualSwitch", - "name": "GUIManualSwitch#22", + "id": "ManualSwitch", + "name": "ManualSwitch#22", "pos": { "x": 60.0, "y": 152.5 @@ -248,8 +248,8 @@ "params": 1 }, { - "id": "GUIManualSwitch", - "name": "GUIManualSwitch#23", + "id": "ManualSwitch", + "name": "ManualSwitch#23", "pos": { "x": 60.0, "y": 172.5 @@ -257,8 +257,8 @@ "params": 1 }, { - "id": "GUIManualSwitch", - "name": "GUIManualSwitch#24", + "id": "ManualSwitch", + "name": "ManualSwitch#24", "pos": { "x": 55.0, "y": 162.5 @@ -266,8 +266,8 @@ "params": 1 }, { - "id": "GUIManualSwitch", - "name": "GUIManualSwitch#25", + "id": "ManualSwitch", + "name": "ManualSwitch#25", "pos": { "x": 55.0, "y": 182.5 @@ -275,8 +275,8 @@ "params": 1 }, { - "id": "GUIManualSwitch", - "name": "GUIManualSwitch#26", + "id": "ManualSwitch", + "name": "ManualSwitch#26", "pos": { "x": 60.0, "y": 192.5 @@ -284,8 +284,8 @@ "params": 1 }, { - "id": "GUIManualSwitch", - "name": "GUIManualSwitch#27", + "id": "ManualSwitch", + "name": "ManualSwitch#27", "pos": { "x": 60.0, "y": 232.5 @@ -293,8 +293,8 @@ "params": 1 }, { - "id": "GUIManualSwitch", - "name": "GUIManualSwitch#28", + "id": "ManualSwitch", + "name": "ManualSwitch#28", "pos": { "x": 55.0, "y": 202.5 @@ -302,8 +302,8 @@ "params": 1 }, { - "id": "GUIManualSwitch", - "name": "GUIManualSwitch#29", + "id": "ManualSwitch", + "name": "ManualSwitch#29", "pos": { "x": 55.0, "y": 222.5 @@ -311,8 +311,8 @@ "params": 1 }, { - "id": "GUIManualSwitch", - "name": "GUIManualSwitch#3", + "id": "ManualSwitch", + "name": "ManualSwitch#3", "pos": { "x": 55.0, "y": 122.5 @@ -320,8 +320,8 @@ "params": 1 }, { - "id": "GUIManualSwitch", - "name": "GUIManualSwitch#30", + "id": "ManualSwitch", + "name": "ManualSwitch#30", "pos": { "x": 60.0, "y": 212.5 @@ -329,8 +329,8 @@ "params": 1 }, { - "id": "GUIManualSwitch", - "name": "GUIManualSwitch#31", + "id": "ManualSwitch", + "name": "ManualSwitch#31", "pos": { "x": 55.0, "y": 242.5 @@ -338,8 +338,8 @@ "params": 1 }, { - "id": "GUIManualSwitch", - "name": "GUIManualSwitch#32", + "id": "ManualSwitch", + "name": "ManualSwitch#32", "pos": { "x": 300.0, "y": 107.5 @@ -347,8 +347,8 @@ "params": 1 }, { - "id": "GUIManualSwitch", - "name": "GUIManualSwitch#33", + "id": "ManualSwitch", + "name": "ManualSwitch#33", "pos": { "x": 300.0, "y": 137.5 @@ -356,8 +356,8 @@ "params": 1 }, { - "id": "GUIManualSwitch", - "name": "GUIManualSwitch#34", + "id": "ManualSwitch", + "name": "ManualSwitch#34", "pos": { "x": 300.0, "y": 92.5 @@ -365,8 +365,8 @@ "params": 1 }, { - "id": "GUIManualSwitch", - "name": "GUIManualSwitch#35", + "id": "ManualSwitch", + "name": "ManualSwitch#35", "pos": { "x": 300.0, "y": 122.5 @@ -374,8 +374,8 @@ "params": 1 }, { - "id": "GUIManualSwitch", - "name": "GUIManualSwitch#36", + "id": "ManualSwitch", + "name": "ManualSwitch#36", "pos": { "x": 300.0, "y": 77.5 @@ -383,8 +383,8 @@ "params": 1 }, { - "id": "GUIManualSwitch", - "name": "GUIManualSwitch#37", + "id": "ManualSwitch", + "name": "ManualSwitch#37", "pos": { "x": 165.0, "y": 270.0 @@ -392,8 +392,8 @@ "params": 1 }, { - "id": "GUIManualSwitch", - "name": "GUIManualSwitch#38", + "id": "ManualSwitch", + "name": "ManualSwitch#38", "pos": { "x": 385.0, "y": 220.0 @@ -401,8 +401,8 @@ "params": 1 }, { - "id": "GUIManualSwitch", - "name": "GUIManualSwitch#4", + "id": "ManualSwitch", + "name": "ManualSwitch#4", "pos": { "x": 170.0, "y": 127.5 @@ -410,8 +410,8 @@ "params": 1 }, { - "id": "GUIManualSwitch", - "name": "GUIManualSwitch#5", + "id": "ManualSwitch", + "name": "ManualSwitch#5", "pos": { "x": 170.0, "y": 142.5 @@ -419,8 +419,8 @@ "params": 1 }, { - "id": "GUIManualSwitch", - "name": "GUIManualSwitch#6", + "id": "ManualSwitch", + "name": "ManualSwitch#6", "pos": { "x": 170.0, "y": 157.5 @@ -428,8 +428,8 @@ "params": 1 }, { - "id": "GUIManualSwitch", - "name": "GUIManualSwitch#7", + "id": "ManualSwitch", + "name": "ManualSwitch#7", "pos": { "x": 155.0, "y": 172.5 @@ -437,8 +437,8 @@ "params": 1 }, { - "id": "GUIManualSwitch", - "name": "GUIManualSwitch#8", + "id": "ManualSwitch", + "name": "ManualSwitch#8", "pos": { "x": 155.0, "y": 187.5 @@ -446,8 +446,8 @@ "params": 1 }, { - "id": "GUIManualSwitch", - "name": "GUIManualSwitch#9", + "id": "ManualSwitch", + "name": "ManualSwitch#9", "pos": { "x": 160.0, "y": 232.5 @@ -455,8 +455,8 @@ "params": 1 }, { - "id": "GUIMerger", - "name": "GUIMerger#0", + "id": "Merger", + "name": "Merger#0", "pos": { "x": 85.0, "y": 130.0 @@ -464,8 +464,8 @@ "params": 13 }, { - "id": "GUITriStateBuffer", - "name": "GUITriStateBuffer#0", + "id": "TriStateBuffer", + "name": "TriStateBuffer#0", "pos": { "x": 175.0, "y": 315.0 @@ -476,8 +476,8 @@ } }, { - "id": "GUITriStateBuffer", - "name": "GUITriStateBuffer#1", + "id": "TriStateBuffer", + "name": "TriStateBuffer#1", "pos": { "x": 175.0, "y": 330.0 @@ -488,8 +488,8 @@ } }, { - "id": "GUITriStateBuffer", - "name": "GUITriStateBuffer#2", + "id": "TriStateBuffer", + "name": "TriStateBuffer#2", "pos": { "x": 175.0, "y": 385.0 @@ -500,8 +500,8 @@ } }, { - "id": "GUITriStateBuffer", - "name": "GUITriStateBuffer#3", + "id": "TriStateBuffer", + "name": "TriStateBuffer#3", "pos": { "x": 175.0, "y": 370.0 @@ -512,8 +512,8 @@ } }, { - "id": "GUITriStateBuffer", - "name": "GUITriStateBuffer#4", + "id": "TriStateBuffer", + "name": "TriStateBuffer#4", "pos": { "x": 335.0, "y": 105.0 @@ -524,8 +524,8 @@ } }, { - "id": "GUITriStateBuffer", - "name": "GUITriStateBuffer#5", + "id": "TriStateBuffer", + "name": "TriStateBuffer#5", "pos": { "x": 335.0, "y": 90.0 @@ -536,8 +536,8 @@ } }, { - "id": "GUITriStateBuffer", - "name": "GUITriStateBuffer#6", + "id": "TriStateBuffer", + "name": "TriStateBuffer#6", "pos": { "x": 335.0, "y": 120.0 @@ -548,8 +548,8 @@ } }, { - "id": "GUITriStateBuffer", - "name": "GUITriStateBuffer#7", + "id": "TriStateBuffer", + "name": "TriStateBuffer#7", "pos": { "x": 335.0, "y": 135.0 @@ -1121,7 +1121,7 @@ "wires": [ { "pin1": { - "compName": "GUIManualSwitch#0", + "compName": "ManualSwitch#0", "pinName": "" }, "pin2": { @@ -1138,7 +1138,7 @@ }, { "pin1": { - "compName": "GUIManualSwitch#1", + "compName": "ManualSwitch#1", "pinName": "" }, "pin2": { @@ -1163,7 +1163,7 @@ "pinName": "_EOVR" }, "pin2": { - "compName": "GUIManualSwitch#10", + "compName": "ManualSwitch#10", "pinName": "" }, "name": "unnamedWire#10", @@ -1180,7 +1180,7 @@ }, { "pin1": { - "compName": "GUIManualSwitch#9", + "compName": "ManualSwitch#9", "pinName": "" }, "pin2": { @@ -1201,7 +1201,7 @@ }, { "pin1": { - "compName": "GUIMerger#0", + "compName": "Merger#0", "pinName": "O" }, "pin2": { @@ -1230,7 +1230,7 @@ }, { "pin1": { - "compName": "GUIManualSwitch#14", + "compName": "ManualSwitch#14", "pinName": "" }, "pin2": { @@ -1284,7 +1284,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIBitDisplay#1", + "compName": "BitDisplay#1", "pinName": "" }, "name": "unnamedWire#16", @@ -1313,7 +1313,7 @@ "pinName": "CT" }, "pin2": { - "compName": "GUIBitDisplay#4", + "compName": "BitDisplay#4", "pinName": "" }, "name": "unnamedWire#18", @@ -1334,7 +1334,7 @@ "pinName": "C0" }, "pin2": { - "compName": "GUIBitDisplay#5", + "compName": "BitDisplay#5", "pinName": "" }, "name": "unnamedWire#19", @@ -1342,7 +1342,7 @@ }, { "pin1": { - "compName": "GUIManualSwitch#2", + "compName": "ManualSwitch#2", "pinName": "" }, "pin2": { @@ -1384,7 +1384,7 @@ "pinName": "" }, "pin2": { - "compName": "GUITriStateBuffer#0", + "compName": "TriStateBuffer#0", "pinName": "OUT" }, "name": "unnamedWire#21", @@ -1409,7 +1409,7 @@ }, { "pin1": { - "compName": "GUITriStateBuffer#1", + "compName": "TriStateBuffer#1", "pinName": "OUT" }, "pin2": { @@ -1421,11 +1421,11 @@ }, { "pin1": { - "compName": "GUIManualSwitch#15", + "compName": "ManualSwitch#15", "pinName": "" }, "pin2": { - "compName": "GUITriStateBuffer#0", + "compName": "TriStateBuffer#0", "pinName": "IN" }, "name": "unnamedWire#24", @@ -1433,11 +1433,11 @@ }, { "pin1": { - "compName": "GUIManualSwitch#16", + "compName": "ManualSwitch#16", "pinName": "" }, "pin2": { - "compName": "GUITriStateBuffer#1", + "compName": "TriStateBuffer#1", "pinName": "IN" }, "name": "unnamedWire#25", @@ -1445,11 +1445,11 @@ }, { "pin1": { - "compName": "GUITriStateBuffer#2", + "compName": "TriStateBuffer#2", "pinName": "IN" }, "pin2": { - "compName": "GUIManualSwitch#17", + "compName": "ManualSwitch#17", "pinName": "" }, "name": "unnamedWire#26", @@ -1457,11 +1457,11 @@ }, { "pin1": { - "compName": "GUIManualSwitch#18", + "compName": "ManualSwitch#18", "pinName": "" }, "pin2": { - "compName": "GUITriStateBuffer#3", + "compName": "TriStateBuffer#3", "pinName": "IN" }, "name": "unnamedWire#27", @@ -1469,7 +1469,7 @@ }, { "pin1": { - "compName": "GUIManualSwitch#19", + "compName": "ManualSwitch#19", "pinName": "" }, "pin2": { @@ -1485,7 +1485,7 @@ "pinName": "" }, "pin2": { - "compName": "GUITriStateBuffer#3", + "compName": "TriStateBuffer#3", "pinName": "EN" }, "name": "unnamedWire#29", @@ -1497,7 +1497,7 @@ "pinName": "IC" }, "pin2": { - "compName": "GUIManualSwitch#4", + "compName": "ManualSwitch#4", "pinName": "" }, "name": "unnamedWire#3", @@ -1518,7 +1518,7 @@ "pinName": "" }, "pin2": { - "compName": "GUITriStateBuffer#2", + "compName": "TriStateBuffer#2", "pinName": "EN" }, "name": "unnamedWire#30", @@ -1535,7 +1535,7 @@ }, { "pin1": { - "compName": "GUIManualSwitch#20", + "compName": "ManualSwitch#20", "pinName": "" }, "pin2": { @@ -1551,7 +1551,7 @@ "pinName": "" }, "pin2": { - "compName": "GUITriStateBuffer#0", + "compName": "TriStateBuffer#0", "pinName": "EN" }, "name": "unnamedWire#32", @@ -1563,7 +1563,7 @@ "pinName": "" }, "pin2": { - "compName": "GUITriStateBuffer#1", + "compName": "TriStateBuffer#1", "pinName": "EN" }, "name": "unnamedWire#33", @@ -1584,7 +1584,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIBitDisplay#9", + "compName": "BitDisplay#9", "pinName": "" }, "name": "unnamedWire#34", @@ -1605,7 +1605,7 @@ }, { "pin1": { - "compName": "GUIBitDisplay#8", + "compName": "BitDisplay#8", "pinName": "" }, "pin2": { @@ -1630,7 +1630,7 @@ }, { "pin1": { - "compName": "GUITriStateBuffer#3", + "compName": "TriStateBuffer#3", "pinName": "OUT" }, "pin2": { @@ -1659,7 +1659,7 @@ "pinName": "" }, "pin2": { - "compName": "GUITriStateBuffer#2", + "compName": "TriStateBuffer#2", "pinName": "OUT" }, "name": "unnamedWire#37", @@ -1680,7 +1680,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIBitDisplay#7", + "compName": "BitDisplay#7", "pinName": "" }, "name": "unnamedWire#38", @@ -1693,7 +1693,7 @@ }, { "pin1": { - "compName": "GUIBitDisplay#6", + "compName": "BitDisplay#6", "pinName": "" }, "pin2": { @@ -1705,7 +1705,7 @@ }, { "pin1": { - "compName": "GUIManualSwitch#5", + "compName": "ManualSwitch#5", "pinName": "" }, "pin2": { @@ -1760,11 +1760,11 @@ }, { "pin1": { - "compName": "GUIManualSwitch#3", + "compName": "ManualSwitch#3", "pinName": "" }, "pin2": { - "compName": "GUIMerger#0", + "compName": "Merger#0", "pinName": "I12" }, "name": "unnamedWire#42", @@ -1772,11 +1772,11 @@ }, { "pin1": { - "compName": "GUIMerger#0", + "compName": "Merger#0", "pinName": "I11" }, "pin2": { - "compName": "GUIManualSwitch#13", + "compName": "ManualSwitch#13", "pinName": "" }, "name": "unnamedWire#43", @@ -1784,11 +1784,11 @@ }, { "pin1": { - "compName": "GUIManualSwitch#21", + "compName": "ManualSwitch#21", "pinName": "" }, "pin2": { - "compName": "GUIMerger#0", + "compName": "Merger#0", "pinName": "I10" }, "name": "unnamedWire#44", @@ -1796,11 +1796,11 @@ }, { "pin1": { - "compName": "GUIMerger#0", + "compName": "Merger#0", "pinName": "I9" }, "pin2": { - "compName": "GUIManualSwitch#22", + "compName": "ManualSwitch#22", "pinName": "" }, "name": "unnamedWire#45", @@ -1808,11 +1808,11 @@ }, { "pin1": { - "compName": "GUIManualSwitch#24", + "compName": "ManualSwitch#24", "pinName": "" }, "pin2": { - "compName": "GUIMerger#0", + "compName": "Merger#0", "pinName": "I8" }, "name": "unnamedWire#46", @@ -1820,11 +1820,11 @@ }, { "pin1": { - "compName": "GUIMerger#0", + "compName": "Merger#0", "pinName": "I7" }, "pin2": { - "compName": "GUIManualSwitch#23", + "compName": "ManualSwitch#23", "pinName": "" }, "name": "unnamedWire#47", @@ -1832,11 +1832,11 @@ }, { "pin1": { - "compName": "GUIManualSwitch#25", + "compName": "ManualSwitch#25", "pinName": "" }, "pin2": { - "compName": "GUIMerger#0", + "compName": "Merger#0", "pinName": "I6" }, "name": "unnamedWire#48", @@ -1844,11 +1844,11 @@ }, { "pin1": { - "compName": "GUIMerger#0", + "compName": "Merger#0", "pinName": "I5" }, "pin2": { - "compName": "GUIManualSwitch#26", + "compName": "ManualSwitch#26", "pinName": "" }, "name": "unnamedWire#49", @@ -1860,7 +1860,7 @@ "pinName": "IOVR" }, "pin2": { - "compName": "GUIManualSwitch#6", + "compName": "ManualSwitch#6", "pinName": "" }, "name": "unnamedWire#5", @@ -1877,11 +1877,11 @@ }, { "pin1": { - "compName": "GUIManualSwitch#28", + "compName": "ManualSwitch#28", "pinName": "" }, "pin2": { - "compName": "GUIMerger#0", + "compName": "Merger#0", "pinName": "I4" }, "name": "unnamedWire#50", @@ -1889,11 +1889,11 @@ }, { "pin1": { - "compName": "GUIMerger#0", + "compName": "Merger#0", "pinName": "I3" }, "pin2": { - "compName": "GUIManualSwitch#30", + "compName": "ManualSwitch#30", "pinName": "" }, "name": "unnamedWire#51", @@ -1901,11 +1901,11 @@ }, { "pin1": { - "compName": "GUIManualSwitch#29", + "compName": "ManualSwitch#29", "pinName": "" }, "pin2": { - "compName": "GUIMerger#0", + "compName": "Merger#0", "pinName": "I2" }, "name": "unnamedWire#52", @@ -1913,11 +1913,11 @@ }, { "pin1": { - "compName": "GUIMerger#0", + "compName": "Merger#0", "pinName": "I1" }, "pin2": { - "compName": "GUIManualSwitch#27", + "compName": "ManualSwitch#27", "pinName": "" }, "name": "unnamedWire#53", @@ -1925,11 +1925,11 @@ }, { "pin1": { - "compName": "GUIManualSwitch#31", + "compName": "ManualSwitch#31", "pinName": "" }, "pin2": { - "compName": "GUIMerger#0", + "compName": "Merger#0", "pinName": "I0" }, "name": "unnamedWire#54", @@ -1937,11 +1937,11 @@ }, { "pin1": { - "compName": "GUITriStateBuffer#7", + "compName": "TriStateBuffer#7", "pinName": "IN" }, "pin2": { - "compName": "GUIManualSwitch#33", + "compName": "ManualSwitch#33", "pinName": "" }, "name": "unnamedWire#55", @@ -1949,11 +1949,11 @@ }, { "pin1": { - "compName": "GUIManualSwitch#35", + "compName": "ManualSwitch#35", "pinName": "" }, "pin2": { - "compName": "GUITriStateBuffer#6", + "compName": "TriStateBuffer#6", "pinName": "IN" }, "name": "unnamedWire#56", @@ -1961,11 +1961,11 @@ }, { "pin1": { - "compName": "GUITriStateBuffer#4", + "compName": "TriStateBuffer#4", "pinName": "IN" }, "pin2": { - "compName": "GUIManualSwitch#32", + "compName": "ManualSwitch#32", "pinName": "" }, "name": "unnamedWire#57", @@ -1973,11 +1973,11 @@ }, { "pin1": { - "compName": "GUIManualSwitch#34", + "compName": "ManualSwitch#34", "pinName": "" }, "pin2": { - "compName": "GUITriStateBuffer#5", + "compName": "TriStateBuffer#5", "pinName": "IN" }, "name": "unnamedWire#58", @@ -1989,7 +1989,7 @@ "pinName": "" }, "pin2": { - "compName": "GUITriStateBuffer#5", + "compName": "TriStateBuffer#5", "pinName": "EN" }, "name": "unnamedWire#59", @@ -1997,7 +1997,7 @@ }, { "pin1": { - "compName": "GUIManualSwitch#7", + "compName": "ManualSwitch#7", "pinName": "" }, "pin2": { @@ -2022,7 +2022,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIManualSwitch#36", + "compName": "ManualSwitch#36", "pinName": "" }, "name": "unnamedWire#60", @@ -2051,7 +2051,7 @@ "pinName": "" }, "pin2": { - "compName": "GUITriStateBuffer#4", + "compName": "TriStateBuffer#4", "pinName": "EN" }, "name": "unnamedWire#62", @@ -2075,7 +2075,7 @@ "pinName": "" }, "pin2": { - "compName": "GUITriStateBuffer#6", + "compName": "TriStateBuffer#6", "pinName": "EN" }, "name": "unnamedWire#64", @@ -2083,7 +2083,7 @@ }, { "pin1": { - "compName": "GUITriStateBuffer#7", + "compName": "TriStateBuffer#7", "pinName": "EN" }, "pin2": { @@ -2104,7 +2104,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIBitDisplay#0", + "compName": "BitDisplay#0", "pinName": "" }, "name": "unnamedWire#66", @@ -2116,7 +2116,7 @@ "pinName": "" }, "pin2": { - "compName": "GUITriStateBuffer#5", + "compName": "TriStateBuffer#5", "pinName": "OUT" }, "name": "unnamedWire#67", @@ -2150,7 +2150,7 @@ "pinName": "" }, "pin2": { - "compName": "GUITriStateBuffer#4", + "compName": "TriStateBuffer#4", "pinName": "OUT" }, "name": "unnamedWire#69", @@ -2167,7 +2167,7 @@ "pinName": "_CEmu" }, "pin2": { - "compName": "GUIManualSwitch#8", + "compName": "ManualSwitch#8", "pinName": "" }, "name": "unnamedWire#7", @@ -2188,7 +2188,7 @@ "pinName": "" }, "pin2": { - "compName": "GUITriStateBuffer#6", + "compName": "TriStateBuffer#6", "pinName": "OUT" }, "name": "unnamedWire#70", @@ -2205,7 +2205,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIBitDisplay#2", + "compName": "BitDisplay#2", "pinName": "" }, "name": "unnamedWire#71", @@ -2217,7 +2217,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIBitDisplay#3", + "compName": "BitDisplay#3", "pinName": "" }, "name": "unnamedWire#72", @@ -2234,7 +2234,7 @@ "pinName": "" }, "pin2": { - "compName": "GUITriStateBuffer#7", + "compName": "TriStateBuffer#7", "pinName": "OUT" }, "name": "unnamedWire#73", @@ -2251,7 +2251,7 @@ "pinName": "_SE" }, "pin2": { - "compName": "GUIManualSwitch#37", + "compName": "ManualSwitch#37", "pinName": "" }, "name": "unnamedWire#74", @@ -2268,7 +2268,7 @@ }, { "pin1": { - "compName": "GUIManualSwitch#38", + "compName": "ManualSwitch#38", "pinName": "" }, "pin2": { @@ -2301,7 +2301,7 @@ "pinName": "_EZ" }, "pin2": { - "compName": "GUIManualSwitch#12", + "compName": "ManualSwitch#12", "pinName": "" }, "name": "unnamedWire#8", @@ -2313,7 +2313,7 @@ "pinName": "_EC" }, "pin2": { - "compName": "GUIManualSwitch#11", + "compName": "ManualSwitch#11", "pinName": "" }, "name": "unnamedWire#9", diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/GUIAm2900.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/Am2900.json similarity index 87% rename from net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/GUIAm2900.json rename to net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/Am2900.json index ede37c77..f52b2d39 100644 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/GUIAm2900.json +++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/Am2900.json @@ -6,7 +6,7 @@ "submodel": { "components": [ { - "id": "GUIAm2901", + "id": "Am2901", "name": "DeserializedSubmodelComponent#0", "pos": { "x": 420.0, @@ -14,7 +14,7 @@ } }, { - "id": "GUIAm2901", + "id": "Am2901", "name": "DeserializedSubmodelComponent#1", "pos": { "x": 485.0, @@ -22,7 +22,7 @@ } }, { - "id": "GUImux1_4", + "id": "mux1_4", "name": "DeserializedSubmodelComponent#10", "pos": { "x": 320.0, @@ -30,7 +30,7 @@ } }, { - "id": "GUImux1_4", + "id": "mux1_4", "name": "DeserializedSubmodelComponent#11", "pos": { "x": 320.0, @@ -38,7 +38,7 @@ } }, { - "id": "GUIdff12_we", + "id": "dff12_we", "name": "DeserializedSubmodelComponent#12", "pos": { "x": 290.0, @@ -46,7 +46,7 @@ } }, { - "id": "GUImux1_12", + "id": "mux1_12", "name": "DeserializedSubmodelComponent#13", "pos": { "x": 170.0, @@ -54,7 +54,7 @@ } }, { - "id": "GUIAm2901", + "id": "Am2901", "name": "DeserializedSubmodelComponent#2", "pos": { "x": 550.0, @@ -62,7 +62,7 @@ } }, { - "id": "GUIAm2901", + "id": "Am2901", "name": "DeserializedSubmodelComponent#3", "pos": { "x": 615.0, @@ -70,7 +70,7 @@ } }, { - "id": "GUIAm2904", + "id": "Am2904", "name": "DeserializedSubmodelComponent#4", "pos": { "x": 240.0, @@ -78,7 +78,7 @@ } }, { - "id": "GUIAm2910", + "id": "Am2910", "name": "DeserializedSubmodelComponent#5", "pos": { "x": 100.0, @@ -86,7 +86,7 @@ } }, { - "id": "GUIand", + "id": "and", "name": "DeserializedSubmodelComponent#6", "pos": { "x": 665.0, @@ -94,7 +94,7 @@ } }, { - "id": "GUIand", + "id": "and", "name": "DeserializedSubmodelComponent#7", "pos": { "x": 550.0, @@ -102,7 +102,7 @@ } }, { - "id": "GUIand", + "id": "and", "name": "DeserializedSubmodelComponent#8", "pos": { "x": 730.0, @@ -110,7 +110,7 @@ } }, { - "id": "GUIdff16_invwe", + "id": "dff16_invwe", "name": "DeserializedSubmodelComponent#9", "pos": { "x": 135.0, @@ -118,8 +118,8 @@ } }, { - "id": "GUIClock", - "name": "GUIClock#0", + "id": "Clock", + "name": "Clock#0", "pos": { "x": 155.0, "y": 246.0 @@ -130,8 +130,8 @@ } }, { - "id": "GUIFixedOutput", - "name": "GUIFixedOutput#0", + "id": "FixedOutput", + "name": "FixedOutput#0", "pos": { "x": 205.0, "y": 211.0 @@ -143,8 +143,8 @@ } }, { - "id": "GUIFixedOutput", - "name": "GUIFixedOutput#1", + "id": "FixedOutput", + "name": "FixedOutput#1", "pos": { "x": 370.0, "y": 301.0 @@ -156,8 +156,8 @@ } }, { - "id": "GUIFixedOutput", - "name": "GUIFixedOutput#11", + "id": "FixedOutput", + "name": "FixedOutput#11", "pos": { "x": 210.0, "y": 281.0 @@ -169,8 +169,8 @@ } }, { - "id": "GUIFixedOutput", - "name": "GUIFixedOutput#3", + "id": "FixedOutput", + "name": "FixedOutput#3", "pos": { "x": 70.0, "y": 346.0 @@ -182,8 +182,8 @@ } }, { - "id": "GUIFixedOutput", - "name": "GUIFixedOutput#5", + "id": "FixedOutput", + "name": "FixedOutput#5", "pos": { "x": 175.0, "y": 396.0 @@ -195,8 +195,8 @@ } }, { - "id": "GUIFixedOutput", - "name": "GUIFixedOutput#7", + "id": "FixedOutput", + "name": "FixedOutput#7", "pos": { "x": 140.0, "y": 431.0 @@ -208,8 +208,8 @@ } }, { - "id": "GUIFixedOutput", - "name": "GUIFixedOutput#9", + "id": "FixedOutput", + "name": "FixedOutput#9", "pos": { "x": 210.0, "y": 316.0 @@ -221,8 +221,8 @@ } }, { - "id": "GUIMerger", - "name": "GUIMerger#0", + "id": "Merger", + "name": "Merger#0", "pos": { "x": 235.0, "y": 56.0 @@ -230,8 +230,8 @@ "params": 8 }, { - "id": "GUIMerger", - "name": "GUIMerger#1", + "id": "Merger", + "name": "Merger#1", "pos": { "x": 235.0, "y": 136.0 @@ -239,8 +239,8 @@ "params": 4 }, { - "id": "GUIMerger", - "name": "GUIMerger#2", + "id": "Merger", + "name": "Merger#2", "pos": { "x": 235.0, "y": 176.0 @@ -248,8 +248,8 @@ "params": 4 }, { - "id": "GUIMerger", - "name": "GUIMerger#3", + "id": "Merger", + "name": "Merger#3", "pos": { "x": 360.0, "y": 20.0 @@ -257,8 +257,8 @@ "params": 4 }, { - "id": "GUIMerger", - "name": "GUIMerger#4", + "id": "Merger", + "name": "Merger#4", "pos": { "x": 360.0, "y": 125.0 @@ -266,8 +266,8 @@ "params": 4 }, { - "id": "GUINandGate", - "name": "GUINandGate#0", + "id": "NandGate", + "name": "NandGate#0", "pos": { "x": 255.0, "y": 495.0 @@ -275,8 +275,8 @@ "params": 1 }, { - "id": "GUINandGate", - "name": "GUINandGate#1", + "id": "NandGate", + "name": "NandGate#1", "pos": { "x": 270.0, "y": 550.0 @@ -284,8 +284,8 @@ "params": 1 }, { - "id": "GUISplitter", - "name": "GUISplitter#0", + "id": "Splitter", + "name": "Splitter#0", "pos": { "x": 215.0, "y": 56.0 @@ -293,8 +293,8 @@ "params": 16 }, { - "id": "GUISplitter", - "name": "GUISplitter#1", + "id": "Splitter", + "name": "Splitter#1", "pos": { "x": 305.0, "y": 30.0 @@ -302,8 +302,8 @@ "params": 4 }, { - "id": "GUISplitter", - "name": "GUISplitter#10", + "id": "Splitter", + "name": "Splitter#10", "pos": { "x": 600.0, "y": 395.0 @@ -311,8 +311,8 @@ "params": 4 }, { - "id": "GUISplitter", - "name": "GUISplitter#2", + "id": "Splitter", + "name": "Splitter#2", "pos": { "x": 305.0, "y": 135.0 @@ -320,8 +320,8 @@ "params": 4 }, { - "id": "GUISplitter", - "name": "GUISplitter#3", + "id": "Splitter", + "name": "Splitter#3", "pos": { "x": 405.0, "y": 395.0 @@ -329,8 +329,8 @@ "params": 4 }, { - "id": "GUISplitter", - "name": "GUISplitter#4", + "id": "Splitter", + "name": "Splitter#4", "pos": { "x": 405.0, "y": 435.0 @@ -338,8 +338,8 @@ "params": 4 }, { - "id": "GUISplitter", - "name": "GUISplitter#5", + "id": "Splitter", + "name": "Splitter#5", "pos": { "x": 470.0, "y": 395.0 @@ -347,8 +347,8 @@ "params": 4 }, { - "id": "GUISplitter", - "name": "GUISplitter#6", + "id": "Splitter", + "name": "Splitter#6", "pos": { "x": 470.0, "y": 435.0 @@ -356,8 +356,8 @@ "params": 4 }, { - "id": "GUISplitter", - "name": "GUISplitter#7", + "id": "Splitter", + "name": "Splitter#7", "pos": { "x": 535.0, "y": 435.0 @@ -365,8 +365,8 @@ "params": 4 }, { - "id": "GUISplitter", - "name": "GUISplitter#8", + "id": "Splitter", + "name": "Splitter#8", "pos": { "x": 535.0, "y": 395.0 @@ -374,8 +374,8 @@ "params": 4 }, { - "id": "GUISplitter", - "name": "GUISplitter#9", + "id": "Splitter", + "name": "Splitter#9", "pos": { "x": 600.0, "y": 435.0 @@ -383,8 +383,8 @@ "params": 4 }, { - "id": "GUIinc12", - "name": "GUIinc12#0", + "id": "inc12", + "name": "inc12#0", "pos": { "x": 245.0, "y": 525.0 @@ -569,7 +569,7 @@ "pinName": "B0" }, "pin2": { - "compName": "GUISplitter#7", + "compName": "Splitter#7", "pinName": "O3" }, "name": "unnamedWire#100", @@ -577,7 +577,7 @@ }, { "pin1": { - "compName": "GUISplitter#8", + "compName": "Splitter#8", "pinName": "O0" }, "pin2": { @@ -593,7 +593,7 @@ "pinName": "A2" }, "pin2": { - "compName": "GUISplitter#8", + "compName": "Splitter#8", "pinName": "O1" }, "name": "unnamedWire#102", @@ -601,7 +601,7 @@ }, { "pin1": { - "compName": "GUISplitter#8", + "compName": "Splitter#8", "pinName": "O2" }, "pin2": { @@ -617,7 +617,7 @@ "pinName": "A0" }, "pin2": { - "compName": "GUISplitter#8", + "compName": "Splitter#8", "pinName": "O3" }, "name": "unnamedWire#104", @@ -625,7 +625,7 @@ }, { "pin1": { - "compName": "GUISplitter#10", + "compName": "Splitter#10", "pinName": "O3" }, "pin2": { @@ -641,7 +641,7 @@ "pinName": "A1" }, "pin2": { - "compName": "GUISplitter#10", + "compName": "Splitter#10", "pinName": "O2" }, "name": "unnamedWire#106", @@ -649,7 +649,7 @@ }, { "pin1": { - "compName": "GUISplitter#10", + "compName": "Splitter#10", "pinName": "O1" }, "pin2": { @@ -665,7 +665,7 @@ "pinName": "A3" }, "pin2": { - "compName": "GUISplitter#10", + "compName": "Splitter#10", "pinName": "O0" }, "name": "unnamedWire#108", @@ -673,7 +673,7 @@ }, { "pin1": { - "compName": "GUISplitter#9", + "compName": "Splitter#9", "pinName": "O3" }, "pin2": { @@ -701,7 +701,7 @@ "pinName": "B1" }, "pin2": { - "compName": "GUISplitter#9", + "compName": "Splitter#9", "pinName": "O2" }, "name": "unnamedWire#110", @@ -709,7 +709,7 @@ }, { "pin1": { - "compName": "GUISplitter#9", + "compName": "Splitter#9", "pinName": "O1" }, "pin2": { @@ -725,7 +725,7 @@ "pinName": "B3" }, "pin2": { - "compName": "GUISplitter#9", + "compName": "Splitter#9", "pinName": "O0" }, "name": "unnamedWire#112", @@ -733,7 +733,7 @@ }, { "pin1": { - "compName": "GUIMerger#3", + "compName": "Merger#3", "pinName": "O" }, "pin2": { @@ -749,7 +749,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIMerger#4", + "compName": "Merger#4", "pinName": "O" }, "name": "unnamedWire#114", @@ -809,7 +809,7 @@ "pinName": "" }, "pin2": { - "compName": "GUISplitter#4", + "compName": "Splitter#4", "pinName": "I" }, "name": "unnamedWire#119", @@ -829,7 +829,7 @@ }, { "pin1": { - "compName": "GUISplitter#3", + "compName": "Splitter#3", "pinName": "I" }, "pin2": { @@ -845,7 +845,7 @@ "pinName": "" }, "pin2": { - "compName": "GUISplitter#6", + "compName": "Splitter#6", "pinName": "I" }, "name": "unnamedWire#121", @@ -857,7 +857,7 @@ "pinName": "" }, "pin2": { - "compName": "GUISplitter#5", + "compName": "Splitter#5", "pinName": "I" }, "name": "unnamedWire#122", @@ -865,7 +865,7 @@ }, { "pin1": { - "compName": "GUISplitter#7", + "compName": "Splitter#7", "pinName": "I" }, "pin2": { @@ -881,7 +881,7 @@ "pinName": "" }, "pin2": { - "compName": "GUISplitter#8", + "compName": "Splitter#8", "pinName": "I" }, "name": "unnamedWire#124", @@ -893,7 +893,7 @@ "pinName": "" }, "pin2": { - "compName": "GUISplitter#9", + "compName": "Splitter#9", "pinName": "I" }, "name": "unnamedWire#125", @@ -901,7 +901,7 @@ }, { "pin1": { - "compName": "GUISplitter#10", + "compName": "Splitter#10", "pinName": "I" }, "pin2": { @@ -913,7 +913,7 @@ }, { "pin1": { - "compName": "GUINandGate#0", + "compName": "NandGate#0", "pinName": "Y" }, "pin2": { @@ -925,7 +925,7 @@ }, { "pin1": { - "compName": "GUIinc12#0", + "compName": "inc12#0", "pinName": "Y" }, "pin2": { @@ -937,7 +937,7 @@ }, { "pin1": { - "compName": "GUIinc12#0", + "compName": "inc12#0", "pinName": "A" }, "pin2": { @@ -961,11 +961,11 @@ }, { "pin1": { - "compName": "GUIinc12#0", + "compName": "inc12#0", "pinName": "CI" }, "pin2": { - "compName": "GUINandGate#1", + "compName": "NandGate#1", "pinName": "Y" }, "name": "unnamedWire#130", @@ -977,7 +977,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#1", + "compName": "NandGate#1", "pinName": "A" }, "name": "unnamedWire#131", @@ -985,7 +985,7 @@ }, { "pin1": { - "compName": "GUINandGate#1", + "compName": "NandGate#1", "pinName": "B" }, "pin2": { @@ -1001,7 +1001,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#0", + "compName": "NandGate#0", "pinName": "B" }, "name": "unnamedWire#133", @@ -1037,7 +1037,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#0", + "compName": "NandGate#0", "pinName": "A" }, "name": "unnamedWire#136", @@ -1217,7 +1217,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIClock#0", + "compName": "Clock#0", "pinName": "" }, "name": "unnamedWire#25", @@ -1345,7 +1345,7 @@ }, { "pin1": { - "compName": "GUIFixedOutput#1", + "compName": "FixedOutput#1", "pinName": "out" }, "pin2": { @@ -1357,7 +1357,7 @@ }, { "pin1": { - "compName": "GUIFixedOutput#3", + "compName": "FixedOutput#3", "pinName": "out" }, "pin2": { @@ -1373,7 +1373,7 @@ "pinName": "CI" }, "pin2": { - "compName": "GUIFixedOutput#5", + "compName": "FixedOutput#5", "pinName": "out" }, "name": "unnamedWire#37", @@ -1385,7 +1385,7 @@ "pinName": "_OE" }, "pin2": { - "compName": "GUIFixedOutput#7", + "compName": "FixedOutput#7", "pinName": "out" }, "name": "unnamedWire#38", @@ -1393,7 +1393,7 @@ }, { "pin1": { - "compName": "GUIFixedOutput#9", + "compName": "FixedOutput#9", "pinName": "out" }, "pin2": { @@ -1417,7 +1417,7 @@ }, { "pin1": { - "compName": "GUIFixedOutput#11", + "compName": "FixedOutput#11", "pinName": "out" }, "pin2": { @@ -1481,7 +1481,7 @@ "pinName": "Q" }, "pin2": { - "compName": "GUISplitter#0", + "compName": "Splitter#0", "pinName": "I" }, "name": "unnamedWire#45", @@ -1489,11 +1489,11 @@ }, { "pin1": { - "compName": "GUISplitter#0", + "compName": "Splitter#0", "pinName": "O15" }, "pin2": { - "compName": "GUIMerger#0", + "compName": "Merger#0", "pinName": "I7" }, "name": "unnamedWire#46", @@ -1501,11 +1501,11 @@ }, { "pin1": { - "compName": "GUIMerger#0", + "compName": "Merger#0", "pinName": "I6" }, "pin2": { - "compName": "GUISplitter#0", + "compName": "Splitter#0", "pinName": "O14" }, "name": "unnamedWire#47", @@ -1513,11 +1513,11 @@ }, { "pin1": { - "compName": "GUISplitter#0", + "compName": "Splitter#0", "pinName": "O13" }, "pin2": { - "compName": "GUIMerger#0", + "compName": "Merger#0", "pinName": "I5" }, "name": "unnamedWire#48", @@ -1525,11 +1525,11 @@ }, { "pin1": { - "compName": "GUIMerger#0", + "compName": "Merger#0", "pinName": "I4" }, "pin2": { - "compName": "GUISplitter#0", + "compName": "Splitter#0", "pinName": "O12" }, "name": "unnamedWire#49", @@ -1549,11 +1549,11 @@ }, { "pin1": { - "compName": "GUISplitter#0", + "compName": "Splitter#0", "pinName": "O11" }, "pin2": { - "compName": "GUIMerger#0", + "compName": "Merger#0", "pinName": "I3" }, "name": "unnamedWire#50", @@ -1561,11 +1561,11 @@ }, { "pin1": { - "compName": "GUISplitter#0", + "compName": "Splitter#0", "pinName": "O10" }, "pin2": { - "compName": "GUIMerger#0", + "compName": "Merger#0", "pinName": "I2" }, "name": "unnamedWire#51", @@ -1573,11 +1573,11 @@ }, { "pin1": { - "compName": "GUIMerger#0", + "compName": "Merger#0", "pinName": "I1" }, "pin2": { - "compName": "GUISplitter#0", + "compName": "Splitter#0", "pinName": "O9" }, "name": "unnamedWire#52", @@ -1585,11 +1585,11 @@ }, { "pin1": { - "compName": "GUISplitter#0", + "compName": "Splitter#0", "pinName": "O8" }, "pin2": { - "compName": "GUIMerger#0", + "compName": "Merger#0", "pinName": "I0" }, "name": "unnamedWire#53", @@ -1597,7 +1597,7 @@ }, { "pin1": { - "compName": "GUIFixedOutput#0", + "compName": "FixedOutput#0", "pinName": "out" }, "pin2": { @@ -1618,7 +1618,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIMerger#1", + "compName": "Merger#1", "pinName": "I3" }, "name": "unnamedWire#55", @@ -1635,7 +1635,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIMerger#2", + "compName": "Merger#2", "pinName": "I3" }, "name": "unnamedWire#56", @@ -1643,11 +1643,11 @@ }, { "pin1": { - "compName": "GUIMerger#2", + "compName": "Merger#2", "pinName": "I2" }, "pin2": { - "compName": "GUISplitter#0", + "compName": "Splitter#0", "pinName": "O2" }, "name": "unnamedWire#57", @@ -1655,11 +1655,11 @@ }, { "pin1": { - "compName": "GUISplitter#0", + "compName": "Splitter#0", "pinName": "O1" }, "pin2": { - "compName": "GUIMerger#2", + "compName": "Merger#2", "pinName": "I1" }, "name": "unnamedWire#58", @@ -1667,11 +1667,11 @@ }, { "pin1": { - "compName": "GUIMerger#2", + "compName": "Merger#2", "pinName": "I0" }, "pin2": { - "compName": "GUISplitter#0", + "compName": "Splitter#0", "pinName": "O0" }, "name": "unnamedWire#59", @@ -1691,11 +1691,11 @@ }, { "pin1": { - "compName": "GUIMerger#1", + "compName": "Merger#1", "pinName": "I0" }, "pin2": { - "compName": "GUISplitter#0", + "compName": "Splitter#0", "pinName": "O4" }, "name": "unnamedWire#60", @@ -1703,11 +1703,11 @@ }, { "pin1": { - "compName": "GUISplitter#0", + "compName": "Splitter#0", "pinName": "O5" }, "pin2": { - "compName": "GUIMerger#1", + "compName": "Merger#1", "pinName": "I1" }, "name": "unnamedWire#61", @@ -1715,11 +1715,11 @@ }, { "pin1": { - "compName": "GUIMerger#1", + "compName": "Merger#1", "pinName": "I2" }, "pin2": { - "compName": "GUISplitter#0", + "compName": "Splitter#0", "pinName": "O6" }, "name": "unnamedWire#62", @@ -1727,7 +1727,7 @@ }, { "pin1": { - "compName": "GUISplitter#1", + "compName": "Splitter#1", "pinName": "O3" }, "pin2": { @@ -1743,7 +1743,7 @@ "pinName": "I0_2" }, "pin2": { - "compName": "GUISplitter#1", + "compName": "Splitter#1", "pinName": "O2" }, "name": "unnamedWire#64", @@ -1751,7 +1751,7 @@ }, { "pin1": { - "compName": "GUISplitter#1", + "compName": "Splitter#1", "pinName": "O1" }, "pin2": { @@ -1763,7 +1763,7 @@ }, { "pin1": { - "compName": "GUISplitter#1", + "compName": "Splitter#1", "pinName": "O0" }, "pin2": { @@ -1775,7 +1775,7 @@ }, { "pin1": { - "compName": "GUISplitter#2", + "compName": "Splitter#2", "pinName": "O3" }, "pin2": { @@ -1791,7 +1791,7 @@ "pinName": "I0_2" }, "pin2": { - "compName": "GUISplitter#2", + "compName": "Splitter#2", "pinName": "O2" }, "name": "unnamedWire#68", @@ -1799,7 +1799,7 @@ }, { "pin1": { - "compName": "GUISplitter#2", + "compName": "Splitter#2", "pinName": "O1" }, "pin2": { @@ -1823,7 +1823,7 @@ }, { "pin1": { - "compName": "GUISplitter#2", + "compName": "Splitter#2", "pinName": "O0" }, "pin2": { @@ -1835,11 +1835,11 @@ }, { "pin1": { - "compName": "GUIMerger#2", + "compName": "Merger#2", "pinName": "O" }, "pin2": { - "compName": "GUISplitter#2", + "compName": "Splitter#2", "pinName": "I" }, "name": "unnamedWire#71", @@ -1847,11 +1847,11 @@ }, { "pin1": { - "compName": "GUIMerger#1", + "compName": "Merger#1", "pinName": "O" }, "pin2": { - "compName": "GUISplitter#1", + "compName": "Splitter#1", "pinName": "I" }, "name": "unnamedWire#72", @@ -1863,7 +1863,7 @@ "pinName": "Y1" }, "pin2": { - "compName": "GUIMerger#3", + "compName": "Merger#3", "pinName": "I3" }, "name": "unnamedWire#73", @@ -1871,7 +1871,7 @@ }, { "pin1": { - "compName": "GUIMerger#3", + "compName": "Merger#3", "pinName": "I2" }, "pin2": { @@ -1887,7 +1887,7 @@ "pinName": "Y3" }, "pin2": { - "compName": "GUIMerger#3", + "compName": "Merger#3", "pinName": "I1" }, "name": "unnamedWire#75", @@ -1895,7 +1895,7 @@ }, { "pin1": { - "compName": "GUIMerger#3", + "compName": "Merger#3", "pinName": "I0" }, "pin2": { @@ -1911,7 +1911,7 @@ "pinName": "Y1" }, "pin2": { - "compName": "GUIMerger#4", + "compName": "Merger#4", "pinName": "I3" }, "name": "unnamedWire#77", @@ -1919,7 +1919,7 @@ }, { "pin1": { - "compName": "GUIMerger#4", + "compName": "Merger#4", "pinName": "I2" }, "pin2": { @@ -1935,7 +1935,7 @@ "pinName": "Y3" }, "pin2": { - "compName": "GUIMerger#4", + "compName": "Merger#4", "pinName": "I1" }, "name": "unnamedWire#79", @@ -1955,7 +1955,7 @@ }, { "pin1": { - "compName": "GUIMerger#4", + "compName": "Merger#4", "pinName": "I0" }, "pin2": { @@ -1971,7 +1971,7 @@ "pinName": "B3" }, "pin2": { - "compName": "GUISplitter#4", + "compName": "Splitter#4", "pinName": "O0" }, "name": "unnamedWire#81", @@ -1979,7 +1979,7 @@ }, { "pin1": { - "compName": "GUISplitter#4", + "compName": "Splitter#4", "pinName": "O1" }, "pin2": { @@ -1995,7 +1995,7 @@ "pinName": "B1" }, "pin2": { - "compName": "GUISplitter#4", + "compName": "Splitter#4", "pinName": "O2" }, "name": "unnamedWire#83", @@ -2003,7 +2003,7 @@ }, { "pin1": { - "compName": "GUISplitter#4", + "compName": "Splitter#4", "pinName": "O3" }, "pin2": { @@ -2019,7 +2019,7 @@ "pinName": "A3" }, "pin2": { - "compName": "GUISplitter#3", + "compName": "Splitter#3", "pinName": "O0" }, "name": "unnamedWire#85", @@ -2027,7 +2027,7 @@ }, { "pin1": { - "compName": "GUISplitter#3", + "compName": "Splitter#3", "pinName": "O1" }, "pin2": { @@ -2043,7 +2043,7 @@ "pinName": "A1" }, "pin2": { - "compName": "GUISplitter#3", + "compName": "Splitter#3", "pinName": "O2" }, "name": "unnamedWire#87", @@ -2055,7 +2055,7 @@ "pinName": "A0" }, "pin2": { - "compName": "GUISplitter#3", + "compName": "Splitter#3", "pinName": "O3" }, "name": "unnamedWire#88", @@ -2063,7 +2063,7 @@ }, { "pin1": { - "compName": "GUISplitter#5", + "compName": "Splitter#5", "pinName": "O3" }, "pin2": { @@ -2091,7 +2091,7 @@ "pinName": "A1" }, "pin2": { - "compName": "GUISplitter#5", + "compName": "Splitter#5", "pinName": "O2" }, "name": "unnamedWire#90", @@ -2099,7 +2099,7 @@ }, { "pin1": { - "compName": "GUISplitter#5", + "compName": "Splitter#5", "pinName": "O1" }, "pin2": { @@ -2115,7 +2115,7 @@ "pinName": "A3" }, "pin2": { - "compName": "GUISplitter#5", + "compName": "Splitter#5", "pinName": "O0" }, "name": "unnamedWire#92", @@ -2127,7 +2127,7 @@ "pinName": "B0" }, "pin2": { - "compName": "GUISplitter#6", + "compName": "Splitter#6", "pinName": "O3" }, "name": "unnamedWire#93", @@ -2135,7 +2135,7 @@ }, { "pin1": { - "compName": "GUISplitter#6", + "compName": "Splitter#6", "pinName": "O2" }, "pin2": { @@ -2151,7 +2151,7 @@ "pinName": "B2" }, "pin2": { - "compName": "GUISplitter#6", + "compName": "Splitter#6", "pinName": "O1" }, "name": "unnamedWire#95", @@ -2159,7 +2159,7 @@ }, { "pin1": { - "compName": "GUISplitter#6", + "compName": "Splitter#6", "pinName": "O0" }, "pin2": { @@ -2171,7 +2171,7 @@ }, { "pin1": { - "compName": "GUISplitter#7", + "compName": "Splitter#7", "pinName": "O0" }, "pin2": { @@ -2187,7 +2187,7 @@ "pinName": "B2" }, "pin2": { - "compName": "GUISplitter#7", + "compName": "Splitter#7", "pinName": "O1" }, "name": "unnamedWire#98", @@ -2195,7 +2195,7 @@ }, { "pin1": { - "compName": "GUISplitter#7", + "compName": "Splitter#7", "pinName": "O2" }, "pin2": { diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/GUI_rsLatch.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/_rsLatch.json similarity index 92% rename from net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/GUI_rsLatch.json rename to net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/_rsLatch.json index 89eab0a4..7a0b4b2c 100644 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/GUI_rsLatch.json +++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/_rsLatch.json @@ -43,8 +43,8 @@ "submodel": { "components": [ { - "id": "GUINandGate", - "name": "GUINandGate#0", + "id": "NandGate", + "name": "NandGate#0", "pos": { "x": 10.0, "y": 7.5 @@ -52,8 +52,8 @@ "params": 1 }, { - "id": "GUINandGate", - "name": "GUINandGate#1", + "id": "NandGate", + "name": "NandGate#1", "pos": { "x": 40.0, "y": 12.5 @@ -127,7 +127,7 @@ "pinName": "_S" }, "pin2": { - "compName": "GUINandGate#0", + "compName": "NandGate#0", "pinName": "A" }, "name": "unnamedWire#0", @@ -139,7 +139,7 @@ "pinName": "_R" }, "pin2": { - "compName": "GUINandGate#1", + "compName": "NandGate#1", "pinName": "B" }, "name": "unnamedWire#1", @@ -156,7 +156,7 @@ }, { "pin1": { - "compName": "GUINandGate#0", + "compName": "NandGate#0", "pinName": "Y" }, "pin2": { @@ -168,7 +168,7 @@ }, { "pin1": { - "compName": "GUINandGate#1", + "compName": "NandGate#1", "pinName": "Y" }, "pin2": { @@ -189,7 +189,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#1", + "compName": "NandGate#1", "pinName": "A" }, "name": "unnamedWire#4", @@ -201,7 +201,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#0", + "compName": "NandGate#0", "pinName": "B" }, "name": "unnamedWire#5", diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/GUIAm2901.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901.json similarity index 88% rename from net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/GUIAm2901.json rename to net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901.json index 5b251e42..70fbac01 100644 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/GUIAm2901.json +++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901.json @@ -322,24 +322,24 @@ "submodel": { "components": [ { - "id": "GUIAm2901ALUInclSourceDecodeInclFunctionDecode", - "name": "GUIAm2901ALUInclSourceDecodeInclFunctionDecode#0", + "id": "Am2901ALUInclSourceDecodeInclFunctionDecode", + "name": "Am2901ALUInclSourceDecodeInclFunctionDecode#0", "pos": { "x": 240.0, "y": 2110.0 } }, { - "id": "GUIAm2901DestDecode", - "name": "GUIAm2901DestDecode#0", + "id": "Am2901DestDecode", + "name": "Am2901DestDecode#0", "pos": { "x": 15.0, "y": 45.0 } }, { - "id": "GUINandGate", - "name": "GUINandGate#0", + "id": "NandGate", + "name": "NandGate#0", "pos": { "x": 160.0, "y": 75.0 @@ -347,8 +347,8 @@ "params": 1 }, { - "id": "GUINandGate", - "name": "GUINandGate#1", + "id": "NandGate", + "name": "NandGate#1", "pos": { "x": 320.0, "y": 440.0 @@ -356,8 +356,8 @@ "params": 1 }, { - "id": "GUITriStateBuffer", - "name": "GUITriStateBuffer#0", + "id": "TriStateBuffer", + "name": "TriStateBuffer#0", "pos": { "x": 255.0, "y": 2485.0 @@ -368,8 +368,8 @@ } }, { - "id": "GUITriStateBuffer", - "name": "GUITriStateBuffer#1", + "id": "TriStateBuffer", + "name": "TriStateBuffer#1", "pos": { "x": 270.0, "y": 2435.0 @@ -380,8 +380,8 @@ } }, { - "id": "GUITriStateBuffer", - "name": "GUITriStateBuffer#3", + "id": "TriStateBuffer", + "name": "TriStateBuffer#3", "pos": { "x": 300.0, "y": 2515.0 @@ -392,8 +392,8 @@ } }, { - "id": "GUITriStateBuffer", - "name": "GUITriStateBuffer#4", + "id": "TriStateBuffer", + "name": "TriStateBuffer#4", "pos": { "x": 300.0, "y": 2310.0 @@ -404,72 +404,72 @@ } }, { - "id": "GUIand", - "name": "GUIand#0", + "id": "and", + "name": "and#0", "pos": { "x": 190.0, "y": 65.0 } }, { - "id": "GUIdff4", - "name": "GUIdff4#0", + "id": "dff4", + "name": "dff4#0", "pos": { "x": 90.0, "y": 2490.0 } }, { - "id": "GUIdlatch4", - "name": "GUIdlatch4#0", + "id": "dlatch4", + "name": "dlatch4#0", "pos": { "x": 160.0, "y": 2220.0 } }, { - "id": "GUIdlatch4", - "name": "GUIdlatch4#1", + "id": "dlatch4", + "name": "dlatch4#1", "pos": { "x": 160.0, "y": 2275.0 } }, { - "id": "GUImux1_4", - "name": "GUImux1_4#0", + "id": "mux1_4", + "name": "mux1_4#0", "pos": { "x": 275.0, "y": 135.0 } }, { - "id": "GUIor4", - "name": "GUIor4#0", + "id": "or4", + "name": "or4#0", "pos": { "x": 275.0, "y": 445.0 } }, { - "id": "GUIram4", - "name": "GUIram4#0", + "id": "ram4", + "name": "ram4#0", "pos": { "x": 95.0, "y": 2220.0 } }, { - "id": "GUIsel3_4", - "name": "GUIsel3_4#0", + "id": "sel3_4", + "name": "sel3_4#0", "pos": { "x": 45.0, "y": 2310.0 } }, { - "id": "GUIsel3_4", - "name": "GUIsel3_4#1", + "id": "sel3_4", + "name": "sel3_4#1", "pos": { "x": 45.0, "y": 2510.0 @@ -915,7 +915,7 @@ "pinName": "I8" }, "pin2": { - "compName": "GUIAm2901DestDecode#0", + "compName": "Am2901DestDecode#0", "pinName": "I8" }, "name": "unnamedWire#0", @@ -927,7 +927,7 @@ "pinName": "I7" }, "pin2": { - "compName": "GUIAm2901DestDecode#0", + "compName": "Am2901DestDecode#0", "pinName": "I7" }, "name": "unnamedWire#1", @@ -956,7 +956,7 @@ }, { "pin1": { - "compName": "GUIAm2901ALUInclSourceDecodeInclFunctionDecode#0", + "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0", "pinName": "F3" }, "pin2": { @@ -1046,7 +1046,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIor4#0", + "compName": "or4#0", "pinName": "A1" }, "name": "unnamedWire#106", @@ -1058,7 +1058,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIor4#0", + "compName": "or4#0", "pinName": "A2" }, "name": "unnamedWire#107", @@ -1070,7 +1070,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIor4#0", + "compName": "or4#0", "pinName": "A3" }, "name": "unnamedWire#108", @@ -1082,7 +1082,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIor4#0", + "compName": "or4#0", "pinName": "A4" }, "name": "unnamedWire#109", @@ -1094,7 +1094,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#0", + "compName": "NandGate#0", "pinName": "A" }, "name": "unnamedWire#11", @@ -1111,7 +1111,7 @@ "pinName": "" }, "pin2": { - "compName": "GUImux1_4#0", + "compName": "mux1_4#0", "pinName": "I1_1" }, "name": "unnamedWire#110", @@ -1128,7 +1128,7 @@ "pinName": "" }, "pin2": { - "compName": "GUImux1_4#0", + "compName": "mux1_4#0", "pinName": "I1_2" }, "name": "unnamedWire#111", @@ -1145,7 +1145,7 @@ "pinName": "" }, "pin2": { - "compName": "GUImux1_4#0", + "compName": "mux1_4#0", "pinName": "I1_3" }, "name": "unnamedWire#112", @@ -1162,7 +1162,7 @@ "pinName": "" }, "pin2": { - "compName": "GUImux1_4#0", + "compName": "mux1_4#0", "pinName": "I1_4" }, "name": "unnamedWire#113", @@ -1226,7 +1226,7 @@ }, { "pin1": { - "compName": "GUIsel3_4#1", + "compName": "sel3_4#1", "pinName": "A1" }, "pin2": { @@ -1247,7 +1247,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIsel3_4#0", + "compName": "sel3_4#0", "pinName": "A2" }, "name": "unnamedWire#118", @@ -1259,7 +1259,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIsel3_4#0", + "compName": "sel3_4#0", "pinName": "A3" }, "name": "unnamedWire#119", @@ -1271,7 +1271,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#0", + "compName": "NandGate#0", "pinName": "B" }, "name": "unnamedWire#12", @@ -1283,7 +1283,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIsel3_4#0", + "compName": "sel3_4#0", "pinName": "A4" }, "name": "unnamedWire#120", @@ -1348,7 +1348,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIsel3_4#0", + "compName": "sel3_4#0", "pinName": "B1" }, "name": "unnamedWire#125", @@ -1360,7 +1360,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIsel3_4#0", + "compName": "sel3_4#0", "pinName": "B2" }, "name": "unnamedWire#126", @@ -1372,7 +1372,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIsel3_4#0", + "compName": "sel3_4#0", "pinName": "B3" }, "name": "unnamedWire#127", @@ -1384,7 +1384,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIsel3_4#0", + "compName": "sel3_4#0", "pinName": "B4" }, "name": "unnamedWire#128", @@ -1444,7 +1444,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIsel3_4#0", + "compName": "sel3_4#0", "pinName": "C1" }, "name": "unnamedWire#132", @@ -1456,7 +1456,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIsel3_4#0", + "compName": "sel3_4#0", "pinName": "C2" }, "name": "unnamedWire#133", @@ -1468,7 +1468,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIsel3_4#0", + "compName": "sel3_4#0", "pinName": "C3" }, "name": "unnamedWire#134", @@ -1480,7 +1480,7 @@ "pinName": "" }, "pin2": { - "compName": "GUITriStateBuffer#3", + "compName": "TriStateBuffer#3", "pinName": "IN" }, "name": "unnamedWire#135", @@ -1492,7 +1492,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIsel3_4#1", + "compName": "sel3_4#1", "pinName": "B1" }, "name": "unnamedWire#136", @@ -1509,7 +1509,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIsel3_4#1", + "compName": "sel3_4#1", "pinName": "B2" }, "name": "unnamedWire#137", @@ -1526,7 +1526,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIsel3_4#1", + "compName": "sel3_4#1", "pinName": "B3" }, "name": "unnamedWire#138", @@ -1543,7 +1543,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIsel3_4#1", + "compName": "sel3_4#1", "pinName": "B4" }, "name": "unnamedWire#139", @@ -1560,7 +1560,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIdlatch4#0", + "compName": "dlatch4#0", "pinName": "C" }, "name": "unnamedWire#14", @@ -1568,11 +1568,11 @@ }, { "pin1": { - "compName": "GUIsel3_4#0", + "compName": "sel3_4#0", "pinName": "Y1" }, "pin2": { - "compName": "GUIram4#0", + "compName": "ram4#0", "pinName": "D1" }, "name": "unnamedWire#140", @@ -1580,11 +1580,11 @@ }, { "pin1": { - "compName": "GUIsel3_4#0", + "compName": "sel3_4#0", "pinName": "Y2" }, "pin2": { - "compName": "GUIram4#0", + "compName": "ram4#0", "pinName": "D2" }, "name": "unnamedWire#141", @@ -1592,11 +1592,11 @@ }, { "pin1": { - "compName": "GUIsel3_4#0", + "compName": "sel3_4#0", "pinName": "Y3" }, "pin2": { - "compName": "GUIram4#0", + "compName": "ram4#0", "pinName": "D3" }, "name": "unnamedWire#142", @@ -1604,11 +1604,11 @@ }, { "pin1": { - "compName": "GUIsel3_4#0", + "compName": "sel3_4#0", "pinName": "Y4" }, "pin2": { - "compName": "GUIram4#0", + "compName": "ram4#0", "pinName": "D4" }, "name": "unnamedWire#143", @@ -1616,11 +1616,11 @@ }, { "pin1": { - "compName": "GUIAm2901DestDecode#0", + "compName": "Am2901DestDecode#0", "pinName": "RAMWE" }, "pin2": { - "compName": "GUIand#0", + "compName": "and#0", "pinName": "A" }, "name": "unnamedWire#144", @@ -1628,22 +1628,22 @@ }, { "pin1": { - "compName": "GUINandGate#0", + "compName": "NandGate#0", "pinName": "Y" }, "pin2": { - "compName": "GUIand#0", + "compName": "and#0", "pinName": "B" }, "name": "unnamedWire#145" }, { "pin1": { - "compName": "GUIand#0", + "compName": "and#0", "pinName": "Y" }, "pin2": { - "compName": "GUIram4#0", + "compName": "ram4#0", "pinName": "WE" }, "name": "unnamedWire#146", @@ -1668,11 +1668,11 @@ }, { "pin1": { - "compName": "GUIAm2901DestDecode#0", + "compName": "Am2901DestDecode#0", "pinName": "QWE" }, "pin2": { - "compName": "GUIdff4#0", + "compName": "dff4#0", "pinName": "WE" }, "name": "unnamedWire#147", @@ -1689,11 +1689,11 @@ }, { "pin1": { - "compName": "GUIAm2901DestDecode#0", + "compName": "Am2901DestDecode#0", "pinName": "YF" }, "pin2": { - "compName": "GUImux1_4#0", + "compName": "mux1_4#0", "pinName": "S0" }, "name": "unnamedWire#148", @@ -1710,7 +1710,7 @@ }, { "pin1": { - "compName": "GUImux1_4#0", + "compName": "mux1_4#0", "pinName": "Y1" }, "pin2": { @@ -1743,7 +1743,7 @@ }, { "pin1": { - "compName": "GUImux1_4#0", + "compName": "mux1_4#0", "pinName": "Y2" }, "pin2": { @@ -1755,7 +1755,7 @@ }, { "pin1": { - "compName": "GUImux1_4#0", + "compName": "mux1_4#0", "pinName": "Y3" }, "pin2": { @@ -1776,7 +1776,7 @@ }, { "pin1": { - "compName": "GUImux1_4#0", + "compName": "mux1_4#0", "pinName": "Y4" }, "pin2": { @@ -1797,7 +1797,7 @@ }, { "pin1": { - "compName": "GUIor4#0", + "compName": "or4#0", "pinName": "Y" }, "pin2": { @@ -1813,7 +1813,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#1", + "compName": "NandGate#1", "pinName": "A" }, "name": "unnamedWire#154", @@ -1830,7 +1830,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#1", + "compName": "NandGate#1", "pinName": "B" }, "name": "unnamedWire#155", @@ -1843,7 +1843,7 @@ }, { "pin1": { - "compName": "GUINandGate#1", + "compName": "NandGate#1", "pinName": "Y" }, "pin2": { @@ -1855,7 +1855,7 @@ }, { "pin1": { - "compName": "GUITriStateBuffer#3", + "compName": "TriStateBuffer#3", "pinName": "OUT" }, "pin2": { @@ -1871,7 +1871,7 @@ "pinName": "" }, "pin2": { - "compName": "GUITriStateBuffer#0", + "compName": "TriStateBuffer#0", "pinName": "OUT" }, "name": "unnamedWire#158", @@ -1896,7 +1896,7 @@ "pinName": "" }, "pin2": { - "compName": "GUITriStateBuffer#1", + "compName": "TriStateBuffer#1", "pinName": "IN" }, "name": "unnamedWire#159", @@ -1908,7 +1908,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIdlatch4#1", + "compName": "dlatch4#1", "pinName": "C" }, "name": "unnamedWire#16", @@ -1920,7 +1920,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIsel3_4#0", + "compName": "sel3_4#0", "pinName": "A1" }, "name": "unnamedWire#160", @@ -1937,7 +1937,7 @@ "pinName": "" }, "pin2": { - "compName": "GUITriStateBuffer#1", + "compName": "TriStateBuffer#1", "pinName": "OUT" }, "name": "unnamedWire#161", @@ -2008,7 +2008,7 @@ "pinName": "" }, "pin2": { - "compName": "GUITriStateBuffer#1", + "compName": "TriStateBuffer#1", "pinName": "EN" }, "name": "unnamedWire#165", @@ -2029,7 +2029,7 @@ "pinName": "" }, "pin2": { - "compName": "GUITriStateBuffer#0", + "compName": "TriStateBuffer#0", "pinName": "EN" }, "name": "unnamedWire#166", @@ -2077,7 +2077,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIdff4#0", + "compName": "dff4#0", "pinName": "C" }, "name": "unnamedWire#17", @@ -2098,7 +2098,7 @@ }, { "pin1": { - "compName": "GUITriStateBuffer#3", + "compName": "TriStateBuffer#3", "pinName": "EN" }, "pin2": { @@ -2114,7 +2114,7 @@ "pinName": "" }, "pin2": { - "compName": "GUITriStateBuffer#4", + "compName": "TriStateBuffer#4", "pinName": "IN" }, "name": "unnamedWire#171", @@ -2127,7 +2127,7 @@ }, { "pin1": { - "compName": "GUIAm2901DestDecode#0", + "compName": "Am2901DestDecode#0", "pinName": "LSH" }, "pin2": { @@ -2152,7 +2152,7 @@ }, { "pin1": { - "compName": "GUIAm2901DestDecode#0", + "compName": "Am2901DestDecode#0", "pinName": "NSH" }, "pin2": { @@ -2181,7 +2181,7 @@ "pinName": "I6" }, "pin2": { - "compName": "GUIAm2901DestDecode#0", + "compName": "Am2901DestDecode#0", "pinName": "I6" }, "name": "unnamedWire#2", @@ -2198,7 +2198,7 @@ }, { "pin1": { - "compName": "GUIAm2901DestDecode#0", + "compName": "Am2901DestDecode#0", "pinName": "RSH" }, "pin2": { @@ -2227,7 +2227,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIsel3_4#0", + "compName": "sel3_4#0", "pinName": "SA" }, "name": "unnamedWire#21", @@ -2239,7 +2239,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIsel3_4#0", + "compName": "sel3_4#0", "pinName": "SB" }, "name": "unnamedWire#22", @@ -2251,7 +2251,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIsel3_4#0", + "compName": "sel3_4#0", "pinName": "SC" }, "name": "unnamedWire#23", @@ -2263,7 +2263,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIsel3_4#1", + "compName": "sel3_4#1", "pinName": "SA" }, "name": "unnamedWire#24", @@ -2280,7 +2280,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIsel3_4#1", + "compName": "sel3_4#1", "pinName": "SB" }, "name": "unnamedWire#25", @@ -2293,7 +2293,7 @@ }, { "pin1": { - "compName": "GUIsel3_4#1", + "compName": "sel3_4#1", "pinName": "SC" }, "pin2": { @@ -2314,7 +2314,7 @@ "pinName": "A0" }, "pin2": { - "compName": "GUIram4#0", + "compName": "ram4#0", "pinName": "A0" }, "name": "unnamedWire#27", @@ -2335,7 +2335,7 @@ "pinName": "A1" }, "pin2": { - "compName": "GUIram4#0", + "compName": "ram4#0", "pinName": "A1" }, "name": "unnamedWire#28", @@ -2356,7 +2356,7 @@ "pinName": "A2" }, "pin2": { - "compName": "GUIram4#0", + "compName": "ram4#0", "pinName": "A2" }, "name": "unnamedWire#29", @@ -2377,7 +2377,7 @@ "pinName": "I5" }, "pin2": { - "compName": "GUIAm2901ALUInclSourceDecodeInclFunctionDecode#0", + "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0", "pinName": "I5" }, "name": "unnamedWire#3", @@ -2398,7 +2398,7 @@ "pinName": "A3" }, "pin2": { - "compName": "GUIram4#0", + "compName": "ram4#0", "pinName": "A3" }, "name": "unnamedWire#30", @@ -2419,7 +2419,7 @@ "pinName": "B0" }, "pin2": { - "compName": "GUIram4#0", + "compName": "ram4#0", "pinName": "B0" }, "name": "unnamedWire#31", @@ -2440,7 +2440,7 @@ "pinName": "B1" }, "pin2": { - "compName": "GUIram4#0", + "compName": "ram4#0", "pinName": "B1" }, "name": "unnamedWire#32", @@ -2461,7 +2461,7 @@ "pinName": "B2" }, "pin2": { - "compName": "GUIram4#0", + "compName": "ram4#0", "pinName": "B2" }, "name": "unnamedWire#33", @@ -2482,7 +2482,7 @@ "pinName": "B3" }, "pin2": { - "compName": "GUIram4#0", + "compName": "ram4#0", "pinName": "B3" }, "name": "unnamedWire#34", @@ -2499,11 +2499,11 @@ }, { "pin1": { - "compName": "GUIram4#0", + "compName": "ram4#0", "pinName": "QA1" }, "pin2": { - "compName": "GUIdlatch4#0", + "compName": "dlatch4#0", "pinName": "D1" }, "name": "unnamedWire#35", @@ -2511,11 +2511,11 @@ }, { "pin1": { - "compName": "GUIram4#0", + "compName": "ram4#0", "pinName": "QA2" }, "pin2": { - "compName": "GUIdlatch4#0", + "compName": "dlatch4#0", "pinName": "D2" }, "name": "unnamedWire#36", @@ -2523,11 +2523,11 @@ }, { "pin1": { - "compName": "GUIram4#0", + "compName": "ram4#0", "pinName": "QA3" }, "pin2": { - "compName": "GUIdlatch4#0", + "compName": "dlatch4#0", "pinName": "D3" }, "name": "unnamedWire#37", @@ -2535,11 +2535,11 @@ }, { "pin1": { - "compName": "GUIram4#0", + "compName": "ram4#0", "pinName": "QA4" }, "pin2": { - "compName": "GUIdlatch4#0", + "compName": "dlatch4#0", "pinName": "D4" }, "name": "unnamedWire#38", @@ -2547,11 +2547,11 @@ }, { "pin1": { - "compName": "GUIram4#0", + "compName": "ram4#0", "pinName": "QB1" }, "pin2": { - "compName": "GUIdlatch4#1", + "compName": "dlatch4#1", "pinName": "D1" }, "name": "unnamedWire#39", @@ -2572,7 +2572,7 @@ "pinName": "I4" }, "pin2": { - "compName": "GUIAm2901ALUInclSourceDecodeInclFunctionDecode#0", + "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0", "pinName": "I4" }, "name": "unnamedWire#4", @@ -2589,11 +2589,11 @@ }, { "pin1": { - "compName": "GUIram4#0", + "compName": "ram4#0", "pinName": "QB2" }, "pin2": { - "compName": "GUIdlatch4#1", + "compName": "dlatch4#1", "pinName": "D2" }, "name": "unnamedWire#40", @@ -2610,11 +2610,11 @@ }, { "pin1": { - "compName": "GUIram4#0", + "compName": "ram4#0", "pinName": "QB3" }, "pin2": { - "compName": "GUIdlatch4#1", + "compName": "dlatch4#1", "pinName": "D3" }, "name": "unnamedWire#41", @@ -2631,11 +2631,11 @@ }, { "pin1": { - "compName": "GUIram4#0", + "compName": "ram4#0", "pinName": "QB4" }, "pin2": { - "compName": "GUIdlatch4#1", + "compName": "dlatch4#1", "pinName": "D4" }, "name": "unnamedWire#42", @@ -2656,7 +2656,7 @@ "pinName": "Cn" }, "pin2": { - "compName": "GUIAm2901ALUInclSourceDecodeInclFunctionDecode#0", + "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0", "pinName": "Cn" }, "name": "unnamedWire#43", @@ -2677,7 +2677,7 @@ "pinName": "D1" }, "pin2": { - "compName": "GUIAm2901ALUInclSourceDecodeInclFunctionDecode#0", + "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0", "pinName": "D1" }, "name": "unnamedWire#44", @@ -2698,7 +2698,7 @@ "pinName": "D2" }, "pin2": { - "compName": "GUIAm2901ALUInclSourceDecodeInclFunctionDecode#0", + "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0", "pinName": "D2" }, "name": "unnamedWire#45", @@ -2719,7 +2719,7 @@ "pinName": "D3" }, "pin2": { - "compName": "GUIAm2901ALUInclSourceDecodeInclFunctionDecode#0", + "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0", "pinName": "D3" }, "name": "unnamedWire#46", @@ -2740,7 +2740,7 @@ "pinName": "D4" }, "pin2": { - "compName": "GUIAm2901ALUInclSourceDecodeInclFunctionDecode#0", + "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0", "pinName": "D4" }, "name": "unnamedWire#47", @@ -2757,7 +2757,7 @@ }, { "pin1": { - "compName": "GUIdlatch4#0", + "compName": "dlatch4#0", "pinName": "Q1" }, "pin2": { @@ -2769,7 +2769,7 @@ }, { "pin1": { - "compName": "GUIdlatch4#0", + "compName": "dlatch4#0", "pinName": "Q2" }, "pin2": { @@ -2785,7 +2785,7 @@ "pinName": "I3" }, "pin2": { - "compName": "GUIAm2901ALUInclSourceDecodeInclFunctionDecode#0", + "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0", "pinName": "I3" }, "name": "unnamedWire#5", @@ -2802,7 +2802,7 @@ }, { "pin1": { - "compName": "GUIdlatch4#0", + "compName": "dlatch4#0", "pinName": "Q3" }, "pin2": { @@ -2814,7 +2814,7 @@ }, { "pin1": { - "compName": "GUIdlatch4#0", + "compName": "dlatch4#0", "pinName": "Q4" }, "pin2": { @@ -2830,7 +2830,7 @@ "pinName": "" }, "pin2": { - "compName": "GUImux1_4#0", + "compName": "mux1_4#0", "pinName": "I0_1" }, "name": "unnamedWire#52", @@ -2847,7 +2847,7 @@ "pinName": "" }, "pin2": { - "compName": "GUImux1_4#0", + "compName": "mux1_4#0", "pinName": "I0_2" }, "name": "unnamedWire#53", @@ -2864,7 +2864,7 @@ "pinName": "" }, "pin2": { - "compName": "GUImux1_4#0", + "compName": "mux1_4#0", "pinName": "I0_3" }, "name": "unnamedWire#54", @@ -2881,7 +2881,7 @@ "pinName": "" }, "pin2": { - "compName": "GUImux1_4#0", + "compName": "mux1_4#0", "pinName": "I0_4" }, "name": "unnamedWire#55", @@ -2898,7 +2898,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIAm2901ALUInclSourceDecodeInclFunctionDecode#0", + "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0", "pinName": "A1" }, "name": "unnamedWire#56", @@ -2910,7 +2910,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIAm2901ALUInclSourceDecodeInclFunctionDecode#0", + "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0", "pinName": "A2" }, "name": "unnamedWire#57", @@ -2922,7 +2922,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIAm2901ALUInclSourceDecodeInclFunctionDecode#0", + "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0", "pinName": "A3" }, "name": "unnamedWire#58", @@ -2934,7 +2934,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIAm2901ALUInclSourceDecodeInclFunctionDecode#0", + "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0", "pinName": "A4" }, "name": "unnamedWire#59", @@ -2946,7 +2946,7 @@ "pinName": "I2" }, "pin2": { - "compName": "GUIAm2901ALUInclSourceDecodeInclFunctionDecode#0", + "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0", "pinName": "I2" }, "name": "unnamedWire#6", @@ -2963,11 +2963,11 @@ }, { "pin1": { - "compName": "GUIdlatch4#1", + "compName": "dlatch4#1", "pinName": "Q1" }, "pin2": { - "compName": "GUIAm2901ALUInclSourceDecodeInclFunctionDecode#0", + "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0", "pinName": "B1" }, "name": "unnamedWire#60", @@ -2984,11 +2984,11 @@ }, { "pin1": { - "compName": "GUIdlatch4#1", + "compName": "dlatch4#1", "pinName": "Q2" }, "pin2": { - "compName": "GUIAm2901ALUInclSourceDecodeInclFunctionDecode#0", + "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0", "pinName": "B2" }, "name": "unnamedWire#61", @@ -3005,11 +3005,11 @@ }, { "pin1": { - "compName": "GUIdlatch4#1", + "compName": "dlatch4#1", "pinName": "Q3" }, "pin2": { - "compName": "GUIAm2901ALUInclSourceDecodeInclFunctionDecode#0", + "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0", "pinName": "B3" }, "name": "unnamedWire#62", @@ -3026,11 +3026,11 @@ }, { "pin1": { - "compName": "GUIdlatch4#1", + "compName": "dlatch4#1", "pinName": "Q4" }, "pin2": { - "compName": "GUIAm2901ALUInclSourceDecodeInclFunctionDecode#0", + "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0", "pinName": "B4" }, "name": "unnamedWire#63", @@ -3047,7 +3047,7 @@ }, { "pin1": { - "compName": "GUIdff4#0", + "compName": "dff4#0", "pinName": "Q1" }, "pin2": { @@ -3059,7 +3059,7 @@ }, { "pin1": { - "compName": "GUIdff4#0", + "compName": "dff4#0", "pinName": "Q2" }, "pin2": { @@ -3071,7 +3071,7 @@ }, { "pin1": { - "compName": "GUIdff4#0", + "compName": "dff4#0", "pinName": "Q3" }, "pin2": { @@ -3083,7 +3083,7 @@ }, { "pin1": { - "compName": "GUIdff4#0", + "compName": "dff4#0", "pinName": "Q4" }, "pin2": { @@ -3111,7 +3111,7 @@ "pinName": "" }, "pin2": { - "compName": "GUITriStateBuffer#0", + "compName": "TriStateBuffer#0", "pinName": "IN" }, "name": "unnamedWire#69", @@ -3123,7 +3123,7 @@ "pinName": "I1" }, "pin2": { - "compName": "GUIAm2901ALUInclSourceDecodeInclFunctionDecode#0", + "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0", "pinName": "I1" }, "name": "unnamedWire#7", @@ -3226,7 +3226,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIsel3_4#1", + "compName": "sel3_4#1", "pinName": "C1" }, "name": "unnamedWire#74", @@ -3238,7 +3238,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIsel3_4#1", + "compName": "sel3_4#1", "pinName": "C2" }, "name": "unnamedWire#75", @@ -3250,7 +3250,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIsel3_4#1", + "compName": "sel3_4#1", "pinName": "C3" }, "name": "unnamedWire#76", @@ -3275,7 +3275,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIsel3_4#1", + "compName": "sel3_4#1", "pinName": "C4" }, "name": "unnamedWire#77", @@ -3299,7 +3299,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIsel3_4#1", + "compName": "sel3_4#1", "pinName": "A2" }, "name": "unnamedWire#79", @@ -3332,7 +3332,7 @@ "pinName": "I0" }, "pin2": { - "compName": "GUIAm2901ALUInclSourceDecodeInclFunctionDecode#0", + "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0", "pinName": "I0" }, "name": "unnamedWire#8", @@ -3353,7 +3353,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIAm2901ALUInclSourceDecodeInclFunctionDecode#0", + "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0", "pinName": "Q1" }, "name": "unnamedWire#80", @@ -3370,7 +3370,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIAm2901ALUInclSourceDecodeInclFunctionDecode#0", + "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0", "pinName": "Q2" }, "name": "unnamedWire#81", @@ -3391,7 +3391,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIAm2901ALUInclSourceDecodeInclFunctionDecode#0", + "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0", "pinName": "Q3" }, "name": "unnamedWire#82", @@ -3412,7 +3412,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIAm2901ALUInclSourceDecodeInclFunctionDecode#0", + "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0", "pinName": "Q4" }, "name": "unnamedWire#83", @@ -3429,7 +3429,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIsel3_4#1", + "compName": "sel3_4#1", "pinName": "A3" }, "name": "unnamedWire#84", @@ -3446,7 +3446,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIsel3_4#1", + "compName": "sel3_4#1", "pinName": "A4" }, "name": "unnamedWire#85", @@ -3459,11 +3459,11 @@ }, { "pin1": { - "compName": "GUIsel3_4#1", + "compName": "sel3_4#1", "pinName": "Y1" }, "pin2": { - "compName": "GUIdff4#0", + "compName": "dff4#0", "pinName": "D1" }, "name": "unnamedWire#86", @@ -3471,11 +3471,11 @@ }, { "pin1": { - "compName": "GUIsel3_4#1", + "compName": "sel3_4#1", "pinName": "Y2" }, "pin2": { - "compName": "GUIdff4#0", + "compName": "dff4#0", "pinName": "D2" }, "name": "unnamedWire#87", @@ -3483,11 +3483,11 @@ }, { "pin1": { - "compName": "GUIsel3_4#1", + "compName": "sel3_4#1", "pinName": "Y3" }, "pin2": { - "compName": "GUIdff4#0", + "compName": "dff4#0", "pinName": "D3" }, "name": "unnamedWire#88", @@ -3495,11 +3495,11 @@ }, { "pin1": { - "compName": "GUIsel3_4#1", + "compName": "sel3_4#1", "pinName": "Y4" }, "pin2": { - "compName": "GUIdff4#0", + "compName": "dff4#0", "pinName": "D4" }, "name": "unnamedWire#89", @@ -3519,7 +3519,7 @@ }, { "pin1": { - "compName": "GUIAm2901ALUInclSourceDecodeInclFunctionDecode#0", + "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0", "pinName": "Cn+4" }, "pin2": { @@ -3540,7 +3540,7 @@ }, { "pin1": { - "compName": "GUIAm2901ALUInclSourceDecodeInclFunctionDecode#0", + "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0", "pinName": "OVR" }, "pin2": { @@ -3561,7 +3561,7 @@ }, { "pin1": { - "compName": "GUIAm2901ALUInclSourceDecodeInclFunctionDecode#0", + "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0", "pinName": "F1" }, "pin2": { @@ -3573,7 +3573,7 @@ }, { "pin1": { - "compName": "GUIAm2901ALUInclSourceDecodeInclFunctionDecode#0", + "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0", "pinName": "F4" }, "pin2": { @@ -3585,7 +3585,7 @@ }, { "pin1": { - "compName": "GUITriStateBuffer#4", + "compName": "TriStateBuffer#4", "pinName": "OUT" }, "pin2": { @@ -3601,7 +3601,7 @@ "pinName": "" }, "pin2": { - "compName": "GUITriStateBuffer#4", + "compName": "TriStateBuffer#4", "pinName": "EN" }, "name": "unnamedWire#95", @@ -3613,7 +3613,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIsel3_4#0", + "compName": "sel3_4#0", "pinName": "C4" }, "name": "unnamedWire#96", @@ -3655,7 +3655,7 @@ }, { "pin1": { - "compName": "GUIAm2901ALUInclSourceDecodeInclFunctionDecode#0", + "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0", "pinName": "F2" }, "pin2": { @@ -3679,7 +3679,7 @@ }, "symbolRendererSnippetID": "simpleRectangularLike", "symbolRendererParams": { - "centerText": "GUIAm2901", + "centerText": "Am2901", "centerTextHeight": 5.0, "horizontalComponentCenter": 17.5, "pinLabelHeight": 3.5, @@ -3692,13 +3692,13 @@ "qreg": { "id": "delegating", "params": { - "delegateTarget": "GUIdff4#0" + "delegateTarget": "dff4#0" } }, "regs": { "id": "delegating", "params": { - "delegateTarget": "GUIram4#0" + "delegateTarget": "ram4#0" } } }, diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/GUIAm2901ALUFuncDecode.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901ALUFuncDecode.json similarity index 90% rename from net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/GUIAm2901ALUFuncDecode.json rename to net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901ALUFuncDecode.json index 92d2200e..ff3e377c 100644 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/GUIAm2901ALUFuncDecode.json +++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901ALUFuncDecode.json @@ -88,8 +88,8 @@ "submodel": { "components": [ { - "id": "GUINandGate", - "name": "GUINandGate#0", + "id": "NandGate", + "name": "NandGate#0", "pos": { "x": 15.0, "y": 10.0 @@ -97,8 +97,8 @@ "params": 1 }, { - "id": "GUINandGate", - "name": "GUINandGate#1", + "id": "NandGate", + "name": "NandGate#1", "pos": { "x": 15.0, "y": 50.0 @@ -106,8 +106,8 @@ "params": 1 }, { - "id": "GUINandGate", - "name": "GUINandGate#2", + "id": "NandGate", + "name": "NandGate#2", "pos": { "x": 55.0, "y": 45.0 @@ -115,8 +115,8 @@ "params": 1 }, { - "id": "GUINandGate", - "name": "GUINandGate#3", + "id": "NandGate", + "name": "NandGate#3", "pos": { "x": 55.0, "y": 70.0 @@ -124,8 +124,8 @@ "params": 1 }, { - "id": "GUINandGate", - "name": "GUINandGate#4", + "id": "NandGate", + "name": "NandGate#4", "pos": { "x": 100.0, "y": 50.0 @@ -133,16 +133,16 @@ "params": 1 }, { - "id": "GUIand", - "name": "GUIand#0", + "id": "and", + "name": "and#0", "pos": { "x": 100.0, "y": 135.0 } }, { - "id": "GUInand3", - "name": "GUInand3#0", + "id": "nand3", + "name": "nand3#0", "pos": { "x": 55.0, "y": 10.0 @@ -267,7 +267,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#0", + "compName": "NandGate#0", "pinName": "A" }, "name": "unnamedWire#1", @@ -284,7 +284,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#1", + "compName": "NandGate#1", "pinName": "A" }, "name": "unnamedWire#10", @@ -308,7 +308,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#1", + "compName": "NandGate#1", "pinName": "B" }, "name": "unnamedWire#12", @@ -332,7 +332,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#3", + "compName": "NandGate#3", "pinName": "B" }, "name": "unnamedWire#14", @@ -415,7 +415,7 @@ "pinName": "" }, "pin2": { - "compName": "GUInand3#0", + "compName": "nand3#0", "pinName": "B" }, "name": "unnamedWire#19", @@ -444,7 +444,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#3", + "compName": "NandGate#3", "pinName": "A" }, "name": "unnamedWire#20", @@ -452,7 +452,7 @@ }, { "pin1": { - "compName": "GUINandGate#0", + "compName": "NandGate#0", "pinName": "Y" }, "pin2": { @@ -505,7 +505,7 @@ "pinName": "" }, "pin2": { - "compName": "GUInand3#0", + "compName": "nand3#0", "pinName": "C" }, "name": "unnamedWire#24", @@ -517,7 +517,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIand#0", + "compName": "and#0", "pinName": "B" }, "name": "unnamedWire#25", @@ -530,11 +530,11 @@ }, { "pin1": { - "compName": "GUINandGate#1", + "compName": "NandGate#1", "pinName": "Y" }, "pin2": { - "compName": "GUINandGate#2", + "compName": "NandGate#2", "pinName": "B" }, "name": "unnamedWire#26", @@ -542,33 +542,33 @@ }, { "pin1": { - "compName": "GUInand3#0", + "compName": "nand3#0", "pinName": "Y" }, "pin2": { - "compName": "GUINandGate#4", + "compName": "NandGate#4", "pinName": "A" }, "name": "unnamedWire#27" }, { "pin1": { - "compName": "GUINandGate#2", + "compName": "NandGate#2", "pinName": "Y" }, "pin2": { - "compName": "GUINandGate#4", + "compName": "NandGate#4", "pinName": "B" }, "name": "unnamedWire#28" }, { "pin1": { - "compName": "GUINandGate#3", + "compName": "NandGate#3", "pinName": "Y" }, "pin2": { - "compName": "GUIand#0", + "compName": "and#0", "pinName": "A" }, "name": "unnamedWire#29" @@ -579,7 +579,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#0", + "compName": "NandGate#0", "pinName": "B" }, "name": "unnamedWire#3", @@ -587,7 +587,7 @@ }, { "pin1": { - "compName": "GUINandGate#4", + "compName": "NandGate#4", "pinName": "Y" }, "pin2": { @@ -599,7 +599,7 @@ }, { "pin1": { - "compName": "GUIand#0", + "compName": "and#0", "pinName": "Y" }, "pin2": { @@ -627,7 +627,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#2", + "compName": "NandGate#2", "pinName": "A" }, "name": "unnamedWire#5", @@ -689,7 +689,7 @@ "pinName": "" }, "pin2": { - "compName": "GUInand3#0", + "compName": "nand3#0", "pinName": "A" }, "name": "unnamedWire#9", @@ -713,7 +713,7 @@ }, "symbolRendererSnippetID": "simpleRectangularLike", "symbolRendererParams": { - "centerText": "GUIAm2901ALUFuncDecode", + "centerText": "Am2901ALUFuncDecode", "centerTextHeight": 5.0, "horizontalComponentCenter": 17.5, "pinLabelHeight": 3.5, diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/GUIAm2901ALUInclDecode.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901ALUInclDecode.json similarity index 90% rename from net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/GUIAm2901ALUInclDecode.json rename to net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901ALUInclDecode.json index 2dec1af2..314cfc23 100644 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/GUIAm2901ALUInclDecode.json +++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901ALUInclDecode.json @@ -169,48 +169,48 @@ "submodel": { "components": [ { - "id": "GUIAm2901ALUFuncDecode", - "name": "GUIAm2901ALUFuncDecode#0", + "id": "Am2901ALUFuncDecode", + "name": "Am2901ALUFuncDecode#0", "pos": { "x": 20.0, "y": 2.5 } }, { - "id": "GUIAm2901ALUOneBit", - "name": "GUIAm2901ALUOneBit#0", + "id": "Am2901ALUOneBit", + "name": "Am2901ALUOneBit#0", "pos": { "x": 45.0, "y": 80.0 } }, { - "id": "GUIAm2901ALUOneBit", - "name": "GUIAm2901ALUOneBit#1", + "id": "Am2901ALUOneBit", + "name": "Am2901ALUOneBit#1", "pos": { "x": 45.0, "y": 180.0 } }, { - "id": "GUIAm2901ALUOneBit", - "name": "GUIAm2901ALUOneBit#2", + "id": "Am2901ALUOneBit", + "name": "Am2901ALUOneBit#2", "pos": { "x": 45.0, "y": 280.0 } }, { - "id": "GUIAm2901ALUOneBit", - "name": "GUIAm2901ALUOneBit#3", + "id": "Am2901ALUOneBit", + "name": "Am2901ALUOneBit#3", "pos": { "x": 45.0, "y": 380.0 } }, { - "id": "GUIxor", - "name": "GUIxor#0", + "id": "xor", + "name": "xor#0", "pos": { "x": 95.0, "y": 400.0 @@ -404,7 +404,7 @@ "pinName": "I5" }, "pin2": { - "compName": "GUIAm2901ALUFuncDecode#0", + "compName": "Am2901ALUFuncDecode#0", "pinName": "I5" }, "name": "unnamedWire#0", @@ -425,7 +425,7 @@ "pinName": "I4" }, "pin2": { - "compName": "GUIAm2901ALUFuncDecode#0", + "compName": "Am2901ALUFuncDecode#0", "pinName": "I4" }, "name": "unnamedWire#1", @@ -442,7 +442,7 @@ }, { "pin1": { - "compName": "GUIAm2901ALUFuncDecode#0", + "compName": "Am2901ALUFuncDecode#0", "pinName": "CinE" }, "pin2": { @@ -495,7 +495,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIAm2901ALUOneBit#0", + "compName": "Am2901ALUOneBit#0", "pinName": "CinE" }, "name": "unnamedWire#13", @@ -507,7 +507,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIAm2901ALUOneBit#1", + "compName": "Am2901ALUOneBit#1", "pinName": "CinE" }, "name": "unnamedWire#14", @@ -519,7 +519,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIAm2901ALUOneBit#2", + "compName": "Am2901ALUOneBit#2", "pinName": "CinE" }, "name": "unnamedWire#15", @@ -531,7 +531,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIAm2901ALUOneBit#3", + "compName": "Am2901ALUOneBit#3", "pinName": "CinE" }, "name": "unnamedWire#16", @@ -544,7 +544,7 @@ }, { "pin1": { - "compName": "GUIAm2901ALUFuncDecode#0", + "compName": "Am2901ALUFuncDecode#0", "pinName": "RN" }, "pin2": { @@ -597,7 +597,7 @@ "pinName": "I3" }, "pin2": { - "compName": "GUIAm2901ALUFuncDecode#0", + "compName": "Am2901ALUFuncDecode#0", "pinName": "I3" }, "name": "unnamedWire#2", @@ -618,7 +618,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIAm2901ALUOneBit#0", + "compName": "Am2901ALUOneBit#0", "pinName": "RN" }, "name": "unnamedWire#20", @@ -630,7 +630,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIAm2901ALUOneBit#1", + "compName": "Am2901ALUOneBit#1", "pinName": "RN" }, "name": "unnamedWire#21", @@ -642,7 +642,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIAm2901ALUOneBit#2", + "compName": "Am2901ALUOneBit#2", "pinName": "RN" }, "name": "unnamedWire#22", @@ -654,7 +654,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIAm2901ALUOneBit#3", + "compName": "Am2901ALUOneBit#3", "pinName": "RN" }, "name": "unnamedWire#23", @@ -667,7 +667,7 @@ }, { "pin1": { - "compName": "GUIAm2901ALUFuncDecode#0", + "compName": "Am2901ALUFuncDecode#0", "pinName": "SN" }, "pin2": { @@ -720,7 +720,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIAm2901ALUOneBit#0", + "compName": "Am2901ALUOneBit#0", "pinName": "SN" }, "name": "unnamedWire#27", @@ -732,7 +732,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIAm2901ALUOneBit#1", + "compName": "Am2901ALUOneBit#1", "pinName": "SN" }, "name": "unnamedWire#28", @@ -744,7 +744,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIAm2901ALUOneBit#2", + "compName": "Am2901ALUOneBit#2", "pinName": "SN" }, "name": "unnamedWire#29", @@ -752,7 +752,7 @@ }, { "pin1": { - "compName": "GUIAm2901ALUFuncDecode#0", + "compName": "Am2901ALUFuncDecode#0", "pinName": "SBE" }, "pin2": { @@ -781,7 +781,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIAm2901ALUOneBit#3", + "compName": "Am2901ALUOneBit#3", "pinName": "SN" }, "name": "unnamedWire#30", @@ -794,7 +794,7 @@ }, { "pin1": { - "compName": "GUIAm2901ALUFuncDecode#0", + "compName": "Am2901ALUFuncDecode#0", "pinName": "FN" }, "pin2": { @@ -847,7 +847,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIAm2901ALUOneBit#0", + "compName": "Am2901ALUOneBit#0", "pinName": "FN" }, "name": "unnamedWire#34", @@ -859,7 +859,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIAm2901ALUOneBit#1", + "compName": "Am2901ALUOneBit#1", "pinName": "FN" }, "name": "unnamedWire#35", @@ -871,7 +871,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIAm2901ALUOneBit#2", + "compName": "Am2901ALUOneBit#2", "pinName": "FN" }, "name": "unnamedWire#36", @@ -883,7 +883,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIAm2901ALUOneBit#3", + "compName": "Am2901ALUOneBit#3", "pinName": "FN" }, "name": "unnamedWire#37", @@ -896,7 +896,7 @@ }, { "pin1": { - "compName": "GUIAm2901ALUFuncDecode#0", + "compName": "Am2901ALUFuncDecode#0", "pinName": "L" }, "pin2": { @@ -961,7 +961,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIAm2901ALUOneBit#0", + "compName": "Am2901ALUOneBit#0", "pinName": "L" }, "name": "unnamedWire#41", @@ -973,7 +973,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIAm2901ALUOneBit#1", + "compName": "Am2901ALUOneBit#1", "pinName": "L" }, "name": "unnamedWire#42", @@ -985,7 +985,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIAm2901ALUOneBit#2", + "compName": "Am2901ALUOneBit#2", "pinName": "L" }, "name": "unnamedWire#43", @@ -997,7 +997,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIAm2901ALUOneBit#3", + "compName": "Am2901ALUOneBit#3", "pinName": "L" }, "name": "unnamedWire#44", @@ -1014,7 +1014,7 @@ "pinName": "R1" }, "pin2": { - "compName": "GUIAm2901ALUOneBit#0", + "compName": "Am2901ALUOneBit#0", "pinName": "R" }, "name": "unnamedWire#45", @@ -1035,7 +1035,7 @@ "pinName": "R2" }, "pin2": { - "compName": "GUIAm2901ALUOneBit#1", + "compName": "Am2901ALUOneBit#1", "pinName": "R" }, "name": "unnamedWire#46", @@ -1056,7 +1056,7 @@ "pinName": "R3" }, "pin2": { - "compName": "GUIAm2901ALUOneBit#2", + "compName": "Am2901ALUOneBit#2", "pinName": "R" }, "name": "unnamedWire#47", @@ -1077,7 +1077,7 @@ "pinName": "R4" }, "pin2": { - "compName": "GUIAm2901ALUOneBit#3", + "compName": "Am2901ALUOneBit#3", "pinName": "R" }, "name": "unnamedWire#48", @@ -1098,7 +1098,7 @@ "pinName": "S1" }, "pin2": { - "compName": "GUIAm2901ALUOneBit#0", + "compName": "Am2901ALUOneBit#0", "pinName": "S" }, "name": "unnamedWire#49", @@ -1131,7 +1131,7 @@ "pinName": "S2" }, "pin2": { - "compName": "GUIAm2901ALUOneBit#1", + "compName": "Am2901ALUOneBit#1", "pinName": "S" }, "name": "unnamedWire#50", @@ -1152,7 +1152,7 @@ "pinName": "S3" }, "pin2": { - "compName": "GUIAm2901ALUOneBit#2", + "compName": "Am2901ALUOneBit#2", "pinName": "S" }, "name": "unnamedWire#51", @@ -1173,7 +1173,7 @@ "pinName": "S4" }, "pin2": { - "compName": "GUIAm2901ALUOneBit#3", + "compName": "Am2901ALUOneBit#3", "pinName": "S" }, "name": "unnamedWire#52", @@ -1194,7 +1194,7 @@ "pinName": "Cn" }, "pin2": { - "compName": "GUIAm2901ALUOneBit#0", + "compName": "Am2901ALUOneBit#0", "pinName": "Cin" }, "name": "unnamedWire#53", @@ -1211,11 +1211,11 @@ }, { "pin1": { - "compName": "GUIAm2901ALUOneBit#0", + "compName": "Am2901ALUOneBit#0", "pinName": "Cout" }, "pin2": { - "compName": "GUIAm2901ALUOneBit#1", + "compName": "Am2901ALUOneBit#1", "pinName": "Cin" }, "name": "unnamedWire#54", @@ -1240,11 +1240,11 @@ }, { "pin1": { - "compName": "GUIAm2901ALUOneBit#1", + "compName": "Am2901ALUOneBit#1", "pinName": "Cout" }, "pin2": { - "compName": "GUIAm2901ALUOneBit#2", + "compName": "Am2901ALUOneBit#2", "pinName": "Cin" }, "name": "unnamedWire#55", @@ -1269,7 +1269,7 @@ }, { "pin1": { - "compName": "GUIAm2901ALUOneBit#2", + "compName": "Am2901ALUOneBit#2", "pinName": "Cout" }, "pin2": { @@ -1290,7 +1290,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIAm2901ALUOneBit#3", + "compName": "Am2901ALUOneBit#3", "pinName": "Cin" }, "name": "unnamedWire#57", @@ -1307,7 +1307,7 @@ }, { "pin1": { - "compName": "GUIAm2901ALUOneBit#3", + "compName": "Am2901ALUOneBit#3", "pinName": "Cout" }, "pin2": { @@ -1319,7 +1319,7 @@ }, { "pin1": { - "compName": "GUIAm2901ALUOneBit#0", + "compName": "Am2901ALUOneBit#0", "pinName": "F" }, "pin2": { @@ -1344,7 +1344,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIAm2901ALUOneBit#0", + "compName": "Am2901ALUOneBit#0", "pinName": "CoutE" }, "name": "unnamedWire#6", @@ -1352,7 +1352,7 @@ }, { "pin1": { - "compName": "GUIAm2901ALUOneBit#1", + "compName": "Am2901ALUOneBit#1", "pinName": "F" }, "pin2": { @@ -1373,7 +1373,7 @@ }, { "pin1": { - "compName": "GUIAm2901ALUOneBit#2", + "compName": "Am2901ALUOneBit#2", "pinName": "F" }, "pin2": { @@ -1394,7 +1394,7 @@ }, { "pin1": { - "compName": "GUIAm2901ALUOneBit#3", + "compName": "Am2901ALUOneBit#3", "pinName": "F" }, "pin2": { @@ -1419,7 +1419,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIxor#0", + "compName": "xor#0", "pinName": "A" }, "name": "unnamedWire#63", @@ -1440,7 +1440,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIxor#0", + "compName": "xor#0", "pinName": "B" }, "name": "unnamedWire#64", @@ -1474,7 +1474,7 @@ }, { "pin1": { - "compName": "GUIxor#0", + "compName": "xor#0", "pinName": "Y" }, "pin2": { @@ -1489,7 +1489,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIAm2901ALUOneBit#1", + "compName": "Am2901ALUOneBit#1", "pinName": "CoutE" }, "name": "unnamedWire#7", @@ -1501,7 +1501,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIAm2901ALUOneBit#2", + "compName": "Am2901ALUOneBit#2", "pinName": "CoutE" }, "name": "unnamedWire#8", @@ -1513,7 +1513,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIAm2901ALUOneBit#3", + "compName": "Am2901ALUOneBit#3", "pinName": "CoutE" }, "name": "unnamedWire#9", @@ -1529,7 +1529,7 @@ }, "symbolRendererSnippetID": "simpleRectangularLike", "symbolRendererParams": { - "centerText": "GUIAm2901ALUInclDecode", + "centerText": "Am2901ALUInclDecode", "centerTextHeight": 5.0, "horizontalComponentCenter": 17.5, "pinLabelHeight": 3.5, diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/GUIAm2901ALUInclSourceDecodeInclFunctionDecode.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901ALUInclSourceDecodeInclFunctionDecode.json similarity index 89% rename from net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/GUIAm2901ALUInclSourceDecodeInclFunctionDecode.json rename to net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901ALUInclSourceDecodeInclFunctionDecode.json index 2fa5c1b1..49a4cc6c 100644 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/GUIAm2901ALUInclSourceDecodeInclFunctionDecode.json +++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901ALUInclSourceDecodeInclFunctionDecode.json @@ -268,32 +268,32 @@ "submodel": { "components": [ { - "id": "GUIAm2901ALUInclDecode", - "name": "GUIAm2901ALUInclDecode#0", + "id": "Am2901ALUInclDecode", + "name": "Am2901ALUInclDecode#0", "pos": { "x": 60.0, "y": 15.0 } }, { - "id": "GUIAm2901SourceDecode", - "name": "GUIAm2901SourceDecode#0", + "id": "Am2901SourceDecode", + "name": "Am2901SourceDecode#0", "pos": { "x": 15.0, "y": 165.0 } }, { - "id": "GUIsel2_4", - "name": "GUIsel2_4#0", + "id": "sel2_4", + "name": "sel2_4#0", "pos": { "x": 45.0, "y": 365.0 } }, { - "id": "GUIsel3_4", - "name": "GUIsel3_4#0", + "id": "sel3_4", + "name": "sel3_4#0", "pos": { "x": 45.0, "y": 575.0 @@ -343,7 +343,7 @@ "pinName": "I5" }, "pin2": { - "compName": "GUIAm2901ALUInclDecode#0", + "compName": "Am2901ALUInclDecode#0", "pinName": "I5" }, "name": "unnamedWire#0", @@ -355,7 +355,7 @@ "pinName": "I4" }, "pin2": { - "compName": "GUIAm2901ALUInclDecode#0", + "compName": "Am2901ALUInclDecode#0", "pinName": "I4" }, "name": "unnamedWire#1", @@ -376,7 +376,7 @@ "pinName": "D4" }, "pin2": { - "compName": "GUIsel2_4#0", + "compName": "sel2_4#0", "pinName": "A4" }, "name": "unnamedWire#10", @@ -436,7 +436,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIsel2_4#0", + "compName": "sel2_4#0", "pinName": "B1" }, "name": "unnamedWire#15", @@ -453,7 +453,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIsel2_4#0", + "compName": "sel2_4#0", "pinName": "B2" }, "name": "unnamedWire#16", @@ -470,7 +470,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIsel2_4#0", + "compName": "sel2_4#0", "pinName": "B3" }, "name": "unnamedWire#17", @@ -487,7 +487,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIsel2_4#0", + "compName": "sel2_4#0", "pinName": "B4" }, "name": "unnamedWire#18", @@ -504,7 +504,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIsel3_4#0", + "compName": "sel3_4#0", "pinName": "A1" }, "name": "unnamedWire#19", @@ -521,7 +521,7 @@ "pinName": "I3" }, "pin2": { - "compName": "GUIAm2901ALUInclDecode#0", + "compName": "Am2901ALUInclDecode#0", "pinName": "I3" }, "name": "unnamedWire#2", @@ -542,7 +542,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIsel3_4#0", + "compName": "sel3_4#0", "pinName": "A2" }, "name": "unnamedWire#20", @@ -559,7 +559,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIsel3_4#0", + "compName": "sel3_4#0", "pinName": "A3" }, "name": "unnamedWire#21", @@ -576,7 +576,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIsel3_4#0", + "compName": "sel3_4#0", "pinName": "A4" }, "name": "unnamedWire#22", @@ -593,7 +593,7 @@ "pinName": "B1" }, "pin2": { - "compName": "GUIsel3_4#0", + "compName": "sel3_4#0", "pinName": "B1" }, "name": "unnamedWire#23", @@ -614,7 +614,7 @@ "pinName": "B2" }, "pin2": { - "compName": "GUIsel3_4#0", + "compName": "sel3_4#0", "pinName": "B2" }, "name": "unnamedWire#24", @@ -626,7 +626,7 @@ "pinName": "B3" }, "pin2": { - "compName": "GUIsel3_4#0", + "compName": "sel3_4#0", "pinName": "B3" }, "name": "unnamedWire#25", @@ -647,7 +647,7 @@ "pinName": "B4" }, "pin2": { - "compName": "GUIsel3_4#0", + "compName": "sel3_4#0", "pinName": "B4" }, "name": "unnamedWire#26", @@ -668,7 +668,7 @@ "pinName": "Q1" }, "pin2": { - "compName": "GUIsel3_4#0", + "compName": "sel3_4#0", "pinName": "C1" }, "name": "unnamedWire#27", @@ -689,7 +689,7 @@ "pinName": "Q2" }, "pin2": { - "compName": "GUIsel3_4#0", + "compName": "sel3_4#0", "pinName": "C2" }, "name": "unnamedWire#28", @@ -710,7 +710,7 @@ "pinName": "Q3" }, "pin2": { - "compName": "GUIsel3_4#0", + "compName": "sel3_4#0", "pinName": "C3" }, "name": "unnamedWire#29", @@ -731,7 +731,7 @@ "pinName": "I2" }, "pin2": { - "compName": "GUIAm2901SourceDecode#0", + "compName": "Am2901SourceDecode#0", "pinName": "I2" }, "name": "unnamedWire#3", @@ -752,7 +752,7 @@ "pinName": "Q4" }, "pin2": { - "compName": "GUIsel3_4#0", + "compName": "sel3_4#0", "pinName": "C4" }, "name": "unnamedWire#30", @@ -769,11 +769,11 @@ }, { "pin1": { - "compName": "GUIAm2901SourceDecode#0", + "compName": "Am2901SourceDecode#0", "pinName": "SQ" }, "pin2": { - "compName": "GUIsel3_4#0", + "compName": "sel3_4#0", "pinName": "SC" }, "name": "unnamedWire#31", @@ -798,11 +798,11 @@ }, { "pin1": { - "compName": "GUIAm2901SourceDecode#0", + "compName": "Am2901SourceDecode#0", "pinName": "RA" }, "pin2": { - "compName": "GUIsel2_4#0", + "compName": "sel2_4#0", "pinName": "SB" }, "name": "unnamedWire#32", @@ -827,11 +827,11 @@ }, { "pin1": { - "compName": "GUIAm2901SourceDecode#0", + "compName": "Am2901SourceDecode#0", "pinName": "SB" }, "pin2": { - "compName": "GUIsel3_4#0", + "compName": "sel3_4#0", "pinName": "SB" }, "name": "unnamedWire#33", @@ -856,11 +856,11 @@ }, { "pin1": { - "compName": "GUIAm2901SourceDecode#0", + "compName": "Am2901SourceDecode#0", "pinName": "SA" }, "pin2": { - "compName": "GUIsel3_4#0", + "compName": "sel3_4#0", "pinName": "SA" }, "name": "unnamedWire#34", @@ -885,11 +885,11 @@ }, { "pin1": { - "compName": "GUIAm2901SourceDecode#0", + "compName": "Am2901SourceDecode#0", "pinName": "RD" }, "pin2": { - "compName": "GUIsel2_4#0", + "compName": "sel2_4#0", "pinName": "SA" }, "name": "unnamedWire#35", @@ -914,11 +914,11 @@ }, { "pin1": { - "compName": "GUIsel2_4#0", + "compName": "sel2_4#0", "pinName": "Y1" }, "pin2": { - "compName": "GUIAm2901ALUInclDecode#0", + "compName": "Am2901ALUInclDecode#0", "pinName": "R1" }, "name": "unnamedWire#36", @@ -943,11 +943,11 @@ }, { "pin1": { - "compName": "GUIsel2_4#0", + "compName": "sel2_4#0", "pinName": "Y2" }, "pin2": { - "compName": "GUIAm2901ALUInclDecode#0", + "compName": "Am2901ALUInclDecode#0", "pinName": "R2" }, "name": "unnamedWire#37", @@ -972,11 +972,11 @@ }, { "pin1": { - "compName": "GUIsel2_4#0", + "compName": "sel2_4#0", "pinName": "Y3" }, "pin2": { - "compName": "GUIAm2901ALUInclDecode#0", + "compName": "Am2901ALUInclDecode#0", "pinName": "R3" }, "name": "unnamedWire#38", @@ -1001,11 +1001,11 @@ }, { "pin1": { - "compName": "GUIsel2_4#0", + "compName": "sel2_4#0", "pinName": "Y4" }, "pin2": { - "compName": "GUIAm2901ALUInclDecode#0", + "compName": "Am2901ALUInclDecode#0", "pinName": "R4" }, "name": "unnamedWire#39", @@ -1034,7 +1034,7 @@ "pinName": "I1" }, "pin2": { - "compName": "GUIAm2901SourceDecode#0", + "compName": "Am2901SourceDecode#0", "pinName": "I1" }, "name": "unnamedWire#4", @@ -1042,11 +1042,11 @@ }, { "pin1": { - "compName": "GUIsel3_4#0", + "compName": "sel3_4#0", "pinName": "Y1" }, "pin2": { - "compName": "GUIAm2901ALUInclDecode#0", + "compName": "Am2901ALUInclDecode#0", "pinName": "S1" }, "name": "unnamedWire#40", @@ -1071,11 +1071,11 @@ }, { "pin1": { - "compName": "GUIsel3_4#0", + "compName": "sel3_4#0", "pinName": "Y2" }, "pin2": { - "compName": "GUIAm2901ALUInclDecode#0", + "compName": "Am2901ALUInclDecode#0", "pinName": "S2" }, "name": "unnamedWire#41", @@ -1100,11 +1100,11 @@ }, { "pin1": { - "compName": "GUIsel3_4#0", + "compName": "sel3_4#0", "pinName": "Y3" }, "pin2": { - "compName": "GUIAm2901ALUInclDecode#0", + "compName": "Am2901ALUInclDecode#0", "pinName": "S3" }, "name": "unnamedWire#42", @@ -1129,11 +1129,11 @@ }, { "pin1": { - "compName": "GUIsel3_4#0", + "compName": "sel3_4#0", "pinName": "Y4" }, "pin2": { - "compName": "GUIAm2901ALUInclDecode#0", + "compName": "Am2901ALUInclDecode#0", "pinName": "S4" }, "name": "unnamedWire#43", @@ -1158,7 +1158,7 @@ }, { "pin1": { - "compName": "GUIAm2901ALUInclDecode#0", + "compName": "Am2901ALUInclDecode#0", "pinName": "F1" }, "pin2": { @@ -1170,7 +1170,7 @@ }, { "pin1": { - "compName": "GUIAm2901ALUInclDecode#0", + "compName": "Am2901ALUInclDecode#0", "pinName": "F2" }, "pin2": { @@ -1191,7 +1191,7 @@ }, { "pin1": { - "compName": "GUIAm2901ALUInclDecode#0", + "compName": "Am2901ALUInclDecode#0", "pinName": "F3" }, "pin2": { @@ -1212,7 +1212,7 @@ }, { "pin1": { - "compName": "GUIAm2901ALUInclDecode#0", + "compName": "Am2901ALUInclDecode#0", "pinName": "F4" }, "pin2": { @@ -1233,7 +1233,7 @@ }, { "pin1": { - "compName": "GUIAm2901ALUInclDecode#0", + "compName": "Am2901ALUInclDecode#0", "pinName": "Cn+4" }, "pin2": { @@ -1254,7 +1254,7 @@ }, { "pin1": { - "compName": "GUIAm2901ALUInclDecode#0", + "compName": "Am2901ALUInclDecode#0", "pinName": "OVR" }, "pin2": { @@ -1279,7 +1279,7 @@ "pinName": "I0" }, "pin2": { - "compName": "GUIAm2901SourceDecode#0", + "compName": "Am2901SourceDecode#0", "pinName": "I0" }, "name": "unnamedWire#5", @@ -1300,7 +1300,7 @@ "pinName": "Cn" }, "pin2": { - "compName": "GUIAm2901ALUInclDecode#0", + "compName": "Am2901ALUInclDecode#0", "pinName": "Cn" }, "name": "unnamedWire#6", @@ -1321,7 +1321,7 @@ "pinName": "D1" }, "pin2": { - "compName": "GUIsel2_4#0", + "compName": "sel2_4#0", "pinName": "A1" }, "name": "unnamedWire#7", @@ -1342,7 +1342,7 @@ "pinName": "D2" }, "pin2": { - "compName": "GUIsel2_4#0", + "compName": "sel2_4#0", "pinName": "A2" }, "name": "unnamedWire#8", @@ -1363,7 +1363,7 @@ "pinName": "D3" }, "pin2": { - "compName": "GUIsel2_4#0", + "compName": "sel2_4#0", "pinName": "A3" }, "name": "unnamedWire#9", @@ -1383,7 +1383,7 @@ }, "symbolRendererSnippetID": "simpleRectangularLike", "symbolRendererParams": { - "centerText": "GUIAm2901ALUInclSourceDecodeInclFunctionDecode", + "centerText": "Am2901ALUInclSourceDecodeInclFunctionDecode", "centerTextHeight": 5.0, "horizontalComponentCenter": 17.5, "pinLabelHeight": 3.5, diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/GUIAm2901ALUOneBit.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901ALUOneBit.json similarity index 86% rename from net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/GUIAm2901ALUOneBit.json rename to net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901ALUOneBit.json index 1fd3ed88..65ae6bef 100644 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/GUIAm2901ALUOneBit.json +++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901ALUOneBit.json @@ -106,8 +106,8 @@ "submodel": { "components": [ { - "id": "GUINandGate", - "name": "GUINandGate#0", + "id": "NandGate", + "name": "NandGate#0", "pos": { "x": 60.0, "y": 55.0 @@ -115,56 +115,56 @@ "params": 1 }, { - "id": "GUIand", - "name": "GUIand#0", + "id": "and", + "name": "and#0", "pos": { "x": 10.0, "y": 20.0 } }, { - "id": "GUIand", - "name": "GUIand#1", + "id": "and", + "name": "and#1", "pos": { "x": 135.0, "y": 20.0 } }, { - "id": "GUIfulladder", - "name": "GUIfulladder#0", + "id": "fulladder", + "name": "fulladder#0", "pos": { "x": 60.0, "y": 20.0 } }, { - "id": "GUImux1", - "name": "GUImux1#0", + "id": "mux1", + "name": "mux1#0", "pos": { "x": 90.0, "y": 70.0 } }, { - "id": "GUIxor", - "name": "GUIxor#0", + "id": "xor", + "name": "xor#0", "pos": { "x": 10.0, "y": 190.0 } }, { - "id": "GUIxor", - "name": "GUIxor#1", + "id": "xor", + "name": "xor#1", "pos": { "x": 10.0, "y": 290.0 } }, { - "id": "GUIxor", - "name": "GUIxor#2", + "id": "xor", + "name": "xor#2", "pos": { "x": 135.0, "y": 70.0 @@ -196,7 +196,7 @@ "pinName": "Cin" }, "pin2": { - "compName": "GUIand#0", + "compName": "and#0", "pinName": "A" }, "name": "unnamedWire#0", @@ -208,7 +208,7 @@ "pinName": "CoutE" }, "pin2": { - "compName": "GUIand#1", + "compName": "and#1", "pinName": "A" }, "name": "unnamedWire#1", @@ -233,7 +233,7 @@ }, { "pin1": { - "compName": "GUIxor#0", + "compName": "xor#0", "pinName": "Y" }, "pin2": { @@ -254,7 +254,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIfulladder#0", + "compName": "fulladder#0", "pinName": "B" }, "name": "unnamedWire#11", @@ -271,7 +271,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#0", + "compName": "NandGate#0", "pinName": "A" }, "name": "unnamedWire#12", @@ -279,7 +279,7 @@ }, { "pin1": { - "compName": "GUIxor#1", + "compName": "xor#1", "pinName": "Y" }, "pin2": { @@ -300,7 +300,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIfulladder#0", + "compName": "fulladder#0", "pinName": "C" }, "name": "unnamedWire#14", @@ -317,7 +317,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#0", + "compName": "NandGate#0", "pinName": "B" }, "name": "unnamedWire#15", @@ -325,11 +325,11 @@ }, { "pin1": { - "compName": "GUIfulladder#0", + "compName": "fulladder#0", "pinName": "Y" }, "pin2": { - "compName": "GUImux1#0", + "compName": "mux1#0", "pinName": "I0" }, "name": "unnamedWire#16", @@ -354,11 +354,11 @@ }, { "pin1": { - "compName": "GUIfulladder#0", + "compName": "fulladder#0", "pinName": "Z" }, "pin2": { - "compName": "GUIand#1", + "compName": "and#1", "pinName": "B" }, "name": "unnamedWire#17", @@ -366,11 +366,11 @@ }, { "pin1": { - "compName": "GUINandGate#0", + "compName": "NandGate#0", "pinName": "Y" }, "pin2": { - "compName": "GUImux1#0", + "compName": "mux1#0", "pinName": "I1" }, "name": "unnamedWire#18", @@ -387,11 +387,11 @@ }, { "pin1": { - "compName": "GUImux1#0", + "compName": "mux1#0", "pinName": "Y" }, "pin2": { - "compName": "GUIxor#2", + "compName": "xor#2", "pinName": "A" }, "name": "unnamedWire#19", @@ -403,7 +403,7 @@ "pinName": "CinE" }, "pin2": { - "compName": "GUIand#0", + "compName": "and#0", "pinName": "B" }, "name": "unnamedWire#2", @@ -420,7 +420,7 @@ }, { "pin1": { - "compName": "GUIand#1", + "compName": "and#1", "pinName": "Y" }, "pin2": { @@ -432,7 +432,7 @@ }, { "pin1": { - "compName": "GUIxor#2", + "compName": "xor#2", "pinName": "Y" }, "pin2": { @@ -448,7 +448,7 @@ "pinName": "R" }, "pin2": { - "compName": "GUIxor#0", + "compName": "xor#0", "pinName": "A" }, "name": "unnamedWire#3" @@ -459,7 +459,7 @@ "pinName": "RN" }, "pin2": { - "compName": "GUIxor#0", + "compName": "xor#0", "pinName": "B" }, "name": "unnamedWire#4" @@ -470,7 +470,7 @@ "pinName": "S" }, "pin2": { - "compName": "GUIxor#1", + "compName": "xor#1", "pinName": "A" }, "name": "unnamedWire#5" @@ -481,7 +481,7 @@ "pinName": "SN" }, "pin2": { - "compName": "GUIxor#1", + "compName": "xor#1", "pinName": "B" }, "name": "unnamedWire#6" @@ -492,7 +492,7 @@ "pinName": "FN" }, "pin2": { - "compName": "GUIxor#2", + "compName": "xor#2", "pinName": "B" }, "name": "unnamedWire#7", @@ -513,7 +513,7 @@ "pinName": "L" }, "pin2": { - "compName": "GUImux1#0", + "compName": "mux1#0", "pinName": "S0" }, "name": "unnamedWire#8", @@ -530,11 +530,11 @@ }, { "pin1": { - "compName": "GUIand#0", + "compName": "and#0", "pinName": "Y" }, "pin2": { - "compName": "GUIfulladder#0", + "compName": "fulladder#0", "pinName": "A" }, "name": "unnamedWire#9", @@ -545,7 +545,7 @@ }, "symbolRendererSnippetID": "simpleRectangularLike", "symbolRendererParams": { - "centerText": "GUIAm2901ALUOneBit", + "centerText": "Am2901ALUOneBit", "centerTextHeight": 5.0, "horizontalComponentCenter": 17.5, "pinLabelHeight": 3.5, diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/GUIAm2901DestDecode.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901DestDecode.json similarity index 89% rename from net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/GUIAm2901DestDecode.json rename to net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901DestDecode.json index 0b2d6111..27cd4f01 100644 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/GUIAm2901DestDecode.json +++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901DestDecode.json @@ -88,8 +88,8 @@ "submodel": { "components": [ { - "id": "GUINandGate", - "name": "GUINandGate#0", + "id": "NandGate", + "name": "NandGate#0", "pos": { "x": 15.0, "y": 10.0 @@ -97,8 +97,8 @@ "params": 1 }, { - "id": "GUINandGate", - "name": "GUINandGate#1", + "id": "NandGate", + "name": "NandGate#1", "pos": { "x": 15.0, "y": 50.0 @@ -106,8 +106,8 @@ "params": 1 }, { - "id": "GUINandGate", - "name": "GUINandGate#10", + "id": "NandGate", + "name": "NandGate#10", "pos": { "x": 80.0, "y": 145.0 @@ -115,8 +115,8 @@ "params": 1 }, { - "id": "GUINandGate", - "name": "GUINandGate#11", + "id": "NandGate", + "name": "NandGate#11", "pos": { "x": 110.0, "y": 105.0 @@ -124,8 +124,8 @@ "params": 1 }, { - "id": "GUINandGate", - "name": "GUINandGate#12", + "id": "NandGate", + "name": "NandGate#12", "pos": { "x": 115.0, "y": 210.0 @@ -133,8 +133,8 @@ "params": 1 }, { - "id": "GUINandGate", - "name": "GUINandGate#2", + "id": "NandGate", + "name": "NandGate#2", "pos": { "x": 15.0, "y": 90.0 @@ -142,8 +142,8 @@ "params": 1 }, { - "id": "GUINandGate", - "name": "GUINandGate#3", + "id": "NandGate", + "name": "NandGate#3", "pos": { "x": 15.0, "y": 150.0 @@ -151,8 +151,8 @@ "params": 1 }, { - "id": "GUINandGate", - "name": "GUINandGate#4", + "id": "NandGate", + "name": "NandGate#4", "pos": { "x": 50.0, "y": 10.0 @@ -160,8 +160,8 @@ "params": 1 }, { - "id": "GUINandGate", - "name": "GUINandGate#5", + "id": "NandGate", + "name": "NandGate#5", "pos": { "x": 50.0, "y": 50.0 @@ -169,8 +169,8 @@ "params": 1 }, { - "id": "GUINandGate", - "name": "GUINandGate#6", + "id": "NandGate", + "name": "NandGate#6", "pos": { "x": 50.0, "y": 90.0 @@ -178,8 +178,8 @@ "params": 1 }, { - "id": "GUINandGate", - "name": "GUINandGate#7", + "id": "NandGate", + "name": "NandGate#7", "pos": { "x": 50.0, "y": 130.0 @@ -187,8 +187,8 @@ "params": 1 }, { - "id": "GUINandGate", - "name": "GUINandGate#8", + "id": "NandGate", + "name": "NandGate#8", "pos": { "x": 80.0, "y": 10.0 @@ -196,8 +196,8 @@ "params": 1 }, { - "id": "GUINandGate", - "name": "GUINandGate#9", + "id": "NandGate", + "name": "NandGate#9", "pos": { "x": 80.0, "y": 90.0 @@ -380,7 +380,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#2", + "compName": "NandGate#2", "pinName": "B" }, "name": "unnamedWire#10", @@ -392,7 +392,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#2", + "compName": "NandGate#2", "pinName": "A" }, "name": "unnamedWire#11", @@ -426,7 +426,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#3", + "compName": "NandGate#3", "pinName": "A" }, "name": "unnamedWire#13", @@ -438,7 +438,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#3", + "compName": "NandGate#3", "pinName": "B" }, "name": "unnamedWire#14", @@ -455,7 +455,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#4", + "compName": "NandGate#4", "pinName": "A" }, "name": "unnamedWire#15", @@ -476,7 +476,7 @@ }, { "pin1": { - "compName": "GUINandGate#1", + "compName": "NandGate#1", "pinName": "Y" }, "pin2": { @@ -492,7 +492,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#4", + "compName": "NandGate#4", "pinName": "B" }, "name": "unnamedWire#17", @@ -509,7 +509,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#5", + "compName": "NandGate#5", "pinName": "B" }, "name": "unnamedWire#18", @@ -522,7 +522,7 @@ }, { "pin1": { - "compName": "GUINandGate#0", + "compName": "NandGate#0", "pinName": "Y" }, "pin2": { @@ -587,7 +587,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#5", + "compName": "NandGate#5", "pinName": "A" }, "name": "unnamedWire#22", @@ -599,7 +599,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#6", + "compName": "NandGate#6", "pinName": "A" }, "name": "unnamedWire#23", @@ -616,7 +616,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#6", + "compName": "NandGate#6", "pinName": "B" }, "name": "unnamedWire#24", @@ -637,7 +637,7 @@ }, { "pin1": { - "compName": "GUINandGate#2", + "compName": "NandGate#2", "pinName": "Y" }, "pin2": { @@ -658,7 +658,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#7", + "compName": "NandGate#7", "pinName": "A" }, "name": "unnamedWire#26", @@ -670,7 +670,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#7", + "compName": "NandGate#7", "pinName": "B" }, "name": "unnamedWire#27", @@ -683,7 +683,7 @@ }, { "pin1": { - "compName": "GUINandGate#4", + "compName": "NandGate#4", "pinName": "Y" }, "pin2": { @@ -699,7 +699,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#8", + "compName": "NandGate#8", "pinName": "A" }, "name": "unnamedWire#29", @@ -716,7 +716,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#0", + "compName": "NandGate#0", "pinName": "A" }, "name": "unnamedWire#3", @@ -728,7 +728,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#8", + "compName": "NandGate#8", "pinName": "B" }, "name": "unnamedWire#30", @@ -741,7 +741,7 @@ }, { "pin1": { - "compName": "GUINandGate#5", + "compName": "NandGate#5", "pinName": "Y" }, "pin2": { @@ -762,7 +762,7 @@ }, { "pin1": { - "compName": "GUINandGate#6", + "compName": "NandGate#6", "pinName": "Y" }, "pin2": { @@ -778,7 +778,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#9", + "compName": "NandGate#9", "pinName": "A" }, "name": "unnamedWire#33", @@ -807,7 +807,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#9", + "compName": "NandGate#9", "pinName": "B" }, "name": "unnamedWire#35", @@ -815,7 +815,7 @@ }, { "pin1": { - "compName": "GUINandGate#7", + "compName": "NandGate#7", "pinName": "Y" }, "pin2": { @@ -840,7 +840,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#10", + "compName": "NandGate#10", "pinName": "A" }, "name": "unnamedWire#37", @@ -853,7 +853,7 @@ }, { "pin1": { - "compName": "GUINandGate#3", + "compName": "NandGate#3", "pinName": "Y" }, "pin2": { @@ -869,7 +869,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#10", + "compName": "NandGate#10", "pinName": "B" }, "name": "unnamedWire#39", @@ -881,7 +881,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#0", + "compName": "NandGate#0", "pinName": "B" }, "name": "unnamedWire#4", @@ -889,7 +889,7 @@ }, { "pin1": { - "compName": "GUINandGate#8", + "compName": "NandGate#8", "pinName": "Y" }, "pin2": { @@ -910,11 +910,11 @@ }, { "pin1": { - "compName": "GUINandGate#9", + "compName": "NandGate#9", "pinName": "Y" }, "pin2": { - "compName": "GUINandGate#11", + "compName": "NandGate#11", "pinName": "A" }, "name": "unnamedWire#41" @@ -925,7 +925,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#11", + "compName": "NandGate#11", "pinName": "B" }, "name": "unnamedWire#42", @@ -946,7 +946,7 @@ }, { "pin1": { - "compName": "GUINandGate#10", + "compName": "NandGate#10", "pinName": "Y" }, "pin2": { @@ -967,7 +967,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#12", + "compName": "NandGate#12", "pinName": "A" }, "name": "unnamedWire#44", @@ -979,7 +979,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#12", + "compName": "NandGate#12", "pinName": "B" }, "name": "unnamedWire#45", @@ -992,7 +992,7 @@ }, { "pin1": { - "compName": "GUINandGate#11", + "compName": "NandGate#11", "pinName": "Y" }, "pin2": { @@ -1003,7 +1003,7 @@ }, { "pin1": { - "compName": "GUINandGate#12", + "compName": "NandGate#12", "pinName": "Y" }, "pin2": { @@ -1031,7 +1031,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#1", + "compName": "NandGate#1", "pinName": "A" }, "name": "unnamedWire#6", @@ -1060,7 +1060,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#1", + "compName": "NandGate#1", "pinName": "B" }, "name": "unnamedWire#8", @@ -1083,7 +1083,7 @@ }, "symbolRendererSnippetID": "simpleRectangularLike", "symbolRendererParams": { - "centerText": "GUIAm2901DestDecode", + "centerText": "Am2901DestDecode", "centerTextHeight": 5.0, "horizontalComponentCenter": 17.5, "pinLabelHeight": 3.5, diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/GUIAm2901SourceDecode.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901SourceDecode.json similarity index 88% rename from net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/GUIAm2901SourceDecode.json rename to net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901SourceDecode.json index 112fecb7..25a64839 100644 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/GUIAm2901SourceDecode.json +++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901SourceDecode.json @@ -79,8 +79,8 @@ "submodel": { "components": [ { - "id": "GUINandGate", - "name": "GUINandGate#0", + "id": "NandGate", + "name": "NandGate#0", "pos": { "x": 10.0, "y": 10.0 @@ -88,8 +88,8 @@ "params": 1 }, { - "id": "GUINandGate", - "name": "GUINandGate#1", + "id": "NandGate", + "name": "NandGate#1", "pos": { "x": 10.0, "y": 50.0 @@ -97,8 +97,8 @@ "params": 1 }, { - "id": "GUINandGate", - "name": "GUINandGate#10", + "id": "NandGate", + "name": "NandGate#10", "pos": { "x": 70.0, "y": 90.0 @@ -106,8 +106,8 @@ "params": 1 }, { - "id": "GUINandGate", - "name": "GUINandGate#11", + "id": "NandGate", + "name": "NandGate#11", "pos": { "x": 70.0, "y": 130.0 @@ -115,8 +115,8 @@ "params": 1 }, { - "id": "GUINandGate", - "name": "GUINandGate#12", + "id": "NandGate", + "name": "NandGate#12", "pos": { "x": 70.0, "y": 170.0 @@ -124,8 +124,8 @@ "params": 1 }, { - "id": "GUINandGate", - "name": "GUINandGate#13", + "id": "NandGate", + "name": "NandGate#13", "pos": { "x": 100.0, "y": 10.0 @@ -133,8 +133,8 @@ "params": 1 }, { - "id": "GUINandGate", - "name": "GUINandGate#14", + "id": "NandGate", + "name": "NandGate#14", "pos": { "x": 100.0, "y": 170.0 @@ -142,8 +142,8 @@ "params": 1 }, { - "id": "GUINandGate", - "name": "GUINandGate#2", + "id": "NandGate", + "name": "NandGate#2", "pos": { "x": 10.0, "y": 90.0 @@ -151,8 +151,8 @@ "params": 1 }, { - "id": "GUINandGate", - "name": "GUINandGate#3", + "id": "NandGate", + "name": "NandGate#3", "pos": { "x": 40.0, "y": 10.0 @@ -160,8 +160,8 @@ "params": 1 }, { - "id": "GUINandGate", - "name": "GUINandGate#4", + "id": "NandGate", + "name": "NandGate#4", "pos": { "x": 40.0, "y": 50.0 @@ -169,8 +169,8 @@ "params": 1 }, { - "id": "GUINandGate", - "name": "GUINandGate#5", + "id": "NandGate", + "name": "NandGate#5", "pos": { "x": 40.0, "y": 90.0 @@ -178,8 +178,8 @@ "params": 1 }, { - "id": "GUINandGate", - "name": "GUINandGate#6", + "id": "NandGate", + "name": "NandGate#6", "pos": { "x": 40.0, "y": 130.0 @@ -187,8 +187,8 @@ "params": 1 }, { - "id": "GUINandGate", - "name": "GUINandGate#7", + "id": "NandGate", + "name": "NandGate#7", "pos": { "x": 40.0, "y": 170.0 @@ -196,8 +196,8 @@ "params": 1 }, { - "id": "GUINandGate", - "name": "GUINandGate#8", + "id": "NandGate", + "name": "NandGate#8", "pos": { "x": 70.0, "y": 10.0 @@ -205,8 +205,8 @@ "params": 1 }, { - "id": "GUINandGate", - "name": "GUINandGate#9", + "id": "NandGate", + "name": "NandGate#9", "pos": { "x": 70.0, "y": 50.0 @@ -377,7 +377,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#3", + "compName": "NandGate#3", "pinName": "A" }, "name": "unnamedWire#1", @@ -402,7 +402,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#1", + "compName": "NandGate#1", "pinName": "B" }, "name": "unnamedWire#10", @@ -431,7 +431,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#2", + "compName": "NandGate#2", "pinName": "A" }, "name": "unnamedWire#12", @@ -460,7 +460,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#2", + "compName": "NandGate#2", "pinName": "B" }, "name": "unnamedWire#14", @@ -472,7 +472,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#5", + "compName": "NandGate#5", "pinName": "B" }, "name": "unnamedWire#15", @@ -493,7 +493,7 @@ }, { "pin1": { - "compName": "GUINandGate#0", + "compName": "NandGate#0", "pinName": "Y" }, "pin2": { @@ -514,7 +514,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#4", + "compName": "NandGate#4", "pinName": "A" }, "name": "unnamedWire#17", @@ -526,7 +526,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#5", + "compName": "NandGate#5", "pinName": "A" }, "name": "unnamedWire#18", @@ -539,7 +539,7 @@ }, { "pin1": { - "compName": "GUINandGate#1", + "compName": "NandGate#1", "pinName": "Y" }, "pin2": { @@ -567,7 +567,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#3", + "compName": "NandGate#3", "pinName": "B" }, "name": "unnamedWire#20", @@ -596,7 +596,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#4", + "compName": "NandGate#4", "pinName": "B" }, "name": "unnamedWire#22", @@ -620,7 +620,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#6", + "compName": "NandGate#6", "pinName": "A" }, "name": "unnamedWire#24", @@ -632,7 +632,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#7", + "compName": "NandGate#7", "pinName": "A" }, "name": "unnamedWire#25", @@ -645,7 +645,7 @@ }, { "pin1": { - "compName": "GUINandGate#2", + "compName": "NandGate#2", "pinName": "Y" }, "pin2": { @@ -661,7 +661,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#8", + "compName": "NandGate#8", "pinName": "B" }, "name": "unnamedWire#27", @@ -686,7 +686,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#7", + "compName": "NandGate#7", "pinName": "B" }, "name": "unnamedWire#28", @@ -699,11 +699,11 @@ }, { "pin1": { - "compName": "GUINandGate#3", + "compName": "NandGate#3", "pinName": "Y" }, "pin2": { - "compName": "GUINandGate#8", + "compName": "NandGate#8", "pinName": "A" }, "name": "unnamedWire#29" @@ -714,7 +714,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#0", + "compName": "NandGate#0", "pinName": "A" }, "name": "unnamedWire#3", @@ -727,7 +727,7 @@ }, { "pin1": { - "compName": "GUINandGate#4", + "compName": "NandGate#4", "pinName": "Y" }, "pin2": { @@ -743,7 +743,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#9", + "compName": "NandGate#9", "pinName": "A" }, "name": "unnamedWire#31", @@ -760,7 +760,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#9", + "compName": "NandGate#9", "pinName": "B" }, "name": "unnamedWire#32", @@ -773,7 +773,7 @@ }, { "pin1": { - "compName": "GUINandGate#5", + "compName": "NandGate#5", "pinName": "Y" }, "pin2": { @@ -789,7 +789,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#10", + "compName": "NandGate#10", "pinName": "A" }, "name": "unnamedWire#34", @@ -806,7 +806,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#10", + "compName": "NandGate#10", "pinName": "B" }, "name": "unnamedWire#35", @@ -819,7 +819,7 @@ }, { "pin1": { - "compName": "GUINandGate#6", + "compName": "NandGate#6", "pinName": "Y" }, "pin2": { @@ -835,7 +835,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#11", + "compName": "NandGate#11", "pinName": "A" }, "name": "unnamedWire#37", @@ -852,7 +852,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#11", + "compName": "NandGate#11", "pinName": "B" }, "name": "unnamedWire#38", @@ -865,11 +865,11 @@ }, { "pin1": { - "compName": "GUINandGate#7", + "compName": "NandGate#7", "pinName": "Y" }, "pin2": { - "compName": "GUINandGate#12", + "compName": "NandGate#12", "pinName": "A" }, "name": "unnamedWire#39" @@ -880,7 +880,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#0", + "compName": "NandGate#0", "pinName": "B" }, "name": "unnamedWire#4", @@ -893,7 +893,7 @@ }, { "pin1": { - "compName": "GUINandGate#8", + "compName": "NandGate#8", "pinName": "Y" }, "pin2": { @@ -909,7 +909,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#13", + "compName": "NandGate#13", "pinName": "A" }, "name": "unnamedWire#41", @@ -926,7 +926,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#13", + "compName": "NandGate#13", "pinName": "B" }, "name": "unnamedWire#42", @@ -939,7 +939,7 @@ }, { "pin1": { - "compName": "GUINandGate#9", + "compName": "NandGate#9", "pinName": "Y" }, "pin2": { @@ -951,7 +951,7 @@ }, { "pin1": { - "compName": "GUINandGate#10", + "compName": "NandGate#10", "pinName": "Y" }, "pin2": { @@ -963,7 +963,7 @@ }, { "pin1": { - "compName": "GUINandGate#11", + "compName": "NandGate#11", "pinName": "Y" }, "pin2": { @@ -975,7 +975,7 @@ }, { "pin1": { - "compName": "GUINandGate#12", + "compName": "NandGate#12", "pinName": "Y" }, "pin2": { @@ -991,7 +991,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#14", + "compName": "NandGate#14", "pinName": "A" }, "name": "unnamedWire#47", @@ -1008,7 +1008,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#14", + "compName": "NandGate#14", "pinName": "B" }, "name": "unnamedWire#48", @@ -1021,7 +1021,7 @@ }, { "pin1": { - "compName": "GUINandGate#13", + "compName": "NandGate#13", "pinName": "Y" }, "pin2": { @@ -1045,7 +1045,7 @@ }, { "pin1": { - "compName": "GUINandGate#14", + "compName": "NandGate#14", "pinName": "Y" }, "pin2": { @@ -1061,7 +1061,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#6", + "compName": "NandGate#6", "pinName": "B" }, "name": "unnamedWire#6", @@ -1073,7 +1073,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#12", + "compName": "NandGate#12", "pinName": "B" }, "name": "unnamedWire#7", @@ -1110,7 +1110,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#1", + "compName": "NandGate#1", "pinName": "A" }, "name": "unnamedWire#9", diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/GUIAm2904.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904.json similarity index 87% rename from net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/GUIAm2904.json rename to net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904.json index 95fd7863..d32bca28 100644 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/GUIAm2904.json +++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904.json @@ -241,7 +241,7 @@ "submodel": { "components": [ { - "id": "GUIAm2904MSR", + "id": "Am2904MSR", "name": "DeserializedSubmodelComponent#0", "pos": { "x": 225.0, @@ -249,7 +249,7 @@ } }, { - "id": "GUIAm2904muSR", + "id": "Am2904muSR", "name": "DeserializedSubmodelComponent#1", "pos": { "x": 270.0, @@ -257,7 +257,7 @@ } }, { - "id": "GUIxor", + "id": "xor", "name": "DeserializedSubmodelComponent#10", "pos": { "x": 455.0, @@ -265,7 +265,7 @@ } }, { - "id": "GUImux1", + "id": "mux1", "name": "DeserializedSubmodelComponent#11", "pos": { "x": 265.0, @@ -273,7 +273,7 @@ } }, { - "id": "GUIxor", + "id": "xor", "name": "DeserializedSubmodelComponent#12", "pos": { "x": 315.0, @@ -281,7 +281,7 @@ } }, { - "id": "GUImux1", + "id": "mux1", "name": "DeserializedSubmodelComponent#13", "pos": { "x": 365.0, @@ -289,7 +289,7 @@ } }, { - "id": "GUImux1", + "id": "mux1", "name": "DeserializedSubmodelComponent#14", "pos": { "x": 415.0, @@ -297,7 +297,7 @@ } }, { - "id": "GUImux2", + "id": "mux2", "name": "DeserializedSubmodelComponent#15", "pos": { "x": 435.0, @@ -305,7 +305,7 @@ } }, { - "id": "GUImux2", + "id": "mux2", "name": "DeserializedSubmodelComponent#16", "pos": { "x": 435.0, @@ -313,7 +313,7 @@ } }, { - "id": "GUImux1", + "id": "mux1", "name": "DeserializedSubmodelComponent#17", "pos": { "x": 190.0, @@ -321,7 +321,7 @@ } }, { - "id": "GUImux1", + "id": "mux1", "name": "DeserializedSubmodelComponent#18", "pos": { "x": 135.0, @@ -329,7 +329,7 @@ } }, { - "id": "GUIand", + "id": "and", "name": "DeserializedSubmodelComponent#2", "pos": { "x": 380.0, @@ -337,7 +337,7 @@ } }, { - "id": "GUIxor", + "id": "xor", "name": "DeserializedSubmodelComponent#21", "pos": { "x": 250.0, @@ -345,7 +345,7 @@ } }, { - "id": "GUImux2", + "id": "mux2", "name": "DeserializedSubmodelComponent#22", "pos": { "x": 120.0, @@ -353,7 +353,7 @@ } }, { - "id": "GUImux3", + "id": "mux3", "name": "DeserializedSubmodelComponent#23", "pos": { "x": 300.0, @@ -361,7 +361,7 @@ } }, { - "id": "GUImux1_4", + "id": "mux1_4", "name": "DeserializedSubmodelComponent#3", "pos": { "x": 470.0, @@ -369,7 +369,7 @@ } }, { - "id": "GUInot4", + "id": "not4", "name": "DeserializedSubmodelComponent#4", "pos": { "x": 135.0, @@ -377,7 +377,7 @@ } }, { - "id": "GUImux1_4", + "id": "mux1_4", "name": "DeserializedSubmodelComponent#5", "pos": { "x": 415.0, @@ -385,7 +385,7 @@ } }, { - "id": "GUIAm2904TestLogic", + "id": "Am2904TestLogic", "name": "DeserializedSubmodelComponent#6", "pos": { "x": 225.0, @@ -393,7 +393,7 @@ } }, { - "id": "GUImux3", + "id": "mux3", "name": "DeserializedSubmodelComponent#7", "pos": { "x": 300.0, @@ -401,7 +401,7 @@ } }, { - "id": "GUIxor", + "id": "xor", "name": "DeserializedSubmodelComponent#8", "pos": { "x": 495.0, @@ -409,7 +409,7 @@ } }, { - "id": "GUImux1", + "id": "mux1", "name": "DeserializedSubmodelComponent#9", "pos": { "x": 450.0, @@ -417,24 +417,24 @@ } }, { - "id": "GUIAm2904RegCTInstrDecode", - "name": "GUIAm2904RegCTInstrDecode#0", + "id": "Am2904RegCTInstrDecode", + "name": "Am2904RegCTInstrDecode#0", "pos": { "x": 50.0, "y": 240.0 } }, { - "id": "GUIAm2904ShiftInstrDecode", - "name": "GUIAm2904ShiftInstrDecode#0", + "id": "Am2904ShiftInstrDecode", + "name": "Am2904ShiftInstrDecode#0", "pos": { "x": 50.0, "y": 360.0 } }, { - "id": "GUIBitDisplay", - "name": "GUIBitDisplay#0", + "id": "BitDisplay", + "name": "BitDisplay#0", "pos": { "x": 530.0, "y": 70.0 @@ -442,8 +442,8 @@ "params": 4 }, { - "id": "GUIBitDisplay", - "name": "GUIBitDisplay#1", + "id": "BitDisplay", + "name": "BitDisplay#1", "pos": { "x": 565.0, "y": 180.0 @@ -451,8 +451,8 @@ "params": 4 }, { - "id": "GUIBitDisplay", - "name": "GUIBitDisplay#2", + "id": "BitDisplay", + "name": "BitDisplay#2", "pos": { "x": 530.0, "y": 200.0 @@ -460,8 +460,8 @@ "params": 4 }, { - "id": "GUIBitDisplay", - "name": "GUIBitDisplay#3", + "id": "BitDisplay", + "name": "BitDisplay#3", "pos": { "x": 560.0, "y": 150.0 @@ -469,8 +469,8 @@ "params": 1 }, { - "id": "GUIMerger", - "name": "GUIMerger#0", + "id": "Merger", + "name": "Merger#0", "pos": { "x": 25.0, "y": 315.0 @@ -478,8 +478,8 @@ "params": 6 }, { - "id": "GUIMerger", - "name": "GUIMerger#1", + "id": "Merger", + "name": "Merger#1", "pos": { "x": 25.0, "y": 265.0 @@ -487,8 +487,8 @@ "params": 5 }, { - "id": "GUIMerger", - "name": "GUIMerger#2", + "id": "Merger", + "name": "Merger#2", "pos": { "x": 15.0, "y": 65.0 @@ -496,8 +496,8 @@ "params": 4 }, { - "id": "GUIMerger", - "name": "GUIMerger#3", + "id": "Merger", + "name": "Merger#3", "pos": { "x": 510.0, "y": 165.0 @@ -505,8 +505,8 @@ "params": 4 }, { - "id": "GUIMerger", - "name": "GUIMerger#4", + "id": "Merger", + "name": "Merger#4", "pos": { "x": 25.0, "y": 245.0 @@ -514,8 +514,8 @@ "params": 2 }, { - "id": "GUINandGate", - "name": "GUINandGate#0", + "id": "NandGate", + "name": "NandGate#0", "pos": { "x": 190.0, "y": 145.0 @@ -523,8 +523,8 @@ "params": 1 }, { - "id": "GUINandGate", - "name": "GUINandGate#1", + "id": "NandGate", + "name": "NandGate#1", "pos": { "x": 130.0, "y": 5.0 @@ -532,8 +532,8 @@ "params": 1 }, { - "id": "GUINandGate", - "name": "GUINandGate#10", + "id": "NandGate", + "name": "NandGate#10", "pos": { "x": 340.0, "y": 120.0 @@ -541,8 +541,8 @@ "params": 1 }, { - "id": "GUINandGate", - "name": "GUINandGate#12", + "id": "NandGate", + "name": "NandGate#12", "pos": { "x": 540.0, "y": 265.0 @@ -550,8 +550,8 @@ "params": 1 }, { - "id": "GUINandGate", - "name": "GUINandGate#2", + "id": "NandGate", + "name": "NandGate#2", "pos": { "x": 225.0, "y": 195.0 @@ -559,8 +559,8 @@ "params": 1 }, { - "id": "GUINandGate", - "name": "GUINandGate#3", + "id": "NandGate", + "name": "NandGate#3", "pos": { "x": 225.0, "y": 215.0 @@ -568,8 +568,8 @@ "params": 1 }, { - "id": "GUINandGate", - "name": "GUINandGate#4", + "id": "NandGate", + "name": "NandGate#4", "pos": { "x": 225.0, "y": 155.0 @@ -577,8 +577,8 @@ "params": 1 }, { - "id": "GUINandGate", - "name": "GUINandGate#5", + "id": "NandGate", + "name": "NandGate#5", "pos": { "x": 225.0, "y": 175.0 @@ -586,8 +586,8 @@ "params": 1 }, { - "id": "GUINandGate", - "name": "GUINandGate#6", + "id": "NandGate", + "name": "NandGate#6", "pos": { "x": 205.0, "y": 70.0 @@ -595,8 +595,8 @@ "params": 1 }, { - "id": "GUINandGate", - "name": "GUINandGate#7", + "id": "NandGate", + "name": "NandGate#7", "pos": { "x": 205.0, "y": 50.0 @@ -604,8 +604,8 @@ "params": 1 }, { - "id": "GUINandGate", - "name": "GUINandGate#8", + "id": "NandGate", + "name": "NandGate#8", "pos": { "x": 205.0, "y": 30.0 @@ -613,8 +613,8 @@ "params": 1 }, { - "id": "GUINandGate", - "name": "GUINandGate#9", + "id": "NandGate", + "name": "NandGate#9", "pos": { "x": 205.0, "y": 10.0 @@ -622,8 +622,8 @@ "params": 1 }, { - "id": "GUISplitter", - "name": "GUISplitter#0", + "id": "Splitter", + "name": "Splitter#0", "pos": { "x": 10.0, "y": 245.0 @@ -631,8 +631,8 @@ "params": 13 }, { - "id": "GUISplitter", - "name": "GUISplitter#1", + "id": "Splitter", + "name": "Splitter#1", "pos": { "x": 555.0, "y": 80.0 @@ -640,8 +640,8 @@ "params": 4 }, { - "id": "GUISplitter", - "name": "GUISplitter#10", + "id": "Splitter", + "name": "Splitter#10", "pos": { "x": 420.0, "y": 410.0 @@ -649,8 +649,8 @@ "params": 4 }, { - "id": "GUISplitter", - "name": "GUISplitter#11", + "id": "Splitter", + "name": "Splitter#11", "pos": { "x": 405.0, "y": 585.0 @@ -658,8 +658,8 @@ "params": 3 }, { - "id": "GUISplitter", - "name": "GUISplitter#12", + "id": "Splitter", + "name": "Splitter#12", "pos": { "x": 410.0, "y": 665.0 @@ -667,8 +667,8 @@ "params": 3 }, { - "id": "GUISplitter", - "name": "GUISplitter#13", + "id": "Splitter", + "name": "Splitter#13", "pos": { "x": 265.0, "y": 725.0 @@ -676,8 +676,8 @@ "params": 3 }, { - "id": "GUISplitter", - "name": "GUISplitter#14", + "id": "Splitter", + "name": "Splitter#14", "pos": { "x": 90.0, "y": 730.0 @@ -685,8 +685,8 @@ "params": 3 }, { - "id": "GUISplitter", - "name": "GUISplitter#15", + "id": "Splitter", + "name": "Splitter#15", "pos": { "x": 120.0, "y": 455.0 @@ -694,8 +694,8 @@ "params": 2 }, { - "id": "GUISplitter", - "name": "GUISplitter#2", + "id": "Splitter", + "name": "Splitter#2", "pos": { "x": 395.0, "y": 195.0 @@ -703,8 +703,8 @@ "params": 2 }, { - "id": "GUISplitter", - "name": "GUISplitter#3", + "id": "Splitter", + "name": "Splitter#3", "pos": { "x": 450.0, "y": 175.0 @@ -712,8 +712,8 @@ "params": 4 }, { - "id": "GUISplitter", - "name": "GUISplitter#4", + "id": "Splitter", + "name": "Splitter#4", "pos": { "x": 395.0, "y": 225.0 @@ -721,8 +721,8 @@ "params": 4 }, { - "id": "GUISplitter", - "name": "GUISplitter#5", + "id": "Splitter", + "name": "Splitter#5", "pos": { "x": 395.0, "y": 265.0 @@ -730,8 +730,8 @@ "params": 4 }, { - "id": "GUISplitter", - "name": "GUISplitter#6", + "id": "Splitter", + "name": "Splitter#6", "pos": { "x": 285.0, "y": 320.0 @@ -739,8 +739,8 @@ "params": 3 }, { - "id": "GUISplitter", - "name": "GUISplitter#7", + "id": "Splitter", + "name": "Splitter#7", "pos": { "x": 420.0, "y": 325.0 @@ -748,8 +748,8 @@ "params": 4 }, { - "id": "GUISplitter", - "name": "GUISplitter#8", + "id": "Splitter", + "name": "Splitter#8", "pos": { "x": 420.0, "y": 365.0 @@ -757,8 +757,8 @@ "params": 4 }, { - "id": "GUISplitter", - "name": "GUISplitter#9", + "id": "Splitter", + "name": "Splitter#9", "pos": { "x": 240.0, "y": 475.0 @@ -766,8 +766,8 @@ "params": 4 }, { - "id": "GUITriStateBuffer", - "name": "GUITriStateBuffer#0", + "id": "TriStateBuffer", + "name": "TriStateBuffer#0", "pos": { "x": 535.0, "y": 165.0 @@ -778,8 +778,8 @@ } }, { - "id": "GUITriStateBuffer", - "name": "GUITriStateBuffer#1", + "id": "TriStateBuffer", + "name": "TriStateBuffer#1", "pos": { "x": 10.0, "y": 650.0 @@ -790,8 +790,8 @@ } }, { - "id": "GUITriStateBuffer", - "name": "GUITriStateBuffer#2", + "id": "TriStateBuffer", + "name": "TriStateBuffer#2", "pos": { "x": 10.0, "y": 605.0 @@ -802,8 +802,8 @@ } }, { - "id": "GUITriStateBuffer", - "name": "GUITriStateBuffer#3", + "id": "TriStateBuffer", + "name": "TriStateBuffer#3", "pos": { "x": 560.0, "y": 595.0 @@ -814,8 +814,8 @@ } }, { - "id": "GUITriStateBuffer", - "name": "GUITriStateBuffer#4", + "id": "TriStateBuffer", + "name": "TriStateBuffer#4", "pos": { "x": 565.0, "y": 655.0 @@ -826,8 +826,8 @@ } }, { - "id": "GUITriStateBuffer", - "name": "GUITriStateBuffer#5", + "id": "TriStateBuffer", + "name": "TriStateBuffer#5", "pos": { "x": 560.0, "y": 290.0 @@ -1150,7 +1150,7 @@ }, { "pin1": { - "compName": "GUIAm2904RegCTInstrDecode#0", + "compName": "Am2904RegCTInstrDecode#0", "pinName": "muSR_MUX" }, "pin2": { @@ -1162,11 +1162,11 @@ }, { "pin1": { - "compName": "GUISplitter#0", + "compName": "Splitter#0", "pinName": "O6" }, "pin2": { - "compName": "GUIMerger#1", + "compName": "Merger#1", "pinName": "I0" }, "name": "unnamedWire#10", @@ -1174,7 +1174,7 @@ }, { "pin1": { - "compName": "GUISplitter#3", + "compName": "Splitter#3", "pinName": "O0" }, "pin2": { @@ -1186,7 +1186,7 @@ }, { "pin1": { - "compName": "GUISplitter#3", + "compName": "Splitter#3", "pinName": "I" }, "pin2": { @@ -1198,7 +1198,7 @@ }, { "pin1": { - "compName": "GUISplitter#4", + "compName": "Splitter#4", "pinName": "O3" }, "pin2": { @@ -1214,7 +1214,7 @@ "pinName": "I0_2" }, "pin2": { - "compName": "GUISplitter#4", + "compName": "Splitter#4", "pinName": "O2" }, "name": "unnamedWire#103", @@ -1222,7 +1222,7 @@ }, { "pin1": { - "compName": "GUISplitter#4", + "compName": "Splitter#4", "pinName": "O1" }, "pin2": { @@ -1238,7 +1238,7 @@ "pinName": "I0_4" }, "pin2": { - "compName": "GUISplitter#4", + "compName": "Splitter#4", "pinName": "O0" }, "name": "unnamedWire#105", @@ -1246,7 +1246,7 @@ }, { "pin1": { - "compName": "GUISplitter#4", + "compName": "Splitter#4", "pinName": "I" }, "pin2": { @@ -1258,7 +1258,7 @@ }, { "pin1": { - "compName": "GUISplitter#5", + "compName": "Splitter#5", "pinName": "O0" }, "pin2": { @@ -1274,7 +1274,7 @@ "pinName": "I1_3" }, "pin2": { - "compName": "GUISplitter#5", + "compName": "Splitter#5", "pinName": "O1" }, "name": "unnamedWire#108", @@ -1282,7 +1282,7 @@ }, { "pin1": { - "compName": "GUISplitter#5", + "compName": "Splitter#5", "pinName": "O2" }, "pin2": { @@ -1294,11 +1294,11 @@ }, { "pin1": { - "compName": "GUIMerger#1", + "compName": "Merger#1", "pinName": "I1" }, "pin2": { - "compName": "GUISplitter#0", + "compName": "Splitter#0", "pinName": "O7" }, "name": "unnamedWire#11", @@ -1310,7 +1310,7 @@ "pinName": "I1_1" }, "pin2": { - "compName": "GUISplitter#5", + "compName": "Splitter#5", "pinName": "O3" }, "name": "unnamedWire#110", @@ -1318,7 +1318,7 @@ }, { "pin1": { - "compName": "GUISplitter#5", + "compName": "Splitter#5", "pinName": "I" }, "pin2": { @@ -1334,7 +1334,7 @@ "pinName": "" }, "pin2": { - "compName": "GUITriStateBuffer#0", + "compName": "TriStateBuffer#0", "pinName": "IN" }, "name": "unnamedWire#112", @@ -1426,11 +1426,11 @@ }, { "pin1": { - "compName": "GUISplitter#0", + "compName": "Splitter#0", "pinName": "O8" }, "pin2": { - "compName": "GUIMerger#1", + "compName": "Merger#1", "pinName": "I2" }, "name": "unnamedWire#12", @@ -1462,11 +1462,11 @@ }, { "pin1": { - "compName": "GUINandGate#12", + "compName": "NandGate#12", "pinName": "Y" }, "pin2": { - "compName": "GUITriStateBuffer#5", + "compName": "TriStateBuffer#5", "pinName": "EN" }, "name": "unnamedWire#122", @@ -1486,11 +1486,11 @@ }, { "pin1": { - "compName": "GUISplitter#6", + "compName": "Splitter#6", "pinName": "I" }, "pin2": { - "compName": "GUIAm2904RegCTInstrDecode#0", + "compName": "Am2904RegCTInstrDecode#0", "pinName": "CT_MUX" }, "name": "unnamedWire#124", @@ -1498,7 +1498,7 @@ }, { "pin1": { - "compName": "GUISplitter#6", + "compName": "Splitter#6", "pinName": "O0" }, "pin2": { @@ -1514,7 +1514,7 @@ "pinName": "S1" }, "pin2": { - "compName": "GUISplitter#6", + "compName": "Splitter#6", "pinName": "O1" }, "name": "unnamedWire#126", @@ -1522,7 +1522,7 @@ }, { "pin1": { - "compName": "GUISplitter#6", + "compName": "Splitter#6", "pinName": "O2" }, "pin2": { @@ -1534,7 +1534,7 @@ }, { "pin1": { - "compName": "GUIAm2904RegCTInstrDecode#0", + "compName": "Am2904RegCTInstrDecode#0", "pinName": "CT_EXP" }, "pin2": { @@ -1558,11 +1558,11 @@ }, { "pin1": { - "compName": "GUIMerger#1", + "compName": "Merger#1", "pinName": "I3" }, "pin2": { - "compName": "GUISplitter#0", + "compName": "Splitter#0", "pinName": "O9" }, "name": "unnamedWire#13", @@ -1574,7 +1574,7 @@ "pinName": "A" }, "pin2": { - "compName": "GUIAm2904RegCTInstrDecode#0", + "compName": "Am2904RegCTInstrDecode#0", "pinName": "CT_INV" }, "name": "unnamedWire#130", @@ -1610,7 +1610,7 @@ "pinName": "" }, "pin2": { - "compName": "GUISplitter#7", + "compName": "Splitter#7", "pinName": "I" }, "name": "unnamedWire#133", @@ -1618,7 +1618,7 @@ }, { "pin1": { - "compName": "GUISplitter#7", + "compName": "Splitter#7", "pinName": "O2" }, "pin2": { @@ -1630,7 +1630,7 @@ }, { "pin1": { - "compName": "GUISplitter#8", + "compName": "Splitter#8", "pinName": "O1" }, "pin2": { @@ -1658,7 +1658,7 @@ "pinName": "" }, "pin2": { - "compName": "GUISplitter#8", + "compName": "Splitter#8", "pinName": "I" }, "name": "unnamedWire#137", @@ -1666,7 +1666,7 @@ }, { "pin1": { - "compName": "GUIAm2904RegCTInstrDecode#0", + "compName": "Am2904RegCTInstrDecode#0", "pinName": "OEN" }, "pin2": { @@ -1678,11 +1678,11 @@ }, { "pin1": { - "compName": "GUISplitter#0", + "compName": "Splitter#0", "pinName": "O11" }, "pin2": { - "compName": "GUIMerger#4", + "compName": "Merger#4", "pinName": "I0" }, "name": "unnamedWire#139", @@ -1690,11 +1690,11 @@ }, { "pin1": { - "compName": "GUISplitter#0", + "compName": "Splitter#0", "pinName": "O10" }, "pin2": { - "compName": "GUIMerger#1", + "compName": "Merger#1", "pinName": "I4" }, "name": "unnamedWire#14", @@ -1702,11 +1702,11 @@ }, { "pin1": { - "compName": "GUIMerger#4", + "compName": "Merger#4", "pinName": "I1" }, "pin2": { - "compName": "GUISplitter#0", + "compName": "Splitter#0", "pinName": "O12" }, "name": "unnamedWire#140", @@ -1714,11 +1714,11 @@ }, { "pin1": { - "compName": "GUIMerger#4", + "compName": "Merger#4", "pinName": "O" }, "pin2": { - "compName": "GUIAm2904RegCTInstrDecode#0", + "compName": "Am2904RegCTInstrDecode#0", "pinName": "I12-11" }, "name": "unnamedWire#141", @@ -1726,11 +1726,11 @@ }, { "pin1": { - "compName": "GUIAm2904RegCTInstrDecode#0", + "compName": "Am2904RegCTInstrDecode#0", "pinName": "C0_MUX" }, "pin2": { - "compName": "GUISplitter#9", + "compName": "Splitter#9", "pinName": "I" }, "name": "unnamedWire#142", @@ -1750,7 +1750,7 @@ }, { "pin1": { - "compName": "GUISplitter#10", + "compName": "Splitter#10", "pinName": "I" }, "pin2": { @@ -1766,7 +1766,7 @@ "pinName": "I0" }, "pin2": { - "compName": "GUISplitter#10", + "compName": "Splitter#10", "pinName": "O2" }, "name": "unnamedWire#145", @@ -1774,7 +1774,7 @@ }, { "pin1": { - "compName": "GUISplitter#9", + "compName": "Splitter#9", "pinName": "O1" }, "pin2": { @@ -1802,7 +1802,7 @@ "pinName": "A" }, "pin2": { - "compName": "GUISplitter#9", + "compName": "Splitter#9", "pinName": "O0" }, "name": "unnamedWire#148", @@ -1810,7 +1810,7 @@ }, { "pin1": { - "compName": "GUISplitter#9", + "compName": "Splitter#9", "pinName": "O2" }, "pin2": { @@ -1822,11 +1822,11 @@ }, { "pin1": { - "compName": "GUIMerger#0", + "compName": "Merger#0", "pinName": "O" }, "pin2": { - "compName": "GUIAm2904RegCTInstrDecode#0", + "compName": "Am2904RegCTInstrDecode#0", "pinName": "I5-0" }, "name": "unnamedWire#15", @@ -1898,7 +1898,7 @@ "pinName": "S0" }, "pin2": { - "compName": "GUISplitter#9", + "compName": "Splitter#9", "pinName": "O3" }, "name": "unnamedWire#155", @@ -1954,11 +1954,11 @@ }, { "pin1": { - "compName": "GUIAm2904ShiftInstrDecode#0", + "compName": "Am2904ShiftInstrDecode#0", "pinName": "I" }, "pin2": { - "compName": "GUIMerger#1", + "compName": "Merger#1", "pinName": "O" }, "name": "unnamedWire#16", @@ -1987,7 +1987,7 @@ }, { "pin1": { - "compName": "GUITriStateBuffer#1", + "compName": "TriStateBuffer#1", "pinName": "OUT" }, "pin2": { @@ -1999,7 +1999,7 @@ }, { "pin1": { - "compName": "GUITriStateBuffer#2", + "compName": "TriStateBuffer#2", "pinName": "OUT" }, "pin2": { @@ -2011,7 +2011,7 @@ }, { "pin1": { - "compName": "GUITriStateBuffer#3", + "compName": "TriStateBuffer#3", "pinName": "OUT" }, "pin2": { @@ -2023,7 +2023,7 @@ }, { "pin1": { - "compName": "GUITriStateBuffer#4", + "compName": "TriStateBuffer#4", "pinName": "OUT" }, "pin2": { @@ -2035,7 +2035,7 @@ }, { "pin1": { - "compName": "GUITriStateBuffer#3", + "compName": "TriStateBuffer#3", "pinName": "IN" }, "pin2": { @@ -2047,11 +2047,11 @@ }, { "pin1": { - "compName": "GUIAm2904ShiftInstrDecode#0", + "compName": "Am2904ShiftInstrDecode#0", "pinName": "SIO0_MUX" }, "pin2": { - "compName": "GUISplitter#11", + "compName": "Splitter#11", "pinName": "I" }, "name": "unnamedWire#166", @@ -2059,7 +2059,7 @@ }, { "pin1": { - "compName": "GUISplitter#11", + "compName": "Splitter#11", "pinName": "O0" }, "pin2": { @@ -2071,7 +2071,7 @@ }, { "pin1": { - "compName": "GUISplitter#11", + "compName": "Splitter#11", "pinName": "O2" }, "pin2": { @@ -2087,7 +2087,7 @@ "pinName": "S0" }, "pin2": { - "compName": "GUISplitter#11", + "compName": "Splitter#11", "pinName": "O1" }, "name": "unnamedWire#169", @@ -2099,7 +2099,7 @@ "pinName": "IOVR" }, "pin2": { - "compName": "GUIMerger#2", + "compName": "Merger#2", "pinName": "I0" }, "name": "unnamedWire#17", @@ -2131,7 +2131,7 @@ }, { "pin1": { - "compName": "GUISplitter#8", + "compName": "Splitter#8", "pinName": "O2" }, "pin2": { @@ -2155,7 +2155,7 @@ }, { "pin1": { - "compName": "GUISplitter#12", + "compName": "Splitter#12", "pinName": "O1" }, "pin2": { @@ -2171,7 +2171,7 @@ "pinName": "S1" }, "pin2": { - "compName": "GUISplitter#12", + "compName": "Splitter#12", "pinName": "O2" }, "name": "unnamedWire#175", @@ -2179,7 +2179,7 @@ }, { "pin1": { - "compName": "GUISplitter#12", + "compName": "Splitter#12", "pinName": "O0" }, "pin2": { @@ -2195,7 +2195,7 @@ "pinName": "Y" }, "pin2": { - "compName": "GUITriStateBuffer#4", + "compName": "TriStateBuffer#4", "pinName": "IN" }, "name": "unnamedWire#177", @@ -2203,11 +2203,11 @@ }, { "pin1": { - "compName": "GUISplitter#12", + "compName": "Splitter#12", "pinName": "I" }, "pin2": { - "compName": "GUIAm2904ShiftInstrDecode#0", + "compName": "Am2904ShiftInstrDecode#0", "pinName": "QIO0_MUX" }, "name": "unnamedWire#178", @@ -2231,7 +2231,7 @@ "pinName": "IN" }, "pin2": { - "compName": "GUIMerger#2", + "compName": "Merger#2", "pinName": "I1" }, "name": "unnamedWire#18", @@ -2275,7 +2275,7 @@ }, { "pin1": { - "compName": "GUISplitter#13", + "compName": "Splitter#13", "pinName": "O0" }, "pin2": { @@ -2335,11 +2335,11 @@ }, { "pin1": { - "compName": "GUISplitter#13", + "compName": "Splitter#13", "pinName": "I" }, "pin2": { - "compName": "GUIAm2904ShiftInstrDecode#0", + "compName": "Am2904ShiftInstrDecode#0", "pinName": "SIOn_MUX" }, "name": "unnamedWire#188", @@ -2347,7 +2347,7 @@ }, { "pin1": { - "compName": "GUISplitter#13", + "compName": "Splitter#13", "pinName": "O2" }, "pin2": { @@ -2359,7 +2359,7 @@ }, { "pin1": { - "compName": "GUIMerger#2", + "compName": "Merger#2", "pinName": "I2" }, "pin2": { @@ -2371,7 +2371,7 @@ }, { "pin1": { - "compName": "GUISplitter#13", + "compName": "Splitter#13", "pinName": "O1" }, "pin2": { @@ -2447,7 +2447,7 @@ "pinName": "I110" }, "pin2": { - "compName": "GUISplitter#7", + "compName": "Splitter#7", "pinName": "O1" }, "name": "unnamedWire#196", @@ -2491,7 +2491,7 @@ }, { "pin1": { - "compName": "GUIAm2904RegCTInstrDecode#0", + "compName": "Am2904RegCTInstrDecode#0", "pinName": "muSR_OVRRET" }, "pin2": { @@ -2507,7 +2507,7 @@ "pinName": "IZ" }, "pin2": { - "compName": "GUIMerger#2", + "compName": "Merger#2", "pinName": "I3" }, "name": "unnamedWire#20", @@ -2543,7 +2543,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIAm2904ShiftInstrDecode#0", + "compName": "Am2904ShiftInstrDecode#0", "pinName": "OEn" }, "name": "unnamedWire#202", @@ -2551,7 +2551,7 @@ }, { "pin1": { - "compName": "GUIAm2904ShiftInstrDecode#0", + "compName": "Am2904ShiftInstrDecode#0", "pinName": "OE0" }, "pin2": { @@ -2591,7 +2591,7 @@ "pinName": "B" }, "pin2": { - "compName": "GUISplitter#7", + "compName": "Splitter#7", "pinName": "O0" }, "name": "unnamedWire#206", @@ -2603,7 +2603,7 @@ "pinName": "Y" }, "pin2": { - "compName": "GUITriStateBuffer#1", + "compName": "TriStateBuffer#1", "pinName": "IN" }, "name": "unnamedWire#207", @@ -2611,7 +2611,7 @@ }, { "pin1": { - "compName": "GUISplitter#14", + "compName": "Splitter#14", "pinName": "O2" }, "pin2": { @@ -2623,7 +2623,7 @@ }, { "pin1": { - "compName": "GUISplitter#14", + "compName": "Splitter#14", "pinName": "O1" }, "pin2": { @@ -2635,7 +2635,7 @@ }, { "pin1": { - "compName": "GUIAm2904RegCTInstrDecode#0", + "compName": "Am2904RegCTInstrDecode#0", "pinName": "muSR_CINV" }, "pin2": { @@ -2647,11 +2647,11 @@ }, { "pin1": { - "compName": "GUISplitter#14", + "compName": "Splitter#14", "pinName": "I" }, "pin2": { - "compName": "GUIAm2904ShiftInstrDecode#0", + "compName": "Am2904ShiftInstrDecode#0", "pinName": "QIOn_MUX" }, "name": "unnamedWire#210", @@ -2659,7 +2659,7 @@ }, { "pin1": { - "compName": "GUISplitter#14", + "compName": "Splitter#14", "pinName": "O0" }, "pin2": { @@ -2671,7 +2671,7 @@ }, { "pin1": { - "compName": "GUITriStateBuffer#2", + "compName": "TriStateBuffer#2", "pinName": "IN" }, "pin2": { @@ -2687,7 +2687,7 @@ "pinName": "_SE" }, "pin2": { - "compName": "GUIAm2904ShiftInstrDecode#0", + "compName": "Am2904ShiftInstrDecode#0", "pinName": "_SE" }, "name": "unnamedWire#213", @@ -2695,7 +2695,7 @@ }, { "pin1": { - "compName": "GUITriStateBuffer#3", + "compName": "TriStateBuffer#3", "pinName": "EN" }, "pin2": { @@ -2711,7 +2711,7 @@ "pinName": "" }, "pin2": { - "compName": "GUITriStateBuffer#4", + "compName": "TriStateBuffer#4", "pinName": "EN" }, "name": "unnamedWire#215", @@ -2719,7 +2719,7 @@ }, { "pin1": { - "compName": "GUITriStateBuffer#2", + "compName": "TriStateBuffer#2", "pinName": "EN" }, "pin2": { @@ -2735,7 +2735,7 @@ "pinName": "" }, "pin2": { - "compName": "GUITriStateBuffer#1", + "compName": "TriStateBuffer#1", "pinName": "EN" }, "name": "unnamedWire#219", @@ -2743,7 +2743,7 @@ }, { "pin1": { - "compName": "GUIMerger#2", + "compName": "Merger#2", "pinName": "O" }, "pin2": { @@ -2815,11 +2815,11 @@ }, { "pin1": { - "compName": "GUIAm2904ShiftInstrDecode#0", + "compName": "Am2904ShiftInstrDecode#0", "pinName": "MC_MUX" }, "pin2": { - "compName": "GUISplitter#15", + "compName": "Splitter#15", "pinName": "I" }, "name": "unnamedWire#226", @@ -2827,7 +2827,7 @@ }, { "pin1": { - "compName": "GUISplitter#15", + "compName": "Splitter#15", "pinName": "O0" }, "pin2": { @@ -2839,7 +2839,7 @@ }, { "pin1": { - "compName": "GUISplitter#15", + "compName": "Splitter#15", "pinName": "O1" }, "pin2": { @@ -2851,7 +2851,7 @@ }, { "pin1": { - "compName": "GUIBitDisplay#0", + "compName": "BitDisplay#0", "pinName": "" }, "pin2": { @@ -2875,11 +2875,11 @@ }, { "pin1": { - "compName": "GUITriStateBuffer#0", + "compName": "TriStateBuffer#0", "pinName": "OUT" }, "pin2": { - "compName": "GUIBitDisplay#1", + "compName": "BitDisplay#1", "pinName": "" }, "name": "unnamedWire#230", @@ -2887,11 +2887,11 @@ }, { "pin1": { - "compName": "GUITriStateBuffer#0", + "compName": "TriStateBuffer#0", "pinName": "IN" }, "pin2": { - "compName": "GUIBitDisplay#2", + "compName": "BitDisplay#2", "pinName": "" }, "name": "unnamedWire#231", @@ -2899,11 +2899,11 @@ }, { "pin1": { - "compName": "GUITriStateBuffer#0", + "compName": "TriStateBuffer#0", "pinName": "EN" }, "pin2": { - "compName": "GUIBitDisplay#3", + "compName": "BitDisplay#3", "pinName": "" }, "name": "unnamedWire#232", @@ -2915,7 +2915,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#12", + "compName": "NandGate#12", "pinName": "A" }, "name": "unnamedWire#233", @@ -2923,7 +2923,7 @@ }, { "pin1": { - "compName": "GUINandGate#12", + "compName": "NandGate#12", "pinName": "B" }, "pin2": { @@ -2947,7 +2947,7 @@ }, { "pin1": { - "compName": "GUITriStateBuffer#5", + "compName": "TriStateBuffer#5", "pinName": "OUT" }, "pin2": { @@ -2959,7 +2959,7 @@ }, { "pin1": { - "compName": "GUITriStateBuffer#5", + "compName": "TriStateBuffer#5", "pinName": "IN" }, "pin2": { @@ -3047,7 +3047,7 @@ "pinName": "I" }, "pin2": { - "compName": "GUISplitter#0", + "compName": "Splitter#0", "pinName": "I" }, "name": "unnamedWire#3", @@ -3067,7 +3067,7 @@ }, { "pin1": { - "compName": "GUIAm2904RegCTInstrDecode#0", + "compName": "Am2904RegCTInstrDecode#0", "pinName": "MSR_MUX" }, "pin2": { @@ -3079,7 +3079,7 @@ }, { "pin1": { - "compName": "GUIAm2904ShiftInstrDecode#0", + "compName": "Am2904ShiftInstrDecode#0", "pinName": "MC_EN" }, "pin2": { @@ -3091,7 +3091,7 @@ }, { "pin1": { - "compName": "GUINandGate#0", + "compName": "NandGate#0", "pinName": "A" }, "pin2": { @@ -3107,7 +3107,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#0", + "compName": "NandGate#0", "pinName": "B" }, "name": "unnamedWire#34", @@ -3127,7 +3127,7 @@ }, { "pin1": { - "compName": "GUINandGate#0", + "compName": "NandGate#0", "pinName": "Y" }, "pin2": { @@ -3143,7 +3143,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#4", + "compName": "NandGate#4", "pinName": "A" }, "name": "unnamedWire#37", @@ -3167,7 +3167,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#5", + "compName": "NandGate#5", "pinName": "A" }, "name": "unnamedWire#39", @@ -3175,11 +3175,11 @@ }, { "pin1": { - "compName": "GUISplitter#0", + "compName": "Splitter#0", "pinName": "O0" }, "pin2": { - "compName": "GUIMerger#0", + "compName": "Merger#0", "pinName": "I0" }, "name": "unnamedWire#4", @@ -3203,7 +3203,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#2", + "compName": "NandGate#2", "pinName": "A" }, "name": "unnamedWire#41", @@ -3211,7 +3211,7 @@ }, { "pin1": { - "compName": "GUINandGate#3", + "compName": "NandGate#3", "pinName": "A" }, "pin2": { @@ -3223,7 +3223,7 @@ }, { "pin1": { - "compName": "GUINandGate#3", + "compName": "NandGate#3", "pinName": "Y" }, "pin2": { @@ -3235,7 +3235,7 @@ }, { "pin1": { - "compName": "GUINandGate#2", + "compName": "NandGate#2", "pinName": "Y" }, "pin2": { @@ -3251,7 +3251,7 @@ "pinName": "_EC" }, "pin2": { - "compName": "GUINandGate#5", + "compName": "NandGate#5", "pinName": "Y" }, "name": "unnamedWire#45", @@ -3259,7 +3259,7 @@ }, { "pin1": { - "compName": "GUINandGate#4", + "compName": "NandGate#4", "pinName": "Y" }, "pin2": { @@ -3271,11 +3271,11 @@ }, { "pin1": { - "compName": "GUINandGate#4", + "compName": "NandGate#4", "pinName": "B" }, "pin2": { - "compName": "GUIAm2904RegCTInstrDecode#0", + "compName": "Am2904RegCTInstrDecode#0", "pinName": "muSR_WEZ" }, "name": "unnamedWire#47", @@ -3283,11 +3283,11 @@ }, { "pin1": { - "compName": "GUIAm2904RegCTInstrDecode#0", + "compName": "Am2904RegCTInstrDecode#0", "pinName": "muSR_WEC" }, "pin2": { - "compName": "GUINandGate#5", + "compName": "NandGate#5", "pinName": "B" }, "name": "unnamedWire#48", @@ -3295,7 +3295,7 @@ }, { "pin1": { - "compName": "GUISplitter#1", + "compName": "Splitter#1", "pinName": "O3" }, "pin2": { @@ -3307,11 +3307,11 @@ }, { "pin1": { - "compName": "GUIMerger#0", + "compName": "Merger#0", "pinName": "I1" }, "pin2": { - "compName": "GUISplitter#0", + "compName": "Splitter#0", "pinName": "O1" }, "name": "unnamedWire#5", @@ -3323,7 +3323,7 @@ "pinName": "YC" }, "pin2": { - "compName": "GUISplitter#1", + "compName": "Splitter#1", "pinName": "O2" }, "name": "unnamedWire#50", @@ -3331,7 +3331,7 @@ }, { "pin1": { - "compName": "GUISplitter#1", + "compName": "Splitter#1", "pinName": "O1" }, "pin2": { @@ -3347,7 +3347,7 @@ "pinName": "YOVR" }, "pin2": { - "compName": "GUISplitter#1", + "compName": "Splitter#1", "pinName": "O0" }, "name": "unnamedWire#52", @@ -3355,7 +3355,7 @@ }, { "pin1": { - "compName": "GUISplitter#1", + "compName": "Splitter#1", "pinName": "I" }, "pin2": { @@ -3383,7 +3383,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#1", + "compName": "NandGate#1", "pinName": "A" }, "name": "unnamedWire#55", @@ -3391,7 +3391,7 @@ }, { "pin1": { - "compName": "GUINandGate#1", + "compName": "NandGate#1", "pinName": "B" }, "pin2": { @@ -3415,11 +3415,11 @@ }, { "pin1": { - "compName": "GUINandGate#2", + "compName": "NandGate#2", "pinName": "B" }, "pin2": { - "compName": "GUIAm2904RegCTInstrDecode#0", + "compName": "Am2904RegCTInstrDecode#0", "pinName": "muSR_WEN" }, "name": "unnamedWire#58", @@ -3427,11 +3427,11 @@ }, { "pin1": { - "compName": "GUIAm2904RegCTInstrDecode#0", + "compName": "Am2904RegCTInstrDecode#0", "pinName": "muSR_WEOVR" }, "pin2": { - "compName": "GUINandGate#3", + "compName": "NandGate#3", "pinName": "B" }, "name": "unnamedWire#59", @@ -3439,11 +3439,11 @@ }, { "pin1": { - "compName": "GUISplitter#0", + "compName": "Splitter#0", "pinName": "O2" }, "pin2": { - "compName": "GUIMerger#0", + "compName": "Merger#0", "pinName": "I2" }, "name": "unnamedWire#6", @@ -3455,7 +3455,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#6", + "compName": "NandGate#6", "pinName": "A" }, "name": "unnamedWire#60", @@ -3463,7 +3463,7 @@ }, { "pin1": { - "compName": "GUINandGate#7", + "compName": "NandGate#7", "pinName": "A" }, "pin2": { @@ -3479,7 +3479,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#8", + "compName": "NandGate#8", "pinName": "A" }, "name": "unnamedWire#62", @@ -3487,7 +3487,7 @@ }, { "pin1": { - "compName": "GUINandGate#9", + "compName": "NandGate#9", "pinName": "A" }, "pin2": { @@ -3523,7 +3523,7 @@ }, { "pin1": { - "compName": "GUINandGate#6", + "compName": "NandGate#6", "pinName": "Y" }, "pin2": { @@ -3539,7 +3539,7 @@ "pinName": "_EN" }, "pin2": { - "compName": "GUINandGate#7", + "compName": "NandGate#7", "pinName": "Y" }, "name": "unnamedWire#67", @@ -3547,7 +3547,7 @@ }, { "pin1": { - "compName": "GUINandGate#8", + "compName": "NandGate#8", "pinName": "Y" }, "pin2": { @@ -3559,7 +3559,7 @@ }, { "pin1": { - "compName": "GUINandGate#9", + "compName": "NandGate#9", "pinName": "Y" }, "pin2": { @@ -3571,11 +3571,11 @@ }, { "pin1": { - "compName": "GUIMerger#0", + "compName": "Merger#0", "pinName": "I3" }, "pin2": { - "compName": "GUISplitter#0", + "compName": "Splitter#0", "pinName": "O3" }, "name": "unnamedWire#7", @@ -3583,7 +3583,7 @@ }, { "pin1": { - "compName": "GUINandGate#1", + "compName": "NandGate#1", "pinName": "Y" }, "pin2": { @@ -3599,7 +3599,7 @@ "pinName": "Y1" }, "pin2": { - "compName": "GUINandGate#9", + "compName": "NandGate#9", "pinName": "B" }, "name": "unnamedWire#71", @@ -3607,7 +3607,7 @@ }, { "pin1": { - "compName": "GUINandGate#8", + "compName": "NandGate#8", "pinName": "B" }, "pin2": { @@ -3623,7 +3623,7 @@ "pinName": "Y3" }, "pin2": { - "compName": "GUINandGate#7", + "compName": "NandGate#7", "pinName": "B" }, "name": "unnamedWire#73", @@ -3635,7 +3635,7 @@ "pinName": "Y4" }, "pin2": { - "compName": "GUINandGate#6", + "compName": "NandGate#6", "pinName": "B" }, "name": "unnamedWire#74", @@ -3691,7 +3691,7 @@ }, { "pin1": { - "compName": "GUITriStateBuffer#0", + "compName": "TriStateBuffer#0", "pinName": "OUT" }, "pin2": { @@ -3703,11 +3703,11 @@ }, { "pin1": { - "compName": "GUISplitter#0", + "compName": "Splitter#0", "pinName": "O4" }, "pin2": { - "compName": "GUIMerger#0", + "compName": "Merger#0", "pinName": "I4" }, "name": "unnamedWire#8", @@ -3719,7 +3719,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#10", + "compName": "NandGate#10", "pinName": "A" }, "name": "unnamedWire#80", @@ -3727,7 +3727,7 @@ }, { "pin1": { - "compName": "GUINandGate#10", + "compName": "NandGate#10", "pinName": "B" }, "pin2": { @@ -3751,7 +3751,7 @@ }, { "pin1": { - "compName": "GUINandGate#10", + "compName": "NandGate#10", "pinName": "Y" }, "pin2": { @@ -3767,7 +3767,7 @@ "pinName": "Y" }, "pin2": { - "compName": "GUITriStateBuffer#0", + "compName": "TriStateBuffer#0", "pinName": "EN" }, "name": "unnamedWire#84", @@ -3823,7 +3823,7 @@ }, { "pin1": { - "compName": "GUIMerger#3", + "compName": "Merger#3", "pinName": "I0" }, "pin2": { @@ -3835,11 +3835,11 @@ }, { "pin1": { - "compName": "GUIMerger#0", + "compName": "Merger#0", "pinName": "I5" }, "pin2": { - "compName": "GUISplitter#0", + "compName": "Splitter#0", "pinName": "O5" }, "name": "unnamedWire#9", @@ -3851,7 +3851,7 @@ "pinName": "Y3" }, "pin2": { - "compName": "GUIMerger#3", + "compName": "Merger#3", "pinName": "I1" }, "name": "unnamedWire#90", @@ -3859,7 +3859,7 @@ }, { "pin1": { - "compName": "GUIMerger#3", + "compName": "Merger#3", "pinName": "I2" }, "pin2": { @@ -3875,7 +3875,7 @@ "pinName": "Y1" }, "pin2": { - "compName": "GUIMerger#3", + "compName": "Merger#3", "pinName": "I3" }, "name": "unnamedWire#92", @@ -3883,7 +3883,7 @@ }, { "pin1": { - "compName": "GUIMerger#3", + "compName": "Merger#3", "pinName": "O" }, "pin2": { @@ -3895,11 +3895,11 @@ }, { "pin1": { - "compName": "GUIAm2904RegCTInstrDecode#0", + "compName": "Am2904RegCTInstrDecode#0", "pinName": "Y_MUX" }, "pin2": { - "compName": "GUISplitter#2", + "compName": "Splitter#2", "pinName": "I" }, "name": "unnamedWire#94", @@ -3907,7 +3907,7 @@ }, { "pin1": { - "compName": "GUISplitter#2", + "compName": "Splitter#2", "pinName": "O0" }, "pin2": { @@ -3919,7 +3919,7 @@ }, { "pin1": { - "compName": "GUISplitter#2", + "compName": "Splitter#2", "pinName": "O1" }, "pin2": { @@ -3931,7 +3931,7 @@ }, { "pin1": { - "compName": "GUISplitter#3", + "compName": "Splitter#3", "pinName": "O3" }, "pin2": { @@ -3943,7 +3943,7 @@ }, { "pin1": { - "compName": "GUISplitter#3", + "compName": "Splitter#3", "pinName": "O2" }, "pin2": { @@ -3959,7 +3959,7 @@ "pinName": "I0_3" }, "pin2": { - "compName": "GUISplitter#3", + "compName": "Splitter#3", "pinName": "O1" }, "name": "unnamedWire#99", diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/GUIAm2904MSR.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904MSR.json similarity index 94% rename from net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/GUIAm2904MSR.json rename to net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904MSR.json index c1b8cbc5..5d492b49 100644 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/GUIAm2904MSR.json +++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904MSR.json @@ -115,7 +115,7 @@ "submodel": { "components": [ { - "id": "GUImux1_4", + "id": "mux1_4", "name": "DeserializedSubmodelComponent#0", "pos": { "x": 55.0, @@ -123,7 +123,7 @@ } }, { - "id": "GUIxor", + "id": "xor", "name": "DeserializedSubmodelComponent#1", "pos": { "x": 35.0, @@ -131,7 +131,7 @@ } }, { - "id": "GUImux1_4", + "id": "mux1_4", "name": "DeserializedSubmodelComponent#2", "pos": { "x": 150.0, @@ -139,7 +139,7 @@ } }, { - "id": "GUInot4", + "id": "not4", "name": "DeserializedSubmodelComponent#3", "pos": { "x": 100.0, @@ -147,7 +147,7 @@ } }, { - "id": "GUImux1_4", + "id": "mux1_4", "name": "DeserializedSubmodelComponent#4", "pos": { "x": 110.0, @@ -155,7 +155,7 @@ } }, { - "id": "GUImux1_4", + "id": "mux1_4", "name": "DeserializedSubmodelComponent#5", "pos": { "x": 200.0, @@ -163,7 +163,7 @@ } }, { - "id": "GUImux1_4", + "id": "mux1_4", "name": "DeserializedSubmodelComponent#6", "pos": { "x": 250.0, @@ -171,7 +171,7 @@ } }, { - "id": "GUImux1", + "id": "mux1", "name": "DeserializedSubmodelComponent#7", "pos": { "x": 325.0, @@ -179,7 +179,7 @@ } }, { - "id": "GUIand", + "id": "and", "name": "DeserializedSubmodelComponent#8", "pos": { "x": 380.0, @@ -187,8 +187,8 @@ } }, { - "id": "GUIMerger", - "name": "GUIMerger#0", + "id": "Merger", + "name": "Merger#0", "pos": { "x": 435.0, "y": 175.0 @@ -196,8 +196,8 @@ "params": 4 }, { - "id": "GUINandGate", - "name": "GUINandGate#0", + "id": "NandGate", + "name": "NandGate#0", "pos": { "x": 325.0, "y": 90.0 @@ -205,8 +205,8 @@ "params": 1 }, { - "id": "GUISplitter", - "name": "GUISplitter#0", + "id": "Splitter", + "name": "Splitter#0", "pos": { "x": 5.0, "y": 35.0 @@ -214,8 +214,8 @@ "params": 4 }, { - "id": "GUISplitter", - "name": "GUISplitter#1", + "id": "Splitter", + "name": "Splitter#1", "pos": { "x": 5.0, "y": 165.0 @@ -223,8 +223,8 @@ "params": 4 }, { - "id": "GUISplitter", - "name": "GUISplitter#2", + "id": "Splitter", + "name": "Splitter#2", "pos": { "x": 45.0, "y": 425.0 @@ -232,8 +232,8 @@ "params": 3 }, { - "id": "GUISplitter", - "name": "GUISplitter#3", + "id": "Splitter", + "name": "Splitter#3", "pos": { "x": 5.0, "y": 295.0 @@ -241,8 +241,8 @@ "params": 4 }, { - "id": "GUIdff4_finewe", - "name": "GUIdff4_finewe#0", + "id": "dff4_finewe", + "name": "dff4_finewe#0", "pos": { "x": 375.0, "y": 170.0 @@ -409,7 +409,7 @@ "pinName": "C" }, "pin2": { - "compName": "GUIdff4_finewe#0", + "compName": "dff4_finewe#0", "pinName": "C" }, "name": "unnamedWire#0", @@ -442,7 +442,7 @@ "pinName": "_EOVR" }, "pin2": { - "compName": "GUIdff4_finewe#0", + "compName": "dff4_finewe#0", "pinName": "_WE4" }, "name": "unnamedWire#1", @@ -463,7 +463,7 @@ "pinName": "mu" }, "pin2": { - "compName": "GUISplitter#0", + "compName": "Splitter#0", "pinName": "I" }, "name": "unnamedWire#10", @@ -475,7 +475,7 @@ "pinName": "Y" }, "pin2": { - "compName": "GUISplitter#1", + "compName": "Splitter#1", "pinName": "I" }, "name": "unnamedWire#11", @@ -487,7 +487,7 @@ "pinName": "I0_1" }, "pin2": { - "compName": "GUISplitter#0", + "compName": "Splitter#0", "pinName": "O3" }, "name": "unnamedWire#12", @@ -504,7 +504,7 @@ }, { "pin1": { - "compName": "GUISplitter#0", + "compName": "Splitter#0", "pinName": "O2" }, "pin2": { @@ -525,7 +525,7 @@ }, { "pin1": { - "compName": "GUISplitter#0", + "compName": "Splitter#0", "pinName": "O1" }, "pin2": { @@ -546,7 +546,7 @@ }, { "pin1": { - "compName": "GUISplitter#0", + "compName": "Splitter#0", "pinName": "O0" }, "pin2": { @@ -567,7 +567,7 @@ }, { "pin1": { - "compName": "GUISplitter#1", + "compName": "Splitter#1", "pinName": "O3" }, "pin2": { @@ -583,7 +583,7 @@ "pinName": "I1_2" }, "pin2": { - "compName": "GUISplitter#1", + "compName": "Splitter#1", "pinName": "O2" }, "name": "unnamedWire#17", @@ -591,7 +591,7 @@ }, { "pin1": { - "compName": "GUISplitter#1", + "compName": "Splitter#1", "pinName": "O1" }, "pin2": { @@ -607,7 +607,7 @@ "pinName": "I1_4" }, "pin2": { - "compName": "GUISplitter#1", + "compName": "Splitter#1", "pinName": "O0" }, "name": "unnamedWire#19", @@ -619,7 +619,7 @@ "pinName": "_EN" }, "pin2": { - "compName": "GUIdff4_finewe#0", + "compName": "dff4_finewe#0", "pinName": "_WE3" }, "name": "unnamedWire#2", @@ -644,7 +644,7 @@ "pinName": "MUX" }, "pin2": { - "compName": "GUISplitter#2", + "compName": "Splitter#2", "pinName": "I" }, "name": "unnamedWire#20", @@ -673,7 +673,7 @@ "pinName": "I" }, "pin2": { - "compName": "GUISplitter#3", + "compName": "Splitter#3", "pinName": "I" }, "name": "unnamedWire#22", @@ -681,7 +681,7 @@ }, { "pin1": { - "compName": "GUISplitter#3", + "compName": "Splitter#3", "pinName": "O2" }, "pin2": { @@ -702,7 +702,7 @@ }, { "pin1": { - "compName": "GUISplitter#2", + "compName": "Splitter#2", "pinName": "O0" }, "pin2": { @@ -739,7 +739,7 @@ }, { "pin1": { - "compName": "GUIdff4_finewe#0", + "compName": "dff4_finewe#0", "pinName": "Q3" }, "pin2": { @@ -755,7 +755,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIMerger#0", + "compName": "Merger#0", "pinName": "I2" }, "name": "unnamedWire#27", @@ -763,7 +763,7 @@ }, { "pin1": { - "compName": "GUIMerger#0", + "compName": "Merger#0", "pinName": "I3" }, "pin2": { @@ -779,7 +779,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIdff4_finewe#0", + "compName": "dff4_finewe#0", "pinName": "Q4" }, "name": "unnamedWire#29", @@ -956,7 +956,7 @@ "pinName": "" }, "pin2": { - "compName": "GUISplitter#3", + "compName": "Splitter#3", "pinName": "O3" }, "name": "unnamedWire#38", @@ -985,7 +985,7 @@ "pinName": "_EZ" }, "pin2": { - "compName": "GUIdff4_finewe#0", + "compName": "dff4_finewe#0", "pinName": "_WE1" }, "name": "unnamedWire#4", @@ -1145,7 +1145,7 @@ }, { "pin1": { - "compName": "GUIMerger#0", + "compName": "Merger#0", "pinName": "O" }, "pin2": { @@ -1258,7 +1258,7 @@ }, { "pin1": { - "compName": "GUISplitter#3", + "compName": "Splitter#3", "pinName": "O1" }, "pin2": { @@ -1287,7 +1287,7 @@ }, { "pin1": { - "compName": "GUIdff4_finewe#0", + "compName": "dff4_finewe#0", "pinName": "Q1" }, "pin2": { @@ -1328,7 +1328,7 @@ }, { "pin1": { - "compName": "GUISplitter#3", + "compName": "Splitter#3", "pinName": "O0" }, "pin2": { @@ -1397,7 +1397,7 @@ }, { "pin1": { - "compName": "GUISplitter#2", + "compName": "Splitter#2", "pinName": "O1" }, "pin2": { @@ -1451,7 +1451,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIMerger#0", + "compName": "Merger#0", "pinName": "I0" }, "name": "unnamedWire#7", @@ -1463,7 +1463,7 @@ "pinName": "Y4" }, "pin2": { - "compName": "GUIdff4_finewe#0", + "compName": "dff4_finewe#0", "pinName": "D4" }, "name": "unnamedWire#70", @@ -1480,7 +1480,7 @@ }, { "pin1": { - "compName": "GUIdff4_finewe#0", + "compName": "dff4_finewe#0", "pinName": "D3" }, "pin2": { @@ -1505,7 +1505,7 @@ "pinName": "Y" }, "pin2": { - "compName": "GUIdff4_finewe#0", + "compName": "dff4_finewe#0", "pinName": "_WE2" }, "name": "unnamedWire#72", @@ -1530,7 +1530,7 @@ }, { "pin1": { - "compName": "GUIdff4_finewe#0", + "compName": "dff4_finewe#0", "pinName": "D1" }, "pin2": { @@ -1641,7 +1641,7 @@ }, { "pin1": { - "compName": "GUIMerger#0", + "compName": "Merger#0", "pinName": "I1" }, "pin2": { @@ -1695,7 +1695,7 @@ }, { "pin1": { - "compName": "GUISplitter#2", + "compName": "Splitter#2", "pinName": "O2" }, "pin2": { @@ -1807,7 +1807,7 @@ "pinName": "Y" }, "pin2": { - "compName": "GUIdff4_finewe#0", + "compName": "dff4_finewe#0", "pinName": "D2" }, "name": "unnamedWire#88", @@ -1824,7 +1824,7 @@ }, { "pin1": { - "compName": "GUINandGate#0", + "compName": "NandGate#0", "pinName": "Y" }, "pin2": { @@ -1836,7 +1836,7 @@ }, { "pin1": { - "compName": "GUIdff4_finewe#0", + "compName": "dff4_finewe#0", "pinName": "Q2" }, "pin2": { @@ -1864,7 +1864,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#0", + "compName": "NandGate#0", "pinName": "B" }, "name": "unnamedWire#91", @@ -1872,7 +1872,7 @@ }, { "pin1": { - "compName": "GUINandGate#0", + "compName": "NandGate#0", "pinName": "A" }, "pin2": { @@ -1918,7 +1918,7 @@ "q": { "id": "delegating", "params": { - "delegateTarget": "GUIdff4_finewe#0", + "delegateTarget": "dff4_finewe#0", "subStateID": "q" } } diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/GUIAm2904TestLogic.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904TestLogic.json similarity index 91% rename from net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/GUIAm2904TestLogic.json rename to net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904TestLogic.json index 3acca4f7..3ec88ac4 100644 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/GUIAm2904TestLogic.json +++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904TestLogic.json @@ -88,7 +88,7 @@ "submodel": { "components": [ { - "id": "GUIxor", + "id": "xor", "name": "DeserializedSubmodelComponent#0", "pos": { "x": 40.0, @@ -96,8 +96,8 @@ } }, { - "id": "GUINandGate", - "name": "GUINandGate#0", + "id": "NandGate", + "name": "NandGate#0", "pos": { "x": 85.0, "y": 20.0 @@ -105,8 +105,8 @@ "params": 1 }, { - "id": "GUINandGate", - "name": "GUINandGate#1", + "id": "NandGate", + "name": "NandGate#1", "pos": { "x": 45.0, "y": 50.0 @@ -114,8 +114,8 @@ "params": 1 }, { - "id": "GUINandGate", - "name": "GUINandGate#2", + "id": "NandGate", + "name": "NandGate#2", "pos": { "x": 120.0, "y": 15.0 @@ -123,8 +123,8 @@ "params": 1 }, { - "id": "GUINandGate", - "name": "GUINandGate#3", + "id": "NandGate", + "name": "NandGate#3", "pos": { "x": 45.0, "y": 105.0 @@ -132,8 +132,8 @@ "params": 1 }, { - "id": "GUINandGate", - "name": "GUINandGate#4", + "id": "NandGate", + "name": "NandGate#4", "pos": { "x": 80.0, "y": 115.0 @@ -141,8 +141,8 @@ "params": 1 }, { - "id": "GUINandGate", - "name": "GUINandGate#5", + "id": "NandGate", + "name": "NandGate#5", "pos": { "x": 80.0, "y": 165.0 @@ -150,8 +150,8 @@ "params": 1 }, { - "id": "GUISplitter", - "name": "GUISplitter#0", + "id": "Splitter", + "name": "Splitter#0", "pos": { "x": 5.0, "y": 110.0 @@ -265,7 +265,7 @@ "pinName": "I" }, "pin2": { - "compName": "GUISplitter#0", + "compName": "Splitter#0", "pinName": "I" }, "name": "unnamedWire#0", @@ -277,7 +277,7 @@ "pinName": "" }, "pin2": { - "compName": "GUISplitter#0", + "compName": "Splitter#0", "pinName": "O2" }, "name": "unnamedWire#1", @@ -285,11 +285,11 @@ }, { "pin1": { - "compName": "GUINandGate#2", + "compName": "NandGate#2", "pinName": "A" }, "pin2": { - "compName": "GUINandGate#0", + "compName": "NandGate#0", "pinName": "Y" }, "name": "unnamedWire#10", @@ -327,7 +327,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#1", + "compName": "NandGate#1", "pinName": "A" }, "name": "unnamedWire#12", @@ -344,7 +344,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#1", + "compName": "NandGate#1", "pinName": "B" }, "name": "unnamedWire#13", @@ -356,7 +356,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#2", + "compName": "NandGate#2", "pinName": "B" }, "name": "unnamedWire#14", @@ -390,7 +390,7 @@ }, { "pin1": { - "compName": "GUINandGate#2", + "compName": "NandGate#2", "pinName": "Y" }, "pin2": { @@ -431,7 +431,7 @@ }, { "pin1": { - "compName": "GUISplitter#0", + "compName": "Splitter#0", "pinName": "O1" }, "pin2": { @@ -455,7 +455,7 @@ }, { "pin1": { - "compName": "GUISplitter#0", + "compName": "Splitter#0", "pinName": "O0" }, "pin2": { @@ -484,7 +484,7 @@ }, { "pin1": { - "compName": "GUINandGate#4", + "compName": "NandGate#4", "pinName": "Y" }, "pin2": { @@ -496,11 +496,11 @@ }, { "pin1": { - "compName": "GUINandGate#3", + "compName": "NandGate#3", "pinName": "Y" }, "pin2": { - "compName": "GUINandGate#4", + "compName": "NandGate#4", "pinName": "B" }, "name": "unnamedWire#24", @@ -533,7 +533,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#4", + "compName": "NandGate#4", "pinName": "A" }, "name": "unnamedWire#26", @@ -545,7 +545,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#3", + "compName": "NandGate#3", "pinName": "A" }, "name": "unnamedWire#27", @@ -569,7 +569,7 @@ "pinName": "Y110" }, "pin2": { - "compName": "GUINandGate#5", + "compName": "NandGate#5", "pinName": "Y" }, "name": "unnamedWire#29", @@ -594,7 +594,7 @@ }, { "pin1": { - "compName": "GUINandGate#5", + "compName": "NandGate#5", "pinName": "A" }, "pin2": { @@ -611,7 +611,7 @@ }, { "pin1": { - "compName": "GUINandGate#3", + "compName": "NandGate#3", "pinName": "B" }, "pin2": { @@ -632,7 +632,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#5", + "compName": "NandGate#5", "pinName": "B" }, "name": "unnamedWire#32", @@ -662,7 +662,7 @@ }, { "pin1": { - "compName": "GUISplitter#0", + "compName": "Splitter#0", "pinName": "O3" }, "pin2": { @@ -712,7 +712,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#0", + "compName": "NandGate#0", "pinName": "A" }, "name": "unnamedWire#6", @@ -720,7 +720,7 @@ }, { "pin1": { - "compName": "GUINandGate#0", + "compName": "NandGate#0", "pinName": "B" }, "pin2": { @@ -744,7 +744,7 @@ }, { "pin1": { - "compName": "GUINandGate#1", + "compName": "NandGate#1", "pinName": "Y" }, "pin2": { diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/GUIAm2904muSR.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904muSR.json similarity index 90% rename from net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/GUIAm2904muSR.json rename to net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904muSR.json index b0993386..79106b07 100644 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/GUIAm2904muSR.json +++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904muSR.json @@ -106,7 +106,7 @@ "submodel": { "components": [ { - "id": "GUImux1_4", + "id": "mux1_4", "name": "DeserializedSubmodelComponent#0", "pos": { "x": 45.0, @@ -114,7 +114,7 @@ } }, { - "id": "GUImux1_4", + "id": "mux1_4", "name": "DeserializedSubmodelComponent#1", "pos": { "x": 100.0, @@ -122,7 +122,7 @@ } }, { - "id": "GUIxor", + "id": "xor", "name": "DeserializedSubmodelComponent#2", "pos": { "x": 215.0, @@ -130,8 +130,8 @@ } }, { - "id": "GUIMerger", - "name": "GUIMerger#0", + "id": "Merger", + "name": "Merger#0", "pos": { "x": 435.0, "y": 175.0 @@ -139,8 +139,8 @@ "params": 4 }, { - "id": "GUINandGate", - "name": "GUINandGate#0", + "id": "NandGate", + "name": "NandGate#0", "pos": { "x": 245.0, "y": 245.0 @@ -148,8 +148,8 @@ "params": 1 }, { - "id": "GUINandGate", - "name": "GUINandGate#1", + "id": "NandGate", + "name": "NandGate#1", "pos": { "x": 215.0, "y": 255.0 @@ -157,8 +157,8 @@ "params": 1 }, { - "id": "GUINandGate", - "name": "GUINandGate#2", + "id": "NandGate", + "name": "NandGate#2", "pos": { "x": 215.0, "y": 235.0 @@ -166,8 +166,8 @@ "params": 1 }, { - "id": "GUISplitter", - "name": "GUISplitter#0", + "id": "Splitter", + "name": "Splitter#0", "pos": { "x": 5.0, "y": 120.0 @@ -175,8 +175,8 @@ "params": 4 }, { - "id": "GUISplitter", - "name": "GUISplitter#1", + "id": "Splitter", + "name": "Splitter#1", "pos": { "x": 5.0, "y": 295.0 @@ -184,8 +184,8 @@ "params": 4 }, { - "id": "GUISplitter", - "name": "GUISplitter#2", + "id": "Splitter", + "name": "Splitter#2", "pos": { "x": 45.0, "y": 430.0 @@ -193,8 +193,8 @@ "params": 2 }, { - "id": "GUIdff4_finewe", - "name": "GUIdff4_finewe#0", + "id": "dff4_finewe", + "name": "dff4_finewe#0", "pos": { "x": 375.0, "y": 170.0 @@ -249,11 +249,11 @@ "wires": [ { "pin1": { - "compName": "GUIdff4_finewe#0", + "compName": "dff4_finewe#0", "pinName": "Q1" }, "pin2": { - "compName": "GUIMerger#0", + "compName": "Merger#0", "pinName": "I3" }, "name": "unnamedWire#0", @@ -261,11 +261,11 @@ }, { "pin1": { - "compName": "GUIMerger#0", + "compName": "Merger#0", "pinName": "I2" }, "pin2": { - "compName": "GUIdff4_finewe#0", + "compName": "dff4_finewe#0", "pinName": "Q2" }, "name": "unnamedWire#1", @@ -277,7 +277,7 @@ "pinName": "I1_4" }, "pin2": { - "compName": "GUISplitter#1", + "compName": "Splitter#1", "pinName": "O0" }, "name": "unnamedWire#10", @@ -289,7 +289,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIMerger#0", + "compName": "Merger#0", "pinName": "I0" }, "name": "unnamedWire#11", @@ -297,7 +297,7 @@ }, { "pin1": { - "compName": "GUISplitter#0", + "compName": "Splitter#0", "pinName": "O0" }, "pin2": { @@ -318,7 +318,7 @@ }, { "pin1": { - "compName": "GUISplitter#0", + "compName": "Splitter#0", "pinName": "O1" }, "pin2": { @@ -339,7 +339,7 @@ }, { "pin1": { - "compName": "GUISplitter#0", + "compName": "Splitter#0", "pinName": "O2" }, "pin2": { @@ -364,7 +364,7 @@ "pinName": "MUX" }, "pin2": { - "compName": "GUISplitter#2", + "compName": "Splitter#2", "pinName": "I" }, "name": "unnamedWire#15", @@ -377,7 +377,7 @@ }, { "pin1": { - "compName": "GUISplitter#2", + "compName": "Splitter#2", "pinName": "O0" }, "pin2": { @@ -430,11 +430,11 @@ }, { "pin1": { - "compName": "GUIMerger#0", + "compName": "Merger#0", "pinName": "I1" }, "pin2": { - "compName": "GUIdff4_finewe#0", + "compName": "dff4_finewe#0", "pinName": "Q3" }, "name": "unnamedWire#2", @@ -552,7 +552,7 @@ }, { "pin1": { - "compName": "GUISplitter#2", + "compName": "Splitter#2", "pinName": "O1" }, "pin2": { @@ -573,7 +573,7 @@ }, { "pin1": { - "compName": "GUIdff4_finewe#0", + "compName": "dff4_finewe#0", "pinName": "Q4" }, "pin2": { @@ -585,11 +585,11 @@ }, { "pin1": { - "compName": "GUINandGate#2", + "compName": "NandGate#2", "pinName": "Y" }, "pin2": { - "compName": "GUINandGate#0", + "compName": "NandGate#0", "pinName": "A" }, "name": "unnamedWire#30", @@ -606,11 +606,11 @@ }, { "pin1": { - "compName": "GUINandGate#0", + "compName": "NandGate#0", "pinName": "B" }, "pin2": { - "compName": "GUINandGate#1", + "compName": "NandGate#1", "pinName": "Y" }, "name": "unnamedWire#31", @@ -631,7 +631,7 @@ "pinName": "OVRRET" }, "pin2": { - "compName": "GUINandGate#1", + "compName": "NandGate#1", "pinName": "A" }, "name": "unnamedWire#32", @@ -668,7 +668,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#1", + "compName": "NandGate#1", "pinName": "B" }, "name": "unnamedWire#34", @@ -726,7 +726,7 @@ }, { "pin1": { - "compName": "GUIdff4_finewe#0", + "compName": "dff4_finewe#0", "pinName": "_WE1" }, "pin2": { @@ -755,7 +755,7 @@ "pinName": "C" }, "pin2": { - "compName": "GUIdff4_finewe#0", + "compName": "dff4_finewe#0", "pinName": "C" }, "name": "unnamedWire#38", @@ -780,7 +780,7 @@ "pinName": "_EOVR" }, "pin2": { - "compName": "GUIdff4_finewe#0", + "compName": "dff4_finewe#0", "pinName": "_WE4" }, "name": "unnamedWire#39", @@ -793,7 +793,7 @@ }, { "pin1": { - "compName": "GUIMerger#0", + "compName": "Merger#0", "pinName": "O" }, "pin2": { @@ -805,7 +805,7 @@ }, { "pin1": { - "compName": "GUIdff4_finewe#0", + "compName": "dff4_finewe#0", "pinName": "_WE3" }, "pin2": { @@ -834,7 +834,7 @@ "pinName": "_EC" }, "pin2": { - "compName": "GUIdff4_finewe#0", + "compName": "dff4_finewe#0", "pinName": "_WE2" }, "name": "unnamedWire#41", @@ -855,7 +855,7 @@ }, { "pin1": { - "compName": "GUIdff4_finewe#0", + "compName": "dff4_finewe#0", "pinName": "D1" }, "pin2": { @@ -880,7 +880,7 @@ "pinName": "Y" }, "pin2": { - "compName": "GUIdff4_finewe#0", + "compName": "dff4_finewe#0", "pinName": "D2" }, "name": "unnamedWire#43", @@ -897,7 +897,7 @@ }, { "pin1": { - "compName": "GUIdff4_finewe#0", + "compName": "dff4_finewe#0", "pinName": "D3" }, "pin2": { @@ -947,11 +947,11 @@ }, { "pin1": { - "compName": "GUINandGate#0", + "compName": "NandGate#0", "pinName": "Y" }, "pin2": { - "compName": "GUIdff4_finewe#0", + "compName": "dff4_finewe#0", "pinName": "D4" }, "name": "unnamedWire#46", @@ -963,7 +963,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#2", + "compName": "NandGate#2", "pinName": "A" }, "name": "unnamedWire#47", @@ -980,7 +980,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#2", + "compName": "NandGate#2", "pinName": "B" }, "name": "unnamedWire#48", @@ -993,7 +993,7 @@ }, { "pin1": { - "compName": "GUISplitter#0", + "compName": "Splitter#0", "pinName": "O3" }, "pin2": { @@ -1018,7 +1018,7 @@ "pinName": "M" }, "pin2": { - "compName": "GUISplitter#0", + "compName": "Splitter#0", "pinName": "I" }, "name": "unnamedWire#5", @@ -1030,7 +1030,7 @@ "pinName": "I" }, "pin2": { - "compName": "GUISplitter#1", + "compName": "Splitter#1", "pinName": "I" }, "name": "unnamedWire#6", @@ -1038,7 +1038,7 @@ }, { "pin1": { - "compName": "GUISplitter#1", + "compName": "Splitter#1", "pinName": "O3" }, "pin2": { @@ -1054,7 +1054,7 @@ "pinName": "I1_2" }, "pin2": { - "compName": "GUISplitter#1", + "compName": "Splitter#1", "pinName": "O2" }, "name": "unnamedWire#8", @@ -1062,7 +1062,7 @@ }, { "pin1": { - "compName": "GUISplitter#1", + "compName": "Splitter#1", "pinName": "O1" }, "pin2": { @@ -1091,7 +1091,7 @@ "q": { "id": "delegating", "params": { - "delegateTarget": "GUIdff4_finewe#0", + "delegateTarget": "dff4_finewe#0", "subStateID": "q" } } diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2910/GUIAm2910.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2910/Am2910.json similarity index 83% rename from net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2910/GUIAm2910.json rename to net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2910/Am2910.json index 751b0bce..b0d1cfd2 100644 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2910/GUIAm2910.json +++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2910/Am2910.json @@ -124,32 +124,32 @@ "submodel": { "components": [ { - "id": "GUIAm2910InstrPLA", - "name": "GUIAm2910InstrPLA#0", + "id": "Am2910InstrPLA", + "name": "Am2910InstrPLA#0", "pos": { "x": 80.0, "y": 155.0 } }, { - "id": "GUIAm2910RegCntr", - "name": "GUIAm2910RegCntr#0", + "id": "Am2910RegCntr", + "name": "Am2910RegCntr#0", "pos": { "x": 160.0, "y": 25.0 } }, { - "id": "GUIAm2910SP", - "name": "GUIAm2910SP#0", + "id": "Am2910SP", + "name": "Am2910SP#0", "pos": { "x": 305.0, "y": 55.0 } }, { - "id": "GUIBitDisplay", - "name": "GUIBitDisplay#0", + "id": "BitDisplay", + "name": "BitDisplay#0", "pos": { "x": 160.0, "y": 95.0 @@ -157,8 +157,8 @@ "params": 12 }, { - "id": "GUIBitDisplay", - "name": "GUIBitDisplay#1", + "id": "BitDisplay", + "name": "BitDisplay#1", "pos": { "x": 260.0, "y": 115.0 @@ -166,8 +166,8 @@ "params": 12 }, { - "id": "GUIBitDisplay", - "name": "GUIBitDisplay#2", + "id": "BitDisplay", + "name": "BitDisplay#2", "pos": { "x": 345.0, "y": 180.0 @@ -175,8 +175,8 @@ "params": 12 }, { - "id": "GUIBitDisplay", - "name": "GUIBitDisplay#3", + "id": "BitDisplay", + "name": "BitDisplay#3", "pos": { "x": 265.0, "y": 150.0 @@ -184,8 +184,8 @@ "params": 12 }, { - "id": "GUIBitDisplay", - "name": "GUIBitDisplay#4", + "id": "BitDisplay", + "name": "BitDisplay#4", "pos": { "x": 260.0, "y": 85.0 @@ -193,8 +193,8 @@ "params": 3 }, { - "id": "GUIBitDisplay", - "name": "GUIBitDisplay#5", + "id": "BitDisplay", + "name": "BitDisplay#5", "pos": { "x": 260.0, "y": 70.0 @@ -202,8 +202,8 @@ "params": 3 }, { - "id": "GUINandGate", - "name": "GUINandGate#0", + "id": "NandGate", + "name": "NandGate#0", "pos": { "x": 40.0, "y": 185.0 @@ -211,8 +211,8 @@ "params": 1 }, { - "id": "GUINandGate", - "name": "GUINandGate#1", + "id": "NandGate", + "name": "NandGate#1", "pos": { "x": 10.0, "y": 210.0 @@ -220,8 +220,8 @@ "params": 1 }, { - "id": "GUINandGate", - "name": "GUINandGate#2", + "id": "NandGate", + "name": "NandGate#2", "pos": { "x": 250.0, "y": 305.0 @@ -229,8 +229,8 @@ "params": 1 }, { - "id": "GUITriStateBuffer", - "name": "GUITriStateBuffer#0", + "id": "TriStateBuffer", + "name": "TriStateBuffer#0", "pos": { "x": 180.0, "y": 290.0 @@ -241,40 +241,40 @@ } }, { - "id": "GUIdff12", - "name": "GUIdff12#0", + "id": "dff12", + "name": "dff12#0", "pos": { "x": 305.0, "y": 160.0 } }, { - "id": "GUIinc12", - "name": "GUIinc12#0", + "id": "inc12", + "name": "inc12#0", "pos": { "x": 305.0, "y": 190.0 } }, { - "id": "GUInor12", - "name": "GUInor12#0", + "id": "nor12", + "name": "nor12#0", "pos": { "x": 190.0, "y": 80.0 } }, { - "id": "GUIram5_12", - "name": "GUIram5_12#0", + "id": "ram5_12", + "name": "ram5_12#0", "pos": { "x": 305.0, "y": 100.0 } }, { - "id": "GUIsel4_12", - "name": "GUIsel4_12#0", + "id": "sel4_12", + "name": "sel4_12#0", "pos": { "x": 150.0, "y": 175.0 @@ -383,11 +383,11 @@ "wires": [ { "pin1": { - "compName": "GUIAm2910InstrPLA#0", + "compName": "Am2910InstrPLA#0", "pinName": "YD" }, "pin2": { - "compName": "GUIsel4_12#0", + "compName": "sel4_12#0", "pinName": "SA" }, "name": "unnamedWire#0", @@ -395,11 +395,11 @@ }, { "pin1": { - "compName": "GUIAm2910InstrPLA#0", + "compName": "Am2910InstrPLA#0", "pinName": "YR" }, "pin2": { - "compName": "GUIsel4_12#0", + "compName": "sel4_12#0", "pinName": "SB" }, "name": "unnamedWire#1", @@ -407,11 +407,11 @@ }, { "pin1": { - "compName": "GUInor12#0", + "compName": "nor12#0", "pinName": "Y" }, "pin2": { - "compName": "GUIAm2910InstrPLA#0", + "compName": "Am2910InstrPLA#0", "pinName": "R\u003d0" }, "name": "unnamedWire#10", @@ -432,11 +432,11 @@ }, { "pin1": { - "compName": "GUIAm2910InstrPLA#0", + "compName": "Am2910InstrPLA#0", "pinName": "RWE" }, "pin2": { - "compName": "GUIAm2910RegCntr#0", + "compName": "Am2910RegCntr#0", "pinName": "WE" }, "name": "unnamedWire#11", @@ -453,11 +453,11 @@ }, { "pin1": { - "compName": "GUIAm2910InstrPLA#0", + "compName": "Am2910InstrPLA#0", "pinName": "RDEC" }, "pin2": { - "compName": "GUIAm2910RegCntr#0", + "compName": "Am2910RegCntr#0", "pinName": "DEC" }, "name": "unnamedWire#12", @@ -474,7 +474,7 @@ }, { "pin1": { - "compName": "GUIAm2910InstrPLA#0", + "compName": "Am2910InstrPLA#0", "pinName": "STKI0" }, "pin2": { @@ -491,11 +491,11 @@ }, { "pin1": { - "compName": "GUIAm2910InstrPLA#0", + "compName": "Am2910InstrPLA#0", "pinName": "STKI1" }, "pin2": { - "compName": "GUIAm2910SP#0", + "compName": "Am2910SP#0", "pinName": "STKI1" }, "name": "unnamedWire#14", @@ -516,7 +516,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIAm2910SP#0", + "compName": "Am2910SP#0", "pinName": "STKI0" }, "name": "unnamedWire#15", @@ -529,7 +529,7 @@ }, { "pin1": { - "compName": "GUIram5_12#0", + "compName": "ram5_12#0", "pinName": "WE" }, "pin2": { @@ -541,7 +541,7 @@ }, { "pin1": { - "compName": "GUIsel4_12#0", + "compName": "sel4_12#0", "pinName": "Y" }, "pin2": { @@ -557,7 +557,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIinc12#0", + "compName": "inc12#0", "pinName": "A" }, "name": "unnamedWire#18", @@ -570,11 +570,11 @@ }, { "pin1": { - "compName": "GUIram5_12#0", + "compName": "ram5_12#0", "pinName": "Y" }, "pin2": { - "compName": "GUIsel4_12#0", + "compName": "sel4_12#0", "pinName": "C" }, "name": "unnamedWire#19", @@ -587,11 +587,11 @@ }, { "pin1": { - "compName": "GUIAm2910InstrPLA#0", + "compName": "Am2910InstrPLA#0", "pinName": "YF" }, "pin2": { - "compName": "GUIsel4_12#0", + "compName": "sel4_12#0", "pinName": "SC" }, "name": "unnamedWire#2", @@ -603,7 +603,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIsel4_12#0", + "compName": "sel4_12#0", "pinName": "D" }, "name": "unnamedWire#20", @@ -620,7 +620,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIsel4_12#0", + "compName": "sel4_12#0", "pinName": "B" }, "name": "unnamedWire#21", @@ -632,7 +632,7 @@ "pinName": "" }, "pin2": { - "compName": "GUInor12#0", + "compName": "nor12#0", "pinName": "D" }, "name": "unnamedWire#22", @@ -656,7 +656,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIAm2910RegCntr#0", + "compName": "Am2910RegCntr#0", "pinName": "D" }, "name": "unnamedWire#24", @@ -668,7 +668,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIsel4_12#0", + "compName": "sel4_12#0", "pinName": "A" }, "name": "unnamedWire#25", @@ -693,7 +693,7 @@ "pinName": "_RLD" }, "pin2": { - "compName": "GUIAm2910RegCntr#0", + "compName": "Am2910RegCntr#0", "pinName": "_RLD" }, "name": "unnamedWire#26", @@ -701,7 +701,7 @@ }, { "pin1": { - "compName": "GUITriStateBuffer#0", + "compName": "TriStateBuffer#0", "pinName": "IN" }, "pin2": { @@ -713,11 +713,11 @@ }, { "pin1": { - "compName": "GUINandGate#0", + "compName": "NandGate#0", "pinName": "Y" }, "pin2": { - "compName": "GUIAm2910InstrPLA#0", + "compName": "Am2910InstrPLA#0", "pinName": "PASS" }, "name": "unnamedWire#28", @@ -738,7 +738,7 @@ "pinName": "_CC" }, "pin2": { - "compName": "GUINandGate#0", + "compName": "NandGate#0", "pinName": "A" }, "name": "unnamedWire#29", @@ -746,11 +746,11 @@ }, { "pin1": { - "compName": "GUIAm2910InstrPLA#0", + "compName": "Am2910InstrPLA#0", "pinName": "YmuPC" }, "pin2": { - "compName": "GUIsel4_12#0", + "compName": "sel4_12#0", "pinName": "SD" }, "name": "unnamedWire#3", @@ -774,7 +774,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#1", + "compName": "NandGate#1", "pinName": "A" }, "name": "unnamedWire#31", @@ -791,7 +791,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#1", + "compName": "NandGate#1", "pinName": "B" }, "name": "unnamedWire#32", @@ -804,11 +804,11 @@ }, { "pin1": { - "compName": "GUINandGate#1", + "compName": "NandGate#1", "pinName": "Y" }, "pin2": { - "compName": "GUINandGate#0", + "compName": "NandGate#0", "pinName": "B" }, "name": "unnamedWire#33", @@ -825,7 +825,7 @@ }, { "pin1": { - "compName": "GUIAm2910SP#0", + "compName": "Am2910SP#0", "pinName": "_FULL" }, "pin2": { @@ -841,7 +841,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIdff12#0", + "compName": "dff12#0", "pinName": "C" }, "name": "unnamedWire#35", @@ -865,7 +865,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIAm2910SP#0", + "compName": "Am2910SP#0", "pinName": "C" }, "name": "unnamedWire#37", @@ -889,7 +889,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIAm2910RegCntr#0", + "compName": "Am2910RegCntr#0", "pinName": "C" }, "name": "unnamedWire#39", @@ -897,11 +897,11 @@ }, { "pin1": { - "compName": "GUIinc12#0", + "compName": "inc12#0", "pinName": "Y" }, "pin2": { - "compName": "GUIdff12#0", + "compName": "dff12#0", "pinName": "D" }, "name": "unnamedWire#4", @@ -921,7 +921,7 @@ }, { "pin1": { - "compName": "GUIinc12#0", + "compName": "inc12#0", "pinName": "CI" }, "pin2": { @@ -933,7 +933,7 @@ }, { "pin1": { - "compName": "GUIAm2910InstrPLA#0", + "compName": "Am2910InstrPLA#0", "pinName": "_PL" }, "pin2": { @@ -954,7 +954,7 @@ }, { "pin1": { - "compName": "GUIAm2910InstrPLA#0", + "compName": "Am2910InstrPLA#0", "pinName": "_MAP" }, "pin2": { @@ -966,7 +966,7 @@ }, { "pin1": { - "compName": "GUIAm2910InstrPLA#0", + "compName": "Am2910InstrPLA#0", "pinName": "_VECT" }, "pin2": { @@ -991,7 +991,7 @@ "pinName": "I" }, "pin2": { - "compName": "GUIAm2910InstrPLA#0", + "compName": "Am2910InstrPLA#0", "pinName": "I" }, "name": "unnamedWire#45", @@ -1008,11 +1008,11 @@ }, { "pin1": { - "compName": "GUIAm2910RegCntr#0", + "compName": "Am2910RegCntr#0", "pinName": "Y" }, "pin2": { - "compName": "GUIBitDisplay#0", + "compName": "BitDisplay#0", "pinName": "" }, "name": "unnamedWire#46", @@ -1020,11 +1020,11 @@ }, { "pin1": { - "compName": "GUIram5_12#0", + "compName": "ram5_12#0", "pinName": "Y" }, "pin2": { - "compName": "GUIBitDisplay#1", + "compName": "BitDisplay#1", "pinName": "" }, "name": "unnamedWire#47", @@ -1032,11 +1032,11 @@ }, { "pin1": { - "compName": "GUIinc12#0", + "compName": "inc12#0", "pinName": "Y" }, "pin2": { - "compName": "GUIBitDisplay#2", + "compName": "BitDisplay#2", "pinName": "" }, "name": "unnamedWire#48", @@ -1044,11 +1044,11 @@ }, { "pin1": { - "compName": "GUIdff12#0", + "compName": "dff12#0", "pinName": "Y" }, "pin2": { - "compName": "GUIBitDisplay#3", + "compName": "BitDisplay#3", "pinName": "" }, "name": "unnamedWire#49", @@ -1056,7 +1056,7 @@ }, { "pin1": { - "compName": "GUIdff12#0", + "compName": "dff12#0", "pinName": "Y" }, "pin2": { @@ -1072,7 +1072,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIram5_12#0", + "compName": "ram5_12#0", "pinName": "C" }, "name": "unnamedWire#50", @@ -1092,7 +1092,7 @@ }, { "pin1": { - "compName": "GUITriStateBuffer#0", + "compName": "TriStateBuffer#0", "pinName": "OUT" }, "pin2": { @@ -1116,11 +1116,11 @@ }, { "pin1": { - "compName": "GUIAm2910SP#0", + "compName": "Am2910SP#0", "pinName": "A" }, "pin2": { - "compName": "GUIBitDisplay#5", + "compName": "BitDisplay#5", "pinName": "" }, "name": "unnamedWire#54", @@ -1128,11 +1128,11 @@ }, { "pin1": { - "compName": "GUIAm2910SP#0", + "compName": "Am2910SP#0", "pinName": "B" }, "pin2": { - "compName": "GUIBitDisplay#4", + "compName": "BitDisplay#4", "pinName": "" }, "name": "unnamedWire#55", @@ -1144,7 +1144,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#2", + "compName": "NandGate#2", "pinName": "B" }, "name": "unnamedWire#56", @@ -1152,7 +1152,7 @@ }, { "pin1": { - "compName": "GUINandGate#2", + "compName": "NandGate#2", "pinName": "A" }, "pin2": { @@ -1169,11 +1169,11 @@ }, { "pin1": { - "compName": "GUITriStateBuffer#0", + "compName": "TriStateBuffer#0", "pinName": "EN" }, "pin2": { - "compName": "GUINandGate#2", + "compName": "NandGate#2", "pinName": "Y" }, "name": "unnamedWire#58", @@ -1194,7 +1194,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIram5_12#0", + "compName": "ram5_12#0", "pinName": "D" }, "name": "unnamedWire#6", @@ -1202,11 +1202,11 @@ }, { "pin1": { - "compName": "GUIAm2910SP#0", + "compName": "Am2910SP#0", "pinName": "A" }, "pin2": { - "compName": "GUIram5_12#0", + "compName": "ram5_12#0", "pinName": "A" }, "name": "unnamedWire#7", @@ -1214,11 +1214,11 @@ }, { "pin1": { - "compName": "GUIAm2910SP#0", + "compName": "Am2910SP#0", "pinName": "B" }, "pin2": { - "compName": "GUIram5_12#0", + "compName": "ram5_12#0", "pinName": "B" }, "name": "unnamedWire#8", @@ -1226,7 +1226,7 @@ }, { "pin1": { - "compName": "GUIAm2910RegCntr#0", + "compName": "Am2910RegCntr#0", "pinName": "Y" }, "pin2": { @@ -1254,25 +1254,25 @@ "r": { "id": "delegating", "params": { - "delegateTarget": "GUIAm2910RegCntr#0" + "delegateTarget": "Am2910RegCntr#0" } }, "stack": { "id": "delegating", "params": { - "delegateTarget": "GUIram5_12#0" + "delegateTarget": "ram5_12#0" } }, "mupc": { "id": "delegating", "params": { - "delegateTarget": "GUIdff12#0" + "delegateTarget": "dff12#0" } }, "sp": { "id": "delegating", "params": { - "delegateTarget": "GUIAm2910SP#0" + "delegateTarget": "Am2910SP#0" } } }, diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/GUIand.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/and.json similarity index 87% rename from net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/GUIand.json rename to net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/and.json index 5e343e09..459bca8d 100644 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/GUIand.json +++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/and.json @@ -34,8 +34,8 @@ "submodel": { "components": [ { - "id": "GUINandGate", - "name": "GUINandGate#0", + "id": "NandGate", + "name": "NandGate#0", "pos": { "x": 20.0, "y": 15.0 @@ -43,8 +43,8 @@ "params": 1 }, { - "id": "GUINandGate", - "name": "GUINandGate#1", + "id": "NandGate", + "name": "NandGate#1", "pos": { "x": 50.0, "y": 15.0 @@ -68,7 +68,7 @@ "pinName": "A" }, "pin2": { - "compName": "GUINandGate#0", + "compName": "NandGate#0", "pinName": "A" }, "name": "unnamedWire#0" @@ -79,14 +79,14 @@ "pinName": "B" }, "pin2": { - "compName": "GUINandGate#0", + "compName": "NandGate#0", "pinName": "B" }, "name": "unnamedWire#1" }, { "pin1": { - "compName": "GUINandGate#0", + "compName": "NandGate#0", "pinName": "Y" }, "pin2": { @@ -102,7 +102,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#1", + "compName": "NandGate#1", "pinName": "A" }, "name": "unnamedWire#3", @@ -119,7 +119,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#1", + "compName": "NandGate#1", "pinName": "B" }, "name": "unnamedWire#4", @@ -132,7 +132,7 @@ }, { "pin1": { - "compName": "GUINandGate#1", + "compName": "NandGate#1", "pinName": "Y" }, "pin2": { @@ -146,7 +146,7 @@ }, "symbolRendererSnippetID": "simpleRectangularLike", "symbolRendererParams": { - "centerText": "GUIand", + "centerText": "and", "centerTextHeight": 5.0, "horizontalComponentCenter": 17.5, "pinLabelHeight": 3.5, diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/GUIand41.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/and41.json similarity index 90% rename from net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/GUIand41.json rename to net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/and41.json index c7ae05e5..0c89805a 100644 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/GUIand41.json +++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/and41.json @@ -88,32 +88,32 @@ "submodel": { "components": [ { - "id": "GUIand", - "name": "GUIand#0", + "id": "and", + "name": "and#0", "pos": { "x": 30.0, "y": 7.5 } }, { - "id": "GUIand", - "name": "GUIand#1", + "id": "and", + "name": "and#1", "pos": { "x": 30.0, "y": 32.5 } }, { - "id": "GUIand", - "name": "GUIand#2", + "id": "and", + "name": "and#2", "pos": { "x": 30.0, "y": 57.5 } }, { - "id": "GUIand", - "name": "GUIand#3", + "id": "and", + "name": "and#3", "pos": { "x": 30.0, "y": 82.5 @@ -154,7 +154,7 @@ "pinName": "A1" }, "pin2": { - "compName": "GUIand#0", + "compName": "and#0", "pinName": "A" }, "name": "unnamedWire#0", @@ -166,7 +166,7 @@ "pinName": "A2" }, "pin2": { - "compName": "GUIand#1", + "compName": "and#1", "pinName": "A" }, "name": "unnamedWire#1", @@ -178,7 +178,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIand#0", + "compName": "and#0", "pinName": "B" }, "name": "unnamedWire#10", @@ -191,7 +191,7 @@ }, { "pin1": { - "compName": "GUIand#0", + "compName": "and#0", "pinName": "Y" }, "pin2": { @@ -203,7 +203,7 @@ }, { "pin1": { - "compName": "GUIand#1", + "compName": "and#1", "pinName": "Y" }, "pin2": { @@ -215,7 +215,7 @@ }, { "pin1": { - "compName": "GUIand#2", + "compName": "and#2", "pinName": "Y" }, "pin2": { @@ -227,7 +227,7 @@ }, { "pin1": { - "compName": "GUIand#3", + "compName": "and#3", "pinName": "Y" }, "pin2": { @@ -243,7 +243,7 @@ "pinName": "A3" }, "pin2": { - "compName": "GUIand#2", + "compName": "and#2", "pinName": "A" }, "name": "unnamedWire#2", @@ -255,7 +255,7 @@ "pinName": "A4" }, "pin2": { - "compName": "GUIand#3", + "compName": "and#3", "pinName": "A" }, "name": "unnamedWire#3", @@ -284,7 +284,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIand#3", + "compName": "and#3", "pinName": "B" }, "name": "unnamedWire#5", @@ -308,7 +308,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIand#2", + "compName": "and#2", "pinName": "B" }, "name": "unnamedWire#7", @@ -332,7 +332,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIand#1", + "compName": "and#1", "pinName": "B" }, "name": "unnamedWire#9", @@ -343,7 +343,7 @@ }, "symbolRendererSnippetID": "simpleRectangularLike", "symbolRendererParams": { - "centerText": "GUIand41", + "centerText": "and41", "centerTextHeight": 5.0, "horizontalComponentCenter": 17.5, "pinLabelHeight": 3.5, diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/GUIandor414.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/andor414.json similarity index 90% rename from net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/GUIandor414.json rename to net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/andor414.json index 5f6d292b..a2b45122 100644 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/GUIandor414.json +++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/andor414.json @@ -124,16 +124,16 @@ "submodel": { "components": [ { - "id": "GUIand41", - "name": "GUIand41#0", + "id": "and41", + "name": "and41#0", "pos": { "x": 15.0, "y": 137.5 } }, { - "id": "GUIor_4", - "name": "GUIor_4#0", + "id": "or_4", + "name": "or_4#0", "pos": { "x": 35.0, "y": 37.5 @@ -147,7 +147,7 @@ "pinName": "A1" }, "pin2": { - "compName": "GUIand41#0", + "compName": "and41#0", "pinName": "A1" }, "name": "unnamedWire#0", @@ -168,7 +168,7 @@ "pinName": "A2" }, "pin2": { - "compName": "GUIand41#0", + "compName": "and41#0", "pinName": "A2" }, "name": "unnamedWire#1", @@ -185,11 +185,11 @@ }, { "pin1": { - "compName": "GUIand41#0", + "compName": "and41#0", "pinName": "Y2" }, "pin2": { - "compName": "GUIor_4#0", + "compName": "or_4#0", "pinName": "B2" }, "name": "unnamedWire#10", @@ -214,11 +214,11 @@ }, { "pin1": { - "compName": "GUIand41#0", + "compName": "and41#0", "pinName": "Y3" }, "pin2": { - "compName": "GUIor_4#0", + "compName": "or_4#0", "pinName": "B3" }, "name": "unnamedWire#11", @@ -243,11 +243,11 @@ }, { "pin1": { - "compName": "GUIand41#0", + "compName": "and41#0", "pinName": "Y4" }, "pin2": { - "compName": "GUIor_4#0", + "compName": "or_4#0", "pinName": "B4" }, "name": "unnamedWire#12", @@ -272,7 +272,7 @@ }, { "pin1": { - "compName": "GUIor_4#0", + "compName": "or_4#0", "pinName": "Y1" }, "pin2": { @@ -293,7 +293,7 @@ }, { "pin1": { - "compName": "GUIor_4#0", + "compName": "or_4#0", "pinName": "Y2" }, "pin2": { @@ -314,7 +314,7 @@ }, { "pin1": { - "compName": "GUIor_4#0", + "compName": "or_4#0", "pinName": "Y3" }, "pin2": { @@ -326,7 +326,7 @@ }, { "pin1": { - "compName": "GUIor_4#0", + "compName": "or_4#0", "pinName": "Y4" }, "pin2": { @@ -351,7 +351,7 @@ "pinName": "A3" }, "pin2": { - "compName": "GUIand41#0", + "compName": "and41#0", "pinName": "A3" }, "name": "unnamedWire#2", @@ -363,7 +363,7 @@ "pinName": "A4" }, "pin2": { - "compName": "GUIand41#0", + "compName": "and41#0", "pinName": "A4" }, "name": "unnamedWire#3", @@ -384,7 +384,7 @@ "pinName": "B" }, "pin2": { - "compName": "GUIand41#0", + "compName": "and41#0", "pinName": "B" }, "name": "unnamedWire#4", @@ -405,7 +405,7 @@ "pinName": "C1" }, "pin2": { - "compName": "GUIor_4#0", + "compName": "or_4#0", "pinName": "A1" }, "name": "unnamedWire#5", @@ -426,7 +426,7 @@ "pinName": "C2" }, "pin2": { - "compName": "GUIor_4#0", + "compName": "or_4#0", "pinName": "A2" }, "name": "unnamedWire#6", @@ -447,7 +447,7 @@ "pinName": "C3" }, "pin2": { - "compName": "GUIor_4#0", + "compName": "or_4#0", "pinName": "A3" }, "name": "unnamedWire#7", @@ -459,7 +459,7 @@ "pinName": "C4" }, "pin2": { - "compName": "GUIor_4#0", + "compName": "or_4#0", "pinName": "A4" }, "name": "unnamedWire#8", @@ -476,11 +476,11 @@ }, { "pin1": { - "compName": "GUIand41#0", + "compName": "and41#0", "pinName": "Y1" }, "pin2": { - "compName": "GUIor_4#0", + "compName": "or_4#0", "pinName": "B1" }, "name": "unnamedWire#9", @@ -508,7 +508,7 @@ }, "symbolRendererSnippetID": "simpleRectangularLike", "symbolRendererParams": { - "centerText": "GUIandor414", + "centerText": "andor414", "centerTextHeight": 5.0, "horizontalComponentCenter": 17.5, "pinLabelHeight": 3.5, diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/GUIdemux2.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/demux2.json similarity index 90% rename from net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/GUIdemux2.json rename to net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/demux2.json index 7e28bfd7..befc8b06 100644 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/GUIdemux2.json +++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/demux2.json @@ -61,8 +61,8 @@ "submodel": { "components": [ { - "id": "GUINandGate", - "name": "GUINandGate#0", + "id": "NandGate", + "name": "NandGate#0", "pos": { "x": 10.0, "y": 2.5 @@ -70,8 +70,8 @@ "params": 1 }, { - "id": "GUINandGate", - "name": "GUINandGate#1", + "id": "NandGate", + "name": "NandGate#1", "pos": { "x": 10.0, "y": 27.5 @@ -79,32 +79,32 @@ "params": 1 }, { - "id": "GUIand", - "name": "GUIand#0", + "id": "and", + "name": "and#0", "pos": { "x": 40.0, "y": 2.5 } }, { - "id": "GUIand", - "name": "GUIand#1", + "id": "and", + "name": "and#1", "pos": { "x": 40.0, "y": 27.5 } }, { - "id": "GUIand", - "name": "GUIand#2", + "id": "and", + "name": "and#2", "pos": { "x": 40.0, "y": 52.5 } }, { - "id": "GUIand", - "name": "GUIand#3", + "id": "and", + "name": "and#3", "pos": { "x": 40.0, "y": 77.5 @@ -210,7 +210,7 @@ }, { "pin1": { - "compName": "GUINandGate#0", + "compName": "NandGate#0", "pinName": "Y" }, "pin2": { @@ -222,7 +222,7 @@ }, { "pin1": { - "compName": "GUINandGate#1", + "compName": "NandGate#1", "pinName": "Y" }, "pin2": { @@ -238,7 +238,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIand#0", + "compName": "and#0", "pinName": "A" }, "name": "unnamedWire#12", @@ -255,7 +255,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIand#0", + "compName": "and#0", "pinName": "B" }, "name": "unnamedWire#13", @@ -272,7 +272,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIand#1", + "compName": "and#1", "pinName": "A" }, "name": "unnamedWire#14", @@ -289,7 +289,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIand#1", + "compName": "and#1", "pinName": "B" }, "name": "unnamedWire#15", @@ -306,7 +306,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIand#2", + "compName": "and#2", "pinName": "A" }, "name": "unnamedWire#16", @@ -323,7 +323,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIand#2", + "compName": "and#2", "pinName": "B" }, "name": "unnamedWire#17", @@ -335,7 +335,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIand#3", + "compName": "and#3", "pinName": "A" }, "name": "unnamedWire#18", @@ -352,7 +352,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIand#3", + "compName": "and#3", "pinName": "B" }, "name": "unnamedWire#19", @@ -369,7 +369,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#0", + "compName": "NandGate#0", "pinName": "A" }, "name": "unnamedWire#2", @@ -382,7 +382,7 @@ }, { "pin1": { - "compName": "GUIand#0", + "compName": "and#0", "pinName": "Y" }, "pin2": { @@ -393,7 +393,7 @@ }, { "pin1": { - "compName": "GUIand#1", + "compName": "and#1", "pinName": "Y" }, "pin2": { @@ -404,7 +404,7 @@ }, { "pin1": { - "compName": "GUIand#2", + "compName": "and#2", "pinName": "Y" }, "pin2": { @@ -415,7 +415,7 @@ }, { "pin1": { - "compName": "GUIand#3", + "compName": "and#3", "pinName": "Y" }, "pin2": { @@ -430,7 +430,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#1", + "compName": "NandGate#1", "pinName": "A" }, "name": "unnamedWire#3", @@ -471,7 +471,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#0", + "compName": "NandGate#0", "pinName": "B" }, "name": "unnamedWire#6", @@ -483,7 +483,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#1", + "compName": "NandGate#1", "pinName": "B" }, "name": "unnamedWire#7", @@ -532,7 +532,7 @@ }, "symbolRendererSnippetID": "simpleRectangularLike", "symbolRendererParams": { - "centerText": "GUIdemux2", + "centerText": "demux2", "centerTextHeight": 5.0, "horizontalComponentCenter": 17.5, "pinLabelHeight": 3.5, diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/GUIdff.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff.json similarity index 88% rename from net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/GUIdff.json rename to net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff.json index 30c17e6c..cb4abaf9 100644 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/GUIdff.json +++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff.json @@ -43,8 +43,8 @@ "submodel": { "components": [ { - "id": "GUINandGate", - "name": "GUINandGate#0", + "id": "NandGate", + "name": "NandGate#0", "pos": { "x": 120.0, "y": 60.0 @@ -52,24 +52,24 @@ "params": 1 }, { - "id": "GUI_rsLatch", - "name": "GUI_rsLatch#0", + "id": "_rsLatch", + "name": "_rsLatch#0", "pos": { "x": 40.0, "y": 10.0 } }, { - "id": "GUI_rsLatch", - "name": "GUI_rsLatch#1", + "id": "_rsLatch", + "name": "_rsLatch#1", "pos": { "x": 120.0, "y": 30.0 } }, { - "id": "GUInand3", - "name": "GUInand3#0", + "id": "nand3", + "name": "nand3#0", "pos": { "x": 40.0, "y": 40.0 @@ -131,7 +131,7 @@ "pinName": "" }, "pin2": { - "compName": "GUI_rsLatch#0", + "compName": "_rsLatch#0", "pinName": "_R" }, "name": "unnamedWire#1", @@ -139,7 +139,7 @@ }, { "pin1": { - "compName": "GUInand3#0", + "compName": "nand3#0", "pinName": "Y" }, "pin2": { @@ -155,7 +155,7 @@ "pinName": "" }, "pin2": { - "compName": "GUI_rsLatch#1", + "compName": "_rsLatch#1", "pinName": "_R" }, "name": "unnamedWire#11", @@ -167,7 +167,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#0", + "compName": "NandGate#0", "pinName": "A" }, "name": "unnamedWire#12", @@ -180,7 +180,7 @@ }, { "pin1": { - "compName": "GUI_rsLatch#1", + "compName": "_rsLatch#1", "pinName": "Q" }, "pin2": { @@ -191,7 +191,7 @@ }, { "pin1": { - "compName": "GUI_rsLatch#1", + "compName": "_rsLatch#1", "pinName": "_Q" }, "pin2": { @@ -206,7 +206,7 @@ "pinName": "" }, "pin2": { - "compName": "GUInand3#0", + "compName": "nand3#0", "pinName": "B" }, "name": "unnamedWire#2", @@ -223,7 +223,7 @@ "pinName": "D" }, "pin2": { - "compName": "GUINandGate#0", + "compName": "NandGate#0", "pinName": "B" }, "name": "unnamedWire#3", @@ -231,7 +231,7 @@ }, { "pin1": { - "compName": "GUINandGate#0", + "compName": "NandGate#0", "pinName": "Y" }, "pin2": { @@ -260,7 +260,7 @@ "pinName": "" }, "pin2": { - "compName": "GUI_rsLatch#0", + "compName": "_rsLatch#0", "pinName": "_S" }, "name": "unnamedWire#5", @@ -277,7 +277,7 @@ "pinName": "" }, "pin2": { - "compName": "GUInand3#0", + "compName": "nand3#0", "pinName": "C" }, "name": "unnamedWire#6", @@ -285,7 +285,7 @@ }, { "pin1": { - "compName": "GUI_rsLatch#0", + "compName": "_rsLatch#0", "pinName": "_Q" }, "pin2": { @@ -306,7 +306,7 @@ "pinName": "" }, "pin2": { - "compName": "GUInand3#0", + "compName": "nand3#0", "pinName": "A" }, "name": "unnamedWire#8", @@ -327,7 +327,7 @@ "pinName": "" }, "pin2": { - "compName": "GUI_rsLatch#1", + "compName": "_rsLatch#1", "pinName": "_S" }, "name": "unnamedWire#9", @@ -338,7 +338,7 @@ }, "symbolRendererSnippetID": "simpleRectangularLike", "symbolRendererParams": { - "centerText": "GUIdff", + "centerText": "dff", "centerTextHeight": 5.0, "horizontalComponentCenter": 17.5, "pinLabelHeight": 3.5, @@ -352,7 +352,7 @@ "q": { "id": "delegating", "params": { - "delegateTarget": "GUI_rsLatch#1", + "delegateTarget": "_rsLatch#1", "subStateID": "q" } } diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/GUIdff12_we.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff12_we.json similarity index 94% rename from net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/GUIdff12_we.json rename to net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff12_we.json index 5d61037d..f5283a09 100644 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/GUIdff12_we.json +++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff12_we.json @@ -43,7 +43,7 @@ "submodel": { "components": [ { - "id": "GUIdff", + "id": "dff", "name": "DeserializedSubmodelComponent#10", "pos": { "x": 175.0, @@ -51,7 +51,7 @@ } }, { - "id": "GUIdff", + "id": "dff", "name": "DeserializedSubmodelComponent#11", "pos": { "x": 130.0, @@ -59,7 +59,7 @@ } }, { - "id": "GUIdff", + "id": "dff", "name": "DeserializedSubmodelComponent#12", "pos": { "x": 130.0, @@ -67,7 +67,7 @@ } }, { - "id": "GUIdff", + "id": "dff", "name": "DeserializedSubmodelComponent#13", "pos": { "x": 175.0, @@ -75,7 +75,7 @@ } }, { - "id": "GUIdff", + "id": "dff", "name": "DeserializedSubmodelComponent#14", "pos": { "x": 175.0, @@ -83,7 +83,7 @@ } }, { - "id": "GUIdff", + "id": "dff", "name": "DeserializedSubmodelComponent#15", "pos": { "x": 130.0, @@ -91,7 +91,7 @@ } }, { - "id": "GUImux1_12", + "id": "mux1_12", "name": "DeserializedSubmodelComponent#17", "pos": { "x": 15.0, @@ -99,7 +99,7 @@ } }, { - "id": "GUIdff", + "id": "dff", "name": "DeserializedSubmodelComponent#4", "pos": { "x": 175.0, @@ -107,7 +107,7 @@ } }, { - "id": "GUIdff", + "id": "dff", "name": "DeserializedSubmodelComponent#5", "pos": { "x": 175.0, @@ -115,7 +115,7 @@ } }, { - "id": "GUIdff", + "id": "dff", "name": "DeserializedSubmodelComponent#6", "pos": { "x": 130.0, @@ -123,7 +123,7 @@ } }, { - "id": "GUIdff", + "id": "dff", "name": "DeserializedSubmodelComponent#7", "pos": { "x": 130.0, @@ -131,7 +131,7 @@ } }, { - "id": "GUIdff", + "id": "dff", "name": "DeserializedSubmodelComponent#8", "pos": { "x": 130.0, @@ -139,7 +139,7 @@ } }, { - "id": "GUIdff", + "id": "dff", "name": "DeserializedSubmodelComponent#9", "pos": { "x": 175.0, @@ -147,8 +147,8 @@ } }, { - "id": "GUIMerger", - "name": "GUIMerger#0", + "id": "Merger", + "name": "Merger#0", "pos": { "x": 250.0, "y": 45.0 @@ -156,8 +156,8 @@ "params": 12 }, { - "id": "GUISplitter", - "name": "GUISplitter#0", + "id": "Splitter", + "name": "Splitter#0", "pos": { "x": 70.0, "y": 65.0 @@ -322,7 +322,7 @@ "pinName": "D" }, "pin2": { - "compName": "GUISplitter#0", + "compName": "Splitter#0", "pinName": "O5" }, "name": "unnamedWire#10", @@ -339,7 +339,7 @@ }, { "pin1": { - "compName": "GUISplitter#0", + "compName": "Splitter#0", "pinName": "O4" }, "pin2": { @@ -364,7 +364,7 @@ "pinName": "D" }, "pin2": { - "compName": "GUISplitter#0", + "compName": "Splitter#0", "pinName": "O3" }, "name": "unnamedWire#12", @@ -372,7 +372,7 @@ }, { "pin1": { - "compName": "GUISplitter#0", + "compName": "Splitter#0", "pinName": "O2" }, "pin2": { @@ -388,7 +388,7 @@ "pinName": "D" }, "pin2": { - "compName": "GUISplitter#0", + "compName": "Splitter#0", "pinName": "O1" }, "name": "unnamedWire#14", @@ -405,7 +405,7 @@ }, { "pin1": { - "compName": "GUISplitter#0", + "compName": "Splitter#0", "pinName": "O0" }, "pin2": { @@ -472,7 +472,7 @@ "pinName": "Y" }, "pin2": { - "compName": "GUISplitter#0", + "compName": "Splitter#0", "pinName": "I" }, "name": "unnamedWire#2", @@ -743,7 +743,7 @@ }, { "pin1": { - "compName": "GUISplitter#0", + "compName": "Splitter#0", "pinName": "O11" }, "pin2": { @@ -780,7 +780,7 @@ "pinName": "D" }, "pin2": { - "compName": "GUISplitter#0", + "compName": "Splitter#0", "pinName": "O10" }, "name": "unnamedWire#5", @@ -797,7 +797,7 @@ }, { "pin1": { - "compName": "GUIMerger#0", + "compName": "Merger#0", "pinName": "I11" }, "pin2": { @@ -822,7 +822,7 @@ "pinName": "Q" }, "pin2": { - "compName": "GUIMerger#0", + "compName": "Merger#0", "pinName": "I10" }, "name": "unnamedWire#54", @@ -839,7 +839,7 @@ }, { "pin1": { - "compName": "GUIMerger#0", + "compName": "Merger#0", "pinName": "I9" }, "pin2": { @@ -864,7 +864,7 @@ "pinName": "Q" }, "pin2": { - "compName": "GUIMerger#0", + "compName": "Merger#0", "pinName": "I8" }, "name": "unnamedWire#56", @@ -881,7 +881,7 @@ }, { "pin1": { - "compName": "GUIMerger#0", + "compName": "Merger#0", "pinName": "I7" }, "pin2": { @@ -906,7 +906,7 @@ "pinName": "Q" }, "pin2": { - "compName": "GUIMerger#0", + "compName": "Merger#0", "pinName": "I6" }, "name": "unnamedWire#58", @@ -923,7 +923,7 @@ }, { "pin1": { - "compName": "GUIMerger#0", + "compName": "Merger#0", "pinName": "I5" }, "pin2": { @@ -939,7 +939,7 @@ "pinName": "D" }, "pin2": { - "compName": "GUISplitter#0", + "compName": "Splitter#0", "pinName": "O9" }, "name": "unnamedWire#6", @@ -956,7 +956,7 @@ }, { "pin1": { - "compName": "GUIMerger#0", + "compName": "Merger#0", "pinName": "I4" }, "pin2": { @@ -968,7 +968,7 @@ }, { "pin1": { - "compName": "GUIMerger#0", + "compName": "Merger#0", "pinName": "I3" }, "pin2": { @@ -993,7 +993,7 @@ "pinName": "Q" }, "pin2": { - "compName": "GUIMerger#0", + "compName": "Merger#0", "pinName": "I2" }, "name": "unnamedWire#62", @@ -1010,7 +1010,7 @@ }, { "pin1": { - "compName": "GUIMerger#0", + "compName": "Merger#0", "pinName": "I1" }, "pin2": { @@ -1035,7 +1035,7 @@ "pinName": "Q" }, "pin2": { - "compName": "GUIMerger#0", + "compName": "Merger#0", "pinName": "I0" }, "name": "unnamedWire#64", @@ -1052,7 +1052,7 @@ }, { "pin1": { - "compName": "GUIMerger#0", + "compName": "Merger#0", "pinName": "O" }, "pin2": { @@ -1076,7 +1076,7 @@ }, { "pin1": { - "compName": "GUISplitter#0", + "compName": "Splitter#0", "pinName": "O8" }, "pin2": { @@ -1101,7 +1101,7 @@ "pinName": "D" }, "pin2": { - "compName": "GUISplitter#0", + "compName": "Splitter#0", "pinName": "O7" }, "name": "unnamedWire#8", @@ -1118,7 +1118,7 @@ }, { "pin1": { - "compName": "GUISplitter#0", + "compName": "Splitter#0", "pinName": "O6" }, "pin2": { diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/GUIdff16_invwe.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff16_invwe.json similarity index 93% rename from net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/GUIdff16_invwe.json rename to net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff16_invwe.json index 55424236..ed4ae62a 100644 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/GUIdff16_invwe.json +++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff16_invwe.json @@ -43,7 +43,7 @@ "submodel": { "components": [ { - "id": "GUIdff", + "id": "dff", "name": "DeserializedSubmodelComponent#0", "pos": { "x": 140.0, @@ -51,7 +51,7 @@ } }, { - "id": "GUIdff", + "id": "dff", "name": "DeserializedSubmodelComponent#1", "pos": { "x": 190.0, @@ -59,7 +59,7 @@ } }, { - "id": "GUIdff", + "id": "dff", "name": "DeserializedSubmodelComponent#10", "pos": { "x": 190.0, @@ -67,7 +67,7 @@ } }, { - "id": "GUIdff", + "id": "dff", "name": "DeserializedSubmodelComponent#11", "pos": { "x": 140.0, @@ -75,7 +75,7 @@ } }, { - "id": "GUIdff", + "id": "dff", "name": "DeserializedSubmodelComponent#12", "pos": { "x": 140.0, @@ -83,7 +83,7 @@ } }, { - "id": "GUIdff", + "id": "dff", "name": "DeserializedSubmodelComponent#13", "pos": { "x": 190.0, @@ -91,7 +91,7 @@ } }, { - "id": "GUIdff", + "id": "dff", "name": "DeserializedSubmodelComponent#14", "pos": { "x": 190.0, @@ -99,7 +99,7 @@ } }, { - "id": "GUIdff", + "id": "dff", "name": "DeserializedSubmodelComponent#15", "pos": { "x": 140.0, @@ -107,7 +107,7 @@ } }, { - "id": "GUImux1_16", + "id": "mux1_16", "name": "DeserializedSubmodelComponent#16", "pos": { "x": 15.0, @@ -115,7 +115,7 @@ } }, { - "id": "GUIdff", + "id": "dff", "name": "DeserializedSubmodelComponent#2", "pos": { "x": 190.0, @@ -123,7 +123,7 @@ } }, { - "id": "GUIdff", + "id": "dff", "name": "DeserializedSubmodelComponent#3", "pos": { "x": 140.0, @@ -131,7 +131,7 @@ } }, { - "id": "GUIdff", + "id": "dff", "name": "DeserializedSubmodelComponent#4", "pos": { "x": 190.0, @@ -139,7 +139,7 @@ } }, { - "id": "GUIdff", + "id": "dff", "name": "DeserializedSubmodelComponent#5", "pos": { "x": 190.0, @@ -147,7 +147,7 @@ } }, { - "id": "GUIdff", + "id": "dff", "name": "DeserializedSubmodelComponent#6", "pos": { "x": 140.0, @@ -155,7 +155,7 @@ } }, { - "id": "GUIdff", + "id": "dff", "name": "DeserializedSubmodelComponent#7", "pos": { "x": 140.0, @@ -163,7 +163,7 @@ } }, { - "id": "GUIdff", + "id": "dff", "name": "DeserializedSubmodelComponent#8", "pos": { "x": 140.0, @@ -171,7 +171,7 @@ } }, { - "id": "GUIdff", + "id": "dff", "name": "DeserializedSubmodelComponent#9", "pos": { "x": 190.0, @@ -179,8 +179,8 @@ } }, { - "id": "GUIMerger", - "name": "GUIMerger#0", + "id": "Merger", + "name": "Merger#0", "pos": { "x": 275.0, "y": 50.0 @@ -188,8 +188,8 @@ "params": 16 }, { - "id": "GUISplitter", - "name": "GUISplitter#0", + "id": "Splitter", + "name": "Splitter#0", "pos": { "x": 75.0, "y": 70.0 @@ -335,7 +335,7 @@ "wires": [ { "pin1": { - "compName": "GUISplitter#0", + "compName": "Splitter#0", "pinName": "O15" }, "pin2": { @@ -360,7 +360,7 @@ "pinName": "D" }, "pin2": { - "compName": "GUISplitter#0", + "compName": "Splitter#0", "pinName": "O14" }, "name": "unnamedWire#1", @@ -381,7 +381,7 @@ "pinName": "D" }, "pin2": { - "compName": "GUISplitter#0", + "compName": "Splitter#0", "pinName": "O5" }, "name": "unnamedWire#10", @@ -398,7 +398,7 @@ }, { "pin1": { - "compName": "GUISplitter#0", + "compName": "Splitter#0", "pinName": "O4" }, "pin2": { @@ -423,7 +423,7 @@ "pinName": "D" }, "pin2": { - "compName": "GUISplitter#0", + "compName": "Splitter#0", "pinName": "O3" }, "name": "unnamedWire#12", @@ -440,7 +440,7 @@ }, { "pin1": { - "compName": "GUISplitter#0", + "compName": "Splitter#0", "pinName": "O2" }, "pin2": { @@ -465,7 +465,7 @@ "pinName": "D" }, "pin2": { - "compName": "GUISplitter#0", + "compName": "Splitter#0", "pinName": "O1" }, "name": "unnamedWire#14", @@ -482,7 +482,7 @@ }, { "pin1": { - "compName": "GUISplitter#0", + "compName": "Splitter#0", "pinName": "O0" }, "pin2": { @@ -507,7 +507,7 @@ "pinName": "Y" }, "pin2": { - "compName": "GUISplitter#0", + "compName": "Splitter#0", "pinName": "I" }, "name": "unnamedWire#16", @@ -551,7 +551,7 @@ }, { "pin1": { - "compName": "GUISplitter#0", + "compName": "Splitter#0", "pinName": "O13" }, "pin2": { @@ -696,7 +696,7 @@ "pinName": "D" }, "pin2": { - "compName": "GUISplitter#0", + "compName": "Splitter#0", "pinName": "O12" }, "name": "unnamedWire#3", @@ -843,7 +843,7 @@ }, { "pin1": { - "compName": "GUISplitter#0", + "compName": "Splitter#0", "pinName": "O11" }, "pin2": { @@ -978,7 +978,7 @@ }, { "pin1": { - "compName": "GUIMerger#0", + "compName": "Merger#0", "pinName": "I15" }, "pin2": { @@ -1003,7 +1003,7 @@ "pinName": "D" }, "pin2": { - "compName": "GUISplitter#0", + "compName": "Splitter#0", "pinName": "O10" }, "name": "unnamedWire#5", @@ -1024,7 +1024,7 @@ "pinName": "Q" }, "pin2": { - "compName": "GUIMerger#0", + "compName": "Merger#0", "pinName": "I14" }, "name": "unnamedWire#50", @@ -1041,7 +1041,7 @@ }, { "pin1": { - "compName": "GUIMerger#0", + "compName": "Merger#0", "pinName": "I13" }, "pin2": { @@ -1062,7 +1062,7 @@ }, { "pin1": { - "compName": "GUIMerger#0", + "compName": "Merger#0", "pinName": "I12" }, "pin2": { @@ -1083,7 +1083,7 @@ }, { "pin1": { - "compName": "GUIMerger#0", + "compName": "Merger#0", "pinName": "I11" }, "pin2": { @@ -1108,7 +1108,7 @@ "pinName": "Q" }, "pin2": { - "compName": "GUIMerger#0", + "compName": "Merger#0", "pinName": "I10" }, "name": "unnamedWire#54", @@ -1125,7 +1125,7 @@ }, { "pin1": { - "compName": "GUIMerger#0", + "compName": "Merger#0", "pinName": "I9" }, "pin2": { @@ -1141,7 +1141,7 @@ "pinName": "Q" }, "pin2": { - "compName": "GUIMerger#0", + "compName": "Merger#0", "pinName": "I8" }, "name": "unnamedWire#56", @@ -1149,7 +1149,7 @@ }, { "pin1": { - "compName": "GUIMerger#0", + "compName": "Merger#0", "pinName": "I7" }, "pin2": { @@ -1174,7 +1174,7 @@ "pinName": "Q" }, "pin2": { - "compName": "GUIMerger#0", + "compName": "Merger#0", "pinName": "I6" }, "name": "unnamedWire#58", @@ -1191,7 +1191,7 @@ }, { "pin1": { - "compName": "GUIMerger#0", + "compName": "Merger#0", "pinName": "I5" }, "pin2": { @@ -1216,7 +1216,7 @@ "pinName": "D" }, "pin2": { - "compName": "GUISplitter#0", + "compName": "Splitter#0", "pinName": "O9" }, "name": "unnamedWire#6", @@ -1233,7 +1233,7 @@ }, { "pin1": { - "compName": "GUIMerger#0", + "compName": "Merger#0", "pinName": "I4" }, "pin2": { @@ -1254,7 +1254,7 @@ }, { "pin1": { - "compName": "GUIMerger#0", + "compName": "Merger#0", "pinName": "I3" }, "pin2": { @@ -1279,7 +1279,7 @@ "pinName": "Q" }, "pin2": { - "compName": "GUIMerger#0", + "compName": "Merger#0", "pinName": "I2" }, "name": "unnamedWire#62", @@ -1296,7 +1296,7 @@ }, { "pin1": { - "compName": "GUIMerger#0", + "compName": "Merger#0", "pinName": "I1" }, "pin2": { @@ -1321,7 +1321,7 @@ "pinName": "Q" }, "pin2": { - "compName": "GUIMerger#0", + "compName": "Merger#0", "pinName": "I0" }, "name": "unnamedWire#64", @@ -1338,7 +1338,7 @@ }, { "pin1": { - "compName": "GUIMerger#0", + "compName": "Merger#0", "pinName": "O" }, "pin2": { @@ -1408,7 +1408,7 @@ }, { "pin1": { - "compName": "GUISplitter#0", + "compName": "Splitter#0", "pinName": "O8" }, "pin2": { @@ -1433,7 +1433,7 @@ "pinName": "D" }, "pin2": { - "compName": "GUISplitter#0", + "compName": "Splitter#0", "pinName": "O7" }, "name": "unnamedWire#8", @@ -1441,7 +1441,7 @@ }, { "pin1": { - "compName": "GUISplitter#0", + "compName": "Splitter#0", "pinName": "O6" }, "pin2": { diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/GUIdff4.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff4.json similarity index 94% rename from net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/GUIdff4.json rename to net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff4.json index a7178188..ced8d500 100644 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/GUIdff4.json +++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff4.json @@ -97,7 +97,7 @@ "submodel": { "components": [ { - "id": "GUImux1_4", + "id": "mux1_4", "name": "DeserializedSubmodelComponent#0", "pos": { "x": 55.0, @@ -105,32 +105,32 @@ } }, { - "id": "GUIdff", - "name": "GUIdff#0", + "id": "dff", + "name": "dff#0", "pos": { "x": 115.0, "y": 20.0 } }, { - "id": "GUIdff", - "name": "GUIdff#1", + "id": "dff", + "name": "dff#1", "pos": { "x": 115.0, "y": 70.0 } }, { - "id": "GUIdff", - "name": "GUIdff#2", + "id": "dff", + "name": "dff#2", "pos": { "x": 115.0, "y": 120.0 } }, { - "id": "GUIdff", - "name": "GUIdff#3", + "id": "dff", + "name": "dff#3", "pos": { "x": 115.0, "y": 170.0 @@ -219,7 +219,7 @@ "pinName": "Y1" }, "pin2": { - "compName": "GUIdff#0", + "compName": "dff#0", "pinName": "D" }, "name": "unnamedWire#1", @@ -290,7 +290,7 @@ }, { "pin1": { - "compName": "GUIdff#0", + "compName": "dff#0", "pinName": "Q" }, "pin2": { @@ -330,7 +330,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIdff#1", + "compName": "dff#1", "pinName": "Q" }, "name": "unnamedWire#16", @@ -359,7 +359,7 @@ }, { "pin1": { - "compName": "GUIdff#2", + "compName": "dff#2", "pinName": "Q" }, "pin2": { @@ -387,7 +387,7 @@ "pinName": "Y2" }, "pin2": { - "compName": "GUIdff#1", + "compName": "dff#1", "pinName": "D" }, "name": "unnamedWire#2", @@ -411,7 +411,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIdff#3", + "compName": "dff#3", "pinName": "Q" }, "name": "unnamedWire#21", @@ -423,7 +423,7 @@ "pinName": "Y3" }, "pin2": { - "compName": "GUIdff#2", + "compName": "dff#2", "pinName": "D" }, "name": "unnamedWire#22", @@ -444,7 +444,7 @@ "pinName": "Y4" }, "pin2": { - "compName": "GUIdff#3", + "compName": "dff#3", "pinName": "D" }, "name": "unnamedWire#23", @@ -577,7 +577,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIdff#0", + "compName": "dff#0", "pinName": "C" }, "name": "unnamedWire#3", @@ -601,7 +601,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIdff#1", + "compName": "dff#1", "pinName": "C" }, "name": "unnamedWire#5", @@ -625,7 +625,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIdff#2", + "compName": "dff#2", "pinName": "C" }, "name": "unnamedWire#7", @@ -637,7 +637,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIdff#3", + "compName": "dff#3", "pinName": "C" }, "name": "unnamedWire#8", @@ -679,14 +679,14 @@ "q1": { "id": "delegating", "params": { - "delegateTarget": "GUIdff#0", + "delegateTarget": "dff#0", "subStateID": "q" } }, "q2": { "id": "delegating", "params": { - "delegateTarget": "GUIdff#1", + "delegateTarget": "dff#1", "subStateID": "q" } }, @@ -710,14 +710,14 @@ "q3": { "id": "delegating", "params": { - "delegateTarget": "GUIdff#2", + "delegateTarget": "dff#2", "subStateID": "q" } }, "q4": { "id": "delegating", "params": { - "delegateTarget": "GUIdff#3", + "delegateTarget": "dff#3", "subStateID": "q" } } diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/GUIdff4_invwe.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff4_invwe.json similarity index 94% rename from net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/GUIdff4_invwe.json rename to net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff4_invwe.json index c34cb35f..0bcf5719 100644 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/GUIdff4_invwe.json +++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dff4_invwe.json @@ -97,7 +97,7 @@ "submodel": { "components": [ { - "id": "GUImux1_4", + "id": "mux1_4", "name": "DeserializedSubmodelComponent#0", "pos": { "x": 55.0, @@ -105,32 +105,32 @@ } }, { - "id": "GUIdff", - "name": "GUIdff#0", + "id": "dff", + "name": "dff#0", "pos": { "x": 115.0, "y": 20.0 } }, { - "id": "GUIdff", - "name": "GUIdff#1", + "id": "dff", + "name": "dff#1", "pos": { "x": 115.0, "y": 70.0 } }, { - "id": "GUIdff", - "name": "GUIdff#2", + "id": "dff", + "name": "dff#2", "pos": { "x": 115.0, "y": 120.0 } }, { - "id": "GUIdff", - "name": "GUIdff#3", + "id": "dff", + "name": "dff#3", "pos": { "x": 115.0, "y": 170.0 @@ -219,7 +219,7 @@ "pinName": "Y1" }, "pin2": { - "compName": "GUIdff#0", + "compName": "dff#0", "pinName": "D" }, "name": "unnamedWire#1", @@ -299,7 +299,7 @@ }, { "pin1": { - "compName": "GUIdff#0", + "compName": "dff#0", "pinName": "Q" }, "pin2": { @@ -339,7 +339,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIdff#1", + "compName": "dff#1", "pinName": "Q" }, "name": "unnamedWire#16", @@ -368,7 +368,7 @@ }, { "pin1": { - "compName": "GUIdff#2", + "compName": "dff#2", "pinName": "Q" }, "pin2": { @@ -396,7 +396,7 @@ "pinName": "Y2" }, "pin2": { - "compName": "GUIdff#1", + "compName": "dff#1", "pinName": "D" }, "name": "unnamedWire#2", @@ -420,7 +420,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIdff#3", + "compName": "dff#3", "pinName": "Q" }, "name": "unnamedWire#21", @@ -432,7 +432,7 @@ "pinName": "Y3" }, "pin2": { - "compName": "GUIdff#2", + "compName": "dff#2", "pinName": "D" }, "name": "unnamedWire#22", @@ -453,7 +453,7 @@ "pinName": "Y4" }, "pin2": { - "compName": "GUIdff#3", + "compName": "dff#3", "pinName": "D" }, "name": "unnamedWire#23", @@ -586,7 +586,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIdff#0", + "compName": "dff#0", "pinName": "C" }, "name": "unnamedWire#3", @@ -610,7 +610,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIdff#1", + "compName": "dff#1", "pinName": "C" }, "name": "unnamedWire#5", @@ -634,7 +634,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIdff#2", + "compName": "dff#2", "pinName": "C" }, "name": "unnamedWire#7", @@ -646,7 +646,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIdff#3", + "compName": "dff#3", "pinName": "C" }, "name": "unnamedWire#8", @@ -688,14 +688,14 @@ "q1": { "id": "delegating", "params": { - "delegateTarget": "GUIdff#0", + "delegateTarget": "dff#0", "subStateID": "q" } }, "q2": { "id": "delegating", "params": { - "delegateTarget": "GUIdff#1", + "delegateTarget": "dff#1", "subStateID": "q" } }, @@ -719,14 +719,14 @@ "q3": { "id": "delegating", "params": { - "delegateTarget": "GUIdff#2", + "delegateTarget": "dff#2", "subStateID": "q" } }, "q4": { "id": "delegating", "params": { - "delegateTarget": "GUIdff#3", + "delegateTarget": "dff#3", "subStateID": "q" } } diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/GUIdlatch.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dlatch.json similarity index 87% rename from net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/GUIdlatch.json rename to net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dlatch.json index b09c439c..212ca70f 100644 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/GUIdlatch.json +++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dlatch.json @@ -43,8 +43,8 @@ "submodel": { "components": [ { - "id": "GUINandGate", - "name": "GUINandGate#0", + "id": "NandGate", + "name": "NandGate#0", "pos": { "x": 10.0, "y": 2.5 @@ -52,8 +52,8 @@ "params": 1 }, { - "id": "GUINandGate", - "name": "GUINandGate#1", + "id": "NandGate", + "name": "NandGate#1", "pos": { "x": 15.0, "y": 27.5 @@ -61,8 +61,8 @@ "params": 1 }, { - "id": "GUI_rsLatch", - "name": "GUI_rsLatch#0", + "id": "_rsLatch", + "name": "_rsLatch#0", "pos": { "x": 45.0, "y": 7.5 @@ -94,7 +94,7 @@ "pinName": "D" }, "pin2": { - "compName": "GUINandGate#0", + "compName": "NandGate#0", "pinName": "A" }, "name": "unnamedWire#0" @@ -117,7 +117,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#0", + "compName": "NandGate#0", "pinName": "B" }, "name": "unnamedWire#2", @@ -134,7 +134,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#1", + "compName": "NandGate#1", "pinName": "B" }, "name": "unnamedWire#3", @@ -147,7 +147,7 @@ }, { "pin1": { - "compName": "GUINandGate#0", + "compName": "NandGate#0", "pinName": "Y" }, "pin2": { @@ -163,7 +163,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#1", + "compName": "NandGate#1", "pinName": "A" }, "name": "unnamedWire#5", @@ -188,7 +188,7 @@ "pinName": "" }, "pin2": { - "compName": "GUI_rsLatch#0", + "compName": "_rsLatch#0", "pinName": "_S" }, "name": "unnamedWire#6", @@ -196,11 +196,11 @@ }, { "pin1": { - "compName": "GUINandGate#1", + "compName": "NandGate#1", "pinName": "Y" }, "pin2": { - "compName": "GUI_rsLatch#0", + "compName": "_rsLatch#0", "pinName": "_R" }, "name": "unnamedWire#7", @@ -217,7 +217,7 @@ }, { "pin1": { - "compName": "GUI_rsLatch#0", + "compName": "_rsLatch#0", "pinName": "Q" }, "pin2": { @@ -229,7 +229,7 @@ }, { "pin1": { - "compName": "GUI_rsLatch#0", + "compName": "_rsLatch#0", "pinName": "_Q" }, "pin2": { @@ -243,7 +243,7 @@ }, "symbolRendererSnippetID": "simpleRectangularLike", "symbolRendererParams": { - "centerText": "GUIdlatch", + "centerText": "dlatch", "centerTextHeight": 5.0, "horizontalComponentCenter": 17.5, "pinLabelHeight": 3.5, @@ -257,7 +257,7 @@ "q": { "id": "delegating", "params": { - "delegateTarget": "GUI_rsLatch#0", + "delegateTarget": "_rsLatch#0", "subStateID": "q" } } diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/GUIdlatch4.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dlatch4.json similarity index 88% rename from net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/GUIdlatch4.json rename to net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dlatch4.json index 3bc4df72..9fdbac01 100644 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/GUIdlatch4.json +++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dlatch4.json @@ -88,32 +88,32 @@ "submodel": { "components": [ { - "id": "GUIdlatch", - "name": "GUIdlatch#0", + "id": "dlatch", + "name": "dlatch#0", "pos": { "x": 30.0, "y": 7.5 } }, { - "id": "GUIdlatch", - "name": "GUIdlatch#1", + "id": "dlatch", + "name": "dlatch#1", "pos": { "x": 30.0, "y": 32.5 } }, { - "id": "GUIdlatch", - "name": "GUIdlatch#2", + "id": "dlatch", + "name": "dlatch#2", "pos": { "x": 30.0, "y": 57.5 } }, { - "id": "GUIdlatch", - "name": "GUIdlatch#3", + "id": "dlatch", + "name": "dlatch#3", "pos": { "x": 30.0, "y": 82.5 @@ -171,7 +171,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIdlatch#3", + "compName": "dlatch#3", "pinName": "E" }, "name": "unnamedWire#1", @@ -183,7 +183,7 @@ "pinName": "D4" }, "pin2": { - "compName": "GUIdlatch#3", + "compName": "dlatch#3", "pinName": "D" }, "name": "unnamedWire#10", @@ -191,7 +191,7 @@ }, { "pin1": { - "compName": "GUIdlatch#0", + "compName": "dlatch#0", "pinName": "Q" }, "pin2": { @@ -203,7 +203,7 @@ }, { "pin1": { - "compName": "GUIdlatch#1", + "compName": "dlatch#1", "pinName": "Q" }, "pin2": { @@ -215,7 +215,7 @@ }, { "pin1": { - "compName": "GUIdlatch#2", + "compName": "dlatch#2", "pinName": "Q" }, "pin2": { @@ -227,7 +227,7 @@ }, { "pin1": { - "compName": "GUIdlatch#3", + "compName": "dlatch#3", "pinName": "Q" }, "pin2": { @@ -255,7 +255,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIdlatch#2", + "compName": "dlatch#2", "pinName": "E" }, "name": "unnamedWire#3", @@ -279,7 +279,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIdlatch#1", + "compName": "dlatch#1", "pinName": "E" }, "name": "unnamedWire#5", @@ -291,7 +291,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIdlatch#0", + "compName": "dlatch#0", "pinName": "E" }, "name": "unnamedWire#6", @@ -308,7 +308,7 @@ "pinName": "D1" }, "pin2": { - "compName": "GUIdlatch#0", + "compName": "dlatch#0", "pinName": "D" }, "name": "unnamedWire#7", @@ -320,7 +320,7 @@ "pinName": "D2" }, "pin2": { - "compName": "GUIdlatch#1", + "compName": "dlatch#1", "pinName": "D" }, "name": "unnamedWire#8", @@ -332,7 +332,7 @@ "pinName": "D3" }, "pin2": { - "compName": "GUIdlatch#2", + "compName": "dlatch#2", "pinName": "D" }, "name": "unnamedWire#9", @@ -343,7 +343,7 @@ }, "symbolRendererSnippetID": "simpleRectangularLike", "symbolRendererParams": { - "centerText": "GUIdlatch4", + "centerText": "dlatch4", "centerTextHeight": 5.0, "horizontalComponentCenter": 17.5, "pinLabelHeight": 3.5, @@ -357,14 +357,14 @@ "q1": { "id": "delegating", "params": { - "delegateTarget": "GUIdlatch#0", + "delegateTarget": "dlatch#0", "subStateID": "q" } }, "q2": { "id": "delegating", "params": { - "delegateTarget": "GUIdlatch#1", + "delegateTarget": "dlatch#1", "subStateID": "q" } }, @@ -388,14 +388,14 @@ "q3": { "id": "delegating", "params": { - "delegateTarget": "GUIdlatch#2", + "delegateTarget": "dlatch#2", "subStateID": "q" } }, "q4": { "id": "delegating", "params": { - "delegateTarget": "GUIdlatch#3", + "delegateTarget": "dlatch#3", "subStateID": "q" } } diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/GUIfulladder.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/fulladder.json similarity index 83% rename from net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/GUIfulladder.json rename to net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/fulladder.json index 8b41bd3e..4ba4b195 100644 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/GUIfulladder.json +++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/fulladder.json @@ -52,8 +52,8 @@ "submodel": { "components": [ { - "id": "GUINandGate", - "name": "GUINandGate#0", + "id": "NandGate", + "name": "NandGate#0", "pos": { "x": 57.5, "y": 40.0 @@ -61,16 +61,16 @@ "params": 1 }, { - "id": "GUIhalfadder", - "name": "GUIhalfadder#0", + "id": "halfadder", + "name": "halfadder#0", "pos": { "x": 5.0, "y": 40.0 } }, { - "id": "GUIhalfadder", - "name": "GUIhalfadder#1", + "id": "halfadder", + "name": "halfadder#1", "pos": { "x": 45.0, "y": 7.5 @@ -84,7 +84,7 @@ "pinName": "A" }, "pin2": { - "compName": "GUIhalfadder#1", + "compName": "halfadder#1", "pinName": "A" }, "name": "unnamedWire#0", @@ -96,7 +96,7 @@ "pinName": "B" }, "pin2": { - "compName": "GUIhalfadder#0", + "compName": "halfadder#0", "pinName": "A" }, "name": "unnamedWire#1" @@ -107,29 +107,29 @@ "pinName": "C" }, "pin2": { - "compName": "GUIhalfadder#0", + "compName": "halfadder#0", "pinName": "B" }, "name": "unnamedWire#2" }, { "pin1": { - "compName": "GUIhalfadder#0", + "compName": "halfadder#0", "pinName": "Y" }, "pin2": { - "compName": "GUIhalfadder#1", + "compName": "halfadder#1", "pinName": "B" }, "name": "unnamedWire#3" }, { "pin1": { - "compName": "GUIhalfadder#0", + "compName": "halfadder#0", "pinName": "_Z" }, "pin2": { - "compName": "GUINandGate#0", + "compName": "NandGate#0", "pinName": "B" }, "name": "unnamedWire#4", @@ -137,7 +137,7 @@ }, { "pin1": { - "compName": "GUIhalfadder#1", + "compName": "halfadder#1", "pinName": "Y" }, "pin2": { @@ -149,11 +149,11 @@ }, { "pin1": { - "compName": "GUIhalfadder#1", + "compName": "halfadder#1", "pinName": "_Z" }, "pin2": { - "compName": "GUINandGate#0", + "compName": "NandGate#0", "pinName": "A" }, "name": "unnamedWire#6", @@ -178,7 +178,7 @@ }, { "pin1": { - "compName": "GUINandGate#0", + "compName": "NandGate#0", "pinName": "Y" }, "pin2": { @@ -192,7 +192,7 @@ }, "symbolRendererSnippetID": "simpleRectangularLike", "symbolRendererParams": { - "centerText": "GUIfulladder", + "centerText": "fulladder", "centerTextHeight": 5.0, "horizontalComponentCenter": 17.5, "pinLabelHeight": 3.5, diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/GUIhalfadder.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/halfadder.json similarity index 88% rename from net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/GUIhalfadder.json rename to net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/halfadder.json index 92720a8e..d56f83e0 100644 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/GUIhalfadder.json +++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/halfadder.json @@ -43,8 +43,8 @@ "submodel": { "components": [ { - "id": "GUINandGate", - "name": "GUINandGate#0", + "id": "NandGate", + "name": "NandGate#0", "pos": { "x": 10.0, "y": 15.0 @@ -52,8 +52,8 @@ "params": 1 }, { - "id": "GUINandGate", - "name": "GUINandGate#1", + "id": "NandGate", + "name": "NandGate#1", "pos": { "x": 40.0, "y": 2.5 @@ -61,8 +61,8 @@ "params": 1 }, { - "id": "GUINandGate", - "name": "GUINandGate#2", + "id": "NandGate", + "name": "NandGate#2", "pos": { "x": 40.0, "y": 27.5 @@ -70,8 +70,8 @@ "params": 1 }, { - "id": "GUINandGate", - "name": "GUINandGate#3", + "id": "NandGate", + "name": "NandGate#3", "pos": { "x": 65.0, "y": 2.5 @@ -125,7 +125,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#1", + "compName": "NandGate#1", "pinName": "A" }, "name": "unnamedWire#1", @@ -138,11 +138,11 @@ }, { "pin1": { - "compName": "GUINandGate#1", + "compName": "NandGate#1", "pinName": "Y" }, "pin2": { - "compName": "GUINandGate#3", + "compName": "NandGate#3", "pinName": "A" }, "name": "unnamedWire#10", @@ -159,11 +159,11 @@ }, { "pin1": { - "compName": "GUINandGate#2", + "compName": "NandGate#2", "pinName": "Y" }, "pin2": { - "compName": "GUINandGate#3", + "compName": "NandGate#3", "pinName": "B" }, "name": "unnamedWire#11", @@ -180,7 +180,7 @@ }, { "pin1": { - "compName": "GUINandGate#3", + "compName": "NandGate#3", "pinName": "Y" }, "pin2": { @@ -196,7 +196,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#0", + "compName": "NandGate#0", "pinName": "A" }, "name": "unnamedWire#2", @@ -225,7 +225,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#2", + "compName": "NandGate#2", "pinName": "B" }, "name": "unnamedWire#4", @@ -242,7 +242,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#0", + "compName": "NandGate#0", "pinName": "B" }, "name": "unnamedWire#5", @@ -255,7 +255,7 @@ }, { "pin1": { - "compName": "GUINandGate#0", + "compName": "NandGate#0", "pinName": "Y" }, "pin2": { @@ -292,7 +292,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#1", + "compName": "NandGate#1", "pinName": "B" }, "name": "unnamedWire#8", @@ -309,7 +309,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#2", + "compName": "NandGate#2", "pinName": "A" }, "name": "unnamedWire#9", @@ -325,7 +325,7 @@ }, "symbolRendererSnippetID": "simpleRectangularLike", "symbolRendererParams": { - "centerText": "GUIhalfadder", + "centerText": "halfadder", "centerTextHeight": 5.0, "horizontalComponentCenter": 17.5, "pinLabelHeight": 3.5, diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/GUImux1.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux1.json similarity index 84% rename from net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/GUImux1.json rename to net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux1.json index 279f905d..3997209b 100644 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/GUImux1.json +++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux1.json @@ -43,8 +43,8 @@ "submodel": { "components": [ { - "id": "GUINandGate", - "name": "GUINandGate#0", + "id": "NandGate", + "name": "NandGate#0", "pos": { "x": 10.0, "y": 7.5 @@ -52,8 +52,8 @@ "params": 1 }, { - "id": "GUINandGate", - "name": "GUINandGate#1", + "id": "NandGate", + "name": "NandGate#1", "pos": { "x": 35.0, "y": 22.5 @@ -61,8 +61,8 @@ "params": 1 }, { - "id": "GUINandGate", - "name": "GUINandGate#2", + "id": "NandGate", + "name": "NandGate#2", "pos": { "x": 35.0, "y": 47.5 @@ -70,8 +70,8 @@ "params": 1 }, { - "id": "GUINandGate", - "name": "GUINandGate#3", + "id": "NandGate", + "name": "NandGate#3", "pos": { "x": 60.0, "y": 30.0 @@ -116,7 +116,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#0", + "compName": "NandGate#0", "pinName": "A" }, "name": "unnamedWire#1", @@ -124,7 +124,7 @@ }, { "pin1": { - "compName": "GUINandGate#3", + "compName": "NandGate#3", "pinName": "Y" }, "pin2": { @@ -151,7 +151,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#0", + "compName": "NandGate#0", "pinName": "B" }, "name": "unnamedWire#3", @@ -159,11 +159,11 @@ }, { "pin1": { - "compName": "GUINandGate#0", + "compName": "NandGate#0", "pinName": "Y" }, "pin2": { - "compName": "GUINandGate#1", + "compName": "NandGate#1", "pinName": "A" }, "name": "unnamedWire#4" @@ -174,7 +174,7 @@ "pinName": "I0" }, "pin2": { - "compName": "GUINandGate#1", + "compName": "NandGate#1", "pinName": "B" }, "name": "unnamedWire#5", @@ -186,7 +186,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#2", + "compName": "NandGate#2", "pinName": "A" }, "name": "unnamedWire#6", @@ -203,7 +203,7 @@ "pinName": "I1" }, "pin2": { - "compName": "GUINandGate#2", + "compName": "NandGate#2", "pinName": "B" }, "name": "unnamedWire#7", @@ -211,22 +211,22 @@ }, { "pin1": { - "compName": "GUINandGate#1", + "compName": "NandGate#1", "pinName": "Y" }, "pin2": { - "compName": "GUINandGate#3", + "compName": "NandGate#3", "pinName": "A" }, "name": "unnamedWire#8" }, { "pin1": { - "compName": "GUINandGate#2", + "compName": "NandGate#2", "pinName": "Y" }, "pin2": { - "compName": "GUINandGate#3", + "compName": "NandGate#3", "pinName": "B" }, "name": "unnamedWire#9" @@ -236,7 +236,7 @@ }, "symbolRendererSnippetID": "simpleRectangularLike", "symbolRendererParams": { - "centerText": "GUImux1", + "centerText": "mux1", "centerTextHeight": 5.0, "horizontalComponentCenter": 17.5, "pinLabelHeight": 3.5, diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/GUImux1_12.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux1_12.json similarity index 94% rename from net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/GUImux1_12.json rename to net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux1_12.json index ed0a82fa..0d1cb5ac 100644 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/GUImux1_12.json +++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux1_12.json @@ -43,7 +43,7 @@ "submodel": { "components": [ { - "id": "GUIsel1", + "id": "sel1", "name": "DeserializedSubmodelComponent#10", "pos": { "x": 95.0, @@ -51,7 +51,7 @@ } }, { - "id": "GUIsel1", + "id": "sel1", "name": "DeserializedSubmodelComponent#11", "pos": { "x": 95.0, @@ -59,7 +59,7 @@ } }, { - "id": "GUIsel1", + "id": "sel1", "name": "DeserializedSubmodelComponent#12", "pos": { "x": 150.0, @@ -67,7 +67,7 @@ } }, { - "id": "GUIsel1", + "id": "sel1", "name": "DeserializedSubmodelComponent#13", "pos": { "x": 150.0, @@ -75,7 +75,7 @@ } }, { - "id": "GUIsel1", + "id": "sel1", "name": "DeserializedSubmodelComponent#14", "pos": { "x": 95.0, @@ -83,7 +83,7 @@ } }, { - "id": "GUIsel1", + "id": "sel1", "name": "DeserializedSubmodelComponent#15", "pos": { "x": 150.0, @@ -91,7 +91,7 @@ } }, { - "id": "GUIsel1", + "id": "sel1", "name": "DeserializedSubmodelComponent#4", "pos": { "x": 150.0, @@ -99,7 +99,7 @@ } }, { - "id": "GUIsel1", + "id": "sel1", "name": "DeserializedSubmodelComponent#5", "pos": { "x": 95.0, @@ -107,7 +107,7 @@ } }, { - "id": "GUIsel1", + "id": "sel1", "name": "DeserializedSubmodelComponent#6", "pos": { "x": 150.0, @@ -115,7 +115,7 @@ } }, { - "id": "GUIsel1", + "id": "sel1", "name": "DeserializedSubmodelComponent#7", "pos": { "x": 95.0, @@ -123,7 +123,7 @@ } }, { - "id": "GUIsel1", + "id": "sel1", "name": "DeserializedSubmodelComponent#8", "pos": { "x": 95.0, @@ -131,7 +131,7 @@ } }, { - "id": "GUIsel1", + "id": "sel1", "name": "DeserializedSubmodelComponent#9", "pos": { "x": 150.0, @@ -139,8 +139,8 @@ } }, { - "id": "GUIMerger", - "name": "GUIMerger#0", + "id": "Merger", + "name": "Merger#0", "pos": { "x": 235.0, "y": 95.0 @@ -148,8 +148,8 @@ "params": 12 }, { - "id": "GUINandGate", - "name": "GUINandGate#0", + "id": "NandGate", + "name": "NandGate#0", "pos": { "x": 55.0, "y": 10.0 @@ -157,8 +157,8 @@ "params": 1 }, { - "id": "GUISplitter", - "name": "GUISplitter#0", + "id": "Splitter", + "name": "Splitter#0", "pos": { "x": 5.0, "y": 45.0 @@ -166,8 +166,8 @@ "params": 12 }, { - "id": "GUISplitter", - "name": "GUISplitter#1", + "id": "Splitter", + "name": "Splitter#1", "pos": { "x": 5.0, "y": 245.0 @@ -434,7 +434,7 @@ "pinName": "Y" }, "pin2": { - "compName": "GUIMerger#0", + "compName": "Merger#0", "pinName": "I11" }, "name": "unnamedWire#103", @@ -455,7 +455,7 @@ "pinName": "Y" }, "pin2": { - "compName": "GUIMerger#0", + "compName": "Merger#0", "pinName": "I10" }, "name": "unnamedWire#104", @@ -472,7 +472,7 @@ }, { "pin1": { - "compName": "GUIMerger#0", + "compName": "Merger#0", "pinName": "I9" }, "pin2": { @@ -497,7 +497,7 @@ "pinName": "Y" }, "pin2": { - "compName": "GUIMerger#0", + "compName": "Merger#0", "pinName": "I8" }, "name": "unnamedWire#106", @@ -514,7 +514,7 @@ }, { "pin1": { - "compName": "GUIMerger#0", + "compName": "Merger#0", "pinName": "I7" }, "pin2": { @@ -539,7 +539,7 @@ "pinName": "Y" }, "pin2": { - "compName": "GUIMerger#0", + "compName": "Merger#0", "pinName": "I6" }, "name": "unnamedWire#108", @@ -556,7 +556,7 @@ }, { "pin1": { - "compName": "GUIMerger#0", + "compName": "Merger#0", "pinName": "I5" }, "pin2": { @@ -593,7 +593,7 @@ "pinName": "Y" }, "pin2": { - "compName": "GUIMerger#0", + "compName": "Merger#0", "pinName": "I4" }, "name": "unnamedWire#110", @@ -610,7 +610,7 @@ }, { "pin1": { - "compName": "GUIMerger#0", + "compName": "Merger#0", "pinName": "I3" }, "pin2": { @@ -635,7 +635,7 @@ "pinName": "Y" }, "pin2": { - "compName": "GUIMerger#0", + "compName": "Merger#0", "pinName": "I2" }, "name": "unnamedWire#112", @@ -652,7 +652,7 @@ }, { "pin1": { - "compName": "GUIMerger#0", + "compName": "Merger#0", "pinName": "I1" }, "pin2": { @@ -677,7 +677,7 @@ "pinName": "Y" }, "pin2": { - "compName": "GUIMerger#0", + "compName": "Merger#0", "pinName": "I0" }, "name": "unnamedWire#114", @@ -694,7 +694,7 @@ }, { "pin1": { - "compName": "GUIMerger#0", + "compName": "Merger#0", "pinName": "O" }, "pin2": { @@ -1197,7 +1197,7 @@ }, { "pin1": { - "compName": "GUISplitter#0", + "compName": "Splitter#0", "pinName": "O11" }, "pin2": { @@ -1218,7 +1218,7 @@ }, { "pin1": { - "compName": "GUISplitter#0", + "compName": "Splitter#0", "pinName": "O10" }, "pin2": { @@ -1239,7 +1239,7 @@ }, { "pin1": { - "compName": "GUISplitter#0", + "compName": "Splitter#0", "pinName": "O9" }, "pin2": { @@ -1260,7 +1260,7 @@ }, { "pin1": { - "compName": "GUISplitter#0", + "compName": "Splitter#0", "pinName": "O8" }, "pin2": { @@ -1281,7 +1281,7 @@ }, { "pin1": { - "compName": "GUISplitter#0", + "compName": "Splitter#0", "pinName": "O7" }, "pin2": { @@ -1302,7 +1302,7 @@ }, { "pin1": { - "compName": "GUISplitter#0", + "compName": "Splitter#0", "pinName": "O6" }, "pin2": { @@ -1335,7 +1335,7 @@ }, { "pin1": { - "compName": "GUISplitter#0", + "compName": "Splitter#0", "pinName": "O5" }, "pin2": { @@ -1356,7 +1356,7 @@ }, { "pin1": { - "compName": "GUISplitter#0", + "compName": "Splitter#0", "pinName": "O4" }, "pin2": { @@ -1377,7 +1377,7 @@ }, { "pin1": { - "compName": "GUISplitter#0", + "compName": "Splitter#0", "pinName": "O3" }, "pin2": { @@ -1398,7 +1398,7 @@ }, { "pin1": { - "compName": "GUISplitter#0", + "compName": "Splitter#0", "pinName": "O2" }, "pin2": { @@ -1419,7 +1419,7 @@ }, { "pin1": { - "compName": "GUISplitter#0", + "compName": "Splitter#0", "pinName": "O1" }, "pin2": { @@ -1440,7 +1440,7 @@ }, { "pin1": { - "compName": "GUISplitter#0", + "compName": "Splitter#0", "pinName": "O0" }, "pin2": { @@ -1465,7 +1465,7 @@ "pinName": "I1" }, "pin2": { - "compName": "GUISplitter#1", + "compName": "Splitter#1", "pinName": "I" }, "name": "unnamedWire#76", @@ -1477,7 +1477,7 @@ "pinName": "I0" }, "pin2": { - "compName": "GUISplitter#0", + "compName": "Splitter#0", "pinName": "I" }, "name": "unnamedWire#77", @@ -1497,7 +1497,7 @@ }, { "pin1": { - "compName": "GUISplitter#1", + "compName": "Splitter#1", "pinName": "O11" }, "pin2": { @@ -1518,7 +1518,7 @@ }, { "pin1": { - "compName": "GUISplitter#1", + "compName": "Splitter#1", "pinName": "O10" }, "pin2": { @@ -1539,7 +1539,7 @@ }, { "pin1": { - "compName": "GUISplitter#1", + "compName": "Splitter#1", "pinName": "O9" }, "pin2": { @@ -1560,7 +1560,7 @@ }, { "pin1": { - "compName": "GUISplitter#1", + "compName": "Splitter#1", "pinName": "O8" }, "pin2": { @@ -1581,7 +1581,7 @@ }, { "pin1": { - "compName": "GUISplitter#1", + "compName": "Splitter#1", "pinName": "O7" }, "pin2": { @@ -1602,7 +1602,7 @@ }, { "pin1": { - "compName": "GUISplitter#1", + "compName": "Splitter#1", "pinName": "O6" }, "pin2": { @@ -1623,7 +1623,7 @@ }, { "pin1": { - "compName": "GUISplitter#1", + "compName": "Splitter#1", "pinName": "O5" }, "pin2": { @@ -1644,7 +1644,7 @@ }, { "pin1": { - "compName": "GUISplitter#1", + "compName": "Splitter#1", "pinName": "O4" }, "pin2": { @@ -1677,7 +1677,7 @@ }, { "pin1": { - "compName": "GUISplitter#1", + "compName": "Splitter#1", "pinName": "O3" }, "pin2": { @@ -1698,7 +1698,7 @@ }, { "pin1": { - "compName": "GUISplitter#1", + "compName": "Splitter#1", "pinName": "O2" }, "pin2": { @@ -1719,7 +1719,7 @@ }, { "pin1": { - "compName": "GUISplitter#1", + "compName": "Splitter#1", "pinName": "O1" }, "pin2": { @@ -1740,7 +1740,7 @@ }, { "pin1": { - "compName": "GUISplitter#1", + "compName": "Splitter#1", "pinName": "O0" }, "pin2": { @@ -1761,7 +1761,7 @@ }, { "pin1": { - "compName": "GUINandGate#0", + "compName": "NandGate#0", "pinName": "Y" }, "pin2": { @@ -1789,7 +1789,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#0", + "compName": "NandGate#0", "pinName": "B" }, "name": "unnamedWire#96", @@ -1801,7 +1801,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#0", + "compName": "NandGate#0", "pinName": "A" }, "name": "unnamedWire#97", diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/GUImux1_16.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux1_16.json similarity index 94% rename from net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/GUImux1_16.json rename to net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux1_16.json index e03f2492..65ce55c8 100644 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/GUImux1_16.json +++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux1_16.json @@ -43,7 +43,7 @@ "submodel": { "components": [ { - "id": "GUIsel1", + "id": "sel1", "name": "DeserializedSubmodelComponent#0", "pos": { "x": 115.0, @@ -51,7 +51,7 @@ } }, { - "id": "GUIsel1", + "id": "sel1", "name": "DeserializedSubmodelComponent#1", "pos": { "x": 175.0, @@ -59,7 +59,7 @@ } }, { - "id": "GUIsel1", + "id": "sel1", "name": "DeserializedSubmodelComponent#10", "pos": { "x": 115.0, @@ -67,7 +67,7 @@ } }, { - "id": "GUIsel1", + "id": "sel1", "name": "DeserializedSubmodelComponent#11", "pos": { "x": 115.0, @@ -75,7 +75,7 @@ } }, { - "id": "GUIsel1", + "id": "sel1", "name": "DeserializedSubmodelComponent#12", "pos": { "x": 175.0, @@ -83,7 +83,7 @@ } }, { - "id": "GUIsel1", + "id": "sel1", "name": "DeserializedSubmodelComponent#13", "pos": { "x": 175.0, @@ -91,7 +91,7 @@ } }, { - "id": "GUIsel1", + "id": "sel1", "name": "DeserializedSubmodelComponent#14", "pos": { "x": 115.0, @@ -99,7 +99,7 @@ } }, { - "id": "GUIsel1", + "id": "sel1", "name": "DeserializedSubmodelComponent#15", "pos": { "x": 175.0, @@ -107,7 +107,7 @@ } }, { - "id": "GUIsel1", + "id": "sel1", "name": "DeserializedSubmodelComponent#2", "pos": { "x": 115.0, @@ -115,7 +115,7 @@ } }, { - "id": "GUIsel1", + "id": "sel1", "name": "DeserializedSubmodelComponent#3", "pos": { "x": 175.0, @@ -123,7 +123,7 @@ } }, { - "id": "GUIsel1", + "id": "sel1", "name": "DeserializedSubmodelComponent#4", "pos": { "x": 175.0, @@ -131,7 +131,7 @@ } }, { - "id": "GUIsel1", + "id": "sel1", "name": "DeserializedSubmodelComponent#5", "pos": { "x": 115.0, @@ -139,7 +139,7 @@ } }, { - "id": "GUIsel1", + "id": "sel1", "name": "DeserializedSubmodelComponent#6", "pos": { "x": 175.0, @@ -147,7 +147,7 @@ } }, { - "id": "GUIsel1", + "id": "sel1", "name": "DeserializedSubmodelComponent#7", "pos": { "x": 115.0, @@ -155,7 +155,7 @@ } }, { - "id": "GUIsel1", + "id": "sel1", "name": "DeserializedSubmodelComponent#8", "pos": { "x": 115.0, @@ -163,7 +163,7 @@ } }, { - "id": "GUIsel1", + "id": "sel1", "name": "DeserializedSubmodelComponent#9", "pos": { "x": 175.0, @@ -171,8 +171,8 @@ } }, { - "id": "GUIMerger", - "name": "GUIMerger#0", + "id": "Merger", + "name": "Merger#0", "pos": { "x": 260.0, "y": 175.0 @@ -180,8 +180,8 @@ "params": 16 }, { - "id": "GUINandGate", - "name": "GUINandGate#0", + "id": "NandGate", + "name": "NandGate#0", "pos": { "x": 70.0, "y": 10.0 @@ -189,8 +189,8 @@ "params": 1 }, { - "id": "GUISplitter", - "name": "GUISplitter#0", + "id": "Splitter", + "name": "Splitter#0", "pos": { "x": 5.0, "y": 50.0 @@ -198,8 +198,8 @@ "params": 16 }, { - "id": "GUISplitter", - "name": "GUISplitter#1", + "id": "Splitter", + "name": "Splitter#1", "pos": { "x": 5.0, "y": 375.0 @@ -534,7 +534,7 @@ }, { "pin1": { - "compName": "GUIMerger#0", + "compName": "Merger#0", "pinName": "I14" }, "pin2": { @@ -559,7 +559,7 @@ "pinName": "Y" }, "pin2": { - "compName": "GUIMerger#0", + "compName": "Merger#0", "pinName": "I13" }, "name": "unnamedWire#101", @@ -576,7 +576,7 @@ }, { "pin1": { - "compName": "GUIMerger#0", + "compName": "Merger#0", "pinName": "I12" }, "pin2": { @@ -601,7 +601,7 @@ "pinName": "Y" }, "pin2": { - "compName": "GUIMerger#0", + "compName": "Merger#0", "pinName": "I11" }, "name": "unnamedWire#103", @@ -622,7 +622,7 @@ "pinName": "Y" }, "pin2": { - "compName": "GUIMerger#0", + "compName": "Merger#0", "pinName": "I10" }, "name": "unnamedWire#104", @@ -639,7 +639,7 @@ }, { "pin1": { - "compName": "GUIMerger#0", + "compName": "Merger#0", "pinName": "I9" }, "pin2": { @@ -664,7 +664,7 @@ "pinName": "Y" }, "pin2": { - "compName": "GUIMerger#0", + "compName": "Merger#0", "pinName": "I8" }, "name": "unnamedWire#106", @@ -681,7 +681,7 @@ }, { "pin1": { - "compName": "GUIMerger#0", + "compName": "Merger#0", "pinName": "I7" }, "pin2": { @@ -706,7 +706,7 @@ "pinName": "Y" }, "pin2": { - "compName": "GUIMerger#0", + "compName": "Merger#0", "pinName": "I6" }, "name": "unnamedWire#108", @@ -723,7 +723,7 @@ }, { "pin1": { - "compName": "GUIMerger#0", + "compName": "Merger#0", "pinName": "I5" }, "pin2": { @@ -760,7 +760,7 @@ "pinName": "Y" }, "pin2": { - "compName": "GUIMerger#0", + "compName": "Merger#0", "pinName": "I4" }, "name": "unnamedWire#110", @@ -777,7 +777,7 @@ }, { "pin1": { - "compName": "GUIMerger#0", + "compName": "Merger#0", "pinName": "I3" }, "pin2": { @@ -802,7 +802,7 @@ "pinName": "Y" }, "pin2": { - "compName": "GUIMerger#0", + "compName": "Merger#0", "pinName": "I2" }, "name": "unnamedWire#112", @@ -819,7 +819,7 @@ }, { "pin1": { - "compName": "GUIMerger#0", + "compName": "Merger#0", "pinName": "I1" }, "pin2": { @@ -844,7 +844,7 @@ "pinName": "Y" }, "pin2": { - "compName": "GUIMerger#0", + "compName": "Merger#0", "pinName": "I0" }, "name": "unnamedWire#114", @@ -861,7 +861,7 @@ }, { "pin1": { - "compName": "GUIMerger#0", + "compName": "Merger#0", "pinName": "O" }, "pin2": { @@ -1556,7 +1556,7 @@ }, { "pin1": { - "compName": "GUISplitter#0", + "compName": "Splitter#0", "pinName": "O15" }, "pin2": { @@ -1568,7 +1568,7 @@ }, { "pin1": { - "compName": "GUISplitter#0", + "compName": "Splitter#0", "pinName": "O14" }, "pin2": { @@ -1589,7 +1589,7 @@ }, { "pin1": { - "compName": "GUISplitter#0", + "compName": "Splitter#0", "pinName": "O13" }, "pin2": { @@ -1610,7 +1610,7 @@ }, { "pin1": { - "compName": "GUISplitter#0", + "compName": "Splitter#0", "pinName": "O12" }, "pin2": { @@ -1631,7 +1631,7 @@ }, { "pin1": { - "compName": "GUISplitter#0", + "compName": "Splitter#0", "pinName": "O11" }, "pin2": { @@ -1652,7 +1652,7 @@ }, { "pin1": { - "compName": "GUISplitter#0", + "compName": "Splitter#0", "pinName": "O10" }, "pin2": { @@ -1673,7 +1673,7 @@ }, { "pin1": { - "compName": "GUISplitter#0", + "compName": "Splitter#0", "pinName": "O9" }, "pin2": { @@ -1694,7 +1694,7 @@ }, { "pin1": { - "compName": "GUISplitter#0", + "compName": "Splitter#0", "pinName": "O8" }, "pin2": { @@ -1715,7 +1715,7 @@ }, { "pin1": { - "compName": "GUISplitter#0", + "compName": "Splitter#0", "pinName": "O7" }, "pin2": { @@ -1736,7 +1736,7 @@ }, { "pin1": { - "compName": "GUISplitter#0", + "compName": "Splitter#0", "pinName": "O6" }, "pin2": { @@ -1769,7 +1769,7 @@ }, { "pin1": { - "compName": "GUISplitter#0", + "compName": "Splitter#0", "pinName": "O5" }, "pin2": { @@ -1790,7 +1790,7 @@ }, { "pin1": { - "compName": "GUISplitter#0", + "compName": "Splitter#0", "pinName": "O4" }, "pin2": { @@ -1811,7 +1811,7 @@ }, { "pin1": { - "compName": "GUISplitter#0", + "compName": "Splitter#0", "pinName": "O3" }, "pin2": { @@ -1832,7 +1832,7 @@ }, { "pin1": { - "compName": "GUISplitter#0", + "compName": "Splitter#0", "pinName": "O2" }, "pin2": { @@ -1853,7 +1853,7 @@ }, { "pin1": { - "compName": "GUISplitter#0", + "compName": "Splitter#0", "pinName": "O1" }, "pin2": { @@ -1874,7 +1874,7 @@ }, { "pin1": { - "compName": "GUISplitter#0", + "compName": "Splitter#0", "pinName": "O0" }, "pin2": { @@ -1899,7 +1899,7 @@ "pinName": "I1" }, "pin2": { - "compName": "GUISplitter#1", + "compName": "Splitter#1", "pinName": "I" }, "name": "unnamedWire#76", @@ -1911,7 +1911,7 @@ "pinName": "I0" }, "pin2": { - "compName": "GUISplitter#0", + "compName": "Splitter#0", "pinName": "I" }, "name": "unnamedWire#77", @@ -1919,7 +1919,7 @@ }, { "pin1": { - "compName": "GUISplitter#1", + "compName": "Splitter#1", "pinName": "O15" }, "pin2": { @@ -1940,7 +1940,7 @@ }, { "pin1": { - "compName": "GUISplitter#1", + "compName": "Splitter#1", "pinName": "O14" }, "pin2": { @@ -1973,7 +1973,7 @@ }, { "pin1": { - "compName": "GUISplitter#1", + "compName": "Splitter#1", "pinName": "O13" }, "pin2": { @@ -1994,7 +1994,7 @@ }, { "pin1": { - "compName": "GUISplitter#1", + "compName": "Splitter#1", "pinName": "O12" }, "pin2": { @@ -2015,7 +2015,7 @@ }, { "pin1": { - "compName": "GUISplitter#1", + "compName": "Splitter#1", "pinName": "O11" }, "pin2": { @@ -2036,7 +2036,7 @@ }, { "pin1": { - "compName": "GUISplitter#1", + "compName": "Splitter#1", "pinName": "O10" }, "pin2": { @@ -2057,7 +2057,7 @@ }, { "pin1": { - "compName": "GUISplitter#1", + "compName": "Splitter#1", "pinName": "O9" }, "pin2": { @@ -2078,7 +2078,7 @@ }, { "pin1": { - "compName": "GUISplitter#1", + "compName": "Splitter#1", "pinName": "O8" }, "pin2": { @@ -2099,7 +2099,7 @@ }, { "pin1": { - "compName": "GUISplitter#1", + "compName": "Splitter#1", "pinName": "O7" }, "pin2": { @@ -2120,7 +2120,7 @@ }, { "pin1": { - "compName": "GUISplitter#1", + "compName": "Splitter#1", "pinName": "O6" }, "pin2": { @@ -2141,7 +2141,7 @@ }, { "pin1": { - "compName": "GUISplitter#1", + "compName": "Splitter#1", "pinName": "O5" }, "pin2": { @@ -2162,7 +2162,7 @@ }, { "pin1": { - "compName": "GUISplitter#1", + "compName": "Splitter#1", "pinName": "O4" }, "pin2": { @@ -2195,7 +2195,7 @@ }, { "pin1": { - "compName": "GUISplitter#1", + "compName": "Splitter#1", "pinName": "O3" }, "pin2": { @@ -2216,7 +2216,7 @@ }, { "pin1": { - "compName": "GUISplitter#1", + "compName": "Splitter#1", "pinName": "O2" }, "pin2": { @@ -2237,7 +2237,7 @@ }, { "pin1": { - "compName": "GUISplitter#1", + "compName": "Splitter#1", "pinName": "O1" }, "pin2": { @@ -2258,7 +2258,7 @@ }, { "pin1": { - "compName": "GUISplitter#1", + "compName": "Splitter#1", "pinName": "O0" }, "pin2": { @@ -2279,7 +2279,7 @@ }, { "pin1": { - "compName": "GUINandGate#0", + "compName": "NandGate#0", "pinName": "Y" }, "pin2": { @@ -2307,7 +2307,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#0", + "compName": "NandGate#0", "pinName": "B" }, "name": "unnamedWire#96", @@ -2319,7 +2319,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#0", + "compName": "NandGate#0", "pinName": "A" }, "name": "unnamedWire#97", @@ -2343,7 +2343,7 @@ "pinName": "Y" }, "pin2": { - "compName": "GUIMerger#0", + "compName": "Merger#0", "pinName": "I15" }, "name": "unnamedWire#99", diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/GUImux1_4.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux1_4.json similarity index 91% rename from net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/GUImux1_4.json rename to net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux1_4.json index 1caab2c4..a84df229 100644 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/GUImux1_4.json +++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux1_4.json @@ -124,32 +124,32 @@ "submodel": { "components": [ { - "id": "GUImux1", - "name": "GUImux1#0", + "id": "mux1", + "name": "mux1#0", "pos": { "x": 30.0, "y": 7.5 } }, { - "id": "GUImux1", - "name": "GUImux1#1", + "id": "mux1", + "name": "mux1#1", "pos": { "x": 30.0, "y": 42.5 } }, { - "id": "GUImux1", - "name": "GUImux1#2", + "id": "mux1", + "name": "mux1#2", "pos": { "x": 30.0, "y": 77.5 } }, { - "id": "GUImux1", - "name": "GUImux1#3", + "id": "mux1", + "name": "mux1#3", "pos": { "x": 30.0, "y": 112.5 @@ -202,7 +202,7 @@ "pinName": "" }, "pin2": { - "compName": "GUImux1#0", + "compName": "mux1#0", "pinName": "S0" }, "name": "unnamedWire#1", @@ -226,7 +226,7 @@ "pinName": "" }, "pin2": { - "compName": "GUImux1#2", + "compName": "mux1#2", "pinName": "S0" }, "name": "unnamedWire#11", @@ -238,7 +238,7 @@ "pinName": "I0_3" }, "pin2": { - "compName": "GUImux1#2", + "compName": "mux1#2", "pinName": "I0" }, "name": "unnamedWire#12", @@ -259,7 +259,7 @@ "pinName": "I1_3" }, "pin2": { - "compName": "GUImux1#2", + "compName": "mux1#2", "pinName": "I1" }, "name": "unnamedWire#13", @@ -276,7 +276,7 @@ }, { "pin1": { - "compName": "GUImux1#2", + "compName": "mux1#2", "pinName": "Y" }, "pin2": { @@ -291,7 +291,7 @@ "pinName": "" }, "pin2": { - "compName": "GUImux1#3", + "compName": "mux1#3", "pinName": "S0" }, "name": "unnamedWire#15", @@ -308,7 +308,7 @@ "pinName": "I0_4" }, "pin2": { - "compName": "GUImux1#3", + "compName": "mux1#3", "pinName": "I0" }, "name": "unnamedWire#16", @@ -329,7 +329,7 @@ "pinName": "I1_4" }, "pin2": { - "compName": "GUImux1#3", + "compName": "mux1#3", "pinName": "I1" }, "name": "unnamedWire#17", @@ -346,7 +346,7 @@ }, { "pin1": { - "compName": "GUImux1#3", + "compName": "mux1#3", "pinName": "Y" }, "pin2": { @@ -361,7 +361,7 @@ "pinName": "I0_1" }, "pin2": { - "compName": "GUImux1#0", + "compName": "mux1#0", "pinName": "I0" }, "name": "unnamedWire#2", @@ -382,7 +382,7 @@ "pinName": "I1_1" }, "pin2": { - "compName": "GUImux1#0", + "compName": "mux1#0", "pinName": "I1" }, "name": "unnamedWire#3", @@ -399,7 +399,7 @@ }, { "pin1": { - "compName": "GUImux1#0", + "compName": "mux1#0", "pinName": "Y" }, "pin2": { @@ -427,7 +427,7 @@ "pinName": "" }, "pin2": { - "compName": "GUImux1#1", + "compName": "mux1#1", "pinName": "S0" }, "name": "unnamedWire#6", @@ -439,7 +439,7 @@ "pinName": "I0_2" }, "pin2": { - "compName": "GUImux1#1", + "compName": "mux1#1", "pinName": "I0" }, "name": "unnamedWire#7", @@ -460,7 +460,7 @@ "pinName": "I1_2" }, "pin2": { - "compName": "GUImux1#1", + "compName": "mux1#1", "pinName": "I1" }, "name": "unnamedWire#8", @@ -477,7 +477,7 @@ }, { "pin1": { - "compName": "GUImux1#1", + "compName": "mux1#1", "pinName": "Y" }, "pin2": { @@ -491,7 +491,7 @@ }, "symbolRendererSnippetID": "simpleRectangularLike", "symbolRendererParams": { - "centerText": "GUImux1_4", + "centerText": "mux1_4", "centerTextHeight": 5.0, "horizontalComponentCenter": 17.5, "pinLabelHeight": 3.5, diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/GUImux2.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux2.json similarity index 96% rename from net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/GUImux2.json rename to net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux2.json index c6b39308..3a1507a1 100644 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/GUImux2.json +++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux2.json @@ -70,7 +70,7 @@ "submodel": { "components": [ { - "id": "GUIsel1", + "id": "sel1", "name": "DeserializedSubmodelComponent#0", "pos": { "x": 60.0, @@ -78,7 +78,7 @@ } }, { - "id": "GUIsel1", + "id": "sel1", "name": "DeserializedSubmodelComponent#1", "pos": { "x": 60.0, @@ -86,7 +86,7 @@ } }, { - "id": "GUImux1", + "id": "mux1", "name": "DeserializedSubmodelComponent#2", "pos": { "x": 115.0, @@ -94,8 +94,8 @@ } }, { - "id": "GUINandGate", - "name": "GUINandGate#0", + "id": "NandGate", + "name": "NandGate#0", "pos": { "x": 30.0, "y": 15.0 @@ -149,7 +149,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#0", + "compName": "NandGate#0", "pinName": "B" }, "name": "unnamedWire#1", @@ -197,7 +197,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#0", + "compName": "NandGate#0", "pinName": "Y" }, "name": "unnamedWire#15", @@ -248,7 +248,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#0", + "compName": "NandGate#0", "pinName": "A" }, "name": "unnamedWire#18", @@ -422,7 +422,7 @@ }, "symbolRendererSnippetID": "simpleRectangularLike", "symbolRendererParams": { - "centerText": "GUImux2", + "centerText": "mux2", "centerTextHeight": 5.0, "horizontalComponentCenter": 17.5, "pinLabelHeight": 3.5, diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/GUImux2_4.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux2_4.json similarity index 90% rename from net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/GUImux2_4.json rename to net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux2_4.json index 7d1342a9..5f8c0c8f 100644 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/GUImux2_4.json +++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux2_4.json @@ -70,7 +70,7 @@ "submodel": { "components": [ { - "id": "GUImux1_4", + "id": "mux1_4", "name": "DeserializedSubmodelComponent#0", "pos": { "x": 40.0, @@ -78,7 +78,7 @@ } }, { - "id": "GUImux1_4", + "id": "mux1_4", "name": "DeserializedSubmodelComponent#1", "pos": { "x": 40.0, @@ -86,7 +86,7 @@ } }, { - "id": "GUImux1_4", + "id": "mux1_4", "name": "DeserializedSubmodelComponent#2", "pos": { "x": 100.0, @@ -94,8 +94,8 @@ } }, { - "id": "GUIMerger", - "name": "GUIMerger#0", + "id": "Merger", + "name": "Merger#0", "pos": { "x": 140.0, "y": 25.0 @@ -103,8 +103,8 @@ "params": 4 }, { - "id": "GUISplitter", - "name": "GUISplitter#0", + "id": "Splitter", + "name": "Splitter#0", "pos": { "x": 25.0, "y": 45.0 @@ -112,8 +112,8 @@ "params": 4 }, { - "id": "GUISplitter", - "name": "GUISplitter#1", + "id": "Splitter", + "name": "Splitter#1", "pos": { "x": 25.0, "y": 85.0 @@ -121,8 +121,8 @@ "params": 4 }, { - "id": "GUISplitter", - "name": "GUISplitter#2", + "id": "Splitter", + "name": "Splitter#2", "pos": { "x": 25.0, "y": 140.0 @@ -130,8 +130,8 @@ "params": 4 }, { - "id": "GUISplitter", - "name": "GUISplitter#3", + "id": "Splitter", + "name": "Splitter#3", "pos": { "x": 25.0, "y": 180.0 @@ -151,7 +151,7 @@ "wires": [ { "pin1": { - "compName": "GUISplitter#2", + "compName": "Splitter#2", "pinName": "O0" }, "pin2": { @@ -167,7 +167,7 @@ "pinName": "I0_2" }, "pin2": { - "compName": "GUISplitter#2", + "compName": "Splitter#2", "pinName": "O1" }, "name": "unnamedWire#1", @@ -179,7 +179,7 @@ "pinName": "I1_1" }, "pin2": { - "compName": "GUISplitter#1", + "compName": "Splitter#1", "pinName": "O0" }, "name": "unnamedWire#10", @@ -187,7 +187,7 @@ }, { "pin1": { - "compName": "GUISplitter#1", + "compName": "Splitter#1", "pinName": "O3" }, "pin2": { @@ -203,7 +203,7 @@ "pinName": "I0_4" }, "pin2": { - "compName": "GUISplitter#0", + "compName": "Splitter#0", "pinName": "O3" }, "name": "unnamedWire#12", @@ -215,7 +215,7 @@ "pinName": "I0_3" }, "pin2": { - "compName": "GUISplitter#0", + "compName": "Splitter#0", "pinName": "O2" }, "name": "unnamedWire#13", @@ -227,7 +227,7 @@ "pinName": "I0_2" }, "pin2": { - "compName": "GUISplitter#0", + "compName": "Splitter#0", "pinName": "O1" }, "name": "unnamedWire#14", @@ -239,7 +239,7 @@ "pinName": "I0_1" }, "pin2": { - "compName": "GUISplitter#0", + "compName": "Splitter#0", "pinName": "O0" }, "name": "unnamedWire#15", @@ -293,7 +293,7 @@ }, { "pin1": { - "compName": "GUISplitter#0", + "compName": "Splitter#0", "pinName": "I" }, "pin2": { @@ -314,7 +314,7 @@ }, { "pin1": { - "compName": "GUISplitter#2", + "compName": "Splitter#2", "pinName": "O2" }, "pin2": { @@ -330,7 +330,7 @@ "pinName": "I01" }, "pin2": { - "compName": "GUISplitter#1", + "compName": "Splitter#1", "pinName": "I" }, "name": "unnamedWire#20", @@ -338,7 +338,7 @@ }, { "pin1": { - "compName": "GUISplitter#2", + "compName": "Splitter#2", "pinName": "I" }, "pin2": { @@ -363,7 +363,7 @@ "pinName": "I11" }, "pin2": { - "compName": "GUISplitter#3", + "compName": "Splitter#3", "pinName": "I" }, "name": "unnamedWire#22", @@ -491,7 +491,7 @@ }, { "pin1": { - "compName": "GUISplitter#3", + "compName": "Splitter#3", "pinName": "O0" }, "pin2": { @@ -524,7 +524,7 @@ }, { "pin1": { - "compName": "GUIMerger#0", + "compName": "Merger#0", "pinName": "O" }, "pin2": { @@ -536,7 +536,7 @@ }, { "pin1": { - "compName": "GUIMerger#0", + "compName": "Merger#0", "pinName": "I0" }, "pin2": { @@ -552,7 +552,7 @@ "pinName": "Y2" }, "pin2": { - "compName": "GUIMerger#0", + "compName": "Merger#0", "pinName": "I1" }, "name": "unnamedWire#33", @@ -560,7 +560,7 @@ }, { "pin1": { - "compName": "GUIMerger#0", + "compName": "Merger#0", "pinName": "I2" }, "pin2": { @@ -576,7 +576,7 @@ "pinName": "Y4" }, "pin2": { - "compName": "GUIMerger#0", + "compName": "Merger#0", "pinName": "I3" }, "name": "unnamedWire#35", @@ -617,7 +617,7 @@ "pinName": "I0_4" }, "pin2": { - "compName": "GUISplitter#2", + "compName": "Splitter#2", "pinName": "O3" }, "name": "unnamedWire#4", @@ -625,7 +625,7 @@ }, { "pin1": { - "compName": "GUISplitter#3", + "compName": "Splitter#3", "pinName": "O1" }, "pin2": { @@ -641,7 +641,7 @@ "pinName": "I1_3" }, "pin2": { - "compName": "GUISplitter#3", + "compName": "Splitter#3", "pinName": "O2" }, "name": "unnamedWire#6", @@ -649,7 +649,7 @@ }, { "pin1": { - "compName": "GUISplitter#3", + "compName": "Splitter#3", "pinName": "O3" }, "pin2": { @@ -661,7 +661,7 @@ }, { "pin1": { - "compName": "GUISplitter#1", + "compName": "Splitter#1", "pinName": "O2" }, "pin2": { @@ -673,7 +673,7 @@ }, { "pin1": { - "compName": "GUISplitter#1", + "compName": "Splitter#1", "pinName": "O1" }, "pin2": { @@ -688,7 +688,7 @@ }, "symbolRendererSnippetID": "simpleRectangularLike", "symbolRendererParams": { - "centerText": "GUImux1_4", + "centerText": "mux1_4", "centerTextHeight": 5.0, "horizontalComponentCenter": 17.5, "pinLabelHeight": 3.5, diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/GUImux3.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux3.json similarity index 98% rename from net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/GUImux3.json rename to net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux3.json index 222e948d..7b54b5d5 100644 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/GUImux3.json +++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/mux3.json @@ -115,7 +115,7 @@ "submodel": { "components": [ { - "id": "GUImux2", + "id": "mux2", "name": "DeserializedSubmodelComponent#0", "pos": { "x": 35.0, @@ -123,7 +123,7 @@ } }, { - "id": "GUImux1", + "id": "mux1", "name": "DeserializedSubmodelComponent#2", "pos": { "x": 125.0, @@ -131,7 +131,7 @@ } }, { - "id": "GUImux2", + "id": "mux2", "name": "DeserializedSubmodelComponent#3", "pos": { "x": 35.0, @@ -471,7 +471,7 @@ }, "symbolRendererSnippetID": "simpleRectangularLike", "symbolRendererParams": { - "centerText": "GUImux3", + "centerText": "mux3", "centerTextHeight": 5.0, "horizontalComponentCenter": 17.5, "pinLabelHeight": 3.5, diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/GUInand3.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/nand3.json similarity index 86% rename from net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/GUInand3.json rename to net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/nand3.json index 28b9a601..ced22619 100644 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/GUInand3.json +++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/nand3.json @@ -43,8 +43,8 @@ "submodel": { "components": [ { - "id": "GUINandGate", - "name": "GUINandGate#0", + "id": "NandGate", + "name": "NandGate#0", "pos": { "x": 10.0, "y": 15.0 @@ -52,8 +52,8 @@ "params": 1 }, { - "id": "GUINandGate", - "name": "GUINandGate#1", + "id": "NandGate", + "name": "NandGate#1", "pos": { "x": 35.0, "y": 15.0 @@ -61,8 +61,8 @@ "params": 1 }, { - "id": "GUINandGate", - "name": "GUINandGate#2", + "id": "NandGate", + "name": "NandGate#2", "pos": { "x": 62.5, "y": 2.5 @@ -86,7 +86,7 @@ "pinName": "A" }, "pin2": { - "compName": "GUINandGate#0", + "compName": "NandGate#0", "pinName": "A" }, "name": "unnamedWire#0" @@ -97,14 +97,14 @@ "pinName": "B" }, "pin2": { - "compName": "GUINandGate#0", + "compName": "NandGate#0", "pinName": "B" }, "name": "unnamedWire#1" }, { "pin1": { - "compName": "GUINandGate#0", + "compName": "NandGate#0", "pinName": "Y" }, "pin2": { @@ -120,7 +120,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#1", + "compName": "NandGate#1", "pinName": "A" }, "name": "unnamedWire#3", @@ -137,7 +137,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#1", + "compName": "NandGate#1", "pinName": "B" }, "name": "unnamedWire#4", @@ -150,11 +150,11 @@ }, { "pin1": { - "compName": "GUINandGate#1", + "compName": "NandGate#1", "pinName": "Y" }, "pin2": { - "compName": "GUINandGate#2", + "compName": "NandGate#2", "pinName": "A" }, "name": "unnamedWire#5", @@ -175,7 +175,7 @@ "pinName": "C" }, "pin2": { - "compName": "GUINandGate#2", + "compName": "NandGate#2", "pinName": "B" }, "name": "unnamedWire#6", @@ -192,7 +192,7 @@ }, { "pin1": { - "compName": "GUINandGate#2", + "compName": "NandGate#2", "pinName": "Y" }, "pin2": { @@ -207,7 +207,7 @@ }, "symbolRendererSnippetID": "simpleRectangularLike", "symbolRendererParams": { - "centerText": "GUInand3", + "centerText": "nand3", "centerTextHeight": 5.0, "horizontalComponentCenter": 17.5, "pinLabelHeight": 3.5, diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/GUInot4.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/not4.json similarity index 90% rename from net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/GUInot4.json rename to net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/not4.json index b80166a2..4b4e51f1 100644 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/GUInot4.json +++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/not4.json @@ -79,8 +79,8 @@ "submodel": { "components": [ { - "id": "GUINandGate", - "name": "GUINandGate#0", + "id": "NandGate", + "name": "NandGate#0", "pos": { "x": 30.0, "y": 2.5 @@ -88,8 +88,8 @@ "params": 1 }, { - "id": "GUINandGate", - "name": "GUINandGate#1", + "id": "NandGate", + "name": "NandGate#1", "pos": { "x": 30.0, "y": 27.5 @@ -97,8 +97,8 @@ "params": 1 }, { - "id": "GUINandGate", - "name": "GUINandGate#2", + "id": "NandGate", + "name": "NandGate#2", "pos": { "x": 30.0, "y": 52.5 @@ -106,8 +106,8 @@ "params": 1 }, { - "id": "GUINandGate", - "name": "GUINandGate#3", + "id": "NandGate", + "name": "NandGate#3", "pos": { "x": 30.0, "y": 77.5 @@ -182,7 +182,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#2", + "compName": "NandGate#2", "pinName": "B" }, "name": "unnamedWire#10", @@ -199,7 +199,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#3", + "compName": "NandGate#3", "pinName": "B" }, "name": "unnamedWire#11", @@ -212,7 +212,7 @@ }, { "pin1": { - "compName": "GUINandGate#0", + "compName": "NandGate#0", "pinName": "Y" }, "pin2": { @@ -224,7 +224,7 @@ }, { "pin1": { - "compName": "GUINandGate#1", + "compName": "NandGate#1", "pinName": "Y" }, "pin2": { @@ -236,7 +236,7 @@ }, { "pin1": { - "compName": "GUINandGate#2", + "compName": "NandGate#2", "pinName": "Y" }, "pin2": { @@ -248,7 +248,7 @@ }, { "pin1": { - "compName": "GUINandGate#3", + "compName": "NandGate#3", "pinName": "Y" }, "pin2": { @@ -288,7 +288,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#0", + "compName": "NandGate#0", "pinName": "A" }, "name": "unnamedWire#4", @@ -305,7 +305,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#1", + "compName": "NandGate#1", "pinName": "A" }, "name": "unnamedWire#5", @@ -322,7 +322,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#2", + "compName": "NandGate#2", "pinName": "A" }, "name": "unnamedWire#6", @@ -339,7 +339,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#3", + "compName": "NandGate#3", "pinName": "A" }, "name": "unnamedWire#7", @@ -356,7 +356,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#0", + "compName": "NandGate#0", "pinName": "B" }, "name": "unnamedWire#8", @@ -373,7 +373,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#1", + "compName": "NandGate#1", "pinName": "B" }, "name": "unnamedWire#9", @@ -389,7 +389,7 @@ }, "symbolRendererSnippetID": "simpleRectangularLike", "symbolRendererParams": { - "centerText": "GUInot4", + "centerText": "not4", "centerTextHeight": 5.0, "horizontalComponentCenter": 17.5, "pinLabelHeight": 3.5, diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/GUIor4.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/or4.json similarity index 85% rename from net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/GUIor4.json rename to net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/or4.json index 9b6e1bf9..33e50e58 100644 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/GUIor4.json +++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/or4.json @@ -52,8 +52,8 @@ "submodel": { "components": [ { - "id": "GUINandGate", - "name": "GUINandGate#0", + "id": "NandGate", + "name": "NandGate#0", "pos": { "x": 20.0, "y": 15.0 @@ -61,8 +61,8 @@ "params": 1 }, { - "id": "GUINandGate", - "name": "GUINandGate#1", + "id": "NandGate", + "name": "NandGate#1", "pos": { "x": 20.0, "y": 65.0 @@ -70,8 +70,8 @@ "params": 1 }, { - "id": "GUINandGate", - "name": "GUINandGate#2", + "id": "NandGate", + "name": "NandGate#2", "pos": { "x": 20.0, "y": 115.0 @@ -79,8 +79,8 @@ "params": 1 }, { - "id": "GUINandGate", - "name": "GUINandGate#3", + "id": "NandGate", + "name": "NandGate#3", "pos": { "x": 20.0, "y": 165.0 @@ -88,8 +88,8 @@ "params": 1 }, { - "id": "GUINandGate", - "name": "GUINandGate#4", + "id": "NandGate", + "name": "NandGate#4", "pos": { "x": 50.0, "y": 40.0 @@ -97,8 +97,8 @@ "params": 1 }, { - "id": "GUINandGate", - "name": "GUINandGate#5", + "id": "NandGate", + "name": "NandGate#5", "pos": { "x": 50.0, "y": 140.0 @@ -106,8 +106,8 @@ "params": 1 }, { - "id": "GUINandGate", - "name": "GUINandGate#6", + "id": "NandGate", + "name": "NandGate#6", "pos": { "x": 110.0, "y": 40.0 @@ -115,8 +115,8 @@ "params": 1 }, { - "id": "GUINandGate", - "name": "GUINandGate#7", + "id": "NandGate", + "name": "NandGate#7", "pos": { "x": 110.0, "y": 140.0 @@ -124,8 +124,8 @@ "params": 1 }, { - "id": "GUINandGate", - "name": "GUINandGate#8", + "id": "NandGate", + "name": "NandGate#8", "pos": { "x": 140.0, "y": 90.0 @@ -218,7 +218,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#2", + "compName": "NandGate#2", "pinName": "B" }, "name": "unnamedWire#10", @@ -235,7 +235,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#3", + "compName": "NandGate#3", "pinName": "B" }, "name": "unnamedWire#11", @@ -248,51 +248,51 @@ }, { "pin1": { - "compName": "GUINandGate#0", + "compName": "NandGate#0", "pinName": "Y" }, "pin2": { - "compName": "GUINandGate#4", + "compName": "NandGate#4", "pinName": "A" }, "name": "unnamedWire#12" }, { "pin1": { - "compName": "GUINandGate#1", + "compName": "NandGate#1", "pinName": "Y" }, "pin2": { - "compName": "GUINandGate#4", + "compName": "NandGate#4", "pinName": "B" }, "name": "unnamedWire#13" }, { "pin1": { - "compName": "GUINandGate#2", + "compName": "NandGate#2", "pinName": "Y" }, "pin2": { - "compName": "GUINandGate#5", + "compName": "NandGate#5", "pinName": "A" }, "name": "unnamedWire#14" }, { "pin1": { - "compName": "GUINandGate#3", + "compName": "NandGate#3", "pinName": "Y" }, "pin2": { - "compName": "GUINandGate#5", + "compName": "NandGate#5", "pinName": "B" }, "name": "unnamedWire#15" }, { "pin1": { - "compName": "GUINandGate#4", + "compName": "NandGate#4", "pinName": "Y" }, "pin2": { @@ -304,7 +304,7 @@ }, { "pin1": { - "compName": "GUINandGate#5", + "compName": "NandGate#5", "pinName": "Y" }, "pin2": { @@ -320,7 +320,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#6", + "compName": "NandGate#6", "pinName": "A" }, "name": "unnamedWire#18", @@ -337,7 +337,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#6", + "compName": "NandGate#6", "pinName": "B" }, "name": "unnamedWire#19", @@ -366,7 +366,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#7", + "compName": "NandGate#7", "pinName": "A" }, "name": "unnamedWire#20", @@ -383,7 +383,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#7", + "compName": "NandGate#7", "pinName": "B" }, "name": "unnamedWire#21", @@ -396,29 +396,29 @@ }, { "pin1": { - "compName": "GUINandGate#6", + "compName": "NandGate#6", "pinName": "Y" }, "pin2": { - "compName": "GUINandGate#8", + "compName": "NandGate#8", "pinName": "A" }, "name": "unnamedWire#22" }, { "pin1": { - "compName": "GUINandGate#7", + "compName": "NandGate#7", "pinName": "Y" }, "pin2": { - "compName": "GUINandGate#8", + "compName": "NandGate#8", "pinName": "B" }, "name": "unnamedWire#23" }, { "pin1": { - "compName": "GUINandGate#8", + "compName": "NandGate#8", "pinName": "Y" }, "pin2": { @@ -445,7 +445,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#0", + "compName": "NandGate#0", "pinName": "A" }, "name": "unnamedWire#4", @@ -462,7 +462,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#1", + "compName": "NandGate#1", "pinName": "A" }, "name": "unnamedWire#5", @@ -479,7 +479,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#2", + "compName": "NandGate#2", "pinName": "A" }, "name": "unnamedWire#6", @@ -496,7 +496,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#3", + "compName": "NandGate#3", "pinName": "A" }, "name": "unnamedWire#7", @@ -513,7 +513,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#0", + "compName": "NandGate#0", "pinName": "B" }, "name": "unnamedWire#8", @@ -530,7 +530,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#1", + "compName": "NandGate#1", "pinName": "B" }, "name": "unnamedWire#9", @@ -546,7 +546,7 @@ }, "symbolRendererSnippetID": "simpleRectangularLike", "symbolRendererParams": { - "centerText": "GUIor4", + "centerText": "or4", "centerTextHeight": 5.0, "horizontalComponentCenter": 17.5, "pinLabelHeight": 3.5, diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/GUIor_4.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/or_4.json similarity index 87% rename from net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/GUIor_4.json rename to net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/or_4.json index 232a77f8..46801b2f 100644 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/GUIor_4.json +++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/or_4.json @@ -115,8 +115,8 @@ "submodel": { "components": [ { - "id": "GUINandGate", - "name": "GUINandGate#0", + "id": "NandGate", + "name": "NandGate#0", "pos": { "x": 15.0, "y": 2.5 @@ -124,8 +124,8 @@ "params": 1 }, { - "id": "GUINandGate", - "name": "GUINandGate#1", + "id": "NandGate", + "name": "NandGate#1", "pos": { "x": 15.0, "y": 27.5 @@ -133,8 +133,8 @@ "params": 1 }, { - "id": "GUINandGate", - "name": "GUINandGate#10", + "id": "NandGate", + "name": "NandGate#10", "pos": { "x": 65.0, "y": 52.5 @@ -142,8 +142,8 @@ "params": 1 }, { - "id": "GUINandGate", - "name": "GUINandGate#11", + "id": "NandGate", + "name": "NandGate#11", "pos": { "x": 65.0, "y": 77.5 @@ -151,8 +151,8 @@ "params": 1 }, { - "id": "GUINandGate", - "name": "GUINandGate#2", + "id": "NandGate", + "name": "NandGate#2", "pos": { "x": 15.0, "y": 52.5 @@ -160,8 +160,8 @@ "params": 1 }, { - "id": "GUINandGate", - "name": "GUINandGate#3", + "id": "NandGate", + "name": "NandGate#3", "pos": { "x": 15.0, "y": 77.5 @@ -169,8 +169,8 @@ "params": 1 }, { - "id": "GUINandGate", - "name": "GUINandGate#4", + "id": "NandGate", + "name": "NandGate#4", "pos": { "x": 15.0, "y": 102.5 @@ -178,8 +178,8 @@ "params": 1 }, { - "id": "GUINandGate", - "name": "GUINandGate#5", + "id": "NandGate", + "name": "NandGate#5", "pos": { "x": 15.0, "y": 127.5 @@ -187,8 +187,8 @@ "params": 1 }, { - "id": "GUINandGate", - "name": "GUINandGate#6", + "id": "NandGate", + "name": "NandGate#6", "pos": { "x": 15.0, "y": 152.5 @@ -196,8 +196,8 @@ "params": 1 }, { - "id": "GUINandGate", - "name": "GUINandGate#7", + "id": "NandGate", + "name": "NandGate#7", "pos": { "x": 15.0, "y": 177.5 @@ -205,8 +205,8 @@ "params": 1 }, { - "id": "GUINandGate", - "name": "GUINandGate#8", + "id": "NandGate", + "name": "NandGate#8", "pos": { "x": 65.0, "y": 2.5 @@ -214,8 +214,8 @@ "params": 1 }, { - "id": "GUINandGate", - "name": "GUINandGate#9", + "id": "NandGate", + "name": "NandGate#9", "pos": { "x": 65.0, "y": 27.5 @@ -326,7 +326,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#1", + "compName": "NandGate#1", "pinName": "A" }, "name": "unnamedWire#10", @@ -343,7 +343,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#1", + "compName": "NandGate#1", "pinName": "B" }, "name": "unnamedWire#11", @@ -360,7 +360,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#2", + "compName": "NandGate#2", "pinName": "A" }, "name": "unnamedWire#12", @@ -377,7 +377,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#2", + "compName": "NandGate#2", "pinName": "B" }, "name": "unnamedWire#13", @@ -394,7 +394,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#3", + "compName": "NandGate#3", "pinName": "A" }, "name": "unnamedWire#14", @@ -411,7 +411,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#3", + "compName": "NandGate#3", "pinName": "B" }, "name": "unnamedWire#15", @@ -428,7 +428,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#4", + "compName": "NandGate#4", "pinName": "A" }, "name": "unnamedWire#16", @@ -445,7 +445,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#4", + "compName": "NandGate#4", "pinName": "B" }, "name": "unnamedWire#17", @@ -462,7 +462,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#5", + "compName": "NandGate#5", "pinName": "A" }, "name": "unnamedWire#18", @@ -479,7 +479,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#5", + "compName": "NandGate#5", "pinName": "B" }, "name": "unnamedWire#19", @@ -508,7 +508,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#6", + "compName": "NandGate#6", "pinName": "A" }, "name": "unnamedWire#20", @@ -525,7 +525,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#6", + "compName": "NandGate#6", "pinName": "B" }, "name": "unnamedWire#21", @@ -542,7 +542,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#7", + "compName": "NandGate#7", "pinName": "A" }, "name": "unnamedWire#22", @@ -559,7 +559,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#7", + "compName": "NandGate#7", "pinName": "B" }, "name": "unnamedWire#23", @@ -572,11 +572,11 @@ }, { "pin1": { - "compName": "GUINandGate#0", + "compName": "NandGate#0", "pinName": "Y" }, "pin2": { - "compName": "GUINandGate#8", + "compName": "NandGate#8", "pinName": "A" }, "name": "unnamedWire#24", @@ -593,11 +593,11 @@ }, { "pin1": { - "compName": "GUINandGate#4", + "compName": "NandGate#4", "pinName": "Y" }, "pin2": { - "compName": "GUINandGate#8", + "compName": "NandGate#8", "pinName": "B" }, "name": "unnamedWire#25", @@ -614,11 +614,11 @@ }, { "pin1": { - "compName": "GUINandGate#1", + "compName": "NandGate#1", "pinName": "Y" }, "pin2": { - "compName": "GUINandGate#9", + "compName": "NandGate#9", "pinName": "A" }, "name": "unnamedWire#26", @@ -635,11 +635,11 @@ }, { "pin1": { - "compName": "GUINandGate#5", + "compName": "NandGate#5", "pinName": "Y" }, "pin2": { - "compName": "GUINandGate#9", + "compName": "NandGate#9", "pinName": "B" }, "name": "unnamedWire#27", @@ -656,11 +656,11 @@ }, { "pin1": { - "compName": "GUINandGate#2", + "compName": "NandGate#2", "pinName": "Y" }, "pin2": { - "compName": "GUINandGate#10", + "compName": "NandGate#10", "pinName": "A" }, "name": "unnamedWire#28", @@ -677,11 +677,11 @@ }, { "pin1": { - "compName": "GUINandGate#6", + "compName": "NandGate#6", "pinName": "Y" }, "pin2": { - "compName": "GUINandGate#10", + "compName": "NandGate#10", "pinName": "B" }, "name": "unnamedWire#29", @@ -710,11 +710,11 @@ }, { "pin1": { - "compName": "GUINandGate#3", + "compName": "NandGate#3", "pinName": "Y" }, "pin2": { - "compName": "GUINandGate#11", + "compName": "NandGate#11", "pinName": "A" }, "name": "unnamedWire#30", @@ -731,11 +731,11 @@ }, { "pin1": { - "compName": "GUINandGate#7", + "compName": "NandGate#7", "pinName": "Y" }, "pin2": { - "compName": "GUINandGate#11", + "compName": "NandGate#11", "pinName": "B" }, "name": "unnamedWire#31", @@ -752,7 +752,7 @@ }, { "pin1": { - "compName": "GUINandGate#8", + "compName": "NandGate#8", "pinName": "Y" }, "pin2": { @@ -764,7 +764,7 @@ }, { "pin1": { - "compName": "GUINandGate#9", + "compName": "NandGate#9", "pinName": "Y" }, "pin2": { @@ -776,7 +776,7 @@ }, { "pin1": { - "compName": "GUINandGate#10", + "compName": "NandGate#10", "pinName": "Y" }, "pin2": { @@ -788,7 +788,7 @@ }, { "pin1": { - "compName": "GUINandGate#11", + "compName": "NandGate#11", "pinName": "Y" }, "pin2": { @@ -852,7 +852,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#0", + "compName": "NandGate#0", "pinName": "A" }, "name": "unnamedWire#8", @@ -869,7 +869,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#0", + "compName": "NandGate#0", "pinName": "B" }, "name": "unnamedWire#9", @@ -885,7 +885,7 @@ }, "symbolRendererSnippetID": "simpleRectangularLike", "symbolRendererParams": { - "centerText": "GUIor_4", + "centerText": "or_4", "centerTextHeight": 5.0, "horizontalComponentCenter": 17.5, "pinLabelHeight": 3.5, diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/GUIram2.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/ram2.json similarity index 88% rename from net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/GUIram2.json rename to net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/ram2.json index 63221104..2dd4182e 100644 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/GUIram2.json +++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/ram2.json @@ -160,120 +160,120 @@ "submodel": { "components": [ { - "id": "GUIand41", - "name": "GUIand41#0", + "id": "and41", + "name": "and41#0", "pos": { "x": 130.0, "y": 150.0 } }, { - "id": "GUIand41", - "name": "GUIand41#1", + "id": "and41", + "name": "and41#1", "pos": { "x": 235.0, "y": 375.0 } }, { - "id": "GUIand41", - "name": "GUIand41#2", + "id": "and41", + "name": "and41#2", "pos": { "x": 135.0, "y": 325.0 } }, { - "id": "GUIandor414", - "name": "GUIandor414#0", + "id": "andor414", + "name": "andor414#0", "pos": { "x": 235.0, "y": 485.0 } }, { - "id": "GUIandor414", - "name": "GUIandor414#1", + "id": "andor414", + "name": "andor414#1", "pos": { "x": 235.0, "y": 635.0 } }, { - "id": "GUIandor414", - "name": "GUIandor414#2", + "id": "andor414", + "name": "andor414#2", "pos": { "x": 235.0, "y": 785.0 } }, { - "id": "GUIandor414", - "name": "GUIandor414#3", + "id": "andor414", + "name": "andor414#3", "pos": { "x": 135.0, "y": 435.0 } }, { - "id": "GUIandor414", - "name": "GUIandor414#4", + "id": "andor414", + "name": "andor414#4", "pos": { "x": 135.0, "y": 585.0 } }, { - "id": "GUIandor414", - "name": "GUIandor414#5", + "id": "andor414", + "name": "andor414#5", "pos": { "x": 135.0, "y": 735.0 } }, { - "id": "GUIdemux2", - "name": "GUIdemux2#0", + "id": "demux2", + "name": "demux2#0", "pos": { "x": 55.0, "y": 45.0 } }, { - "id": "GUIdemux2", - "name": "GUIdemux2#1", + "id": "demux2", + "name": "demux2#1", "pos": { "x": 55.0, "y": 150.0 } }, { - "id": "GUIdlatch4", - "name": "GUIdlatch4#0", + "id": "dlatch4", + "name": "dlatch4#0", "pos": { "x": 55.0, "y": 325.0 } }, { - "id": "GUIdlatch4", - "name": "GUIdlatch4#1", + "id": "dlatch4", + "name": "dlatch4#1", "pos": { "x": 55.0, "y": 475.0 } }, { - "id": "GUIdlatch4", - "name": "GUIdlatch4#2", + "id": "dlatch4", + "name": "dlatch4#2", "pos": { "x": 55.0, "y": 625.0 } }, { - "id": "GUIdlatch4", - "name": "GUIdlatch4#3", + "id": "dlatch4", + "name": "dlatch4#3", "pos": { "x": 55.0, "y": 775.0 @@ -575,7 +575,7 @@ "pinName": "A0" }, "pin2": { - "compName": "GUIdemux2#0", + "compName": "demux2#0", "pinName": "S0" }, "name": "unnamedWire#0", @@ -587,7 +587,7 @@ "pinName": "A1" }, "pin2": { - "compName": "GUIdemux2#0", + "compName": "demux2#0", "pinName": "S1" }, "name": "unnamedWire#1", @@ -608,7 +608,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIand41#0", + "compName": "and41#0", "pinName": "A3" }, "name": "unnamedWire#10", @@ -620,7 +620,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIandor414#5", + "compName": "andor414#5", "pinName": "A4" }, "name": "unnamedWire#100", @@ -628,11 +628,11 @@ }, { "pin1": { - "compName": "GUIand41#1", + "compName": "and41#1", "pinName": "Y1" }, "pin2": { - "compName": "GUIandor414#0", + "compName": "andor414#0", "pinName": "C1" }, "name": "unnamedWire#101", @@ -657,11 +657,11 @@ }, { "pin1": { - "compName": "GUIand41#1", + "compName": "and41#1", "pinName": "Y2" }, "pin2": { - "compName": "GUIandor414#0", + "compName": "andor414#0", "pinName": "C2" }, "name": "unnamedWire#102", @@ -686,11 +686,11 @@ }, { "pin1": { - "compName": "GUIand41#1", + "compName": "and41#1", "pinName": "Y3" }, "pin2": { - "compName": "GUIandor414#0", + "compName": "andor414#0", "pinName": "C3" }, "name": "unnamedWire#103", @@ -715,11 +715,11 @@ }, { "pin1": { - "compName": "GUIand41#1", + "compName": "and41#1", "pinName": "Y4" }, "pin2": { - "compName": "GUIandor414#0", + "compName": "andor414#0", "pinName": "C4" }, "name": "unnamedWire#104", @@ -744,11 +744,11 @@ }, { "pin1": { - "compName": "GUIandor414#0", + "compName": "andor414#0", "pinName": "Y1" }, "pin2": { - "compName": "GUIandor414#1", + "compName": "andor414#1", "pinName": "C1" }, "name": "unnamedWire#105", @@ -773,11 +773,11 @@ }, { "pin1": { - "compName": "GUIandor414#0", + "compName": "andor414#0", "pinName": "Y2" }, "pin2": { - "compName": "GUIandor414#1", + "compName": "andor414#1", "pinName": "C2" }, "name": "unnamedWire#106", @@ -802,11 +802,11 @@ }, { "pin1": { - "compName": "GUIandor414#0", + "compName": "andor414#0", "pinName": "Y3" }, "pin2": { - "compName": "GUIandor414#1", + "compName": "andor414#1", "pinName": "C3" }, "name": "unnamedWire#107", @@ -831,11 +831,11 @@ }, { "pin1": { - "compName": "GUIandor414#0", + "compName": "andor414#0", "pinName": "Y4" }, "pin2": { - "compName": "GUIandor414#1", + "compName": "andor414#1", "pinName": "C4" }, "name": "unnamedWire#108", @@ -860,11 +860,11 @@ }, { "pin1": { - "compName": "GUIandor414#1", + "compName": "andor414#1", "pinName": "Y1" }, "pin2": { - "compName": "GUIandor414#2", + "compName": "andor414#2", "pinName": "C1" }, "name": "unnamedWire#109", @@ -893,7 +893,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIand41#0", + "compName": "and41#0", "pinName": "A4" }, "name": "unnamedWire#11", @@ -901,11 +901,11 @@ }, { "pin1": { - "compName": "GUIandor414#1", + "compName": "andor414#1", "pinName": "Y2" }, "pin2": { - "compName": "GUIandor414#2", + "compName": "andor414#2", "pinName": "C2" }, "name": "unnamedWire#110", @@ -930,11 +930,11 @@ }, { "pin1": { - "compName": "GUIandor414#1", + "compName": "andor414#1", "pinName": "Y3" }, "pin2": { - "compName": "GUIandor414#2", + "compName": "andor414#2", "pinName": "C3" }, "name": "unnamedWire#111", @@ -959,11 +959,11 @@ }, { "pin1": { - "compName": "GUIandor414#1", + "compName": "andor414#1", "pinName": "Y4" }, "pin2": { - "compName": "GUIandor414#2", + "compName": "andor414#2", "pinName": "C4" }, "name": "unnamedWire#112", @@ -988,7 +988,7 @@ }, { "pin1": { - "compName": "GUIandor414#2", + "compName": "andor414#2", "pinName": "Y1" }, "pin2": { @@ -1009,7 +1009,7 @@ }, { "pin1": { - "compName": "GUIandor414#2", + "compName": "andor414#2", "pinName": "Y2" }, "pin2": { @@ -1030,7 +1030,7 @@ }, { "pin1": { - "compName": "GUIandor414#2", + "compName": "andor414#2", "pinName": "Y3" }, "pin2": { @@ -1051,7 +1051,7 @@ }, { "pin1": { - "compName": "GUIandor414#2", + "compName": "andor414#2", "pinName": "Y4" }, "pin2": { @@ -1072,11 +1072,11 @@ }, { "pin1": { - "compName": "GUIand41#2", + "compName": "and41#2", "pinName": "Y1" }, "pin2": { - "compName": "GUIandor414#3", + "compName": "andor414#3", "pinName": "C1" }, "name": "unnamedWire#117", @@ -1101,11 +1101,11 @@ }, { "pin1": { - "compName": "GUIand41#2", + "compName": "and41#2", "pinName": "Y2" }, "pin2": { - "compName": "GUIandor414#3", + "compName": "andor414#3", "pinName": "C2" }, "name": "unnamedWire#118", @@ -1130,11 +1130,11 @@ }, { "pin1": { - "compName": "GUIand41#2", + "compName": "and41#2", "pinName": "Y3" }, "pin2": { - "compName": "GUIandor414#3", + "compName": "andor414#3", "pinName": "C3" }, "name": "unnamedWire#119", @@ -1163,7 +1163,7 @@ "pinName": "WE" }, "pin2": { - "compName": "GUIand41#0", + "compName": "and41#0", "pinName": "B" }, "name": "unnamedWire#12", @@ -1188,11 +1188,11 @@ }, { "pin1": { - "compName": "GUIand41#2", + "compName": "and41#2", "pinName": "Y4" }, "pin2": { - "compName": "GUIandor414#3", + "compName": "andor414#3", "pinName": "C4" }, "name": "unnamedWire#120", @@ -1217,11 +1217,11 @@ }, { "pin1": { - "compName": "GUIandor414#3", + "compName": "andor414#3", "pinName": "Y1" }, "pin2": { - "compName": "GUIandor414#4", + "compName": "andor414#4", "pinName": "C1" }, "name": "unnamedWire#121", @@ -1246,11 +1246,11 @@ }, { "pin1": { - "compName": "GUIandor414#3", + "compName": "andor414#3", "pinName": "Y2" }, "pin2": { - "compName": "GUIandor414#4", + "compName": "andor414#4", "pinName": "C2" }, "name": "unnamedWire#122", @@ -1275,11 +1275,11 @@ }, { "pin1": { - "compName": "GUIandor414#3", + "compName": "andor414#3", "pinName": "Y3" }, "pin2": { - "compName": "GUIandor414#4", + "compName": "andor414#4", "pinName": "C3" }, "name": "unnamedWire#123", @@ -1304,11 +1304,11 @@ }, { "pin1": { - "compName": "GUIandor414#3", + "compName": "andor414#3", "pinName": "Y4" }, "pin2": { - "compName": "GUIandor414#4", + "compName": "andor414#4", "pinName": "C4" }, "name": "unnamedWire#124", @@ -1333,11 +1333,11 @@ }, { "pin1": { - "compName": "GUIandor414#4", + "compName": "andor414#4", "pinName": "Y1" }, "pin2": { - "compName": "GUIandor414#5", + "compName": "andor414#5", "pinName": "C1" }, "name": "unnamedWire#125", @@ -1362,11 +1362,11 @@ }, { "pin1": { - "compName": "GUIandor414#4", + "compName": "andor414#4", "pinName": "Y2" }, "pin2": { - "compName": "GUIandor414#5", + "compName": "andor414#5", "pinName": "C2" }, "name": "unnamedWire#126", @@ -1391,11 +1391,11 @@ }, { "pin1": { - "compName": "GUIandor414#4", + "compName": "andor414#4", "pinName": "Y3" }, "pin2": { - "compName": "GUIandor414#5", + "compName": "andor414#5", "pinName": "C3" }, "name": "unnamedWire#127", @@ -1420,11 +1420,11 @@ }, { "pin1": { - "compName": "GUIandor414#4", + "compName": "andor414#4", "pinName": "Y4" }, "pin2": { - "compName": "GUIandor414#5", + "compName": "andor414#5", "pinName": "C4" }, "name": "unnamedWire#128", @@ -1449,7 +1449,7 @@ }, { "pin1": { - "compName": "GUIandor414#5", + "compName": "andor414#5", "pinName": "Y1" }, "pin2": { @@ -1478,11 +1478,11 @@ }, { "pin1": { - "compName": "GUIand41#0", + "compName": "and41#0", "pinName": "Y1" }, "pin2": { - "compName": "GUIdlatch4#0", + "compName": "dlatch4#0", "pinName": "C" }, "name": "unnamedWire#13", @@ -1507,7 +1507,7 @@ }, { "pin1": { - "compName": "GUIandor414#5", + "compName": "andor414#5", "pinName": "Y2" }, "pin2": { @@ -1536,7 +1536,7 @@ }, { "pin1": { - "compName": "GUIandor414#5", + "compName": "andor414#5", "pinName": "Y3" }, "pin2": { @@ -1565,7 +1565,7 @@ }, { "pin1": { - "compName": "GUIandor414#5", + "compName": "andor414#5", "pinName": "Y4" }, "pin2": { @@ -1594,11 +1594,11 @@ }, { "pin1": { - "compName": "GUIand41#0", + "compName": "and41#0", "pinName": "Y2" }, "pin2": { - "compName": "GUIdlatch4#1", + "compName": "dlatch4#1", "pinName": "C" }, "name": "unnamedWire#14", @@ -1623,11 +1623,11 @@ }, { "pin1": { - "compName": "GUIand41#0", + "compName": "and41#0", "pinName": "Y3" }, "pin2": { - "compName": "GUIdlatch4#2", + "compName": "dlatch4#2", "pinName": "C" }, "name": "unnamedWire#15", @@ -1652,11 +1652,11 @@ }, { "pin1": { - "compName": "GUIand41#0", + "compName": "and41#0", "pinName": "Y4" }, "pin2": { - "compName": "GUIdlatch4#3", + "compName": "dlatch4#3", "pinName": "C" }, "name": "unnamedWire#16", @@ -1721,7 +1721,7 @@ "pinName": "B0" }, "pin2": { - "compName": "GUIdemux2#1", + "compName": "demux2#1", "pinName": "S0" }, "name": "unnamedWire#2", @@ -1759,7 +1759,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIdlatch4#0", + "compName": "dlatch4#0", "pinName": "D1" }, "name": "unnamedWire#21", @@ -1776,7 +1776,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIdlatch4#0", + "compName": "dlatch4#0", "pinName": "D2" }, "name": "unnamedWire#22", @@ -1793,7 +1793,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIdlatch4#0", + "compName": "dlatch4#0", "pinName": "D3" }, "name": "unnamedWire#23", @@ -1810,7 +1810,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIdlatch4#0", + "compName": "dlatch4#0", "pinName": "D4" }, "name": "unnamedWire#24", @@ -1827,7 +1827,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIdlatch4#1", + "compName": "dlatch4#1", "pinName": "D1" }, "name": "unnamedWire#25", @@ -1839,7 +1839,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIdlatch4#1", + "compName": "dlatch4#1", "pinName": "D2" }, "name": "unnamedWire#26", @@ -1851,7 +1851,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIdlatch4#1", + "compName": "dlatch4#1", "pinName": "D3" }, "name": "unnamedWire#27", @@ -1863,7 +1863,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIdlatch4#1", + "compName": "dlatch4#1", "pinName": "D4" }, "name": "unnamedWire#28", @@ -1887,7 +1887,7 @@ "pinName": "B1" }, "pin2": { - "compName": "GUIdemux2#1", + "compName": "demux2#1", "pinName": "S1" }, "name": "unnamedWire#3", @@ -1956,7 +1956,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIdlatch4#2", + "compName": "dlatch4#2", "pinName": "D1" }, "name": "unnamedWire#34", @@ -1968,7 +1968,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIdlatch4#2", + "compName": "dlatch4#2", "pinName": "D2" }, "name": "unnamedWire#35", @@ -1980,7 +1980,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIdlatch4#2", + "compName": "dlatch4#2", "pinName": "D3" }, "name": "unnamedWire#36", @@ -1992,7 +1992,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIdlatch4#2", + "compName": "dlatch4#2", "pinName": "D4" }, "name": "unnamedWire#37", @@ -2024,7 +2024,7 @@ }, { "pin1": { - "compName": "GUIdemux2#1", + "compName": "demux2#1", "pinName": "Y00" }, "pin2": { @@ -2052,7 +2052,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIdlatch4#3", + "compName": "dlatch4#3", "pinName": "D1" }, "name": "unnamedWire#41", @@ -2069,7 +2069,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIdlatch4#3", + "compName": "dlatch4#3", "pinName": "D2" }, "name": "unnamedWire#42", @@ -2086,7 +2086,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIdlatch4#3", + "compName": "dlatch4#3", "pinName": "D3" }, "name": "unnamedWire#43", @@ -2103,7 +2103,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIdlatch4#3", + "compName": "dlatch4#3", "pinName": "D4" }, "name": "unnamedWire#44", @@ -2111,7 +2111,7 @@ }, { "pin1": { - "compName": "GUIdlatch4#0", + "compName": "dlatch4#0", "pinName": "Q1" }, "pin2": { @@ -2123,7 +2123,7 @@ }, { "pin1": { - "compName": "GUIdlatch4#0", + "compName": "dlatch4#0", "pinName": "Q2" }, "pin2": { @@ -2135,7 +2135,7 @@ }, { "pin1": { - "compName": "GUIdlatch4#0", + "compName": "dlatch4#0", "pinName": "Q3" }, "pin2": { @@ -2147,7 +2147,7 @@ }, { "pin1": { - "compName": "GUIdlatch4#0", + "compName": "dlatch4#0", "pinName": "Q4" }, "pin2": { @@ -2159,7 +2159,7 @@ }, { "pin1": { - "compName": "GUIdlatch4#1", + "compName": "dlatch4#1", "pinName": "Q1" }, "pin2": { @@ -2171,7 +2171,7 @@ }, { "pin1": { - "compName": "GUIdemux2#1", + "compName": "demux2#1", "pinName": "Y01" }, "pin2": { @@ -2183,7 +2183,7 @@ }, { "pin1": { - "compName": "GUIdlatch4#1", + "compName": "dlatch4#1", "pinName": "Q2" }, "pin2": { @@ -2195,7 +2195,7 @@ }, { "pin1": { - "compName": "GUIdlatch4#1", + "compName": "dlatch4#1", "pinName": "Q3" }, "pin2": { @@ -2207,7 +2207,7 @@ }, { "pin1": { - "compName": "GUIdlatch4#1", + "compName": "dlatch4#1", "pinName": "Q4" }, "pin2": { @@ -2219,7 +2219,7 @@ }, { "pin1": { - "compName": "GUIdlatch4#2", + "compName": "dlatch4#2", "pinName": "Q1" }, "pin2": { @@ -2231,7 +2231,7 @@ }, { "pin1": { - "compName": "GUIdlatch4#2", + "compName": "dlatch4#2", "pinName": "Q2" }, "pin2": { @@ -2243,7 +2243,7 @@ }, { "pin1": { - "compName": "GUIdlatch4#2", + "compName": "dlatch4#2", "pinName": "Q3" }, "pin2": { @@ -2255,7 +2255,7 @@ }, { "pin1": { - "compName": "GUIdlatch4#2", + "compName": "dlatch4#2", "pinName": "Q4" }, "pin2": { @@ -2267,7 +2267,7 @@ }, { "pin1": { - "compName": "GUIdlatch4#3", + "compName": "dlatch4#3", "pinName": "Q1" }, "pin2": { @@ -2279,7 +2279,7 @@ }, { "pin1": { - "compName": "GUIdlatch4#3", + "compName": "dlatch4#3", "pinName": "Q2" }, "pin2": { @@ -2291,7 +2291,7 @@ }, { "pin1": { - "compName": "GUIdlatch4#3", + "compName": "dlatch4#3", "pinName": "Q3" }, "pin2": { @@ -2303,7 +2303,7 @@ }, { "pin1": { - "compName": "GUIdemux2#1", + "compName": "demux2#1", "pinName": "Y10" }, "pin2": { @@ -2315,7 +2315,7 @@ }, { "pin1": { - "compName": "GUIdlatch4#3", + "compName": "dlatch4#3", "pinName": "Q4" }, "pin2": { @@ -2327,11 +2327,11 @@ }, { "pin1": { - "compName": "GUIdemux2#0", + "compName": "demux2#0", "pinName": "Y00" }, "pin2": { - "compName": "GUIand41#1", + "compName": "and41#1", "pinName": "B" }, "name": "unnamedWire#61", @@ -2348,11 +2348,11 @@ }, { "pin1": { - "compName": "GUIdemux2#0", + "compName": "demux2#0", "pinName": "Y01" }, "pin2": { - "compName": "GUIandor414#0", + "compName": "andor414#0", "pinName": "B" }, "name": "unnamedWire#62", @@ -2369,11 +2369,11 @@ }, { "pin1": { - "compName": "GUIdemux2#0", + "compName": "demux2#0", "pinName": "Y10" }, "pin2": { - "compName": "GUIandor414#1", + "compName": "andor414#1", "pinName": "B" }, "name": "unnamedWire#63", @@ -2390,11 +2390,11 @@ }, { "pin1": { - "compName": "GUIdemux2#0", + "compName": "demux2#0", "pinName": "Y11" }, "pin2": { - "compName": "GUIandor414#2", + "compName": "andor414#2", "pinName": "B" }, "name": "unnamedWire#64", @@ -2415,7 +2415,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIand41#2", + "compName": "and41#2", "pinName": "B" }, "name": "unnamedWire#65", @@ -2432,7 +2432,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIandor414#3", + "compName": "andor414#3", "pinName": "B" }, "name": "unnamedWire#66", @@ -2449,7 +2449,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIandor414#4", + "compName": "andor414#4", "pinName": "B" }, "name": "unnamedWire#67", @@ -2466,7 +2466,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIandor414#5", + "compName": "andor414#5", "pinName": "B" }, "name": "unnamedWire#68", @@ -2483,7 +2483,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIand41#1", + "compName": "and41#1", "pinName": "A1" }, "name": "unnamedWire#69", @@ -2496,7 +2496,7 @@ }, { "pin1": { - "compName": "GUIdemux2#1", + "compName": "demux2#1", "pinName": "Y11" }, "pin2": { @@ -2512,7 +2512,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIand41#1", + "compName": "and41#1", "pinName": "A2" }, "name": "unnamedWire#70", @@ -2529,7 +2529,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIand41#1", + "compName": "and41#1", "pinName": "A3" }, "name": "unnamedWire#71", @@ -2546,7 +2546,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIand41#1", + "compName": "and41#1", "pinName": "A4" }, "name": "unnamedWire#72", @@ -2563,7 +2563,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIandor414#0", + "compName": "andor414#0", "pinName": "A1" }, "name": "unnamedWire#73", @@ -2580,7 +2580,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIandor414#0", + "compName": "andor414#0", "pinName": "A2" }, "name": "unnamedWire#74", @@ -2597,7 +2597,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIandor414#0", + "compName": "andor414#0", "pinName": "A3" }, "name": "unnamedWire#75", @@ -2614,7 +2614,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIandor414#0", + "compName": "andor414#0", "pinName": "A4" }, "name": "unnamedWire#76", @@ -2631,7 +2631,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIandor414#1", + "compName": "andor414#1", "pinName": "A1" }, "name": "unnamedWire#77", @@ -2648,7 +2648,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIandor414#1", + "compName": "andor414#1", "pinName": "A2" }, "name": "unnamedWire#78", @@ -2665,7 +2665,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIandor414#1", + "compName": "andor414#1", "pinName": "A3" }, "name": "unnamedWire#79", @@ -2682,7 +2682,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIand41#0", + "compName": "and41#0", "pinName": "A1" }, "name": "unnamedWire#8", @@ -2694,7 +2694,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIandor414#1", + "compName": "andor414#1", "pinName": "A4" }, "name": "unnamedWire#80", @@ -2711,7 +2711,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIandor414#2", + "compName": "andor414#2", "pinName": "A1" }, "name": "unnamedWire#81", @@ -2728,7 +2728,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIandor414#2", + "compName": "andor414#2", "pinName": "A2" }, "name": "unnamedWire#82", @@ -2745,7 +2745,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIandor414#2", + "compName": "andor414#2", "pinName": "A3" }, "name": "unnamedWire#83", @@ -2762,7 +2762,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIandor414#2", + "compName": "andor414#2", "pinName": "A4" }, "name": "unnamedWire#84", @@ -2779,7 +2779,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIand41#2", + "compName": "and41#2", "pinName": "A1" }, "name": "unnamedWire#85", @@ -2791,7 +2791,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIand41#2", + "compName": "and41#2", "pinName": "A2" }, "name": "unnamedWire#86", @@ -2803,7 +2803,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIand41#2", + "compName": "and41#2", "pinName": "A3" }, "name": "unnamedWire#87", @@ -2815,7 +2815,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIand41#2", + "compName": "and41#2", "pinName": "A4" }, "name": "unnamedWire#88", @@ -2827,7 +2827,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIandor414#3", + "compName": "andor414#3", "pinName": "A1" }, "name": "unnamedWire#89", @@ -2839,7 +2839,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIand41#0", + "compName": "and41#0", "pinName": "A2" }, "name": "unnamedWire#9", @@ -2851,7 +2851,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIandor414#3", + "compName": "andor414#3", "pinName": "A2" }, "name": "unnamedWire#90", @@ -2863,7 +2863,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIandor414#3", + "compName": "andor414#3", "pinName": "A3" }, "name": "unnamedWire#91", @@ -2875,7 +2875,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIandor414#3", + "compName": "andor414#3", "pinName": "A4" }, "name": "unnamedWire#92", @@ -2887,7 +2887,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIandor414#4", + "compName": "andor414#4", "pinName": "A1" }, "name": "unnamedWire#93", @@ -2899,7 +2899,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIandor414#4", + "compName": "andor414#4", "pinName": "A2" }, "name": "unnamedWire#94", @@ -2911,7 +2911,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIandor414#4", + "compName": "andor414#4", "pinName": "A3" }, "name": "unnamedWire#95", @@ -2923,7 +2923,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIandor414#4", + "compName": "andor414#4", "pinName": "A4" }, "name": "unnamedWire#96", @@ -2935,7 +2935,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIandor414#5", + "compName": "andor414#5", "pinName": "A1" }, "name": "unnamedWire#97", @@ -2947,7 +2947,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIandor414#5", + "compName": "andor414#5", "pinName": "A2" }, "name": "unnamedWire#98", @@ -2959,7 +2959,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIandor414#5", + "compName": "andor414#5", "pinName": "A3" }, "name": "unnamedWire#99", @@ -2970,7 +2970,7 @@ }, "symbolRendererSnippetID": "simpleRectangularLike", "symbolRendererParams": { - "centerText": "GUIram2", + "centerText": "ram2", "centerTextHeight": 5.0, "horizontalComponentCenter": 17.5, "pinLabelHeight": 3.5, @@ -2983,25 +2983,25 @@ "c00": { "id": "delegating", "params": { - "delegateTarget": "GUIdlatch4#0" + "delegateTarget": "dlatch4#0" } }, "c11": { "id": "delegating", "params": { - "delegateTarget": "GUIdlatch4#3" + "delegateTarget": "dlatch4#3" } }, "c10": { "id": "delegating", "params": { - "delegateTarget": "GUIdlatch4#2" + "delegateTarget": "dlatch4#2" } }, "c01": { "id": "delegating", "params": { - "delegateTarget": "GUIdlatch4#1" + "delegateTarget": "dlatch4#1" } } }, diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/GUIram4.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/ram4.json similarity index 87% rename from net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/GUIram4.json rename to net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/ram4.json index 55ddef82..51a74517 100644 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/GUIram4.json +++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/ram4.json @@ -196,120 +196,120 @@ "submodel": { "components": [ { - "id": "GUIand41", - "name": "GUIand41#0", + "id": "and41", + "name": "and41#0", "pos": { "x": 235.0, "y": 150.0 } }, { - "id": "GUIand41", - "name": "GUIand41#1", + "id": "and41", + "name": "and41#1", "pos": { "x": 250.0, "y": 375.0 } }, { - "id": "GUIand41", - "name": "GUIand41#2", + "id": "and41", + "name": "and41#2", "pos": { "x": 155.0, "y": 325.0 } }, { - "id": "GUIandor414", - "name": "GUIandor414#0", + "id": "andor414", + "name": "andor414#0", "pos": { "x": 250.0, "y": 485.0 } }, { - "id": "GUIandor414", - "name": "GUIandor414#1", + "id": "andor414", + "name": "andor414#1", "pos": { "x": 250.0, "y": 635.0 } }, { - "id": "GUIandor414", - "name": "GUIandor414#2", + "id": "andor414", + "name": "andor414#2", "pos": { "x": 250.0, "y": 785.0 } }, { - "id": "GUIandor414", - "name": "GUIandor414#3", + "id": "andor414", + "name": "andor414#3", "pos": { "x": 155.0, "y": 435.0 } }, { - "id": "GUIandor414", - "name": "GUIandor414#4", + "id": "andor414", + "name": "andor414#4", "pos": { "x": 155.0, "y": 585.0 } }, { - "id": "GUIandor414", - "name": "GUIandor414#5", + "id": "andor414", + "name": "andor414#5", "pos": { "x": 155.0, "y": 735.0 } }, { - "id": "GUIdemux2", - "name": "GUIdemux2#0", + "id": "demux2", + "name": "demux2#0", "pos": { "x": 55.0, "y": 45.0 } }, { - "id": "GUIdemux2", - "name": "GUIdemux2#1", + "id": "demux2", + "name": "demux2#1", "pos": { "x": 55.0, "y": 150.0 } }, { - "id": "GUIram2", - "name": "GUIram2#0", + "id": "ram2", + "name": "ram2#0", "pos": { "x": 80.0, "y": 330.0 } }, { - "id": "GUIram2", - "name": "GUIram2#1", + "id": "ram2", + "name": "ram2#1", "pos": { "x": 80.0, "y": 480.0 } }, { - "id": "GUIram2", - "name": "GUIram2#2", + "id": "ram2", + "name": "ram2#2", "pos": { "x": 80.0, "y": 630.0 } }, { - "id": "GUIram2", - "name": "GUIram2#3", + "id": "ram2", + "name": "ram2#3", "pos": { "x": 80.0, "y": 780.0 @@ -575,7 +575,7 @@ "pinName": "A0" }, "pin2": { - "compName": "GUIdemux2#0", + "compName": "demux2#0", "pinName": "S0" }, "name": "unnamedWire#0", @@ -587,7 +587,7 @@ "pinName": "A1" }, "pin2": { - "compName": "GUIdemux2#0", + "compName": "demux2#0", "pinName": "S1" }, "name": "unnamedWire#1", @@ -608,7 +608,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIand41#0", + "compName": "and41#0", "pinName": "A3" }, "name": "unnamedWire#10", @@ -616,11 +616,11 @@ }, { "pin1": { - "compName": "GUIram2#0", + "compName": "ram2#0", "pinName": "QA4" }, "pin2": { - "compName": "GUIand41#2", + "compName": "and41#2", "pinName": "A4" }, "name": "unnamedWire#100", @@ -637,11 +637,11 @@ }, { "pin1": { - "compName": "GUIram2#1", + "compName": "ram2#1", "pinName": "QA1" }, "pin2": { - "compName": "GUIandor414#3", + "compName": "andor414#3", "pinName": "A1" }, "name": "unnamedWire#101", @@ -658,11 +658,11 @@ }, { "pin1": { - "compName": "GUIram2#1", + "compName": "ram2#1", "pinName": "QA2" }, "pin2": { - "compName": "GUIandor414#3", + "compName": "andor414#3", "pinName": "A2" }, "name": "unnamedWire#102", @@ -679,11 +679,11 @@ }, { "pin1": { - "compName": "GUIram2#1", + "compName": "ram2#1", "pinName": "QA3" }, "pin2": { - "compName": "GUIandor414#3", + "compName": "andor414#3", "pinName": "A3" }, "name": "unnamedWire#103", @@ -700,11 +700,11 @@ }, { "pin1": { - "compName": "GUIram2#1", + "compName": "ram2#1", "pinName": "QA4" }, "pin2": { - "compName": "GUIandor414#3", + "compName": "andor414#3", "pinName": "A4" }, "name": "unnamedWire#104", @@ -721,11 +721,11 @@ }, { "pin1": { - "compName": "GUIram2#2", + "compName": "ram2#2", "pinName": "QA1" }, "pin2": { - "compName": "GUIandor414#4", + "compName": "andor414#4", "pinName": "A1" }, "name": "unnamedWire#105", @@ -742,11 +742,11 @@ }, { "pin1": { - "compName": "GUIram2#2", + "compName": "ram2#2", "pinName": "QA2" }, "pin2": { - "compName": "GUIandor414#4", + "compName": "andor414#4", "pinName": "A2" }, "name": "unnamedWire#106", @@ -763,11 +763,11 @@ }, { "pin1": { - "compName": "GUIram2#2", + "compName": "ram2#2", "pinName": "QA3" }, "pin2": { - "compName": "GUIandor414#4", + "compName": "andor414#4", "pinName": "A3" }, "name": "unnamedWire#107", @@ -784,11 +784,11 @@ }, { "pin1": { - "compName": "GUIram2#2", + "compName": "ram2#2", "pinName": "QA4" }, "pin2": { - "compName": "GUIandor414#4", + "compName": "andor414#4", "pinName": "A4" }, "name": "unnamedWire#108", @@ -805,11 +805,11 @@ }, { "pin1": { - "compName": "GUIram2#3", + "compName": "ram2#3", "pinName": "QA1" }, "pin2": { - "compName": "GUIandor414#5", + "compName": "andor414#5", "pinName": "A1" }, "name": "unnamedWire#109", @@ -830,7 +830,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIand41#0", + "compName": "and41#0", "pinName": "A4" }, "name": "unnamedWire#11", @@ -838,11 +838,11 @@ }, { "pin1": { - "compName": "GUIram2#3", + "compName": "ram2#3", "pinName": "QA2" }, "pin2": { - "compName": "GUIandor414#5", + "compName": "andor414#5", "pinName": "A2" }, "name": "unnamedWire#110", @@ -859,11 +859,11 @@ }, { "pin1": { - "compName": "GUIram2#3", + "compName": "ram2#3", "pinName": "QA3" }, "pin2": { - "compName": "GUIandor414#5", + "compName": "andor414#5", "pinName": "A3" }, "name": "unnamedWire#111", @@ -880,11 +880,11 @@ }, { "pin1": { - "compName": "GUIram2#3", + "compName": "ram2#3", "pinName": "QA4" }, "pin2": { - "compName": "GUIandor414#5", + "compName": "andor414#5", "pinName": "A4" }, "name": "unnamedWire#112", @@ -901,11 +901,11 @@ }, { "pin1": { - "compName": "GUIand41#1", + "compName": "and41#1", "pinName": "Y1" }, "pin2": { - "compName": "GUIandor414#0", + "compName": "andor414#0", "pinName": "C1" }, "name": "unnamedWire#113", @@ -930,11 +930,11 @@ }, { "pin1": { - "compName": "GUIand41#1", + "compName": "and41#1", "pinName": "Y2" }, "pin2": { - "compName": "GUIandor414#0", + "compName": "andor414#0", "pinName": "C2" }, "name": "unnamedWire#114", @@ -959,11 +959,11 @@ }, { "pin1": { - "compName": "GUIand41#1", + "compName": "and41#1", "pinName": "Y3" }, "pin2": { - "compName": "GUIandor414#0", + "compName": "andor414#0", "pinName": "C3" }, "name": "unnamedWire#115", @@ -988,11 +988,11 @@ }, { "pin1": { - "compName": "GUIand41#1", + "compName": "and41#1", "pinName": "Y4" }, "pin2": { - "compName": "GUIandor414#0", + "compName": "andor414#0", "pinName": "C4" }, "name": "unnamedWire#116", @@ -1017,11 +1017,11 @@ }, { "pin1": { - "compName": "GUIandor414#0", + "compName": "andor414#0", "pinName": "Y1" }, "pin2": { - "compName": "GUIandor414#1", + "compName": "andor414#1", "pinName": "C1" }, "name": "unnamedWire#117", @@ -1046,11 +1046,11 @@ }, { "pin1": { - "compName": "GUIandor414#0", + "compName": "andor414#0", "pinName": "Y2" }, "pin2": { - "compName": "GUIandor414#1", + "compName": "andor414#1", "pinName": "C2" }, "name": "unnamedWire#118", @@ -1075,11 +1075,11 @@ }, { "pin1": { - "compName": "GUIandor414#0", + "compName": "andor414#0", "pinName": "Y3" }, "pin2": { - "compName": "GUIandor414#1", + "compName": "andor414#1", "pinName": "C3" }, "name": "unnamedWire#119", @@ -1108,7 +1108,7 @@ "pinName": "WE" }, "pin2": { - "compName": "GUIand41#0", + "compName": "and41#0", "pinName": "B" }, "name": "unnamedWire#12", @@ -1125,11 +1125,11 @@ }, { "pin1": { - "compName": "GUIandor414#0", + "compName": "andor414#0", "pinName": "Y4" }, "pin2": { - "compName": "GUIandor414#1", + "compName": "andor414#1", "pinName": "C4" }, "name": "unnamedWire#120", @@ -1154,11 +1154,11 @@ }, { "pin1": { - "compName": "GUIandor414#1", + "compName": "andor414#1", "pinName": "Y1" }, "pin2": { - "compName": "GUIandor414#2", + "compName": "andor414#2", "pinName": "C1" }, "name": "unnamedWire#121", @@ -1183,11 +1183,11 @@ }, { "pin1": { - "compName": "GUIandor414#1", + "compName": "andor414#1", "pinName": "Y2" }, "pin2": { - "compName": "GUIandor414#2", + "compName": "andor414#2", "pinName": "C2" }, "name": "unnamedWire#122", @@ -1212,11 +1212,11 @@ }, { "pin1": { - "compName": "GUIandor414#1", + "compName": "andor414#1", "pinName": "Y3" }, "pin2": { - "compName": "GUIandor414#2", + "compName": "andor414#2", "pinName": "C3" }, "name": "unnamedWire#123", @@ -1241,11 +1241,11 @@ }, { "pin1": { - "compName": "GUIandor414#1", + "compName": "andor414#1", "pinName": "Y4" }, "pin2": { - "compName": "GUIandor414#2", + "compName": "andor414#2", "pinName": "C4" }, "name": "unnamedWire#124", @@ -1270,7 +1270,7 @@ }, { "pin1": { - "compName": "GUIandor414#2", + "compName": "andor414#2", "pinName": "Y1" }, "pin2": { @@ -1291,7 +1291,7 @@ }, { "pin1": { - "compName": "GUIandor414#2", + "compName": "andor414#2", "pinName": "Y2" }, "pin2": { @@ -1312,7 +1312,7 @@ }, { "pin1": { - "compName": "GUIandor414#2", + "compName": "andor414#2", "pinName": "Y3" }, "pin2": { @@ -1333,7 +1333,7 @@ }, { "pin1": { - "compName": "GUIandor414#2", + "compName": "andor414#2", "pinName": "Y4" }, "pin2": { @@ -1354,11 +1354,11 @@ }, { "pin1": { - "compName": "GUIand41#2", + "compName": "and41#2", "pinName": "Y1" }, "pin2": { - "compName": "GUIandor414#3", + "compName": "andor414#3", "pinName": "C1" }, "name": "unnamedWire#129", @@ -1383,11 +1383,11 @@ }, { "pin1": { - "compName": "GUIand41#0", + "compName": "and41#0", "pinName": "Y1" }, "pin2": { - "compName": "GUIram2#0", + "compName": "ram2#0", "pinName": "WE" }, "name": "unnamedWire#13", @@ -1412,11 +1412,11 @@ }, { "pin1": { - "compName": "GUIand41#2", + "compName": "and41#2", "pinName": "Y2" }, "pin2": { - "compName": "GUIandor414#3", + "compName": "andor414#3", "pinName": "C2" }, "name": "unnamedWire#130", @@ -1441,11 +1441,11 @@ }, { "pin1": { - "compName": "GUIand41#2", + "compName": "and41#2", "pinName": "Y3" }, "pin2": { - "compName": "GUIandor414#3", + "compName": "andor414#3", "pinName": "C3" }, "name": "unnamedWire#131", @@ -1470,11 +1470,11 @@ }, { "pin1": { - "compName": "GUIand41#2", + "compName": "and41#2", "pinName": "Y4" }, "pin2": { - "compName": "GUIandor414#3", + "compName": "andor414#3", "pinName": "C4" }, "name": "unnamedWire#132", @@ -1499,11 +1499,11 @@ }, { "pin1": { - "compName": "GUIandor414#3", + "compName": "andor414#3", "pinName": "Y1" }, "pin2": { - "compName": "GUIandor414#4", + "compName": "andor414#4", "pinName": "C1" }, "name": "unnamedWire#133", @@ -1528,11 +1528,11 @@ }, { "pin1": { - "compName": "GUIandor414#3", + "compName": "andor414#3", "pinName": "Y2" }, "pin2": { - "compName": "GUIandor414#4", + "compName": "andor414#4", "pinName": "C2" }, "name": "unnamedWire#134", @@ -1557,11 +1557,11 @@ }, { "pin1": { - "compName": "GUIandor414#3", + "compName": "andor414#3", "pinName": "Y3" }, "pin2": { - "compName": "GUIandor414#4", + "compName": "andor414#4", "pinName": "C3" }, "name": "unnamedWire#135", @@ -1586,11 +1586,11 @@ }, { "pin1": { - "compName": "GUIandor414#3", + "compName": "andor414#3", "pinName": "Y4" }, "pin2": { - "compName": "GUIandor414#4", + "compName": "andor414#4", "pinName": "C4" }, "name": "unnamedWire#136", @@ -1615,11 +1615,11 @@ }, { "pin1": { - "compName": "GUIandor414#4", + "compName": "andor414#4", "pinName": "Y1" }, "pin2": { - "compName": "GUIandor414#5", + "compName": "andor414#5", "pinName": "C1" }, "name": "unnamedWire#137", @@ -1644,11 +1644,11 @@ }, { "pin1": { - "compName": "GUIandor414#4", + "compName": "andor414#4", "pinName": "Y2" }, "pin2": { - "compName": "GUIandor414#5", + "compName": "andor414#5", "pinName": "C2" }, "name": "unnamedWire#138", @@ -1673,11 +1673,11 @@ }, { "pin1": { - "compName": "GUIandor414#4", + "compName": "andor414#4", "pinName": "Y3" }, "pin2": { - "compName": "GUIandor414#5", + "compName": "andor414#5", "pinName": "C3" }, "name": "unnamedWire#139", @@ -1702,11 +1702,11 @@ }, { "pin1": { - "compName": "GUIand41#0", + "compName": "and41#0", "pinName": "Y2" }, "pin2": { - "compName": "GUIram2#1", + "compName": "ram2#1", "pinName": "WE" }, "name": "unnamedWire#14", @@ -1731,11 +1731,11 @@ }, { "pin1": { - "compName": "GUIandor414#4", + "compName": "andor414#4", "pinName": "Y4" }, "pin2": { - "compName": "GUIandor414#5", + "compName": "andor414#5", "pinName": "C4" }, "name": "unnamedWire#140", @@ -1760,7 +1760,7 @@ }, { "pin1": { - "compName": "GUIandor414#5", + "compName": "andor414#5", "pinName": "Y1" }, "pin2": { @@ -1789,7 +1789,7 @@ }, { "pin1": { - "compName": "GUIandor414#5", + "compName": "andor414#5", "pinName": "Y2" }, "pin2": { @@ -1818,7 +1818,7 @@ }, { "pin1": { - "compName": "GUIandor414#5", + "compName": "andor414#5", "pinName": "Y3" }, "pin2": { @@ -1847,7 +1847,7 @@ }, { "pin1": { - "compName": "GUIandor414#5", + "compName": "andor414#5", "pinName": "Y4" }, "pin2": { @@ -1876,11 +1876,11 @@ }, { "pin1": { - "compName": "GUIand41#0", + "compName": "and41#0", "pinName": "Y3" }, "pin2": { - "compName": "GUIram2#2", + "compName": "ram2#2", "pinName": "WE" }, "name": "unnamedWire#15", @@ -1905,11 +1905,11 @@ }, { "pin1": { - "compName": "GUIand41#0", + "compName": "and41#0", "pinName": "Y4" }, "pin2": { - "compName": "GUIram2#3", + "compName": "ram2#3", "pinName": "WE" }, "name": "unnamedWire#16", @@ -1950,7 +1950,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIram2#0", + "compName": "ram2#0", "pinName": "A0" }, "name": "unnamedWire#18", @@ -1974,7 +1974,7 @@ "pinName": "B0" }, "pin2": { - "compName": "GUIdemux2#1", + "compName": "demux2#1", "pinName": "S0" }, "name": "unnamedWire#2", @@ -1995,7 +1995,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIram2#0", + "compName": "ram2#0", "pinName": "A1" }, "name": "unnamedWire#20", @@ -2012,7 +2012,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIram2#0", + "compName": "ram2#0", "pinName": "B0" }, "name": "unnamedWire#21", @@ -2029,7 +2029,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIram2#0", + "compName": "ram2#0", "pinName": "B1" }, "name": "unnamedWire#22", @@ -2046,7 +2046,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIram2#1", + "compName": "ram2#1", "pinName": "A0" }, "name": "unnamedWire#23", @@ -2058,7 +2058,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIram2#1", + "compName": "ram2#1", "pinName": "A1" }, "name": "unnamedWire#24", @@ -2070,7 +2070,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIram2#1", + "compName": "ram2#1", "pinName": "B0" }, "name": "unnamedWire#25", @@ -2082,7 +2082,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIram2#1", + "compName": "ram2#1", "pinName": "B1" }, "name": "unnamedWire#26", @@ -2130,7 +2130,7 @@ "pinName": "B1" }, "pin2": { - "compName": "GUIdemux2#1", + "compName": "demux2#1", "pinName": "S1" }, "name": "unnamedWire#3", @@ -2187,7 +2187,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIram2#2", + "compName": "ram2#2", "pinName": "A0" }, "name": "unnamedWire#33", @@ -2199,7 +2199,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIram2#2", + "compName": "ram2#2", "pinName": "A1" }, "name": "unnamedWire#34", @@ -2211,7 +2211,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIram2#2", + "compName": "ram2#2", "pinName": "B0" }, "name": "unnamedWire#35", @@ -2223,7 +2223,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIram2#2", + "compName": "ram2#2", "pinName": "B1" }, "name": "unnamedWire#36", @@ -2235,7 +2235,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIram2#3", + "compName": "ram2#3", "pinName": "A0" }, "name": "unnamedWire#37", @@ -2252,7 +2252,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIram2#3", + "compName": "ram2#3", "pinName": "A1" }, "name": "unnamedWire#38", @@ -2269,7 +2269,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIram2#3", + "compName": "ram2#3", "pinName": "B0" }, "name": "unnamedWire#39", @@ -2282,7 +2282,7 @@ }, { "pin1": { - "compName": "GUIdemux2#1", + "compName": "demux2#1", "pinName": "Y00" }, "pin2": { @@ -2310,7 +2310,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIram2#3", + "compName": "ram2#3", "pinName": "B1" }, "name": "unnamedWire#41", @@ -2368,7 +2368,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIram2#0", + "compName": "ram2#0", "pinName": "D1" }, "name": "unnamedWire#45", @@ -2385,7 +2385,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIram2#0", + "compName": "ram2#0", "pinName": "D2" }, "name": "unnamedWire#46", @@ -2402,7 +2402,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIram2#0", + "compName": "ram2#0", "pinName": "D3" }, "name": "unnamedWire#47", @@ -2419,7 +2419,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIram2#0", + "compName": "ram2#0", "pinName": "D4" }, "name": "unnamedWire#48", @@ -2436,7 +2436,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIram2#1", + "compName": "ram2#1", "pinName": "D1" }, "name": "unnamedWire#49", @@ -2444,7 +2444,7 @@ }, { "pin1": { - "compName": "GUIdemux2#1", + "compName": "demux2#1", "pinName": "Y01" }, "pin2": { @@ -2460,7 +2460,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIram2#1", + "compName": "ram2#1", "pinName": "D2" }, "name": "unnamedWire#50", @@ -2472,7 +2472,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIram2#1", + "compName": "ram2#1", "pinName": "D3" }, "name": "unnamedWire#51", @@ -2484,7 +2484,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIram2#1", + "compName": "ram2#1", "pinName": "D4" }, "name": "unnamedWire#52", @@ -2544,7 +2544,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIram2#2", + "compName": "ram2#2", "pinName": "D1" }, "name": "unnamedWire#57", @@ -2556,7 +2556,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIram2#2", + "compName": "ram2#2", "pinName": "D2" }, "name": "unnamedWire#58", @@ -2568,7 +2568,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIram2#2", + "compName": "ram2#2", "pinName": "D3" }, "name": "unnamedWire#59", @@ -2576,7 +2576,7 @@ }, { "pin1": { - "compName": "GUIdemux2#1", + "compName": "demux2#1", "pinName": "Y10" }, "pin2": { @@ -2592,7 +2592,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIram2#2", + "compName": "ram2#2", "pinName": "D4" }, "name": "unnamedWire#60", @@ -2652,7 +2652,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIram2#3", + "compName": "ram2#3", "pinName": "D1" }, "name": "unnamedWire#65", @@ -2664,7 +2664,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIram2#3", + "compName": "ram2#3", "pinName": "D2" }, "name": "unnamedWire#66", @@ -2676,7 +2676,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIram2#3", + "compName": "ram2#3", "pinName": "D3" }, "name": "unnamedWire#67", @@ -2688,7 +2688,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIram2#3", + "compName": "ram2#3", "pinName": "D4" }, "name": "unnamedWire#68", @@ -2713,7 +2713,7 @@ }, { "pin1": { - "compName": "GUIdemux2#1", + "compName": "demux2#1", "pinName": "Y11" }, "pin2": { @@ -2776,11 +2776,11 @@ }, { "pin1": { - "compName": "GUIdemux2#0", + "compName": "demux2#0", "pinName": "Y00" }, "pin2": { - "compName": "GUIand41#2", + "compName": "and41#2", "pinName": "B" }, "name": "unnamedWire#73", @@ -2797,11 +2797,11 @@ }, { "pin1": { - "compName": "GUIdemux2#0", + "compName": "demux2#0", "pinName": "Y01" }, "pin2": { - "compName": "GUIandor414#3", + "compName": "andor414#3", "pinName": "B" }, "name": "unnamedWire#74", @@ -2818,11 +2818,11 @@ }, { "pin1": { - "compName": "GUIdemux2#0", + "compName": "demux2#0", "pinName": "Y10" }, "pin2": { - "compName": "GUIandor414#4", + "compName": "andor414#4", "pinName": "B" }, "name": "unnamedWire#75", @@ -2839,11 +2839,11 @@ }, { "pin1": { - "compName": "GUIdemux2#0", + "compName": "demux2#0", "pinName": "Y11" }, "pin2": { - "compName": "GUIandor414#5", + "compName": "andor414#5", "pinName": "B" }, "name": "unnamedWire#76", @@ -2864,7 +2864,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIand41#1", + "compName": "and41#1", "pinName": "B" }, "name": "unnamedWire#77", @@ -2881,7 +2881,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIandor414#0", + "compName": "andor414#0", "pinName": "B" }, "name": "unnamedWire#78", @@ -2898,7 +2898,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIandor414#1", + "compName": "andor414#1", "pinName": "B" }, "name": "unnamedWire#79", @@ -2915,7 +2915,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIand41#0", + "compName": "and41#0", "pinName": "A1" }, "name": "unnamedWire#8", @@ -2927,7 +2927,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIandor414#2", + "compName": "andor414#2", "pinName": "B" }, "name": "unnamedWire#80", @@ -2940,11 +2940,11 @@ }, { "pin1": { - "compName": "GUIram2#0", + "compName": "ram2#0", "pinName": "QB1" }, "pin2": { - "compName": "GUIand41#1", + "compName": "and41#1", "pinName": "A1" }, "name": "unnamedWire#81", @@ -2961,11 +2961,11 @@ }, { "pin1": { - "compName": "GUIram2#0", + "compName": "ram2#0", "pinName": "QB2" }, "pin2": { - "compName": "GUIand41#1", + "compName": "and41#1", "pinName": "A2" }, "name": "unnamedWire#82", @@ -2982,11 +2982,11 @@ }, { "pin1": { - "compName": "GUIram2#0", + "compName": "ram2#0", "pinName": "QB3" }, "pin2": { - "compName": "GUIand41#1", + "compName": "and41#1", "pinName": "A3" }, "name": "unnamedWire#83", @@ -3003,11 +3003,11 @@ }, { "pin1": { - "compName": "GUIram2#0", + "compName": "ram2#0", "pinName": "QB4" }, "pin2": { - "compName": "GUIand41#1", + "compName": "and41#1", "pinName": "A4" }, "name": "unnamedWire#84", @@ -3024,11 +3024,11 @@ }, { "pin1": { - "compName": "GUIram2#1", + "compName": "ram2#1", "pinName": "QB1" }, "pin2": { - "compName": "GUIandor414#0", + "compName": "andor414#0", "pinName": "A1" }, "name": "unnamedWire#85", @@ -3045,11 +3045,11 @@ }, { "pin1": { - "compName": "GUIram2#1", + "compName": "ram2#1", "pinName": "QB2" }, "pin2": { - "compName": "GUIandor414#0", + "compName": "andor414#0", "pinName": "A2" }, "name": "unnamedWire#86", @@ -3066,11 +3066,11 @@ }, { "pin1": { - "compName": "GUIram2#1", + "compName": "ram2#1", "pinName": "QB3" }, "pin2": { - "compName": "GUIandor414#0", + "compName": "andor414#0", "pinName": "A3" }, "name": "unnamedWire#87", @@ -3087,11 +3087,11 @@ }, { "pin1": { - "compName": "GUIram2#1", + "compName": "ram2#1", "pinName": "QB4" }, "pin2": { - "compName": "GUIandor414#0", + "compName": "andor414#0", "pinName": "A4" }, "name": "unnamedWire#88", @@ -3108,11 +3108,11 @@ }, { "pin1": { - "compName": "GUIram2#2", + "compName": "ram2#2", "pinName": "QB1" }, "pin2": { - "compName": "GUIandor414#1", + "compName": "andor414#1", "pinName": "A1" }, "name": "unnamedWire#89", @@ -3133,7 +3133,7 @@ "pinName": "" }, "pin2": { - "compName": "GUIand41#0", + "compName": "and41#0", "pinName": "A2" }, "name": "unnamedWire#9", @@ -3141,11 +3141,11 @@ }, { "pin1": { - "compName": "GUIram2#2", + "compName": "ram2#2", "pinName": "QB2" }, "pin2": { - "compName": "GUIandor414#1", + "compName": "andor414#1", "pinName": "A2" }, "name": "unnamedWire#90", @@ -3162,11 +3162,11 @@ }, { "pin1": { - "compName": "GUIram2#2", + "compName": "ram2#2", "pinName": "QB3" }, "pin2": { - "compName": "GUIandor414#1", + "compName": "andor414#1", "pinName": "A3" }, "name": "unnamedWire#91", @@ -3183,11 +3183,11 @@ }, { "pin1": { - "compName": "GUIram2#2", + "compName": "ram2#2", "pinName": "QB4" }, "pin2": { - "compName": "GUIandor414#1", + "compName": "andor414#1", "pinName": "A4" }, "name": "unnamedWire#92", @@ -3204,11 +3204,11 @@ }, { "pin1": { - "compName": "GUIram2#3", + "compName": "ram2#3", "pinName": "QB1" }, "pin2": { - "compName": "GUIandor414#2", + "compName": "andor414#2", "pinName": "A1" }, "name": "unnamedWire#93", @@ -3225,11 +3225,11 @@ }, { "pin1": { - "compName": "GUIram2#3", + "compName": "ram2#3", "pinName": "QB2" }, "pin2": { - "compName": "GUIandor414#2", + "compName": "andor414#2", "pinName": "A2" }, "name": "unnamedWire#94", @@ -3246,11 +3246,11 @@ }, { "pin1": { - "compName": "GUIram2#3", + "compName": "ram2#3", "pinName": "QB3" }, "pin2": { - "compName": "GUIandor414#2", + "compName": "andor414#2", "pinName": "A3" }, "name": "unnamedWire#95", @@ -3267,11 +3267,11 @@ }, { "pin1": { - "compName": "GUIram2#3", + "compName": "ram2#3", "pinName": "QB4" }, "pin2": { - "compName": "GUIandor414#2", + "compName": "andor414#2", "pinName": "A4" }, "name": "unnamedWire#96", @@ -3288,11 +3288,11 @@ }, { "pin1": { - "compName": "GUIram2#0", + "compName": "ram2#0", "pinName": "QA1" }, "pin2": { - "compName": "GUIand41#2", + "compName": "and41#2", "pinName": "A1" }, "name": "unnamedWire#97", @@ -3309,11 +3309,11 @@ }, { "pin1": { - "compName": "GUIram2#0", + "compName": "ram2#0", "pinName": "QA2" }, "pin2": { - "compName": "GUIand41#2", + "compName": "and41#2", "pinName": "A2" }, "name": "unnamedWire#98", @@ -3330,11 +3330,11 @@ }, { "pin1": { - "compName": "GUIram2#0", + "compName": "ram2#0", "pinName": "QA3" }, "pin2": { - "compName": "GUIand41#2", + "compName": "and41#2", "pinName": "A3" }, "name": "unnamedWire#99", @@ -3354,7 +3354,7 @@ }, "symbolRendererSnippetID": "simpleRectangularLike", "symbolRendererParams": { - "centerText": "GUIram4", + "centerText": "ram4", "centerTextHeight": 5.0, "horizontalComponentCenter": 17.5, "pinLabelHeight": 3.5, @@ -3367,136 +3367,136 @@ "c00": { "id": "delegating", "params": { - "delegateTarget": "GUIram2#0" + "delegateTarget": "ram2#0" } }, "c11": { "id": "delegating", "params": { - "delegateTarget": "GUIram2#3" + "delegateTarget": "ram2#3" } }, "c10": { "id": "delegating", "params": { - "delegateTarget": "GUIram2#2" + "delegateTarget": "ram2#2" } }, "c01": { "id": "delegating", "params": { - "delegateTarget": "GUIram2#1" + "delegateTarget": "ram2#1" } }, "c1000": { "id": "delegating", "params": { - "delegateTarget": "GUIram2#0", + "delegateTarget": "ram2#0", "prefix": "c10" } }, "c1011": { "id": "delegating", "params": { - "delegateTarget": "GUIram2#3", + "delegateTarget": "ram2#3", "prefix": "c10" } }, "c1110": { "id": "delegating", "params": { - "delegateTarget": "GUIram2#2", + "delegateTarget": "ram2#2", "prefix": "c11" } }, "c1001": { "id": "delegating", "params": { - "delegateTarget": "GUIram2#1", + "delegateTarget": "ram2#1", "prefix": "c10" } }, "c1100": { "id": "delegating", "params": { - "delegateTarget": "GUIram2#0", + "delegateTarget": "ram2#0", "prefix": "c11" } }, "c1111": { "id": "delegating", "params": { - "delegateTarget": "GUIram2#3", + "delegateTarget": "ram2#3", "prefix": "c11" } }, "c0000": { "id": "delegating", "params": { - "delegateTarget": "GUIram2#0", + "delegateTarget": "ram2#0", "prefix": "c00" } }, "c0011": { "id": "delegating", "params": { - "delegateTarget": "GUIram2#3", + "delegateTarget": "ram2#3", "prefix": "c00" } }, "c0110": { "id": "delegating", "params": { - "delegateTarget": "GUIram2#2", + "delegateTarget": "ram2#2", "prefix": "c01" } }, "c0010": { "id": "delegating", "params": { - "delegateTarget": "GUIram2#2", + "delegateTarget": "ram2#2", "prefix": "c00" } }, "c1010": { "id": "delegating", "params": { - "delegateTarget": "GUIram2#2", + "delegateTarget": "ram2#2", "prefix": "c10" } }, "c0101": { "id": "delegating", "params": { - "delegateTarget": "GUIram2#1", + "delegateTarget": "ram2#1", "prefix": "c01" } }, "c0001": { "id": "delegating", "params": { - "delegateTarget": "GUIram2#1", + "delegateTarget": "ram2#1", "prefix": "c00" } }, "c0100": { "id": "delegating", "params": { - "delegateTarget": "GUIram2#0", + "delegateTarget": "ram2#0", "prefix": "c01" } }, "c0111": { "id": "delegating", "params": { - "delegateTarget": "GUIram2#3", + "delegateTarget": "ram2#3", "prefix": "c01" } }, "c1101": { "id": "delegating", "params": { - "delegateTarget": "GUIram2#1", + "delegateTarget": "ram2#1", "prefix": "c11" } } diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/GUIsel1.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/sel1.json similarity index 86% rename from net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/GUIsel1.json rename to net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/sel1.json index 093657b9..d53f4c8e 100644 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/GUIsel1.json +++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/sel1.json @@ -52,8 +52,8 @@ "submodel": { "components": [ { - "id": "GUINandGate", - "name": "GUINandGate#1", + "id": "NandGate", + "name": "NandGate#1", "pos": { "x": 35.0, "y": 30.0 @@ -61,8 +61,8 @@ "params": 1 }, { - "id": "GUINandGate", - "name": "GUINandGate#2", + "id": "NandGate", + "name": "NandGate#2", "pos": { "x": 35.0, "y": 55.0 @@ -70,8 +70,8 @@ "params": 1 }, { - "id": "GUINandGate", - "name": "GUINandGate#3", + "id": "NandGate", + "name": "NandGate#3", "pos": { "x": 60.0, "y": 40.0 @@ -86,7 +86,7 @@ "pinName": "S1" }, "pin2": { - "compName": "GUINandGate#1", + "compName": "NandGate#1", "pinName": "A" }, "name": "unnamedWire#0", @@ -107,7 +107,7 @@ "pinName": "S2" }, "pin2": { - "compName": "GUINandGate#2", + "compName": "NandGate#2", "pinName": "A" }, "name": "unnamedWire#1", @@ -124,7 +124,7 @@ }, { "pin1": { - "compName": "GUINandGate#3", + "compName": "NandGate#3", "pinName": "Y" }, "pin2": { @@ -139,7 +139,7 @@ "pinName": "I1" }, "pin2": { - "compName": "GUINandGate#1", + "compName": "NandGate#1", "pinName": "B" }, "name": "unnamedWire#5", @@ -160,7 +160,7 @@ "pinName": "I2" }, "pin2": { - "compName": "GUINandGate#2", + "compName": "NandGate#2", "pinName": "B" }, "name": "unnamedWire#7", @@ -177,22 +177,22 @@ }, { "pin1": { - "compName": "GUINandGate#1", + "compName": "NandGate#1", "pinName": "Y" }, "pin2": { - "compName": "GUINandGate#3", + "compName": "NandGate#3", "pinName": "A" }, "name": "unnamedWire#8" }, { "pin1": { - "compName": "GUINandGate#2", + "compName": "NandGate#2", "pinName": "Y" }, "pin2": { - "compName": "GUINandGate#3", + "compName": "NandGate#3", "pinName": "B" }, "name": "unnamedWire#9" @@ -202,7 +202,7 @@ }, "symbolRendererSnippetID": "simpleRectangularLike", "symbolRendererParams": { - "centerText": "GUIsel1", + "centerText": "sel1", "centerTextHeight": 5.0, "horizontalComponentCenter": 17.5, "pinLabelHeight": 3.5, diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/GUIsel2_4.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/sel2_4.json similarity index 86% rename from net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/GUIsel2_4.json rename to net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/sel2_4.json index a9234a2e..22f3ce64 100644 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/GUIsel2_4.json +++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/sel2_4.json @@ -133,8 +133,8 @@ "submodel": { "components": [ { - "id": "GUINandGate", - "name": "GUINandGate#0", + "id": "NandGate", + "name": "NandGate#0", "pos": { "x": 20.0, "y": 2.5 @@ -142,8 +142,8 @@ "params": 1 }, { - "id": "GUINandGate", - "name": "GUINandGate#1", + "id": "NandGate", + "name": "NandGate#1", "pos": { "x": 20.0, "y": 52.5 @@ -151,8 +151,8 @@ "params": 1 }, { - "id": "GUINandGate", - "name": "GUINandGate#10", + "id": "NandGate", + "name": "NandGate#10", "pos": { "x": 65.0, "y": 52.5 @@ -160,8 +160,8 @@ "params": 1 }, { - "id": "GUINandGate", - "name": "GUINandGate#11", + "id": "NandGate", + "name": "NandGate#11", "pos": { "x": 65.0, "y": 77.5 @@ -169,8 +169,8 @@ "params": 1 }, { - "id": "GUINandGate", - "name": "GUINandGate#2", + "id": "NandGate", + "name": "NandGate#2", "pos": { "x": 20.0, "y": 102.5 @@ -178,8 +178,8 @@ "params": 1 }, { - "id": "GUINandGate", - "name": "GUINandGate#3", + "id": "NandGate", + "name": "NandGate#3", "pos": { "x": 20.0, "y": 152.5 @@ -187,8 +187,8 @@ "params": 1 }, { - "id": "GUINandGate", - "name": "GUINandGate#4", + "id": "NandGate", + "name": "NandGate#4", "pos": { "x": 20.0, "y": 27.5 @@ -196,8 +196,8 @@ "params": 1 }, { - "id": "GUINandGate", - "name": "GUINandGate#5", + "id": "NandGate", + "name": "NandGate#5", "pos": { "x": 20.0, "y": 77.5 @@ -205,8 +205,8 @@ "params": 1 }, { - "id": "GUINandGate", - "name": "GUINandGate#6", + "id": "NandGate", + "name": "NandGate#6", "pos": { "x": 20.0, "y": 127.5 @@ -214,8 +214,8 @@ "params": 1 }, { - "id": "GUINandGate", - "name": "GUINandGate#7", + "id": "NandGate", + "name": "NandGate#7", "pos": { "x": 20.0, "y": 177.5 @@ -223,8 +223,8 @@ "params": 1 }, { - "id": "GUINandGate", - "name": "GUINandGate#8", + "id": "NandGate", + "name": "NandGate#8", "pos": { "x": 65.0, "y": 2.5 @@ -232,8 +232,8 @@ "params": 1 }, { - "id": "GUINandGate", - "name": "GUINandGate#9", + "id": "NandGate", + "name": "NandGate#9", "pos": { "x": 65.0, "y": 27.5 @@ -302,7 +302,7 @@ "pinName": "A1" }, "pin2": { - "compName": "GUINandGate#0", + "compName": "NandGate#0", "pinName": "A" }, "name": "unnamedWire#0", @@ -323,7 +323,7 @@ "pinName": "A2" }, "pin2": { - "compName": "GUINandGate#1", + "compName": "NandGate#1", "pinName": "A" }, "name": "unnamedWire#1", @@ -355,7 +355,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#0", + "compName": "NandGate#0", "pinName": "B" }, "name": "unnamedWire#11" @@ -377,7 +377,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#1", + "compName": "NandGate#1", "pinName": "B" }, "name": "unnamedWire#13" @@ -388,7 +388,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#2", + "compName": "NandGate#2", "pinName": "B" }, "name": "unnamedWire#14" @@ -399,7 +399,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#3", + "compName": "NandGate#3", "pinName": "B" }, "name": "unnamedWire#15", @@ -427,7 +427,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#4", + "compName": "NandGate#4", "pinName": "B" }, "name": "unnamedWire#17" @@ -449,7 +449,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#5", + "compName": "NandGate#5", "pinName": "B" }, "name": "unnamedWire#19" @@ -460,7 +460,7 @@ "pinName": "A3" }, "pin2": { - "compName": "GUINandGate#2", + "compName": "NandGate#2", "pinName": "A" }, "name": "unnamedWire#2", @@ -481,7 +481,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#6", + "compName": "NandGate#6", "pinName": "B" }, "name": "unnamedWire#20" @@ -492,7 +492,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#7", + "compName": "NandGate#7", "pinName": "B" }, "name": "unnamedWire#21", @@ -505,11 +505,11 @@ }, { "pin1": { - "compName": "GUINandGate#0", + "compName": "NandGate#0", "pinName": "Y" }, "pin2": { - "compName": "GUINandGate#8", + "compName": "NandGate#8", "pinName": "A" }, "name": "unnamedWire#22", @@ -526,11 +526,11 @@ }, { "pin1": { - "compName": "GUINandGate#4", + "compName": "NandGate#4", "pinName": "Y" }, "pin2": { - "compName": "GUINandGate#8", + "compName": "NandGate#8", "pinName": "B" }, "name": "unnamedWire#23", @@ -547,11 +547,11 @@ }, { "pin1": { - "compName": "GUINandGate#1", + "compName": "NandGate#1", "pinName": "Y" }, "pin2": { - "compName": "GUINandGate#9", + "compName": "NandGate#9", "pinName": "A" }, "name": "unnamedWire#24", @@ -568,11 +568,11 @@ }, { "pin1": { - "compName": "GUINandGate#5", + "compName": "NandGate#5", "pinName": "Y" }, "pin2": { - "compName": "GUINandGate#9", + "compName": "NandGate#9", "pinName": "B" }, "name": "unnamedWire#25", @@ -589,11 +589,11 @@ }, { "pin1": { - "compName": "GUINandGate#2", + "compName": "NandGate#2", "pinName": "Y" }, "pin2": { - "compName": "GUINandGate#10", + "compName": "NandGate#10", "pinName": "A" }, "name": "unnamedWire#26", @@ -610,11 +610,11 @@ }, { "pin1": { - "compName": "GUINandGate#6", + "compName": "NandGate#6", "pinName": "Y" }, "pin2": { - "compName": "GUINandGate#10", + "compName": "NandGate#10", "pinName": "B" }, "name": "unnamedWire#27", @@ -631,11 +631,11 @@ }, { "pin1": { - "compName": "GUINandGate#3", + "compName": "NandGate#3", "pinName": "Y" }, "pin2": { - "compName": "GUINandGate#11", + "compName": "NandGate#11", "pinName": "A" }, "name": "unnamedWire#28", @@ -652,11 +652,11 @@ }, { "pin1": { - "compName": "GUINandGate#7", + "compName": "NandGate#7", "pinName": "Y" }, "pin2": { - "compName": "GUINandGate#11", + "compName": "NandGate#11", "pinName": "B" }, "name": "unnamedWire#29", @@ -677,7 +677,7 @@ "pinName": "A4" }, "pin2": { - "compName": "GUINandGate#3", + "compName": "NandGate#3", "pinName": "A" }, "name": "unnamedWire#3", @@ -694,7 +694,7 @@ }, { "pin1": { - "compName": "GUINandGate#8", + "compName": "NandGate#8", "pinName": "Y" }, "pin2": { @@ -706,7 +706,7 @@ }, { "pin1": { - "compName": "GUINandGate#9", + "compName": "NandGate#9", "pinName": "Y" }, "pin2": { @@ -718,7 +718,7 @@ }, { "pin1": { - "compName": "GUINandGate#10", + "compName": "NandGate#10", "pinName": "Y" }, "pin2": { @@ -730,7 +730,7 @@ }, { "pin1": { - "compName": "GUINandGate#11", + "compName": "NandGate#11", "pinName": "Y" }, "pin2": { @@ -746,7 +746,7 @@ "pinName": "B1" }, "pin2": { - "compName": "GUINandGate#4", + "compName": "NandGate#4", "pinName": "A" }, "name": "unnamedWire#4", @@ -767,7 +767,7 @@ "pinName": "B2" }, "pin2": { - "compName": "GUINandGate#5", + "compName": "NandGate#5", "pinName": "A" }, "name": "unnamedWire#5", @@ -788,7 +788,7 @@ "pinName": "B3" }, "pin2": { - "compName": "GUINandGate#6", + "compName": "NandGate#6", "pinName": "A" }, "name": "unnamedWire#6", @@ -809,7 +809,7 @@ "pinName": "B4" }, "pin2": { - "compName": "GUINandGate#7", + "compName": "NandGate#7", "pinName": "A" }, "name": "unnamedWire#7", @@ -851,7 +851,7 @@ }, "symbolRendererSnippetID": "simpleRectangularLike", "symbolRendererParams": { - "centerText": "GUIsel2_4", + "centerText": "sel2_4", "centerTextHeight": 5.0, "horizontalComponentCenter": 17.5, "pinLabelHeight": 3.5, diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/GUIsel3_4.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/sel3_4.json similarity index 86% rename from net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/GUIsel3_4.json rename to net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/sel3_4.json index 5951bdc5..ad1b3977 100644 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/GUIsel3_4.json +++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/sel3_4.json @@ -178,8 +178,8 @@ "submodel": { "components": [ { - "id": "GUINandGate", - "name": "GUINandGate#0", + "id": "NandGate", + "name": "NandGate#0", "pos": { "x": 50.0, "y": 570.0 @@ -187,8 +187,8 @@ "params": 1 }, { - "id": "GUINandGate", - "name": "GUINandGate#1", + "id": "NandGate", + "name": "NandGate#1", "pos": { "x": 50.0, "y": 620.0 @@ -196,8 +196,8 @@ "params": 1 }, { - "id": "GUINandGate", - "name": "GUINandGate#2", + "id": "NandGate", + "name": "NandGate#2", "pos": { "x": 50.0, "y": 670.0 @@ -205,8 +205,8 @@ "params": 1 }, { - "id": "GUINandGate", - "name": "GUINandGate#3", + "id": "NandGate", + "name": "NandGate#3", "pos": { "x": 50.0, "y": 720.0 @@ -214,8 +214,8 @@ "params": 1 }, { - "id": "GUINandGate", - "name": "GUINandGate#4", + "id": "NandGate", + "name": "NandGate#4", "pos": { "x": 152.5, "y": 15.0 @@ -223,8 +223,8 @@ "params": 1 }, { - "id": "GUINandGate", - "name": "GUINandGate#5", + "id": "NandGate", + "name": "NandGate#5", "pos": { "x": 152.5, "y": 65.0 @@ -232,8 +232,8 @@ "params": 1 }, { - "id": "GUINandGate", - "name": "GUINandGate#6", + "id": "NandGate", + "name": "NandGate#6", "pos": { "x": 152.5, "y": 115.0 @@ -241,8 +241,8 @@ "params": 1 }, { - "id": "GUINandGate", - "name": "GUINandGate#7", + "id": "NandGate", + "name": "NandGate#7", "pos": { "x": 152.5, "y": 165.0 @@ -250,16 +250,16 @@ "params": 1 }, { - "id": "GUInot4", - "name": "GUInot4#0", + "id": "not4", + "name": "not4#0", "pos": { "x": 75.0, "y": 250.0 } }, { - "id": "GUIsel2_4", - "name": "GUIsel2_4#0", + "id": "sel2_4", + "name": "sel2_4#0", "pos": { "x": 35.0, "y": 250.0 @@ -300,7 +300,7 @@ "pinName": "SA" }, "pin2": { - "compName": "GUIsel2_4#0", + "compName": "sel2_4#0", "pinName": "SA" }, "name": "unnamedWire#0", @@ -321,7 +321,7 @@ "pinName": "SB" }, "pin2": { - "compName": "GUIsel2_4#0", + "compName": "sel2_4#0", "pinName": "SB" }, "name": "unnamedWire#1", @@ -338,11 +338,11 @@ }, { "pin1": { - "compName": "GUIsel2_4#0", + "compName": "sel2_4#0", "pinName": "Y1" }, "pin2": { - "compName": "GUInot4#0", + "compName": "not4#0", "pinName": "A1" }, "name": "unnamedWire#10", @@ -350,11 +350,11 @@ }, { "pin1": { - "compName": "GUIsel2_4#0", + "compName": "sel2_4#0", "pinName": "Y2" }, "pin2": { - "compName": "GUInot4#0", + "compName": "not4#0", "pinName": "A2" }, "name": "unnamedWire#11", @@ -362,11 +362,11 @@ }, { "pin1": { - "compName": "GUIsel2_4#0", + "compName": "sel2_4#0", "pinName": "Y3" }, "pin2": { - "compName": "GUInot4#0", + "compName": "not4#0", "pinName": "A3" }, "name": "unnamedWire#12", @@ -374,11 +374,11 @@ }, { "pin1": { - "compName": "GUIsel2_4#0", + "compName": "sel2_4#0", "pinName": "Y4" }, "pin2": { - "compName": "GUInot4#0", + "compName": "not4#0", "pinName": "A4" }, "name": "unnamedWire#13", @@ -407,7 +407,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#0", + "compName": "NandGate#0", "pinName": "B" }, "name": "unnamedWire#15", @@ -436,7 +436,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#1", + "compName": "NandGate#1", "pinName": "B" }, "name": "unnamedWire#17", @@ -465,7 +465,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#2", + "compName": "NandGate#2", "pinName": "B" }, "name": "unnamedWire#19", @@ -477,7 +477,7 @@ "pinName": "A1" }, "pin2": { - "compName": "GUIsel2_4#0", + "compName": "sel2_4#0", "pinName": "A1" }, "name": "unnamedWire#2", @@ -498,7 +498,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#3", + "compName": "NandGate#3", "pinName": "B" }, "name": "unnamedWire#20", @@ -515,7 +515,7 @@ "pinName": "C1" }, "pin2": { - "compName": "GUINandGate#0", + "compName": "NandGate#0", "pinName": "A" }, "name": "unnamedWire#21", @@ -527,7 +527,7 @@ "pinName": "C2" }, "pin2": { - "compName": "GUINandGate#1", + "compName": "NandGate#1", "pinName": "A" }, "name": "unnamedWire#22", @@ -539,7 +539,7 @@ "pinName": "C3" }, "pin2": { - "compName": "GUINandGate#2", + "compName": "NandGate#2", "pinName": "A" }, "name": "unnamedWire#23", @@ -551,7 +551,7 @@ "pinName": "C4" }, "pin2": { - "compName": "GUINandGate#3", + "compName": "NandGate#3", "pinName": "A" }, "name": "unnamedWire#24", @@ -559,11 +559,11 @@ }, { "pin1": { - "compName": "GUInot4#0", + "compName": "not4#0", "pinName": "Y1" }, "pin2": { - "compName": "GUINandGate#4", + "compName": "NandGate#4", "pinName": "A" }, "name": "unnamedWire#25", @@ -580,11 +580,11 @@ }, { "pin1": { - "compName": "GUInot4#0", + "compName": "not4#0", "pinName": "Y2" }, "pin2": { - "compName": "GUINandGate#5", + "compName": "NandGate#5", "pinName": "A" }, "name": "unnamedWire#26", @@ -601,11 +601,11 @@ }, { "pin1": { - "compName": "GUInot4#0", + "compName": "not4#0", "pinName": "Y3" }, "pin2": { - "compName": "GUINandGate#6", + "compName": "NandGate#6", "pinName": "A" }, "name": "unnamedWire#27", @@ -622,11 +622,11 @@ }, { "pin1": { - "compName": "GUInot4#0", + "compName": "not4#0", "pinName": "Y4" }, "pin2": { - "compName": "GUINandGate#7", + "compName": "NandGate#7", "pinName": "A" }, "name": "unnamedWire#28", @@ -643,11 +643,11 @@ }, { "pin1": { - "compName": "GUINandGate#0", + "compName": "NandGate#0", "pinName": "Y" }, "pin2": { - "compName": "GUINandGate#4", + "compName": "NandGate#4", "pinName": "B" }, "name": "unnamedWire#29", @@ -668,7 +668,7 @@ "pinName": "A2" }, "pin2": { - "compName": "GUIsel2_4#0", + "compName": "sel2_4#0", "pinName": "A2" }, "name": "unnamedWire#3", @@ -685,11 +685,11 @@ }, { "pin1": { - "compName": "GUINandGate#1", + "compName": "NandGate#1", "pinName": "Y" }, "pin2": { - "compName": "GUINandGate#5", + "compName": "NandGate#5", "pinName": "B" }, "name": "unnamedWire#30", @@ -706,11 +706,11 @@ }, { "pin1": { - "compName": "GUINandGate#2", + "compName": "NandGate#2", "pinName": "Y" }, "pin2": { - "compName": "GUINandGate#6", + "compName": "NandGate#6", "pinName": "B" }, "name": "unnamedWire#31", @@ -727,11 +727,11 @@ }, { "pin1": { - "compName": "GUINandGate#3", + "compName": "NandGate#3", "pinName": "Y" }, "pin2": { - "compName": "GUINandGate#7", + "compName": "NandGate#7", "pinName": "B" }, "name": "unnamedWire#32", @@ -748,7 +748,7 @@ }, { "pin1": { - "compName": "GUINandGate#4", + "compName": "NandGate#4", "pinName": "Y" }, "pin2": { @@ -760,7 +760,7 @@ }, { "pin1": { - "compName": "GUINandGate#5", + "compName": "NandGate#5", "pinName": "Y" }, "pin2": { @@ -772,7 +772,7 @@ }, { "pin1": { - "compName": "GUINandGate#6", + "compName": "NandGate#6", "pinName": "Y" }, "pin2": { @@ -784,7 +784,7 @@ }, { "pin1": { - "compName": "GUINandGate#7", + "compName": "NandGate#7", "pinName": "Y" }, "pin2": { @@ -800,7 +800,7 @@ "pinName": "A3" }, "pin2": { - "compName": "GUIsel2_4#0", + "compName": "sel2_4#0", "pinName": "A3" }, "name": "unnamedWire#4", @@ -821,7 +821,7 @@ "pinName": "A4" }, "pin2": { - "compName": "GUIsel2_4#0", + "compName": "sel2_4#0", "pinName": "A4" }, "name": "unnamedWire#5", @@ -842,7 +842,7 @@ "pinName": "B1" }, "pin2": { - "compName": "GUIsel2_4#0", + "compName": "sel2_4#0", "pinName": "B1" }, "name": "unnamedWire#6", @@ -863,7 +863,7 @@ "pinName": "B2" }, "pin2": { - "compName": "GUIsel2_4#0", + "compName": "sel2_4#0", "pinName": "B2" }, "name": "unnamedWire#7", @@ -884,7 +884,7 @@ "pinName": "B3" }, "pin2": { - "compName": "GUIsel2_4#0", + "compName": "sel2_4#0", "pinName": "B3" }, "name": "unnamedWire#8", @@ -905,7 +905,7 @@ "pinName": "B4" }, "pin2": { - "compName": "GUIsel2_4#0", + "compName": "sel2_4#0", "pinName": "B4" }, "name": "unnamedWire#9", @@ -925,7 +925,7 @@ }, "symbolRendererSnippetID": "simpleRectangularLike", "symbolRendererParams": { - "centerText": "GUIsel3_4", + "centerText": "sel3_4", "centerTextHeight": 5.0, "horizontalComponentCenter": 17.5, "pinLabelHeight": 3.5, diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/GUIxor.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/xor.json similarity index 86% rename from net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/GUIxor.json rename to net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/xor.json index 48c22e59..2eff80ef 100644 --- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/GUIxor.json +++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/xor.json @@ -34,8 +34,8 @@ "submodel": { "components": [ { - "id": "GUINandGate", - "name": "GUINandGate#0", + "id": "NandGate", + "name": "NandGate#0", "pos": { "x": 7.5, "y": 15.0 @@ -43,8 +43,8 @@ "params": 1 }, { - "id": "GUINandGate", - "name": "GUINandGate#1", + "id": "NandGate", + "name": "NandGate#1", "pos": { "x": 35.0, "y": 2.5 @@ -52,8 +52,8 @@ "params": 1 }, { - "id": "GUINandGate", - "name": "GUINandGate#2", + "id": "NandGate", + "name": "NandGate#2", "pos": { "x": 35.0, "y": 27.5 @@ -61,8 +61,8 @@ "params": 1 }, { - "id": "GUINandGate", - "name": "GUINandGate#3", + "id": "NandGate", + "name": "NandGate#3", "pos": { "x": 62.5, "y": 15.0 @@ -124,18 +124,18 @@ }, { "pin1": { - "compName": "GUINandGate#2", + "compName": "NandGate#2", "pinName": "Y" }, "pin2": { - "compName": "GUINandGate#3", + "compName": "NandGate#3", "pinName": "B" }, "name": "unnamedWire#10" }, { "pin1": { - "compName": "GUINandGate#3", + "compName": "NandGate#3", "pinName": "Y" }, "pin2": { @@ -150,7 +150,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#0", + "compName": "NandGate#0", "pinName": "A" }, "name": "unnamedWire#2", @@ -167,7 +167,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#0", + "compName": "NandGate#0", "pinName": "B" }, "name": "unnamedWire#3", @@ -180,7 +180,7 @@ }, { "pin1": { - "compName": "GUINandGate#0", + "compName": "NandGate#0", "pinName": "Y" }, "pin2": { @@ -195,7 +195,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#1", + "compName": "NandGate#1", "pinName": "B" }, "name": "unnamedWire#5", @@ -212,7 +212,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#2", + "compName": "NandGate#2", "pinName": "A" }, "name": "unnamedWire#6", @@ -229,7 +229,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#1", + "compName": "NandGate#1", "pinName": "A" }, "name": "unnamedWire#7", @@ -246,7 +246,7 @@ "pinName": "" }, "pin2": { - "compName": "GUINandGate#2", + "compName": "NandGate#2", "pinName": "B" }, "name": "unnamedWire#8", @@ -259,11 +259,11 @@ }, { "pin1": { - "compName": "GUINandGate#1", + "compName": "NandGate#1", "pinName": "Y" }, "pin2": { - "compName": "GUINandGate#3", + "compName": "NandGate#3", "pinName": "A" }, "name": "unnamedWire#9" @@ -273,7 +273,7 @@ }, "symbolRendererSnippetID": "simpleRectangularLike", "symbolRendererParams": { - "centerText": "GUIxor", + "centerText": "xor", "centerTextHeight": 5.0, "horizontalComponentCenter": 17.5, "pinLabelHeight": 3.5, diff --git a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/Am2900Loader.java b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/Am2900Loader.java index 2b483d51..172c4b1e 100644 --- a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/Am2900Loader.java +++ b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/Am2900Loader.java @@ -6,7 +6,7 @@ import org.osgi.framework.BundleActivator; import org.osgi.framework.BundleContext; import net.mograsim.logic.model.serializing.ClassLoaderBasedResourceLoader; -import net.mograsim.logic.model.serializing.IndirectGUIComponentCreator; +import net.mograsim.logic.model.serializing.IndirectModelComponentCreator; public class Am2900Loader implements BundleActivator { @@ -29,8 +29,8 @@ public class Am2900Loader implements BundleActivator if (activated.getAndSet(true)) return; ClassLoaderBasedResourceLoader resourceLoader = ClassLoaderBasedResourceLoader.create(Am2900Loader.class.getClassLoader()); - IndirectGUIComponentCreator.registerResourceLoader(resourceLoader, "Am2900Loader"); - IndirectGUIComponentCreator.loadStandardComponentIDs(Am2900Loader.class.getResourceAsStream("standardComponentIDMapping.json")); + IndirectModelComponentCreator.registerResourceLoader(resourceLoader, "Am2900Loader"); + IndirectModelComponentCreator.loadStandardComponentIDs(Am2900Loader.class.getResourceAsStream("standardComponentIDMapping.json")); // System.out.println("SETUP DONE"); // TODO: Debug } } diff --git a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/GUIdff12.java b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/Modeldff12.java similarity index 84% rename from net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/GUIdff12.java rename to net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/Modeldff12.java index f412554e..954d5c0c 100644 --- a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/GUIdff12.java +++ b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/Modeldff12.java @@ -12,17 +12,17 @@ import net.mograsim.logic.core.types.BitVector; import net.mograsim.logic.core.wires.CoreWire.ReadEnd; import net.mograsim.logic.core.wires.CoreWire.ReadWriteEnd; import net.mograsim.logic.model.model.ViewModelModifiable; -import net.mograsim.logic.model.model.components.atomic.SimpleRectangularHardcodedGUIComponent; +import net.mograsim.logic.model.model.components.atomic.SimpleRectangularHardcodedModelComponent; import net.mograsim.logic.model.model.wires.Pin; import net.mograsim.logic.model.model.wires.PinUsage; -import net.mograsim.logic.model.serializing.IndirectGUIComponentCreator; +import net.mograsim.logic.model.serializing.IndirectModelComponentCreator; import net.mograsim.logic.model.snippets.symbolrenderers.PinNamesSymbolRenderer.PinNamesParams.Position; -public class GUIdff12 extends SimpleRectangularHardcodedGUIComponent +public class Modeldff12 extends SimpleRectangularHardcodedModelComponent { - public GUIdff12(ViewModelModifiable model, String name) + public Modeldff12(ViewModelModifiable model, String name) { - super(model, "GUIdff12", name, "D flip flop\n12 bits"); + super(model, "dff12", name, "D flip flop\n12 bits"); setSize(40, 20); addPin(new Pin(this, "D", 12, PinUsage.INPUT, 20, 20), Position.TOP); addPin(new Pin(this, "C", 1, PinUsage.INPUT, 0, 10), Position.RIGHT); @@ -80,6 +80,6 @@ public class GUIdff12 extends SimpleRectangularHardcodedGUIComponent static { - IndirectGUIComponentCreator.setComponentSupplier(GUIdff12.class.getCanonicalName(), (m, p, n) -> new GUIdff12(m, n)); + IndirectModelComponentCreator.setComponentSupplier(Modeldff12.class.getCanonicalName(), (m, p, n) -> new Modeldff12(m, n)); } } \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/GUIdff4_finewe.java b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/Modeldff4_finewe.java similarity index 88% rename from net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/GUIdff4_finewe.java rename to net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/Modeldff4_finewe.java index 8781f1ac..eb496660 100644 --- a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/GUIdff4_finewe.java +++ b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/Modeldff4_finewe.java @@ -14,17 +14,17 @@ import net.mograsim.logic.core.types.BitVector; import net.mograsim.logic.core.wires.CoreWire.ReadEnd; import net.mograsim.logic.core.wires.CoreWire.ReadWriteEnd; import net.mograsim.logic.model.model.ViewModelModifiable; -import net.mograsim.logic.model.model.components.atomic.SimpleRectangularHardcodedGUIComponent; +import net.mograsim.logic.model.model.components.atomic.SimpleRectangularHardcodedModelComponent; import net.mograsim.logic.model.model.wires.Pin; import net.mograsim.logic.model.model.wires.PinUsage; -import net.mograsim.logic.model.serializing.IndirectGUIComponentCreator; +import net.mograsim.logic.model.serializing.IndirectModelComponentCreator; import net.mograsim.logic.model.snippets.symbolrenderers.PinNamesSymbolRenderer.PinNamesParams.Position; -public class GUIdff4_finewe extends SimpleRectangularHardcodedGUIComponent +public class Modeldff4_finewe extends SimpleRectangularHardcodedModelComponent { - public GUIdff4_finewe(ViewModelModifiable model, String name) + public Modeldff4_finewe(ViewModelModifiable model, String name) { - super(model, "GUIdff4_finewe", name, "D flip flop\n4 bits"); + super(model, "dff4_finewe", name, "D flip flop\n4 bits"); setSize(35, 90); addPin(new Pin(this, "C", 1, PinUsage.INPUT, 0, 5), Position.RIGHT); addPin(new Pin(this, "_WE1", 1, PinUsage.INPUT, 0, 15), Position.RIGHT); @@ -102,6 +102,7 @@ public class GUIdff4_finewe extends SimpleRectangularHardcodedGUIComponent static { - IndirectGUIComponentCreator.setComponentSupplier(GUIdff4_finewe.class.getCanonicalName(), (m, p, n) -> new GUIdff4_finewe(m, n)); + IndirectModelComponentCreator.setComponentSupplier(Modeldff4_finewe.class.getCanonicalName(), + (m, p, n) -> new Modeldff4_finewe(m, n)); } } \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/GUIinc12.java b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/Modelinc12.java similarity index 77% rename from net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/GUIinc12.java rename to net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/Modelinc12.java index ca740768..0ba3404e 100644 --- a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/GUIinc12.java +++ b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/Modelinc12.java @@ -12,17 +12,17 @@ import net.mograsim.logic.core.types.Bit; import net.mograsim.logic.core.wires.CoreWire.ReadEnd; import net.mograsim.logic.core.wires.CoreWire.ReadWriteEnd; import net.mograsim.logic.model.model.ViewModelModifiable; -import net.mograsim.logic.model.model.components.atomic.SimpleRectangularHardcodedGUIComponent; +import net.mograsim.logic.model.model.components.atomic.SimpleRectangularHardcodedModelComponent; import net.mograsim.logic.model.model.wires.Pin; import net.mograsim.logic.model.model.wires.PinUsage; -import net.mograsim.logic.model.serializing.IndirectGUIComponentCreator; +import net.mograsim.logic.model.serializing.IndirectModelComponentCreator; import net.mograsim.logic.model.snippets.symbolrenderers.PinNamesSymbolRenderer.PinNamesParams.Position; -public class GUIinc12 extends SimpleRectangularHardcodedGUIComponent +public class Modelinc12 extends SimpleRectangularHardcodedModelComponent { - public GUIinc12(ViewModelModifiable model, String name) + public Modelinc12(ViewModelModifiable model, String name) { - super(model, "GUIinc12", name, "Incrementer"); + super(model, "inc12", name, "Incrementer"); setSize(40, 20); addPin(new Pin(this, "A", 12, PinUsage.INPUT, 20, 20), Position.TOP); addPin(new Pin(this, "CI", 1, PinUsage.INPUT, 40, 10), Position.LEFT); @@ -46,7 +46,7 @@ public class GUIinc12 extends SimpleRectangularHardcodedGUIComponent else { Bit carry = Bit.ONE; - // TODO extract to helper. This code almost also exists in GUIAM2910RegCntr. + // TODO extract to helper. This code almost also exists in ModelAm2910RegCntr. for (int i = 11; i >= 0; i--) { Bit a = ABits[i]; @@ -60,6 +60,6 @@ public class GUIinc12 extends SimpleRectangularHardcodedGUIComponent static { - IndirectGUIComponentCreator.setComponentSupplier(GUIinc12.class.getCanonicalName(), (m, p, n) -> new GUIinc12(m, n)); + IndirectModelComponentCreator.setComponentSupplier(Modelinc12.class.getCanonicalName(), (m, p, n) -> new Modelinc12(m, n)); } } \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/GUInor12.java b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/Modelnor12.java similarity index 79% rename from net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/GUInor12.java rename to net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/Modelnor12.java index bb36801d..9ff945d8 100644 --- a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/GUInor12.java +++ b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/Modelnor12.java @@ -12,17 +12,17 @@ import net.mograsim.logic.core.types.Bit; import net.mograsim.logic.core.wires.CoreWire.ReadEnd; import net.mograsim.logic.core.wires.CoreWire.ReadWriteEnd; import net.mograsim.logic.model.model.ViewModelModifiable; -import net.mograsim.logic.model.model.components.atomic.SimpleRectangularHardcodedGUIComponent; +import net.mograsim.logic.model.model.components.atomic.SimpleRectangularHardcodedModelComponent; import net.mograsim.logic.model.model.wires.Pin; import net.mograsim.logic.model.model.wires.PinUsage; -import net.mograsim.logic.model.serializing.IndirectGUIComponentCreator; +import net.mograsim.logic.model.serializing.IndirectModelComponentCreator; import net.mograsim.logic.model.snippets.symbolrenderers.PinNamesSymbolRenderer.PinNamesParams.Position; -public class GUInor12 extends SimpleRectangularHardcodedGUIComponent +public class Modelnor12 extends SimpleRectangularHardcodedModelComponent { - public GUInor12(ViewModelModifiable model, String name) + public Modelnor12(ViewModelModifiable model, String name) { - super(model, "GUInor12", name, "=0"); + super(model, "nor12", name, "=0"); setSize(35, 20); addPin(new Pin(this, "D", 12, PinUsage.INPUT, 0, 10), Position.RIGHT); addPin(new Pin(this, "Y", 1, PinUsage.OUTPUT, 35, 10), Position.LEFT); @@ -54,6 +54,6 @@ public class GUInor12 extends SimpleRectangularHardcodedGUIComponent static { - IndirectGUIComponentCreator.setComponentSupplier(GUInor12.class.getCanonicalName(), (m, p, n) -> new GUInor12(m, n)); + IndirectModelComponentCreator.setComponentSupplier(Modelnor12.class.getCanonicalName(), (m, p, n) -> new Modelnor12(m, n)); } } \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/GUIram5_12.java b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/Modelram5_12.java similarity index 90% rename from net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/GUIram5_12.java rename to net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/Modelram5_12.java index 4a13c471..6658f816 100644 --- a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/GUIram5_12.java +++ b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/Modelram5_12.java @@ -16,17 +16,17 @@ import net.mograsim.logic.core.types.BitVector; import net.mograsim.logic.core.wires.CoreWire.ReadEnd; import net.mograsim.logic.core.wires.CoreWire.ReadWriteEnd; import net.mograsim.logic.model.model.ViewModelModifiable; -import net.mograsim.logic.model.model.components.atomic.SimpleRectangularHardcodedGUIComponent; +import net.mograsim.logic.model.model.components.atomic.SimpleRectangularHardcodedModelComponent; import net.mograsim.logic.model.model.wires.Pin; import net.mograsim.logic.model.model.wires.PinUsage; -import net.mograsim.logic.model.serializing.IndirectGUIComponentCreator; +import net.mograsim.logic.model.serializing.IndirectModelComponentCreator; import net.mograsim.logic.model.snippets.symbolrenderers.PinNamesSymbolRenderer.PinNamesParams.Position; -public class GUIram5_12 extends SimpleRectangularHardcodedGUIComponent +public class Modelram5_12 extends SimpleRectangularHardcodedModelComponent { - public GUIram5_12(ViewModelModifiable model, String name) + public Modelram5_12(ViewModelModifiable model, String name) { - super(model, "GUIram5_12", name, "RAM\n5 x 12 Bit"); + super(model, "ram5_12", name, "RAM\n5 x 12 Bit"); setSize(40, 40); addPin(new Pin(this, "A", 3, PinUsage.INPUT, 10, 0), Position.BOTTOM); addPin(new Pin(this, "B", 3, PinUsage.INPUT, 30, 0), Position.BOTTOM); @@ -114,6 +114,6 @@ public class GUIram5_12 extends SimpleRectangularHardcodedGUIComponent static { - IndirectGUIComponentCreator.setComponentSupplier(GUIram5_12.class.getCanonicalName(), (m, p, n) -> new GUIram5_12(m, n)); + IndirectModelComponentCreator.setComponentSupplier(Modelram5_12.class.getCanonicalName(), (m, p, n) -> new Modelram5_12(m, n)); } } \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/GUIsel4_12.java b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/Modelsel4_12.java similarity index 86% rename from net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/GUIsel4_12.java rename to net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/Modelsel4_12.java index 3b88d72a..3d26c191 100644 --- a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/GUIsel4_12.java +++ b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/Modelsel4_12.java @@ -13,17 +13,17 @@ import net.mograsim.logic.core.types.BitVector; import net.mograsim.logic.core.wires.CoreWire.ReadEnd; import net.mograsim.logic.core.wires.CoreWire.ReadWriteEnd; import net.mograsim.logic.model.model.ViewModelModifiable; -import net.mograsim.logic.model.model.components.atomic.SimpleRectangularHardcodedGUIComponent; +import net.mograsim.logic.model.model.components.atomic.SimpleRectangularHardcodedModelComponent; import net.mograsim.logic.model.model.wires.Pin; import net.mograsim.logic.model.model.wires.PinUsage; -import net.mograsim.logic.model.serializing.IndirectGUIComponentCreator; +import net.mograsim.logic.model.serializing.IndirectModelComponentCreator; import net.mograsim.logic.model.snippets.symbolrenderers.PinNamesSymbolRenderer.PinNamesParams.Position; -public class GUIsel4_12 extends SimpleRectangularHardcodedGUIComponent +public class Modelsel4_12 extends SimpleRectangularHardcodedModelComponent { - public GUIsel4_12(ViewModelModifiable model, String name) + public Modelsel4_12(ViewModelModifiable model, String name) { - super(model, "GUIsel4_12", name, "4-way SEL\n12 bit"); + super(model, "sel4_12", name, "4-way SEL\n12 bit"); setSize(80, 40); addPin(new Pin(this, "SA", 1, PinUsage.INPUT, 0, 5), Position.RIGHT); addPin(new Pin(this, "SB", 1, PinUsage.INPUT, 0, 15), Position.RIGHT); @@ -80,6 +80,6 @@ public class GUIsel4_12 extends SimpleRectangularHardcodedGUIComponent static { - IndirectGUIComponentCreator.setComponentSupplier(GUIsel4_12.class.getCanonicalName(), (m, p, n) -> new GUIsel4_12(m, n)); + IndirectModelComponentCreator.setComponentSupplier(Modelsel4_12.class.getCanonicalName(), (m, p, n) -> new Modelsel4_12(m, n)); } } \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/am2904/GUIAm2904RegCTInstrDecode.java b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/am2904/ModelAm2904RegCTInstrDecode.java similarity index 95% rename from net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/am2904/GUIAm2904RegCTInstrDecode.java rename to net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/am2904/ModelAm2904RegCTInstrDecode.java index 4fff66bb..a6ebd2b3 100644 --- a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/am2904/GUIAm2904RegCTInstrDecode.java +++ b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/am2904/ModelAm2904RegCTInstrDecode.java @@ -12,17 +12,17 @@ import net.mograsim.logic.core.types.BitVector; import net.mograsim.logic.core.wires.CoreWire.ReadEnd; import net.mograsim.logic.core.wires.CoreWire.ReadWriteEnd; import net.mograsim.logic.model.model.ViewModelModifiable; -import net.mograsim.logic.model.model.components.atomic.SimpleRectangularHardcodedGUIComponent; +import net.mograsim.logic.model.model.components.atomic.SimpleRectangularHardcodedModelComponent; import net.mograsim.logic.model.model.wires.Pin; import net.mograsim.logic.model.model.wires.PinUsage; -import net.mograsim.logic.model.serializing.IndirectGUIComponentCreator; +import net.mograsim.logic.model.serializing.IndirectModelComponentCreator; import net.mograsim.logic.model.snippets.symbolrenderers.PinNamesSymbolRenderer.PinNamesParams.Position; -public class GUIAm2904RegCTInstrDecode extends SimpleRectangularHardcodedGUIComponent +public class ModelAm2904RegCTInstrDecode extends SimpleRectangularHardcodedModelComponent { - public GUIAm2904RegCTInstrDecode(ViewModelModifiable model, String name) + public ModelAm2904RegCTInstrDecode(ViewModelModifiable model, String name) { - super(model, "GUIAm2904RegCTInstrDecode", name, "Instruction\ndecode"); + super(model, "Am2904RegCTInstrDecode", name, "Instruction\ndecode"); setSize(80, 80); addPin(new Pin(this, "I12-11", 2, PinUsage.INPUT, 0, 30), Position.RIGHT); addPin(new Pin(this, "I5-0", 6, PinUsage.INPUT, 0, 50), Position.RIGHT); @@ -278,7 +278,7 @@ public class GUIAm2904RegCTInstrDecode extends SimpleRectangularHardcodedGUIComp static { - IndirectGUIComponentCreator.setComponentSupplier(GUIAm2904RegCTInstrDecode.class.getCanonicalName(), - (m, p, n) -> new GUIAm2904RegCTInstrDecode(m, n)); + IndirectModelComponentCreator.setComponentSupplier(ModelAm2904RegCTInstrDecode.class.getCanonicalName(), + (m, p, n) -> new ModelAm2904RegCTInstrDecode(m, n)); } } \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/am2904/GUIAm2904ShiftInstrDecode.java b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/am2904/ModelAm2904ShiftInstrDecode.java similarity index 93% rename from net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/am2904/GUIAm2904ShiftInstrDecode.java rename to net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/am2904/ModelAm2904ShiftInstrDecode.java index 9f3865cc..96b6222d 100644 --- a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/am2904/GUIAm2904ShiftInstrDecode.java +++ b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/am2904/ModelAm2904ShiftInstrDecode.java @@ -13,17 +13,17 @@ import net.mograsim.logic.core.types.BitVector; import net.mograsim.logic.core.wires.CoreWire.ReadEnd; import net.mograsim.logic.core.wires.CoreWire.ReadWriteEnd; import net.mograsim.logic.model.model.ViewModelModifiable; -import net.mograsim.logic.model.model.components.atomic.SimpleRectangularHardcodedGUIComponent; +import net.mograsim.logic.model.model.components.atomic.SimpleRectangularHardcodedModelComponent; import net.mograsim.logic.model.model.wires.Pin; import net.mograsim.logic.model.model.wires.PinUsage; -import net.mograsim.logic.model.serializing.IndirectGUIComponentCreator; +import net.mograsim.logic.model.serializing.IndirectModelComponentCreator; import net.mograsim.logic.model.snippets.symbolrenderers.PinNamesSymbolRenderer.PinNamesParams.Position; -public class GUIAm2904ShiftInstrDecode extends SimpleRectangularHardcodedGUIComponent +public class ModelAm2904ShiftInstrDecode extends SimpleRectangularHardcodedModelComponent { - public GUIAm2904ShiftInstrDecode(ViewModelModifiable model, String name) + public ModelAm2904ShiftInstrDecode(ViewModelModifiable model, String name) { - super(model, "GUIAm2904ShiftInstrDecode", name, "Shift \ninstruction\ndecode"); + super(model, "Am2904ShiftInstrDecode", name, "Shift \ninstruction\ndecode"); setSize(60, 80); addPin(new Pin(this, "I", 5, PinUsage.INPUT, 0, 25), Position.RIGHT); addPin(new Pin(this, "_SE", 1, PinUsage.INPUT, 0, 55), Position.RIGHT); @@ -315,7 +315,7 @@ public class GUIAm2904ShiftInstrDecode extends SimpleRectangularHardcodedGUIComp static { - IndirectGUIComponentCreator.setComponentSupplier(GUIAm2904ShiftInstrDecode.class.getCanonicalName(), - (m, p, n) -> new GUIAm2904ShiftInstrDecode(m, n)); + IndirectModelComponentCreator.setComponentSupplier(ModelAm2904ShiftInstrDecode.class.getCanonicalName(), + (m, p, n) -> new ModelAm2904ShiftInstrDecode(m, n)); } } \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/am2910/GUIAm2910InstrPLA.java b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/am2910/ModelAm2910InstrPLA.java similarity index 93% rename from net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/am2910/GUIAm2910InstrPLA.java rename to net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/am2910/ModelAm2910InstrPLA.java index 96831419..5929bc27 100644 --- a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/am2910/GUIAm2910InstrPLA.java +++ b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/am2910/ModelAm2910InstrPLA.java @@ -11,17 +11,17 @@ import net.mograsim.logic.core.types.Bit; import net.mograsim.logic.core.wires.CoreWire.ReadEnd; import net.mograsim.logic.core.wires.CoreWire.ReadWriteEnd; import net.mograsim.logic.model.model.ViewModelModifiable; -import net.mograsim.logic.model.model.components.atomic.SimpleRectangularHardcodedGUIComponent; +import net.mograsim.logic.model.model.components.atomic.SimpleRectangularHardcodedModelComponent; import net.mograsim.logic.model.model.wires.Pin; import net.mograsim.logic.model.model.wires.PinUsage; -import net.mograsim.logic.model.serializing.IndirectGUIComponentCreator; +import net.mograsim.logic.model.serializing.IndirectModelComponentCreator; import net.mograsim.logic.model.snippets.symbolrenderers.PinNamesSymbolRenderer.PinNamesParams.Position; -public class GUIAm2910InstrPLA extends SimpleRectangularHardcodedGUIComponent +public class ModelAm2910InstrPLA extends SimpleRectangularHardcodedModelComponent { - public GUIAm2910InstrPLA(ViewModelModifiable model, String name) + public ModelAm2910InstrPLA(ViewModelModifiable model, String name) { - super(model, "GUIAm2910InstrPLA", name, "Instr.\nPLA"); + super(model, "Am2910InstrPLA", name, "Instr.\nPLA"); setSize(30, 85); addPin(new Pin(this, "PASS", 1, PinUsage.INPUT, 0, 5), Position.RIGHT); addPin(new Pin(this, "I", 4, PinUsage.INPUT, 0, 20), Position.RIGHT); @@ -259,7 +259,7 @@ public class GUIAm2910InstrPLA extends SimpleRectangularHardcodedGUIComponent static { - IndirectGUIComponentCreator.setComponentSupplier(GUIAm2910InstrPLA.class.getCanonicalName(), - (m, p, n) -> new GUIAm2910InstrPLA(m, n)); + IndirectModelComponentCreator.setComponentSupplier(ModelAm2910InstrPLA.class.getCanonicalName(), + (m, p, n) -> new ModelAm2910InstrPLA(m, n)); } } \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/am2910/GUIAm2910RegCntr.java b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/am2910/ModelAm2910RegCntr.java similarity index 85% rename from net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/am2910/GUIAm2910RegCntr.java rename to net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/am2910/ModelAm2910RegCntr.java index 964637d8..534dea41 100644 --- a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/am2910/GUIAm2910RegCntr.java +++ b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/am2910/ModelAm2910RegCntr.java @@ -12,17 +12,17 @@ import net.mograsim.logic.core.types.BitVector; import net.mograsim.logic.core.wires.CoreWire.ReadEnd; import net.mograsim.logic.core.wires.CoreWire.ReadWriteEnd; import net.mograsim.logic.model.model.ViewModelModifiable; -import net.mograsim.logic.model.model.components.atomic.SimpleRectangularHardcodedGUIComponent; +import net.mograsim.logic.model.model.components.atomic.SimpleRectangularHardcodedModelComponent; import net.mograsim.logic.model.model.wires.Pin; import net.mograsim.logic.model.model.wires.PinUsage; -import net.mograsim.logic.model.serializing.IndirectGUIComponentCreator; +import net.mograsim.logic.model.serializing.IndirectModelComponentCreator; import net.mograsim.logic.model.snippets.symbolrenderers.PinNamesSymbolRenderer.PinNamesParams.Position; -public class GUIAm2910RegCntr extends SimpleRectangularHardcodedGUIComponent +public class ModelAm2910RegCntr extends SimpleRectangularHardcodedModelComponent { - public GUIAm2910RegCntr(ViewModelModifiable model, String name) + public ModelAm2910RegCntr(ViewModelModifiable model, String name) { - super(model, "GUIAm2910RegCntr", name, "Register/\nCounter"); + super(model, "Am2910RegCntr", name, "Register/\nCounter"); setSize(40, 40); addPin(new Pin(this, "D", 12, PinUsage.INPUT, 20, 0), Position.BOTTOM); addPin(new Pin(this, "_RLD", 1, PinUsage.INPUT, 0, 5), Position.RIGHT); @@ -60,7 +60,7 @@ public class GUIAm2910RegCntr extends SimpleRectangularHardcodedGUIComponent else if (WE.getValue() == ONE) { Bit carry = Bit.ZERO; - // TODO extract to helper. This code almost also exists in GUIinc12. + // TODO extract to helper. This code almost also exists in Modelinc12. for (int i = 11; i >= 0; i--) { Bit a = QC[i]; @@ -105,7 +105,7 @@ public class GUIAm2910RegCntr extends SimpleRectangularHardcodedGUIComponent static { - IndirectGUIComponentCreator.setComponentSupplier(GUIAm2910RegCntr.class.getCanonicalName(), - (m, p, n) -> new GUIAm2910RegCntr(m, n)); + IndirectModelComponentCreator.setComponentSupplier(ModelAm2910RegCntr.class.getCanonicalName(), + (m, p, n) -> new ModelAm2910RegCntr(m, n)); } } \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/am2910/GUIAm2910SP.java b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/am2910/ModelAm2910SP.java similarity index 89% rename from net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/am2910/GUIAm2910SP.java rename to net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/am2910/ModelAm2910SP.java index 2be4d04b..60787f04 100644 --- a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/am2910/GUIAm2910SP.java +++ b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/am2910/ModelAm2910SP.java @@ -12,17 +12,17 @@ import net.mograsim.logic.core.types.BitVector; import net.mograsim.logic.core.wires.CoreWire.ReadEnd; import net.mograsim.logic.core.wires.CoreWire.ReadWriteEnd; import net.mograsim.logic.model.model.ViewModelModifiable; -import net.mograsim.logic.model.model.components.atomic.SimpleRectangularHardcodedGUIComponent; +import net.mograsim.logic.model.model.components.atomic.SimpleRectangularHardcodedModelComponent; import net.mograsim.logic.model.model.wires.Pin; import net.mograsim.logic.model.model.wires.PinUsage; -import net.mograsim.logic.model.serializing.IndirectGUIComponentCreator; +import net.mograsim.logic.model.serializing.IndirectModelComponentCreator; import net.mograsim.logic.model.snippets.symbolrenderers.PinNamesSymbolRenderer.PinNamesParams.Position; -public class GUIAm2910SP extends SimpleRectangularHardcodedGUIComponent +public class ModelAm2910SP extends SimpleRectangularHardcodedModelComponent { - public GUIAm2910SP(ViewModelModifiable model, String name) + public ModelAm2910SP(ViewModelModifiable model, String name) { - super(model, "GUIAm2910SP", name, "Stack\npointer"); + super(model, "Am2910SP", name, "Stack\npointer"); setSize(40, 30); addPin(new Pin(this, "STKI0", 1, PinUsage.INPUT, 0, 5), Position.RIGHT); addPin(new Pin(this, "STKI1", 1, PinUsage.INPUT, 0, 15), Position.RIGHT); @@ -127,6 +127,6 @@ public class GUIAm2910SP extends SimpleRectangularHardcodedGUIComponent static { - IndirectGUIComponentCreator.setComponentSupplier(GUIAm2910SP.class.getCanonicalName(), (m, p, n) -> new GUIAm2910SP(m, n)); + IndirectModelComponentCreator.setComponentSupplier(ModelAm2910SP.class.getCanonicalName(), (m, p, n) -> new ModelAm2910SP(m, n)); } } \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/Am2900Machine.java b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/Am2900Machine.java index 3c6ca1c2..ecb13b4c 100644 --- a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/Am2900Machine.java +++ b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/Am2900Machine.java @@ -7,7 +7,7 @@ import net.mograsim.logic.model.model.ViewModel; import net.mograsim.logic.model.model.ViewModelModifiable; import net.mograsim.logic.model.modeladapter.LogicModelParameters; import net.mograsim.logic.model.modeladapter.ViewLogicModelAdapter; -import net.mograsim.logic.model.serializing.IndirectGUIComponentCreator; +import net.mograsim.logic.model.serializing.IndirectModelComponentCreator; import net.mograsim.machine.Machine; import net.mograsim.machine.MachineDefinition; import net.mograsim.machine.Register; @@ -23,8 +23,8 @@ public class Am2900Machine implements Machine { this.machineDefinition = am2900MachineDefinition; viewModel = new ViewModelModifiable(); - IndirectGUIComponentCreator.createComponent(viewModel, - "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/GUIAm2900.json"); + IndirectModelComponentCreator.createComponent(viewModel, + "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/ModelAm2900.json"); LogicModelParameters params = new LogicModelParameters(); params.gateProcessTime = 50; params.wireTravelTime = 10; diff --git a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/standardComponentIDMapping.json b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/standardComponentIDMapping.json index beef385c..bcfae4a6 100644 --- a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/standardComponentIDMapping.json +++ b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/standardComponentIDMapping.json @@ -1,58 +1,58 @@ mograsim version: 0.1.3 { - "GUIAm2904RegCTInstrDecode": "resloader:Am2900Loader:class:net.mograsim.logic.model.am2900.components.am2904.GUIAm2904RegCTInstrDecode", - "GUIAm2904ShiftInstrDecode": "resloader:Am2900Loader:class:net.mograsim.logic.model.am2900.components.am2904.GUIAm2904ShiftInstrDecode", - "GUIAm2910InstrPLA": "resloader:Am2900Loader:class:net.mograsim.logic.model.am2900.components.am2910.GUIAm2910InstrPLA", - "GUIAm2910RegCntr": "resloader:Am2900Loader:class:net.mograsim.logic.model.am2900.components.am2910.GUIAm2910RegCntr", - "GUIAm2910SP": "resloader:Am2900Loader:class:net.mograsim.logic.model.am2900.components.am2910.GUIAm2910SP", - "GUIdff12": "resloader:Am2900Loader:class:net.mograsim.logic.model.am2900.components.GUIdff12", - "GUIdff4_finewe": "resloader:Am2900Loader:class:net.mograsim.logic.model.am2900.components.GUIdff4_finewe", - "GUIinc12": "resloader:Am2900Loader:class:net.mograsim.logic.model.am2900.components.GUIinc12", - "GUInor12": "resloader:Am2900Loader:class:net.mograsim.logic.model.am2900.components.GUInor12", - "GUIram5_12": "resloader:Am2900Loader:class:net.mograsim.logic.model.am2900.components.GUIram5_12", - "GUIsel4_12": "resloader:Am2900Loader:class:net.mograsim.logic.model.am2900.components.GUIsel4_12", + "Am2904RegCTInstrDecode": "resloader:Am2900Loader:class:net.mograsim.logic.model.am2900.components.am2904.ModelAm2904RegCTInstrDecode", + "Am2904ShiftInstrDecode": "resloader:Am2900Loader:class:net.mograsim.logic.model.am2900.components.am2904.ModelAm2904ShiftInstrDecode", + "Am2910InstrPLA": "resloader:Am2900Loader:class:net.mograsim.logic.model.am2900.components.am2910.ModelAm2910InstrPLA", + "Am2910RegCntr": "resloader:Am2900Loader:class:net.mograsim.logic.model.am2900.components.am2910.ModelAm2910RegCntr", + "Am2910SP": "resloader:Am2900Loader:class:net.mograsim.logic.model.am2900.components.am2910.ModelAm2910SP", + "dff12": "resloader:Am2900Loader:class:net.mograsim.logic.model.am2900.components.Modeldff12", + "dff4_finewe": "resloader:Am2900Loader:class:net.mograsim.logic.model.am2900.components.Modeldff4_finewe", + "inc12": "resloader:Am2900Loader:class:net.mograsim.logic.model.am2900.components.Modelinc12", + "nor12": "resloader:Am2900Loader:class:net.mograsim.logic.model.am2900.components.Modelnor12", + "ram5_12": "resloader:Am2900Loader:class:net.mograsim.logic.model.am2900.components.Modelram5_12", + "sel4_12": "resloader:Am2900Loader:class:net.mograsim.logic.model.am2900.components.Modelsel4_12", - "GUIAm2901": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/am2901/GUIAm2901.json", - "GUIAm2901ALUFuncDecode": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/am2901/GUIAm2901ALUFuncDecode.json", - "GUIAm2901ALUInclDecode": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/am2901/GUIAm2901ALUInclDecode.json", - "GUIAm2901ALUInclSourceDecodeInclFunctionDecode": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/am2901/GUIAm2901ALUInclSourceDecodeInclFunctionDecode.json", - "GUIAm2901ALUOneBit": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/am2901/GUIAm2901ALUOneBit.json", - "GUIAm2904": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/am2904/GUIAm2904.json", - "GUIAm2910": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/am2910/GUIAm2910.json", - "GUIAm2904MSR": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/am2904/GUIAm2904MSR.json", - "GUIAm2904muSR": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/am2904/GUIAm2904muSR.json", - "GUIAm2904TestLogic": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/am2904/GUIAm2904TestLogic.json", - "GUIAm2901DestDecode": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/am2901/GUIAm2901DestDecode.json", - "GUIAm2901SourceDecode": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/am2901/GUIAm2901SourceDecode.json", - "GUI_rsLatch": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/GUI_rsLatch.json", - "GUIand": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/GUIand.json", - "GUIand41": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/GUIand41.json", - "GUIandor414": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/GUIandor414.json", - "GUIdemux2": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/GUIdemux2.json", - "GUIdff": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/GUIdff.json", - "GUIdff12_we": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/GUIdff12_we.json", - "GUIdff16_invwe": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/GUIdff16_invwe.json", - "GUIdff4": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/GUIdff4.json", - "GUIdff4_invwe": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/GUIdff4_invwe.json", - "GUIdlatch": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/GUIdlatch.json", - "GUIdlatch4": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/GUIdlatch4.json", - "GUIfulladder": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/GUIfulladder.json", - "GUIhalfadder": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/GUIhalfadder.json", - "GUImux1": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/GUImux1.json", - "GUImux1_12": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/GUImux1_12.json", - "GUImux1_16": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/GUImux1_16.json", - "GUImux1_4": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/GUImux1_4.json", - "GUImux2": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/GUImux2.json", - "GUImux2_4": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/GUImux2_4.json", - "GUImux3": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/GUImux3.json", - "GUInand3": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/GUInand3.json", - "GUInot4": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/GUInot4.json", - "GUIor4": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/GUIor4.json", - "GUIor_4": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/GUIor_4.json", - "GUIram2": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/GUIram2.json", - "GUIram4": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/GUIram4.json", - "GUIsel1": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/GUIsel1.json", - "GUIsel2_4": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/GUIsel2_4.json", - "GUIsel3_4": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/GUIsel3_4.json", - "GUIxor": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/GUIxor.json" + "Am2901": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/am2901/Am2901.json", + "Am2901ALUFuncDecode": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/am2901/Am2901ALUFuncDecode.json", + "Am2901ALUInclDecode": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/am2901/Am2901ALUInclDecode.json", + "Am2901ALUInclSourceDecodeInclFunctionDecode": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/am2901/Am2901ALUInclSourceDecodeInclFunctionDecode.json", + "Am2901ALUOneBit": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/am2901/Am2901ALUOneBit.json", + "Am2904": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/am2904/Am2904.json", + "Am2910": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/am2910/Am2910.json", + "Am2904MSR": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/am2904/Am2904MSR.json", + "Am2904muSR": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/am2904/Am2904muSR.json", + "Am2904TestLogic": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/am2904/Am2904TestLogic.json", + "Am2901DestDecode": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/am2901/Am2901DestDecode.json", + "Am2901SourceDecode": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/am2901/Am2901SourceDecode.json", + "_rsLatch": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/_rsLatch.json", + "and": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/and.json", + "and41": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/and41.json", + "andor414": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/andor414.json", + "demux2": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/demux2.json", + "dff": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/dff.json", + "dff12_we": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/dff12_we.json", + "dff16_invwe": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/dff16_invwe.json", + "dff4": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/dff4.json", + "dff4_invwe": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/dff4_invwe.json", + "dlatch": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/dlatch.json", + "dlatch4": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/dlatch4.json", + "fulladder": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/fulladder.json", + "halfadder": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/halfadder.json", + "mux1": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/mux1.json", + "mux1_12": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/mux1_12.json", + "mux1_16": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/mux1_16.json", + "mux1_4": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/mux1_4.json", + "mux2": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/mux2.json", + "mux2_4": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/mux2_4.json", + "mux3": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/mux3.json", + "nand3": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/nand3.json", + "not4": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/not4.json", + "or4": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/or4.json", + "or_4": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/or_4.json", + "ram2": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/ram2.json", + "ram4": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/ram4.json", + "sel1": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/sel1.json", + "sel2_4": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/sel2_4.json", + "sel3_4": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/sel3_4.json", + "xor": "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/xor.json" } \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/examples/GUIComponentTestbench.java b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/examples/ModelComponentTestbench.java similarity index 59% rename from net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/examples/GUIComponentTestbench.java rename to net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/examples/ModelComponentTestbench.java index f62840e5..20b25dbd 100644 --- a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/examples/GUIComponentTestbench.java +++ b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/examples/ModelComponentTestbench.java @@ -7,27 +7,27 @@ import java.util.List; import net.mograsim.logic.model.SimpleLogicUIStandalone; import net.mograsim.logic.model.am2900.Am2900Loader; import net.mograsim.logic.model.model.ViewModelModifiable; -import net.mograsim.logic.model.model.components.GUIComponent; -import net.mograsim.logic.model.model.components.atomic.GUIBitDisplay; -import net.mograsim.logic.model.model.components.atomic.GUIManualSwitch; -import net.mograsim.logic.model.model.wires.GUIWire; +import net.mograsim.logic.model.model.components.ModelComponent; +import net.mograsim.logic.model.model.components.atomic.ModelBitDisplay; +import net.mograsim.logic.model.model.components.atomic.ModelManualSwitch; +import net.mograsim.logic.model.model.wires.ModelWire; import net.mograsim.logic.model.model.wires.Pin; import net.mograsim.logic.model.model.wires.PinUsage; -import net.mograsim.logic.model.serializing.IndirectGUIComponentCreator; +import net.mograsim.logic.model.serializing.IndirectModelComponentCreator; -public class GUIComponentTestbench +public class ModelComponentTestbench { public static void main(String[] args) { - SimpleLogicUIStandalone.executeVisualisation(GUIComponentTestbench::createTestbench); + SimpleLogicUIStandalone.executeVisualisation(ModelComponentTestbench::createTestbench); } - @SuppressWarnings("unused") // for GUIWires being created + @SuppressWarnings("unused") // for ModelWires being created public static void createTestbench(ViewModelModifiable model) { Am2900Loader.setup(); - GUIComponent comp = IndirectGUIComponentCreator.createComponent(model, - "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/GUIdff16_invwe.json"); + ModelComponent comp = IndirectModelComponentCreator.createComponent(model, + "resloader:Am2900Loader:jsonres:net/mograsim/logic/model/am2900/components/dff16_invwe.json"); List inputPinNames = new ArrayList<>(); List outputPinNames = new ArrayList<>(); @@ -44,16 +44,16 @@ public class GUIComponentTestbench for (int i = 0; i < inputPinNames.size(); i++) { String pinName = inputPinNames.get(i); - GUIManualSwitch sw = new GUIManualSwitch(model, comp.getPin(pinName).logicWidth); + ModelManualSwitch sw = new ModelManualSwitch(model, comp.getPin(pinName).logicWidth); sw.moveTo(0, 20 * i); - new GUIWire(model, comp.getPin(pinName), sw.getOutputPin()); + new ModelWire(model, comp.getPin(pinName), sw.getOutputPin()); } for (int i = 0; i < outputPinNames.size(); i++) { String pinName = outputPinNames.get(i); - GUIBitDisplay bd = new GUIBitDisplay(model, comp.getPin(pinName).logicWidth); + ModelBitDisplay bd = new ModelBitDisplay(model, comp.getPin(pinName).logicWidth); bd.moveTo(200, 20 * i); - new GUIWire(model, comp.getPin(pinName), bd.getInputPin()); + new ModelWire(model, comp.getPin(pinName), bd.getInputPin()); } } } \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/examples/ReserializeJSONsSettingUsages.java b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/examples/ReserializeJSONsSettingUsages.java index 9ccfd8a0..085cb8f2 100644 --- a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/examples/ReserializeJSONsSettingUsages.java +++ b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/examples/ReserializeJSONsSettingUsages.java @@ -13,12 +13,12 @@ import java.util.stream.Stream; import net.mograsim.logic.model.am2900.Am2900Loader; import net.mograsim.logic.model.model.ViewModelModifiable; -import net.mograsim.logic.model.model.wires.GUIWire; +import net.mograsim.logic.model.model.wires.ModelWire; import net.mograsim.logic.model.model.wires.MovablePin; import net.mograsim.logic.model.model.wires.Pin; import net.mograsim.logic.model.model.wires.PinUsage; import net.mograsim.logic.model.serializing.DeserializedSubmodelComponent; -import net.mograsim.logic.model.serializing.IndirectGUIComponentCreator; +import net.mograsim.logic.model.serializing.IndirectModelComponentCreator; import net.mograsim.logic.model.serializing.SubmodelComponentSerializer; public class ReserializeJSONsSettingUsages @@ -51,7 +51,7 @@ public class ReserializeJSONsSettingUsages { try { - DeserializedSubmodelComponent comp = (DeserializedSubmodelComponent) IndirectGUIComponentCreator + DeserializedSubmodelComponent comp = (DeserializedSubmodelComponent) IndirectModelComponentCreator .createComponent(new ViewModelModifiable(), "jsonfile:" + json.toString()); System.out.println("Reserializing " + json); comp.getSupermodelPins().entrySet().stream().sorted(Comparator.comparing(Entry::getKey)).map(Entry::getValue).forEach(pin -> @@ -75,13 +75,13 @@ public class ReserializeJSONsSettingUsages private static void setInterfacePinUsage(DeserializedSubmodelComponent comp, Pin interfacePin, PinUsage usage) { - Set wiresConnectedToPin = comp.submodel.getWiresByName().values().stream() + Set wiresConnectedToPin = comp.submodel.getWiresByName().values().stream() .filter(w -> w.getPin1() == interfacePin || w.getPin2() == interfacePin).collect(Collectors.toSet()); wiresConnectedToPin.forEach(comp.getSubmodelModifiable()::destroyWire); comp.removeSubmodelInterface(interfacePin.name); comp.addSubmodelInterface( new MovablePin(comp, interfacePin.name, interfacePin.logicWidth, usage, interfacePin.getRelX(), interfacePin.getRelY())); ViewModelModifiable submodelModifiable = comp.getSubmodelModifiable(); - wiresConnectedToPin.forEach(w -> new GUIWire(submodelModifiable, w.getPin1(), w.getPin2())); + wiresConnectedToPin.forEach(w -> new ModelWire(submodelModifiable, w.getPin1(), w.getPin2())); } } \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2901/Am2901Testbench.java b/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2901/Am2901Testbench.java index 91ba7eb0..e9ce12aa 100644 --- a/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2901/Am2901Testbench.java +++ b/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2901/Am2901Testbench.java @@ -10,16 +10,16 @@ import net.mograsim.logic.model.SimpleLogicUIStandalone; import net.mograsim.logic.model.SimpleLogicUIStandalone.VisualisationObjects; import net.mograsim.logic.model.am2900.Am2900Loader; import net.mograsim.logic.model.model.ViewModelModifiable; -import net.mograsim.logic.model.model.components.GUIComponent; -import net.mograsim.logic.model.model.components.atomic.GUIAndGate; -import net.mograsim.logic.model.model.components.atomic.GUIBitDisplay; -import net.mograsim.logic.model.model.components.atomic.GUIManualSwitch; -import net.mograsim.logic.model.model.components.atomic.GUINotGate; -import net.mograsim.logic.model.model.components.atomic.TextComponent; +import net.mograsim.logic.model.model.components.ModelComponent; +import net.mograsim.logic.model.model.components.atomic.ModelAndGate; +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.atomic.ModelNotGate; +import net.mograsim.logic.model.model.components.atomic.ModelTextComponent; import net.mograsim.logic.model.model.wires.Pin; import net.mograsim.logic.model.model.wires.PinUsage; -import net.mograsim.logic.model.model.wires.WireCrossPoint; -import net.mograsim.logic.model.serializing.IndirectGUIComponentCreator; +import net.mograsim.logic.model.model.wires.ModelWireCrossPoint; +import net.mograsim.logic.model.serializing.IndirectModelComponentCreator; import net.mograsim.logic.model.util.ModellingTool; public class Am2901Testbench @@ -32,17 +32,17 @@ public class Am2901Testbench public static void createTestbench(ViewModelModifiable model) { - GUIComponent comp = IndirectGUIComponentCreator.createComponent(model, "GUIAm2901"); + ModelComponent comp = IndirectModelComponentCreator.createComponent(model, "Am2901"); ModellingTool tool = ModellingTool.createFor(model); comp.moveTo(240, 0); - GUIManualSwitch enable = new GUIManualSwitch(model, 1); - WireCrossPoint wcp0 = new WireCrossPoint(model, 1); - GUINotGate not1 = new GUINotGate(model, 1); - GUINotGate not2 = new GUINotGate(model, 1); - GUINotGate not3 = new GUINotGate(model, 1); - GUIAndGate and = new GUIAndGate(model, 1); + ModelManualSwitch enable = new ModelManualSwitch(model, 1); + ModelWireCrossPoint wcp0 = new ModelWireCrossPoint(model, 1); + ModelNotGate not1 = new ModelNotGate(model, 1); + ModelNotGate not2 = new ModelNotGate(model, 1); + ModelNotGate not3 = new ModelNotGate(model, 1); + ModelAndGate and = new ModelAndGate(model, 1); tool.connect(wcp0, enable, ""); tool.connect(wcp0, and, "A"); tool.connect(wcp0, not1, "A"); @@ -73,9 +73,9 @@ public class Am2901Testbench double x = 55 + 70 * (i % 2); double y = 10 * i; - WireCrossPoint wcp = new WireCrossPoint(model, 1); - GUIComponent d_ff = IndirectGUIComponentCreator.createComponent(model, "GUIdff"); - GUIManualSwitch sw = new GUIManualSwitch(model, 1); + ModelWireCrossPoint wcp = new ModelWireCrossPoint(model, 1); + ModelComponent d_ff = IndirectModelComponentCreator.createComponent(model, "dff"); + ModelManualSwitch sw = new ModelManualSwitch(model, 1); tool.connect(last, wcp); tool.connect(wcp, d_ff, "C"); @@ -83,7 +83,7 @@ public class Am2901Testbench tool.connect(d_ff, comp, "Q", inputPinNames.get(i)); last = wcp.getPin(); - TextComponent label = new TextComponent(model, inputPinNames.get(i)); + ModelTextComponent label = new ModelTextComponent(model, inputPinNames.get(i)); sw.moveTo(x, y + 7.5); wcp.moveTo(160, y); @@ -95,11 +95,11 @@ public class Am2901Testbench { double x = 300 + 75 * (i % 2); double y = 10 * i - 2.5; - GUIBitDisplay bd = new GUIBitDisplay(model, 1); + ModelBitDisplay bd = new ModelBitDisplay(model, 1); bd.moveTo(x, y); tool.connect(bd.getInputPin(), comp, outputPinNames.get(i)); - TextComponent label = new TextComponent(model, outputPinNames.get(i)); + ModelTextComponent label = new ModelTextComponent(model, outputPinNames.get(i)); label.moveTo(x + 25, y); } } @@ -108,9 +108,9 @@ public class Am2901Testbench { vis.model.getComponentsByName().values().forEach(c -> { - if (c instanceof GUIManualSwitch) + if (c instanceof ModelManualSwitch) { - GUIManualSwitch cCasted = (GUIManualSwitch) c; + ModelManualSwitch cCasted = (ModelManualSwitch) c; cCasted.setHighLevelState("out", BitVector.of(Bit.ZERO, cCasted.logicWidth)); } }); diff --git a/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2901/TestableAm2901Impl.java b/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2901/TestableAm2901Impl.java index 45e9e044..60c1cf86 100644 --- a/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2901/TestableAm2901Impl.java +++ b/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2901/TestableAm2901Impl.java @@ -8,11 +8,11 @@ import net.mograsim.logic.model.am2900.util.SwitchWithDisplay; import net.mograsim.logic.model.am2900.util.TestEnvironmentHelper; import net.mograsim.logic.model.am2900.util.TestEnvironmentHelper.DebugState; import net.mograsim.logic.model.am2900.util.TestUtil; -import net.mograsim.logic.model.model.components.GUIComponent; +import net.mograsim.logic.model.model.components.ModelComponent; public class TestableAm2901Impl implements TestableAm2901 { - private GUIComponent am2901; + private ModelComponent am2901; private CoreManualSwitch I8, I7, I6, I5, I4, I3, I2, I1, I0; private CoreManualSwitch C; private CoreManualSwitch Cn; @@ -23,7 +23,7 @@ public class TestableAm2901Impl implements TestableAm2901 private CoreBitDisplay F_0, Cn_4, OVR, F3; private SwitchWithDisplay RAMn, RAMn_3, Qn, Qn_3; - private final TestEnvironmentHelper testHelper = new TestEnvironmentHelper(this, "GUIAm2901"); + private final TestEnvironmentHelper testHelper = new TestEnvironmentHelper(this, "Am2901"); @Override public Result run() diff --git a/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2904/Am2904Testbench.java b/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2904/Am2904Testbench.java index dcf05694..7ead54a2 100644 --- a/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2904/Am2904Testbench.java +++ b/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2904/Am2904Testbench.java @@ -8,11 +8,11 @@ import net.mograsim.logic.model.SimpleLogicUIStandalone; import net.mograsim.logic.model.SimpleLogicUIStandalone.VisualisationObjects; import net.mograsim.logic.model.am2900.Am2900Loader; import net.mograsim.logic.model.model.ViewModelModifiable; -import net.mograsim.logic.model.model.components.atomic.GUIManualSwitch; +import net.mograsim.logic.model.model.components.atomic.ModelManualSwitch; import net.mograsim.logic.model.model.components.submodels.SubmodelComponent; import net.mograsim.logic.model.serializing.DeserializedSubmodelComponent; import net.mograsim.logic.model.serializing.IdentifyParams; -import net.mograsim.logic.model.serializing.IndirectGUIComponentCreator; +import net.mograsim.logic.model.serializing.IndirectModelComponentCreator; import net.mograsim.logic.model.snippets.Renderer; public class Am2904Testbench @@ -26,8 +26,8 @@ public class Am2904Testbench public static void create(ViewModelModifiable model) { // TODO replace with proper ViewModel deserialization - DeserializedSubmodelComponent testbench = (DeserializedSubmodelComponent) IndirectGUIComponentCreator.createComponent(model, - "jsonfile:GUIAm2904Testbench.json", "testbench"); + DeserializedSubmodelComponent testbench = (DeserializedSubmodelComponent) IndirectModelComponentCreator.createComponent(model, + "jsonfile:Am2904Testbench.json", "testbench"); testbench.setSize(1000, 1000); testbench.setOutlineRenderer(new Renderer() { @@ -55,9 +55,9 @@ public class Am2904Testbench { ((SubmodelComponent) vis.model.getComponentsByName().get("testbench")).submodel.getComponentsByName().values().forEach(c -> { - if (c instanceof GUIManualSwitch) + if (c instanceof ModelManualSwitch) { - GUIManualSwitch cCasted = (GUIManualSwitch) c; + ModelManualSwitch cCasted = (ModelManualSwitch) c; cCasted.setHighLevelState("out", BitVector.of(Bit.ZERO, cCasted.logicWidth)); } }); diff --git a/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2904/TestableAm2904Impl.java b/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2904/TestableAm2904Impl.java index 6d926384..677a3e1b 100644 --- a/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2904/TestableAm2904Impl.java +++ b/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2904/TestableAm2904Impl.java @@ -7,12 +7,12 @@ import net.mograsim.logic.core.types.BitVector; import net.mograsim.logic.model.am2900.util.SwitchWithDisplay; import net.mograsim.logic.model.am2900.util.TestEnvironmentHelper; import net.mograsim.logic.model.am2900.util.TestEnvironmentHelper.DebugState; -import net.mograsim.logic.model.model.components.GUIComponent; +import net.mograsim.logic.model.model.components.ModelComponent; public class TestableAm2904Impl implements TestableAm2904 { - private GUIComponent am2904; + private ModelComponent am2904; private CoreManualSwitch I; private CoreManualSwitch C; private CoreManualSwitch Cx; @@ -26,7 +26,7 @@ public class TestableAm2904Impl implements TestableAm2904 private SwitchWithDisplay SIO0, SIOn, QIO0, QIOn; private SwitchWithDisplay YC, YN, YOVR, YZ; - private final TestEnvironmentHelper testHelper = new TestEnvironmentHelper(this, "GUIAm2904"); + private final TestEnvironmentHelper testHelper = new TestEnvironmentHelper(this, "Am2904"); @Override public void setup() diff --git a/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2910/Am2910Testbench.java b/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2910/Am2910Testbench.java index 5a6b3d01..6185a755 100644 --- a/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2910/Am2910Testbench.java +++ b/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2910/Am2910Testbench.java @@ -7,14 +7,14 @@ import net.mograsim.logic.model.SimpleLogicUIStandalone; import net.mograsim.logic.model.SimpleLogicUIStandalone.VisualisationObjects; import net.mograsim.logic.model.am2900.Am2900Loader; import net.mograsim.logic.model.model.ViewModelModifiable; -import net.mograsim.logic.model.model.components.GUIComponent; +import net.mograsim.logic.model.model.components.ModelComponent; import net.mograsim.logic.model.model.components.Orientation; -import net.mograsim.logic.model.model.components.atomic.GUIBitDisplay; -import net.mograsim.logic.model.model.components.atomic.GUIClock; -import net.mograsim.logic.model.model.components.atomic.GUIClock.GUIClockParams; -import net.mograsim.logic.model.model.components.atomic.GUIManualSwitch; -import net.mograsim.logic.model.model.wires.GUIWire; -import net.mograsim.logic.model.serializing.IndirectGUIComponentCreator; +import net.mograsim.logic.model.model.components.atomic.ModelBitDisplay; +import net.mograsim.logic.model.model.components.atomic.ModelClock; +import net.mograsim.logic.model.model.components.atomic.ModelClock.ModelClockParams; +import net.mograsim.logic.model.model.components.atomic.ModelManualSwitch; +import net.mograsim.logic.model.model.wires.ModelWire; +import net.mograsim.logic.model.serializing.IndirectModelComponentCreator; public class Am2910Testbench { @@ -24,23 +24,23 @@ public class Am2910Testbench SimpleLogicUIStandalone.executeVisualisation(Am2910Testbench::create, Am2910Testbench::beforeRun); } - @SuppressWarnings("unused") // for GUIWires being created + @SuppressWarnings("unused") // for ModelWires being created public static void create(ViewModelModifiable model) { - GUIComponent am2910 = IndirectGUIComponentCreator.createComponent(model, "GUIAm2910", "Am2910"); - GUIClock C = new GUIClock(model, new GUIClockParams(1000, Orientation.RIGHT)); - GUIManualSwitch D = new GUIManualSwitch(model, 12, "D"); - GUIManualSwitch _RLD = new GUIManualSwitch(model, 1, "_RLD"); - GUIManualSwitch _CC = new GUIManualSwitch(model, 1, "_CC"); - GUIManualSwitch _CCEN = new GUIManualSwitch(model, 1, "_CCEN"); - GUIManualSwitch I = new GUIManualSwitch(model, 4, "I"); - GUIManualSwitch CI = new GUIManualSwitch(model, 1, "CI"); - GUIManualSwitch _OE = new GUIManualSwitch(model, 1, "_OE"); - GUIBitDisplay _FULL = new GUIBitDisplay(model, 1, "_FULL"); - GUIBitDisplay _PL = new GUIBitDisplay(model, 1, "_PL"); - GUIBitDisplay _MAP = new GUIBitDisplay(model, 1, "_MAP"); - GUIBitDisplay _VECT = new GUIBitDisplay(model, 1, "_VECT"); - GUIBitDisplay Y = new GUIBitDisplay(model, 12, "Y"); + ModelComponent am2910 = IndirectModelComponentCreator.createComponent(model, "Am2910", "Am2910"); + ModelClock C = new ModelClock(model, new ModelClockParams(1000, Orientation.RIGHT)); + ModelManualSwitch D = new ModelManualSwitch(model, 12, "D"); + ModelManualSwitch _RLD = new ModelManualSwitch(model, 1, "_RLD"); + ModelManualSwitch _CC = new ModelManualSwitch(model, 1, "_CC"); + ModelManualSwitch _CCEN = new ModelManualSwitch(model, 1, "_CCEN"); + ModelManualSwitch I = new ModelManualSwitch(model, 4, "I"); + ModelManualSwitch CI = new ModelManualSwitch(model, 1, "CI"); + ModelManualSwitch _OE = new ModelManualSwitch(model, 1, "_OE"); + ModelBitDisplay _FULL = new ModelBitDisplay(model, 1, "_FULL"); + ModelBitDisplay _PL = new ModelBitDisplay(model, 1, "_PL"); + ModelBitDisplay _MAP = new ModelBitDisplay(model, 1, "_MAP"); + ModelBitDisplay _VECT = new ModelBitDisplay(model, 1, "_VECT"); + ModelBitDisplay Y = new ModelBitDisplay(model, 12, "Y"); C.moveTo(35, -35); D.moveTo(10, -20); @@ -56,28 +56,28 @@ public class Am2910Testbench Y.moveTo(40, 65); _OE.moveTo(60, 85); - new GUIWire(model, C.getOutputPin(), am2910.getPin("C"), new Point(60, -27.5)); - new GUIWire(model, D.getOutputPin(), am2910.getPin("D"), new Point(36, -12.5)); - new GUIWire(model, _RLD.getOutputPin(), am2910.getPin("_RLD"), new Point[0]); - new GUIWire(model, _CC.getOutputPin(), am2910.getPin("_CC")); - new GUIWire(model, _CCEN.getOutputPin(), am2910.getPin("_CCEN")); - new GUIWire(model, I.getOutputPin(), am2910.getPin("I")); - new GUIWire(model, CI.getOutputPin(), am2910.getPin("CI"), new Point(100, 52.5), new Point(100, 40)); - new GUIWire(model, am2910.getPin("_FULL"), _FULL.getInputPin(), new Point[0]); - new GUIWire(model, am2910.getPin("_PL"), _PL.getInputPin(), new Point(13, 92.5)); - new GUIWire(model, am2910.getPin("_MAP"), _MAP.getInputPin(), new Point(19, 112.5)); - new GUIWire(model, am2910.getPin("_VECT"), _VECT.getInputPin(), new Point(25, 132.5)); - new GUIWire(model, am2910.getPin("Y"), Y.getInputPin(), new Point(38, 72.5)); - new GUIWire(model, am2910.getPin("_OE"), _OE.getOutputPin()); + new ModelWire(model, C.getOutputPin(), am2910.getPin("C"), new Point(60, -27.5)); + new ModelWire(model, D.getOutputPin(), am2910.getPin("D"), new Point(36, -12.5)); + new ModelWire(model, _RLD.getOutputPin(), am2910.getPin("_RLD"), new Point[0]); + new ModelWire(model, _CC.getOutputPin(), am2910.getPin("_CC")); + new ModelWire(model, _CCEN.getOutputPin(), am2910.getPin("_CCEN")); + new ModelWire(model, I.getOutputPin(), am2910.getPin("I")); + new ModelWire(model, CI.getOutputPin(), am2910.getPin("CI"), new Point(100, 52.5), new Point(100, 40)); + new ModelWire(model, am2910.getPin("_FULL"), _FULL.getInputPin(), new Point[0]); + new ModelWire(model, am2910.getPin("_PL"), _PL.getInputPin(), new Point(13, 92.5)); + new ModelWire(model, am2910.getPin("_MAP"), _MAP.getInputPin(), new Point(19, 112.5)); + new ModelWire(model, am2910.getPin("_VECT"), _VECT.getInputPin(), new Point(25, 132.5)); + new ModelWire(model, am2910.getPin("Y"), Y.getInputPin(), new Point(38, 72.5)); + new ModelWire(model, am2910.getPin("_OE"), _OE.getOutputPin()); } public static void beforeRun(VisualisationObjects vis) { vis.model.getComponentsByName().values().forEach(c -> { - if (c instanceof GUIManualSwitch) + if (c instanceof ModelManualSwitch) { - GUIManualSwitch cCasted = (GUIManualSwitch) c; + ModelManualSwitch cCasted = (ModelManualSwitch) c; cCasted.setHighLevelState("out", BitVector.of(Bit.ZERO, cCasted.logicWidth)); } }); diff --git a/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2910/TestableAm2910Impl.java b/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2910/TestableAm2910Impl.java index a7d25252..48b85698 100644 --- a/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2910/TestableAm2910Impl.java +++ b/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/am2910/TestableAm2910Impl.java @@ -5,12 +5,12 @@ import net.mograsim.logic.core.components.CoreManualSwitch; import net.mograsim.logic.core.types.BitVector; import net.mograsim.logic.model.am2900.util.TestEnvironmentHelper; import net.mograsim.logic.model.am2900.util.TestEnvironmentHelper.DebugState; -import net.mograsim.logic.model.model.components.GUIComponent; +import net.mograsim.logic.model.model.components.ModelComponent; public class TestableAm2910Impl implements TestableAm2910 { - private GUIComponent am2901; + private ModelComponent am2901; private CoreManualSwitch I; private CoreManualSwitch C; private CoreManualSwitch CI; @@ -23,7 +23,7 @@ public class TestableAm2910Impl implements TestableAm2910 private CoreBitDisplay Y; private CoreBitDisplay _PL, _MAP, _VECT; - private final TestEnvironmentHelper testHelper = new TestEnvironmentHelper(this, "GUIAm2910"); + private final TestEnvironmentHelper testHelper = new TestEnvironmentHelper(this, "Am2910"); @Override public void setup() diff --git a/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/util/SwitchWithDisplay.java b/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/util/SwitchWithDisplay.java index c5ee27b8..27261546 100644 --- a/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/util/SwitchWithDisplay.java +++ b/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/util/SwitchWithDisplay.java @@ -4,38 +4,38 @@ import net.mograsim.logic.core.components.CoreBitDisplay; import net.mograsim.logic.core.components.CoreManualSwitch; import net.mograsim.logic.core.types.BitVector; 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.components.atomic.ModelBitDisplay; +import net.mograsim.logic.model.model.components.atomic.ModelManualSwitch; import net.mograsim.logic.model.model.wires.Pin; -import net.mograsim.logic.model.model.wires.WireCrossPoint; +import net.mograsim.logic.model.model.wires.ModelWireCrossPoint; import net.mograsim.logic.model.util.ModellingTool; public class SwitchWithDisplay { private final Pin pin; - private final GUIBitDisplay guiBitDisplay; - private final GUIManualSwitch guiManualSwitch; + private final ModelBitDisplay modelBitDisplay; + private final ModelManualSwitch modelManualSwitch; public SwitchWithDisplay(ViewModelModifiable model, Pin target) { pin = target; - guiBitDisplay = new GUIBitDisplay(model, pin.logicWidth); - guiManualSwitch = new GUIManualSwitch(model, pin.logicWidth); + modelBitDisplay = new ModelBitDisplay(model, pin.logicWidth); + modelManualSwitch = new ModelManualSwitch(model, pin.logicWidth); ModellingTool tool = ModellingTool.createFor(model); - WireCrossPoint crossPoint = new WireCrossPoint(model, pin.logicWidth); - tool.connect(guiBitDisplay.getInputPin(), crossPoint); - tool.connect(guiManualSwitch.getOutputPin(), crossPoint); + ModelWireCrossPoint crossPoint = new ModelWireCrossPoint(model, pin.logicWidth); + tool.connect(modelBitDisplay.getInputPin(), crossPoint); + tool.connect(modelManualSwitch.getOutputPin(), crossPoint); } public final BitVector getDisplayedValue() { - return guiBitDisplay.getBitDisplay().getDisplayedValue(); + return modelBitDisplay.getBitDisplay().getDisplayedValue(); } public final void setState(BitVector bits) { - guiManualSwitch.getManualSwitch().setState(bits); + modelManualSwitch.getManualSwitch().setState(bits); } public final Pin getPin() @@ -45,21 +45,21 @@ public class SwitchWithDisplay public final CoreBitDisplay getBitDisplay() { - return guiBitDisplay.getBitDisplay(); + return modelBitDisplay.getBitDisplay(); } public final CoreManualSwitch getManualSwitch() { - return guiManualSwitch.getManualSwitch(); + return modelManualSwitch.getManualSwitch(); } - final GUIBitDisplay getGuiBitDisplay() + final ModelBitDisplay getModelBitDisplay() { - return guiBitDisplay; + return modelBitDisplay; } - final GUIManualSwitch getGuiManualSwitch() + final ModelManualSwitch getModelManualSwitch() { - return guiManualSwitch; + return modelManualSwitch; } } diff --git a/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/util/TestEnvironmentHelper.java b/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/util/TestEnvironmentHelper.java index 9707b9ae..bf8ee363 100644 --- a/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/util/TestEnvironmentHelper.java +++ b/net.mograsim.logic.model.am2900/test/net/mograsim/logic/model/am2900/util/TestEnvironmentHelper.java @@ -21,15 +21,15 @@ import net.mograsim.logic.model.am2900.TestableCircuit; import net.mograsim.logic.model.am2900.TestableCircuit.Result; import net.mograsim.logic.model.model.ViewModel; import net.mograsim.logic.model.model.ViewModelModifiable; -import net.mograsim.logic.model.model.components.GUIComponent; -import net.mograsim.logic.model.model.components.atomic.GUIBitDisplay; -import net.mograsim.logic.model.model.components.atomic.GUIManualSwitch; +import net.mograsim.logic.model.model.components.ModelComponent; +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.SubmodelComponent; -import net.mograsim.logic.model.model.wires.GUIWire; +import net.mograsim.logic.model.model.wires.ModelWire; import net.mograsim.logic.model.model.wires.Pin; import net.mograsim.logic.model.modeladapter.LogicModelParameters; import net.mograsim.logic.model.modeladapter.ViewLogicModelAdapter; -import net.mograsim.logic.model.serializing.IndirectGUIComponentCreator; +import net.mograsim.logic.model.serializing.IndirectModelComponentCreator; import net.mograsim.logic.model.util.ModellingTool; public class TestEnvironmentHelper @@ -40,12 +40,12 @@ public class TestEnvironmentHelper private Field componentField; private Optional timelineField = Optional.empty(); - private GUIComponent component; + private ModelComponent component; private Timeline timeline; private ViewModelModifiable viewModel; private ModellingTool modellingTool; - private HashMap idSwitchMap = new HashMap<>(); - private HashMap idDisplayMap = new HashMap<>(); + private HashMap idSwitchMap = new HashMap<>(); + private HashMap idDisplayMap = new HashMap<>(); private DebugState debug = DebugState.NO_DEBUG; private Set wireDebugChangeSet; @@ -61,7 +61,7 @@ public class TestEnvironmentHelper this.testEnvClass = testEnvInstance.getClass(); for (Field f : testEnvClass.getDeclaredFields()) { - if (GUIComponent.class.isAssignableFrom(f.getType())) + if (ModelComponent.class.isAssignableFrom(f.getType())) { componentField = f; componentField.setAccessible(true); @@ -82,7 +82,7 @@ public class TestEnvironmentHelper viewModel = new ViewModelModifiable(); modellingTool = ModellingTool.createFor(viewModel); Am2900Loader.setup(); - component = IndirectGUIComponentCreator.createComponent(viewModel, modelId); + component = IndirectModelComponentCreator.createComponent(viewModel, modelId); setField(componentField, component); component.getPins().values().forEach(this::extendModelPin); @@ -113,12 +113,12 @@ public class TestEnvironmentHelper Class type = f.getType(); if (CoreManualSwitch.class.isAssignableFrom(type)) { - GUIManualSwitch gms = new GUIManualSwitch(viewModel, p.logicWidth); + ModelManualSwitch gms = new ModelManualSwitch(viewModel, p.logicWidth); modellingTool.connect(p, gms.getOutputPin()); idSwitchMap.put(p.name, gms); } else if (CoreBitDisplay.class.isAssignableFrom(type)) { - GUIBitDisplay gbd = new GUIBitDisplay(viewModel, p.logicWidth); + ModelBitDisplay gbd = new ModelBitDisplay(viewModel, p.logicWidth); modellingTool.connect(p, gbd.getInputPin()); idDisplayMap.put(p.name, gbd); } else if (SwitchWithDisplay.class.isAssignableFrom(type)) @@ -148,14 +148,14 @@ public class TestEnvironmentHelper private void setupDebugging() { // Debug code - HashSet wiresIncludingSubmodels = new HashSet<>(); + HashSet wiresIncludingSubmodels = new HashSet<>(); Queue modelsToIterate = new LinkedList<>(); modelsToIterate.add(viewModel); while (modelsToIterate.size() > 0) { ViewModel model = modelsToIterate.poll(); wiresIncludingSubmodels.addAll(model.getWiresByName().values()); - for (GUIComponent comp : model.getComponentsByName().values()) + for (ModelComponent comp : model.getComponentsByName().values()) if (comp instanceof SubmodelComponent) modelsToIterate.offer(((SubmodelComponent) comp).submodel); } diff --git a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/Editor.java b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/Editor.java index b6de1acb..6f3919a9 100644 --- a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/Editor.java +++ b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/Editor.java @@ -21,11 +21,11 @@ import net.mograsim.logic.model.editor.states.StateManager; import net.mograsim.logic.model.editor.ui.DialogManager; import net.mograsim.logic.model.editor.ui.EditorGUI; import net.mograsim.logic.model.model.ViewModelModifiable; -import net.mograsim.logic.model.model.components.GUIComponent; -import net.mograsim.logic.model.model.wires.GUIWire; +import net.mograsim.logic.model.model.components.ModelComponent; +import net.mograsim.logic.model.model.wires.ModelWire; import net.mograsim.logic.model.serializing.DeserializedSubmodelComponent; import net.mograsim.logic.model.serializing.IdentifyParams; -import net.mograsim.logic.model.serializing.IndirectGUIComponentCreator; +import net.mograsim.logic.model.serializing.IndirectModelComponentCreator; import net.mograsim.logic.model.snippets.highlevelstatehandlers.DefaultHighLevelStateHandler; import net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer; import net.mograsim.logic.model.snippets.symbolrenderers.DefaultSymbolRenderer; @@ -36,7 +36,7 @@ public final class Editor final Set copyBuffer = new HashSet<>(); public final DeserializedSubmodelComponent toBeEdited; public final HandleManager handleManager; - final static Map identifierPerComponent = new HashMap<>(); + final static Map identifierPerComponent = new HashMap<>(); public final EditorGUI gui; public final StateManager stateManager; private final SaveLoadManager saveManager; @@ -127,7 +127,7 @@ public final class Editor selection.clear(); for (ComponentInfo info : copyBuffer) { - GUIComponent comp = addComponent(info.identifier, info.params); + ModelComponent comp = addComponent(info.identifier, info.params); ComponentHandle h = handleManager.getHandle(comp); h.reqMove(info.relX, info.relY); selection.add(h); @@ -154,7 +154,7 @@ public final class Editor String selected = gui.getAddListSelected(); try { - GUIComponent c = addComponent(selected, params); + ModelComponent c = addComponent(selected, params); selection.clear(); selection.add(handleManager.getHandle(c)); moveSelection(x, y); @@ -171,14 +171,14 @@ public final class Editor } } - private GUIComponent addComponent(String identifier, JsonElement params) + private ModelComponent addComponent(String identifier, JsonElement params) { - GUIComponent comp = IndirectGUIComponentCreator.createComponent(toBeEdited.getSubmodelModifiable(), identifier, params); + ModelComponent comp = IndirectModelComponentCreator.createComponent(toBeEdited.getSubmodelModifiable(), identifier, params); identifierPerComponent.put(comp, identifier); return comp; } - public static String getIdentifier(GUIComponent c) + public static String getIdentifier(ModelComponent c) { if (identifierPerComponent.containsKey(c)) return identifierPerComponent.get(c); @@ -225,7 +225,7 @@ public final class Editor @SuppressWarnings("unused") public void addWire(PinHandle a, PinHandle b) { - new GUIWire(toBeEdited.getSubmodelModifiable(), a.getPin(), b.getPin(), new Point[0]); + new ModelWire(toBeEdited.getSubmodelModifiable(), a.getPin(), b.getPin(), new Point[0]); } public static enum Snapping diff --git a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/SaveLoadManager.java b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/SaveLoadManager.java index 7fecf7f0..ac387223 100644 --- a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/SaveLoadManager.java +++ b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/SaveLoadManager.java @@ -8,7 +8,7 @@ import org.eclipse.swt.widgets.Shell; import net.mograsim.logic.model.model.ViewModelModifiable; import net.mograsim.logic.model.serializing.DeserializedSubmodelComponent; -import net.mograsim.logic.model.serializing.IndirectGUIComponentCreator; +import net.mograsim.logic.model.serializing.IndirectModelComponentCreator; import net.mograsim.logic.model.serializing.SubmodelComponentSerializer; public class SaveLoadManager @@ -68,7 +68,7 @@ public class SaveLoadManager fdShell.dispose(); if (result != null) { - new Editor((DeserializedSubmodelComponent) IndirectGUIComponentCreator.createComponent(new ViewModelModifiable(), + new Editor((DeserializedSubmodelComponent) IndirectModelComponentCreator.createComponent(new ViewModelModifiable(), "jsonfile:" + result)); } } diff --git a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/ComponentHandle.java b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/ComponentHandle.java index 5fe0aa44..8281501d 100644 --- a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/ComponentHandle.java +++ b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/ComponentHandle.java @@ -11,18 +11,18 @@ import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle; import net.mograsim.logic.model.editor.Editor; import net.mograsim.logic.model.editor.Editor.ComponentInfo; import net.mograsim.logic.model.model.ViewModelModifiable; -import net.mograsim.logic.model.model.components.GUIComponent; +import net.mograsim.logic.model.model.components.ModelComponent; import net.mograsim.logic.model.serializing.IdentifyParams; public class ComponentHandle extends Handle { private final ViewModelModifiable model; - public final GUIComponent parent; + public final ModelComponent parent; private final static double POS_OFFSET = 2.0d; private final static double LENGTH_OFFSET = POS_OFFSET * 2; boolean selected = false; - public ComponentHandle(ViewModelModifiable model, GUIComponent parent) + public ComponentHandle(ViewModelModifiable model, ModelComponent parent) { super(4); this.model = model; diff --git a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/HandleManager.java b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/HandleManager.java index 51890038..37818e16 100644 --- a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/HandleManager.java +++ b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/HandleManager.java @@ -17,9 +17,9 @@ import net.mograsim.logic.model.editor.Editor; import net.mograsim.logic.model.editor.states.EditorState; import net.mograsim.logic.model.editor.util.PrioritySet; import net.mograsim.logic.model.model.ViewModelModifiable; -import net.mograsim.logic.model.model.components.GUIComponent; +import net.mograsim.logic.model.model.components.ModelComponent; import net.mograsim.logic.model.model.components.submodels.SubmodelComponent; -import net.mograsim.logic.model.model.wires.GUIWire; +import net.mograsim.logic.model.model.wires.ModelWire; import net.mograsim.logic.model.model.wires.MovablePin; import net.mograsim.logic.model.model.wires.Pin; @@ -27,11 +27,11 @@ public class HandleManager { private final Map handlePerPin; private final Map handlePerInterfacePin; - private final Map> pointHandlesPerWire; - private final Map handlePerWire; + private final Map> pointHandlesPerWire; + private final Map handlePerWire; private final Set handles; private final Set wirePointHandles; - private final Map handlePerComp; + private final Map handlePerComp; private final Collection> handleAddedListeners; private final Collection> handleRemovedListeners; @@ -84,9 +84,9 @@ public class HandleManager else { ViewModelModifiable model = editor.getSubmodel(); - Map compsByName = model.getComponentsByName(); - Set comps = new HashSet<>(compsByName.values()); - GUIComponent interfaceComp = compsByName.get(SubmodelComponent.SUBMODEL_INTERFACE_NAME); + Map compsByName = model.getComponentsByName(); + Set comps = new HashSet<>(compsByName.values()); + ModelComponent interfaceComp = compsByName.get(SubmodelComponent.SUBMODEL_INTERFACE_NAME); comps.remove(interfaceComp); registerInterfaceComponent(interfaceComp); comps.forEach(c -> registerComponent(c)); @@ -96,14 +96,14 @@ public class HandleManager } } - private void registerInterfaceComponent(GUIComponent c) + private void registerInterfaceComponent(ModelComponent c) { c.getPins().values().forEach(p -> addInterfacePinHandle(p)); c.addPinAddedListener(p -> addInterfacePinHandle(p)); c.addPinRemovedListener(p -> removeInterfacePinHandle(p)); } - private void registerComponent(GUIComponent c) + private void registerComponent(ModelComponent c) { addComponentHandle(c); @@ -113,7 +113,7 @@ public class HandleManager c.addPinRemovedListener(p -> removePinHandle(p)); } - private void registerWire(GUIWire wire) + private void registerWire(ModelWire wire) { Point[] path = wire.getPath(); AtomicInteger oldLength = new AtomicInteger(path == null ? 0 : path.length); @@ -152,14 +152,14 @@ public class HandleManager // -- Adding/Removing handles -- /// /////////////////////////////////// - private void addComponentHandle(GUIComponent c) + private void addComponentHandle(ModelComponent c) { ComponentHandle h = new ComponentHandle(editor.getSubmodel(), c); handlePerComp.put(c, h); addHandle(h); } - private void removeComponentHandle(GUIComponent c) + private void removeComponentHandle(ModelComponent c) { ComponentHandle h = handlePerComp.get(c); handlePerComp.remove(c); @@ -197,7 +197,7 @@ public class HandleManager removeHandle(h); } - private void addWirePointHandle(GUIWire w) + private void addWirePointHandle(ModelWire w) { List wireHandles = pointHandlesPerWire.get(w); WirePointHandle h; @@ -214,7 +214,7 @@ public class HandleManager addHandle(h); } - void destroyWirePointHandle(GUIWire owner, WirePointHandle h) + void destroyWirePointHandle(ModelWire owner, WirePointHandle h) { if (pointHandlesPerWire.containsKey(owner)) { @@ -226,7 +226,7 @@ public class HandleManager } } - private void removeWirePointHandles(GUIWire owner) + private void removeWirePointHandles(ModelWire owner) { if (!pointHandlesPerWire.containsKey(owner)) return; @@ -238,14 +238,14 @@ public class HandleManager pointHandlesPerWire.remove(owner); } - private void addWireHandle(GUIWire w) + private void addWireHandle(ModelWire w) { WireHandle h = new WireHandle(editor.getSubmodel(), w); handlePerWire.put(w, h); addHandle(h); } - private void removeWireHandle(GUIWire w) + private void removeWireHandle(ModelWire w) { WireHandle h = handlePerWire.get(w); handlePerWire.remove(w); @@ -270,12 +270,12 @@ public class HandleManager return handlePerPin.get(parent); } - public ComponentHandle getHandle(GUIComponent parent) + public ComponentHandle getHandle(ModelComponent parent) { return handlePerComp.get(parent); } - public WireHandle getHandle(GUIWire parent) + public WireHandle getHandle(ModelWire parent) { return handlePerWire.get(parent); } @@ -288,7 +288,7 @@ public class HandleManager /** * @return A Collection of the registered {@link WirePointHandle}s of the specified wire */ - public Collection getWirePointHandles(GUIWire parent) + public Collection getWirePointHandles(ModelWire parent) { return pointHandlesPerWire.get(parent).stream().collect(Collectors.toSet()); } diff --git a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/WireHandle.java b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/WireHandle.java index be9a5ca6..d5e80c83 100644 --- a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/WireHandle.java +++ b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/WireHandle.java @@ -10,7 +10,7 @@ import net.haspamelodica.swt.helper.swtobjectwrappers.Point; import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle; import net.mograsim.logic.model.editor.states.EditorState; import net.mograsim.logic.model.model.ViewModelModifiable; -import net.mograsim.logic.model.model.wires.GUIWire; +import net.mograsim.logic.model.model.wires.ModelWire; public class WireHandle extends Handle { @@ -18,9 +18,9 @@ public class WireHandle extends Handle private final static double WIDTH = 2.0; private final static double WIDTH_SQUARED = WIDTH * WIDTH; private final ViewModelModifiable model; - public final GUIWire parent; + public final ModelWire parent; - public WireHandle(ViewModelModifiable model, GUIWire parent) + public WireHandle(ViewModelModifiable model, ModelWire parent) { super(5); this.model = model; @@ -104,7 +104,7 @@ public class WireHandle extends Handle } - private static Optional click(GUIWire w, double x, double y) + private static Optional click(ModelWire w, double x, double y) { Rectangle modifiedBounds = w.getBounds(); modifiedBounds.x -= WIDTH; diff --git a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/WirePointHandle.java b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/WirePointHandle.java index b7cc23e9..2947535f 100644 --- a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/WirePointHandle.java +++ b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/WirePointHandle.java @@ -6,18 +6,18 @@ import org.eclipse.swt.widgets.Display; import net.haspamelodica.swt.helper.gcs.GeneralGC; import net.haspamelodica.swt.helper.swtobjectwrappers.Point; import net.mograsim.logic.core.wires.CoreWire; -import net.mograsim.logic.model.model.wires.GUIWire; +import net.mograsim.logic.model.model.wires.ModelWire; public class WirePointHandle extends Handle { private final static int END_OFFSET = 4; private final HandleManager manager; private boolean selected = false; - public final GUIWire parent; + public final ModelWire parent; private int pointIndex; - public WirePointHandle(HandleManager manager, GUIWire parent, int pointIndex) + public WirePointHandle(HandleManager manager, ModelWire parent, int pointIndex) { super(3); this.manager = manager; diff --git a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/ui/EditorGUI.java b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/ui/EditorGUI.java index 0c4d0385..17e12ebb 100644 --- a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/ui/EditorGUI.java +++ b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/ui/EditorGUI.java @@ -24,7 +24,7 @@ import net.haspamelodica.swt.helper.zoomablecanvas.helper.ZoomableCanvasOverlay; import net.haspamelodica.swt.helper.zoomablecanvas.helper.ZoomableCanvasUserInput; import net.mograsim.logic.model.editor.Editor; import net.mograsim.logic.model.editor.SaveLoadManager; -import net.mograsim.logic.model.serializing.IndirectGUIComponentCreator; +import net.mograsim.logic.model.serializing.IndirectModelComponentCreator; public class EditorGUI { @@ -210,7 +210,7 @@ public class EditorGUI public void refreshAddList() { - addList.setItems(IndirectGUIComponentCreator.getStandardComponentIDs().keySet().stream().sorted().toArray(String[]::new)); + addList.setItems(IndirectModelComponentCreator.getStandardComponentIDs().keySet().stream().sorted().toArray(String[]::new)); addList.select(0); } diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/LogicUICanvas.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/LogicUICanvas.java index 115605f1..24bd3eab 100644 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/LogicUICanvas.java +++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/LogicUICanvas.java @@ -23,10 +23,10 @@ import net.haspamelodica.swt.helper.zoomablecanvas.ZoomableCanvas; import net.mograsim.logic.core.types.Bit; import net.mograsim.logic.core.types.BitVector; import net.mograsim.logic.model.model.ViewModel; -import net.mograsim.logic.model.model.components.GUIComponent; +import net.mograsim.logic.model.model.components.ModelComponent; import net.mograsim.logic.model.model.components.submodels.SubmodelComponent; import net.mograsim.logic.model.model.components.submodels.SubmodelInterface; -import net.mograsim.logic.model.model.wires.WireCrossPoint; +import net.mograsim.logic.model.model.wires.ModelWireCrossPoint; import net.mograsim.preferences.Preferences; /** @@ -67,7 +67,7 @@ public class LogicUICanvas extends ZoomableCanvas if (e.button == 1) { Point click = canvasToWorldCoords(e.x, e.y); - for (GUIComponent component : model.getComponentsByName().values()) + for (ModelComponent component : model.getComponentsByName().values()) if (component.getBounds().contains(click) && component.clicked(click.x, click.y)) { redraw(); @@ -83,8 +83,8 @@ public class LogicUICanvas extends ZoomableCanvas new Label(debugShell, SWT.NONE).setText("Target component: "); Combo componentSelector = new Combo(debugShell, SWT.DROP_DOWN | SWT.READ_ONLY); componentSelector.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false)); - List componentsByItemIndex = new ArrayList<>(); - Consumer compsChanged = c -> recalculateComponentSelector(componentsByItemIndex, componentSelector, model); + List componentsByItemIndex = new ArrayList<>(); + Consumer compsChanged = c -> recalculateComponentSelector(componentsByItemIndex, componentSelector, model); model.addComponentAddedListener(compsChanged); model.addComponentRemovedListener(compsChanged); debugShell.addListener(SWT.Dispose, e -> @@ -123,7 +123,7 @@ public class LogicUICanvas extends ZoomableCanvas int componentIndex = componentSelector.getSelectionIndex(); if (componentIndex < 0 || componentIndex >= componentsByItemIndex.size()) throw new RuntimeException("No component selected"); - GUIComponent target = componentsByItemIndex.get(componentIndex); + ModelComponent target = componentsByItemIndex.get(componentIndex); String valueString = valueText.getText(); Object value; if (radioBit.getSelection()) @@ -161,18 +161,18 @@ public class LogicUICanvas extends ZoomableCanvas debugShell.open(); } - private void recalculateComponentSelector(List componentsByItemIndex, Combo componentSelector, ViewModel model) + private void recalculateComponentSelector(List componentsByItemIndex, Combo componentSelector, ViewModel model) { componentsByItemIndex.clear(); componentSelector.setItems(); addComponentSelectorItems(componentsByItemIndex, "", componentSelector, model); } - private void addComponentSelectorItems(List componentsByItemIndex, String base, Combo componentSelector, ViewModel model) + private void addComponentSelectorItems(List componentsByItemIndex, String base, Combo componentSelector, ViewModel model) { model.getComponentsByName().values().stream().sorted((c1, c2) -> c1.name.compareTo(c2.name)).forEach(c -> { - if (!(c instanceof WireCrossPoint || c instanceof SubmodelInterface)) + if (!(c instanceof ModelWireCrossPoint || c instanceof SubmodelInterface)) { String item = base + c.name; componentsByItemIndex.add(c); diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/LogicUIRenderer.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/LogicUIRenderer.java index 36b165a1..b90e259e 100644 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/LogicUIRenderer.java +++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/LogicUIRenderer.java @@ -6,7 +6,7 @@ import net.haspamelodica.swt.helper.gcs.GeneralGC; import net.haspamelodica.swt.helper.swtobjectwrappers.Point; import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle; import net.mograsim.logic.model.model.ViewModel; -import net.mograsim.logic.model.model.components.GUIComponent; +import net.mograsim.logic.model.model.components.ModelComponent; import net.mograsim.logic.model.model.wires.Pin; import net.mograsim.preferences.Preferences; @@ -36,7 +36,7 @@ public class LogicUIRenderer model.getComponentsByName().values().forEach(c -> renderComponent(gc, c, visibleRegion)); } - private static void renderComponent(GeneralGC gc, GUIComponent component, Rectangle visibleRegion) + private static void renderComponent(GeneralGC gc, ModelComponent component, Rectangle visibleRegion) { Rectangle bounds = component.getBounds(); double lw = gc.getLineWidth(); 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 41212009..ac09b1c5 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 @@ -2,10 +2,10 @@ 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.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 { @@ -16,20 +16,20 @@ public class ClickableSubmodelComponentsTest public static void createExample(ViewModelModifiable model) { - @SuppressWarnings("unused") // GUIWire + @SuppressWarnings("unused") // Wire SimpleRectangularSubmodelComponent comp = new SimpleRectangularSubmodelComponent(model, 1, "") { { setSubmodelScale(.4); setOutputPins("O0"); - GUIManualSwitch sw = new GUIManualSwitch(submodelModifiable, 1); - GUIBitDisplay bd = new GUIBitDisplay(submodelModifiable, 1); + 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()); } }; diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/examples/RSLatchExample.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/examples/RSLatchExample.java index 58f75550..2c71dc11 100644 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/examples/RSLatchExample.java +++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/examples/RSLatchExample.java @@ -3,11 +3,11 @@ package net.mograsim.logic.model.examples; import net.haspamelodica.swt.helper.swtobjectwrappers.Point; import net.mograsim.logic.model.SimpleLogicUIStandalone; import net.mograsim.logic.model.model.ViewModelModifiable; -import net.mograsim.logic.model.model.components.atomic.GUIManualSwitch; -import net.mograsim.logic.model.model.components.atomic.GUINotGate; -import net.mograsim.logic.model.model.components.atomic.GUIOrGate; -import net.mograsim.logic.model.model.wires.GUIWire; -import net.mograsim.logic.model.model.wires.WireCrossPoint; +import net.mograsim.logic.model.model.components.atomic.ModelManualSwitch; +import net.mograsim.logic.model.model.components.atomic.ModelNotGate; +import net.mograsim.logic.model.model.components.atomic.ModelOrGate; +import net.mograsim.logic.model.model.wires.ModelWire; +import net.mograsim.logic.model.model.wires.ModelWireCrossPoint; public class RSLatchExample { @@ -16,46 +16,46 @@ public class RSLatchExample SimpleLogicUIStandalone.executeVisualisation(RSLatchExample::createRSLatchExample); } - @SuppressWarnings("unused") // for GUIWires being created + @SuppressWarnings("unused") // for Wires being created public static void createRSLatchExample(ViewModelModifiable model) { - GUIManualSwitch rIn = new GUIManualSwitch(model, 1); + ModelManualSwitch rIn = new ModelManualSwitch(model, 1); rIn.moveTo(100, 100); - GUIManualSwitch sIn = new GUIManualSwitch(model, 1); + ModelManualSwitch sIn = new ModelManualSwitch(model, 1); sIn.moveTo(100, 200); - GUIOrGate or1 = new GUIOrGate(model, 1); + ModelOrGate or1 = new ModelOrGate(model, 1); or1.moveTo(160, 102.5); - new GUIWire(model, rIn.getOutputPin(), or1.getPin("A")); + new ModelWire(model, rIn.getOutputPin(), or1.getPin("A")); - GUIOrGate or2 = new GUIOrGate(model, 1); + ModelOrGate or2 = new ModelOrGate(model, 1); or2.moveTo(160, 192.5); - new GUIWire(model, sIn.getOutputPin(), or2.getPin("B")); + new ModelWire(model, sIn.getOutputPin(), or2.getPin("B")); - GUINotGate not1 = new GUINotGate(model, 1); + ModelNotGate not1 = new ModelNotGate(model, 1); not1.moveTo(200, 107.5); - new GUIWire(model, or1.getPin("Y"), not1.getPin("A")); + new ModelWire(model, or1.getPin("Y"), not1.getPin("A")); - GUINotGate not2 = new GUINotGate(model, 1); + ModelNotGate not2 = new ModelNotGate(model, 1); not2.moveTo(200, 197.5); - new GUIWire(model, or2.getPin("Y"), not2.getPin("A")); + new ModelWire(model, or2.getPin("Y"), not2.getPin("A")); - WireCrossPoint p1 = new WireCrossPoint(model, 1); + ModelWireCrossPoint p1 = new ModelWireCrossPoint(model, 1); p1.moveCenterTo(250, 112.5); - new GUIWire(model, not1.getPin("Y"), p1); - new GUIWire(model, p1, or2.getPin("A"), new Point(250, 130), new Point(140, 185), new Point(140, 197.5)); + new ModelWire(model, not1.getPin("Y"), p1); + new ModelWire(model, p1, or2.getPin("A"), new Point(250, 130), new Point(140, 185), new Point(140, 197.5)); - WireCrossPoint p2 = new WireCrossPoint(model, 1); + ModelWireCrossPoint p2 = new ModelWireCrossPoint(model, 1); p2.moveCenterTo(250, 202.5); - new GUIWire(model, not2.getPin("Y"), p2); - new GUIWire(model, p2, or1.getPin("B"), new Point(250, 185), new Point(140, 130), new Point(140, 117.5)); + new ModelWire(model, not2.getPin("Y"), p2); + new ModelWire(model, p2, or1.getPin("B"), new Point(250, 185), new Point(140, 130), new Point(140, 117.5)); - WireCrossPoint o1 = new WireCrossPoint(model, 1); + ModelWireCrossPoint o1 = new ModelWireCrossPoint(model, 1); o1.moveCenterTo(270, 112.5); - new GUIWire(model, p1, o1); + new ModelWire(model, p1, o1); - WireCrossPoint o2 = new WireCrossPoint(model, 1); + ModelWireCrossPoint o2 = new ModelWireCrossPoint(model, 1); o2.moveCenterTo(270, 202.5); - new GUIWire(model, p2, o2); + new ModelWire(model, p2, o2); } } \ No newline at end of file diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/ViewModel.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/ViewModel.java index cf679cd1..b0d6a3cf 100644 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/ViewModel.java +++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/ViewModel.java @@ -7,22 +7,22 @@ import java.util.List; import java.util.Map; import java.util.function.Consumer; -import net.mograsim.logic.model.model.components.GUIComponent; -import net.mograsim.logic.model.model.wires.GUIWire; +import net.mograsim.logic.model.model.components.ModelComponent; +import net.mograsim.logic.model.model.wires.ModelWire; public class ViewModel { - private final Map components; + private final Map components; private final Map componentDestroyFunctions; - private final Map componentsUnmodifiable; - private final Map wires; + private final Map componentsUnmodifiable; + private final Map wires; private final Map wireDestroyFunctions; - private final Map wiresUnmodifiable; + private final Map wiresUnmodifiable; - private final List> componentAddedListeners; - private final List> componentRemovedListeners; - private final List> wireAddedListeners; - private final List> wireRemovedListeners; + private final List> componentAddedListeners; + private final List> componentRemovedListeners; + private final List> wireAddedListeners; + private final List> wireRemovedListeners; private final List> redrawHandlerChangedListeners; private Runnable redrawHandler; @@ -45,11 +45,11 @@ public class ViewModel /** * Adds the given component to the list of components and calls all componentAddedListeners. Don't call this method from application - * code as it is automatically called in {@link GUIComponent}'s constructor. + * code as it is automatically called in {@link ModelComponent}'s constructor. * * @author Daniel Kirschten */ - protected void componentCreated(GUIComponent component, Runnable destroyed) + protected void componentCreated(ModelComponent component, Runnable destroyed) { if (components.containsKey(component.name)) throw new IllegalStateException("Don't add the same component twice!"); @@ -64,7 +64,7 @@ public class ViewModel * * @author Daniel Kirschten */ - protected void destroyComponent(GUIComponent component) + protected void destroyComponent(ModelComponent component) { componentDestroyFunctions.get(component.name).run(); if (!components.containsKey(component.name)) @@ -79,7 +79,7 @@ public class ViewModel * * @author Daniel Kirschten */ - protected void wireCreated(GUIWire wire, Runnable destroyed) + protected void wireCreated(ModelWire wire, Runnable destroyed) { if (wires.containsKey(wire.name)) throw new IllegalStateException("Don't add the same wire twice!"); @@ -94,7 +94,7 @@ public class ViewModel * * @author Daniel Kirschten */ - protected void destroyWire(GUIWire wire) + protected void destroyWire(ModelWire wire) { wireDestroyFunctions.get(wire.name).run(); if (!wires.containsKey(wire.name)) @@ -104,33 +104,33 @@ public class ViewModel requestRedraw(); } - public Map getComponentsByName() + public Map getComponentsByName() { return componentsUnmodifiable; } - public Map getWiresByName() + public Map getWiresByName() { return wiresUnmodifiable; } // @formatter:off - public void addComponentAddedListener (Consumer listener) {componentAddedListeners .add (listener);} - public void addComponentRemovedListener (Consumer listener) {componentRemovedListeners .add (listener);} - public void addWireAddedListener (Consumer listener) {wireAddedListeners .add (listener);} - public void addWireRemovedListener (Consumer listener) {wireRemovedListeners .add (listener);} + public void addComponentAddedListener (Consumer listener) {componentAddedListeners .add (listener);} + public void addComponentRemovedListener (Consumer listener) {componentRemovedListeners .add (listener);} + public void addWireAddedListener (Consumer listener) {wireAddedListeners .add (listener);} + public void addWireRemovedListener (Consumer listener) {wireRemovedListeners .add (listener);} public void addRedrawHandlerChangedListener (Consumer listener) {redrawHandlerChangedListeners.add (listener);} - public void removeComponentAddedListener (Consumer listener) {componentAddedListeners .remove(listener);} - public void removeComponentRemovedListener (Consumer listener) {componentRemovedListeners .remove(listener);} - public void removeWireAddedListener (Consumer listener) {wireAddedListeners .remove(listener);} - public void removeWireRemovedListener (Consumer listener) {wireRemovedListeners .remove(listener);} + public void removeComponentAddedListener (Consumer listener) {componentAddedListeners .remove(listener);} + public void removeComponentRemovedListener (Consumer listener) {componentRemovedListeners .remove(listener);} + public void removeWireAddedListener (Consumer listener) {wireAddedListeners .remove(listener);} + public void removeWireRemovedListener (Consumer listener) {wireRemovedListeners .remove(listener);} public void removeRedrawHandlerChangedListener(Consumer listener) {redrawHandlerChangedListeners.remove(listener);} - private void callComponentAddedListeners (GUIComponent c) {componentAddedListeners .forEach(l -> l.accept(c));} - private void callComponentRemovedListeners (GUIComponent c) {componentRemovedListeners .forEach(l -> l.accept(c));} - private void callWireAddedListeners (GUIWire w) {wireAddedListeners .forEach(l -> l.accept(w));} - private void callWireRemovedListeners (GUIWire w) {wireRemovedListeners .forEach(l -> l.accept(w));} + private void callComponentAddedListeners (ModelComponent c) {componentAddedListeners .forEach(l -> l.accept(c));} + private void callComponentRemovedListeners (ModelComponent c) {componentRemovedListeners .forEach(l -> l.accept(c));} + private void callWireAddedListeners (ModelWire w) {wireAddedListeners .forEach(l -> l.accept(w));} + private void callWireRemovedListeners (ModelWire w) {wireRemovedListeners .forEach(l -> l.accept(w));} private void callRedrawHandlerChangedListener(Runnable r) {redrawHandlerChangedListeners.forEach(l -> l.accept(r));} // @formatter:on diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/ViewModelModifiable.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/ViewModelModifiable.java index b4fa4f53..7ebde10e 100644 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/ViewModelModifiable.java +++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/ViewModelModifiable.java @@ -2,12 +2,12 @@ package net.mograsim.logic.model.model; import java.util.Set; -import net.mograsim.logic.model.model.components.GUIComponent; -import net.mograsim.logic.model.model.wires.GUIWire; +import net.mograsim.logic.model.model.components.ModelComponent; +import net.mograsim.logic.model.model.wires.ModelWire; public class ViewModelModifiable extends ViewModel { - public String getDefaultComponentName(GUIComponent component) + public String getDefaultComponentName(ModelComponent component) { Set componentNames = getComponentsByName().keySet(); // TODO get the ID of component @@ -40,25 +40,25 @@ public class ViewModelModifiable extends ViewModel } @Override - public void componentCreated(GUIComponent component, Runnable destroyed) + public void componentCreated(ModelComponent component, Runnable destroyed) { super.componentCreated(component, destroyed); } @Override - public void destroyComponent(GUIComponent component) + public void destroyComponent(ModelComponent component) { super.destroyComponent(component); } @Override - public void wireCreated(GUIWire wire, Runnable destroyed) + public void wireCreated(ModelWire wire, Runnable destroyed) { super.wireCreated(wire, destroyed); } @Override - public void destroyWire(GUIWire wire) + public void destroyWire(ModelWire wire) { super.destroyWire(wire); } diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/GUIComponent.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/ModelComponent.java similarity index 87% rename from net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/GUIComponent.java rename to net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/ModelComponent.java index 63582600..6853e382 100644 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/GUIComponent.java +++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/ModelComponent.java @@ -16,14 +16,14 @@ import net.mograsim.logic.model.serializing.JSONSerializable; import net.mograsim.logic.model.snippets.HighLevelStateHandler; /** - * The base class for all GUI components.
- * A GUIComponent has a reference to the ViewModel it belongs to.
- * A GUIComponent has a name. This name is unique in the model the GUIComponent belongs to.
- * A GUIComponent has a position and size. The size can only be modified by subclasses. + * The base class for all model components.
+ * A ModelComponent has a reference to the ViewModel it belongs to.
+ * A ModelComponent has a name. This name is unique in the model the ModelComponent belongs to.
+ * A ModelComponent has a position and size. The size can only be modified by subclasses. * * @author Daniel Kirschten */ -public abstract class GUIComponent implements JSONSerializable +public abstract class ModelComponent implements JSONSerializable { /** * The model this component is a part of. @@ -43,8 +43,8 @@ public abstract class GUIComponent implements JSONSerializable */ protected final Map pinsUnmodifiable; - private final List> componentMovedListeners; - private final List> componentResizedListeners; + private final List> componentMovedListeners; + private final List> componentResizedListeners; private final List> pinAddedListeners; private final List> pinRemovedListeners; @@ -52,7 +52,7 @@ public abstract class GUIComponent implements JSONSerializable // creation and destruction - public GUIComponent(ViewModelModifiable model, String name) + public ModelComponent(ViewModelModifiable model, String name) { this.model = model; this.name = name == null ? model.getDefaultComponentName(this) : name; @@ -71,7 +71,7 @@ public abstract class GUIComponent implements JSONSerializable } /** - * Destroys this component. This method is called from {@link ViewModelModifiable#componentDestroyed(GUIComponent) destroyComponent()} + * Destroys this component. This method is called from {@link ViewModelModifiable#componentDestroyed(ModelComponent) destroyComponent()} * of the model this component is a part of.
* When overriding, make sure to also call the original implementation. * @@ -294,13 +294,13 @@ public abstract class GUIComponent implements JSONSerializable // listeners // @formatter:off - public void addComponentMovedListener (Consumer listener) {componentMovedListeners .add (listener);} - public void addComponentResizedListener (Consumer listener) {componentResizedListeners.add (listener);} + public void addComponentMovedListener (Consumer listener) {componentMovedListeners .add (listener);} + public void addComponentResizedListener (Consumer listener) {componentResizedListeners.add (listener);} public void addPinAddedListener (Consumer listener) {pinAddedListeners .add (listener);} public void addPinRemovedListener (Consumer listener) {pinRemovedListeners .add (listener);} - public void removeComponentMovedListener (Consumer listener) {componentMovedListeners .remove(listener);} - public void removeComponentResizedListener (Consumer listener) {componentResizedListeners.remove(listener);} + public void removeComponentMovedListener (Consumer listener) {componentMovedListeners .remove(listener);} + public void removeComponentResizedListener (Consumer listener) {componentResizedListeners.remove(listener);} public void removePinAddedListener (Consumer listener) {pinAddedListeners .remove(listener);} public void removePinRemovedListener (Consumer listener) {pinRemovedListeners .remove(listener);} diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/OrientationCalculator.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/OrientationCalculator.java index f16eaa9b..06621baf 100644 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/OrientationCalculator.java +++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/OrientationCalculator.java @@ -1,13 +1,13 @@ package net.mograsim.logic.model.model.components; /** - * This class simplifies the calculation of coordinates, especially for GUI components. + * This class simplifies the calculation of coordinates, especially for model components. *

* Supply it with the original width and height and an orientation, and use the methods {@link #newX(double, double)} and * {@link #newY(double, double)} to retrieve the new coordinates, relative to the upper left corner of {@link Orientation#RIGHT}. The * {@link #height()} and {@link #width()} methods return the width and height in the new orientation. *

- * This is meant to be used in the context of a a classic display coordinate system, as done in the {@link GUIComponent}s. + * This is meant to be used in the context of a a classic display coordinate system, as done in the {@link ModelComponent}s. * * @see Orientation * @author Christian Femers diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUIAndGate.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUIAndGate.java deleted file mode 100644 index d2f656f8..00000000 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUIAndGate.java +++ /dev/null @@ -1,28 +0,0 @@ -package net.mograsim.logic.model.model.components.atomic; - -import net.mograsim.logic.core.components.gates.CoreAndGate; -import net.mograsim.logic.model.model.ViewModelModifiable; -import net.mograsim.logic.model.modeladapter.ViewLogicModelAdapter; -import net.mograsim.logic.model.modeladapter.componentadapters.SimpleGateAdapter; -import net.mograsim.logic.model.serializing.IndirectGUIComponentCreator; - -public class GUIAndGate extends SimpleRectangularGUIGate -{ - public GUIAndGate(ViewModelModifiable model, int logicWidth) - { - this(model, logicWidth, null); - } - - public GUIAndGate(ViewModelModifiable model, int logicWidth, String name) - { - super(model, "GUIAndGate", "&", false, logicWidth, name); - setInputCount(2);// TODO make variable - } - - static - { - ViewLogicModelAdapter.addComponentAdapter(new SimpleGateAdapter<>(GUIAndGate.class, CoreAndGate::new)); - IndirectGUIComponentCreator.setComponentSupplier(GUIAndGate.class.getCanonicalName(), - (m, p, n) -> new GUIAndGate(m, p.getAsInt(), n)); - } -} \ No newline at end of file diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUINandGate.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUINandGate.java deleted file mode 100644 index ddad7f82..00000000 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUINandGate.java +++ /dev/null @@ -1,28 +0,0 @@ -package net.mograsim.logic.model.model.components.atomic; - -import net.mograsim.logic.core.components.gates.CoreNandGate; -import net.mograsim.logic.model.model.ViewModelModifiable; -import net.mograsim.logic.model.modeladapter.ViewLogicModelAdapter; -import net.mograsim.logic.model.modeladapter.componentadapters.SimpleGateAdapter; -import net.mograsim.logic.model.serializing.IndirectGUIComponentCreator; - -public class GUINandGate extends SimpleRectangularGUIGate -{ - public GUINandGate(ViewModelModifiable model, int logicWidth) - { - this(model, logicWidth, null); - } - - public GUINandGate(ViewModelModifiable model, int logicWidth, String name) - { - super(model, "GUINandGate", "&", true, logicWidth, name); - setInputCount(2);// TODO make variable - } - - static - { - ViewLogicModelAdapter.addComponentAdapter(new SimpleGateAdapter<>(GUINandGate.class, CoreNandGate::new)); - IndirectGUIComponentCreator.setComponentSupplier(GUINandGate.class.getCanonicalName(), - (m, p, n) -> new GUINandGate(m, p.getAsInt(), n)); - } -} \ No newline at end of file diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUINotGate.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUINotGate.java deleted file mode 100644 index c6001d29..00000000 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUINotGate.java +++ /dev/null @@ -1,28 +0,0 @@ -package net.mograsim.logic.model.model.components.atomic; - -import net.mograsim.logic.core.components.gates.CoreNotGate; -import net.mograsim.logic.model.model.ViewModelModifiable; -import net.mograsim.logic.model.modeladapter.ViewLogicModelAdapter; -import net.mograsim.logic.model.modeladapter.componentadapters.SimpleGateAdapter; -import net.mograsim.logic.model.serializing.IndirectGUIComponentCreator; - -public class GUINotGate extends SimpleRectangularGUIGate -{ - public GUINotGate(ViewModelModifiable model, int logicWidth) - { - this(model, logicWidth, null); - } - - public GUINotGate(ViewModelModifiable model, int logicWidth, String name) - { - super(model, "GUINotGate", "1", true, logicWidth, name); - setInputCount(1); - } - - static - { - ViewLogicModelAdapter.addComponentAdapter(new SimpleGateAdapter<>(GUINotGate.class, (t, p, o, i) -> new CoreNotGate(t, p, i[0], o))); - IndirectGUIComponentCreator.setComponentSupplier(GUINotGate.class.getCanonicalName(), - (m, p, n) -> new GUINotGate(m, p.getAsInt(), n)); - } -} \ No newline at end of file diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUIOrGate.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUIOrGate.java deleted file mode 100644 index 6a6ba0f0..00000000 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUIOrGate.java +++ /dev/null @@ -1,28 +0,0 @@ -package net.mograsim.logic.model.model.components.atomic; - -import net.mograsim.logic.core.components.gates.CoreOrGate; -import net.mograsim.logic.model.model.ViewModelModifiable; -import net.mograsim.logic.model.modeladapter.ViewLogicModelAdapter; -import net.mograsim.logic.model.modeladapter.componentadapters.SimpleGateAdapter; -import net.mograsim.logic.model.serializing.IndirectGUIComponentCreator; - -public class GUIOrGate extends SimpleRectangularGUIGate -{ - public GUIOrGate(ViewModelModifiable model, int logicWidth) - { - this(model, logicWidth, null); - } - - public GUIOrGate(ViewModelModifiable model, int logicWidth, String name) - { - super(model, "GUIOrGate", "\u22651", false, logicWidth, name);// ">=1" - setInputCount(2); - } - - static - { - ViewLogicModelAdapter.addComponentAdapter(new SimpleGateAdapter<>(GUIOrGate.class, CoreOrGate::new)); - IndirectGUIComponentCreator.setComponentSupplier(GUIOrGate.class.getCanonicalName(), - (m, p, n) -> new GUIOrGate(m, p.getAsInt(), n)); - } -} \ No newline at end of file diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/ModelAndGate.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/ModelAndGate.java new file mode 100644 index 00000000..3707a783 --- /dev/null +++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/ModelAndGate.java @@ -0,0 +1,28 @@ +package net.mograsim.logic.model.model.components.atomic; + +import net.mograsim.logic.core.components.gates.CoreAndGate; +import net.mograsim.logic.model.model.ViewModelModifiable; +import net.mograsim.logic.model.modeladapter.ViewLogicModelAdapter; +import net.mograsim.logic.model.modeladapter.componentadapters.SimpleGateAdapter; +import net.mograsim.logic.model.serializing.IndirectModelComponentCreator; + +public class ModelAndGate extends SimpleRectangularModelGate +{ + public ModelAndGate(ViewModelModifiable model, int logicWidth) + { + this(model, logicWidth, null); + } + + public ModelAndGate(ViewModelModifiable model, int logicWidth, String name) + { + super(model, "AndGate", "&", false, logicWidth, name); + setInputCount(2);// TODO make variable + } + + static + { + ViewLogicModelAdapter.addComponentAdapter(new SimpleGateAdapter<>(ModelAndGate.class, CoreAndGate::new)); + IndirectModelComponentCreator.setComponentSupplier(ModelAndGate.class.getCanonicalName(), + (m, p, n) -> new ModelAndGate(m, p.getAsInt(), n)); + } +} \ No newline at end of file diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUIBitDisplay.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/ModelBitDisplay.java similarity index 85% rename from net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUIBitDisplay.java rename to net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/ModelBitDisplay.java index ac92ecba..b0a97b4d 100644 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUIBitDisplay.java +++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/ModelBitDisplay.java @@ -10,16 +10,16 @@ import net.mograsim.logic.core.LogicObserver; import net.mograsim.logic.core.components.CoreBitDisplay; import net.mograsim.logic.core.types.BitVectorFormatter; import net.mograsim.logic.model.model.ViewModelModifiable; -import net.mograsim.logic.model.model.components.GUIComponent; +import net.mograsim.logic.model.model.components.ModelComponent; import net.mograsim.logic.model.model.wires.Pin; import net.mograsim.logic.model.model.wires.PinUsage; import net.mograsim.logic.model.modeladapter.ViewLogicModelAdapter; import net.mograsim.logic.model.modeladapter.componentadapters.BitDisplayAdapter; import net.mograsim.logic.model.serializing.IdentifyParams; -import net.mograsim.logic.model.serializing.IndirectGUIComponentCreator; +import net.mograsim.logic.model.serializing.IndirectModelComponentCreator; import net.mograsim.preferences.Preferences; -public class GUIBitDisplay extends GUIComponent +public class ModelBitDisplay extends ModelComponent { private static final double width = 20; private static final double height = 15; @@ -31,12 +31,12 @@ public class GUIBitDisplay extends GUIComponent private final LogicObserver logicObs; private CoreBitDisplay bitDisplay; - public GUIBitDisplay(ViewModelModifiable model, int logicWidth) + public ModelBitDisplay(ViewModelModifiable model, int logicWidth) { this(model, logicWidth, null); } - public GUIBitDisplay(ViewModelModifiable model, int logicWidth, String name) + public ModelBitDisplay(ViewModelModifiable model, int logicWidth, String name) { super(model, name); this.logicWidth = logicWidth; @@ -93,7 +93,7 @@ public class GUIBitDisplay extends GUIComponent @Override public String getIDForSerializing(IdentifyParams idParams) { - return "GUIBitDisplay"; + return "BitDisplay"; } @Override @@ -105,7 +105,7 @@ public class GUIBitDisplay extends GUIComponent static { ViewLogicModelAdapter.addComponentAdapter(new BitDisplayAdapter()); - IndirectGUIComponentCreator.setComponentSupplier(GUIBitDisplay.class.getCanonicalName(), - (m, p, n) -> new GUIBitDisplay(m, p.getAsInt(), n)); + IndirectModelComponentCreator.setComponentSupplier(ModelBitDisplay.class.getCanonicalName(), + (m, p, n) -> new ModelBitDisplay(m, p.getAsInt(), n)); } } \ No newline at end of file diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUIClock.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/ModelClock.java similarity index 83% rename from net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUIClock.java rename to net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/ModelClock.java index 5d314cc1..2755ac10 100644 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUIClock.java +++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/ModelClock.java @@ -11,7 +11,7 @@ import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle; import net.mograsim.logic.core.LogicObserver; import net.mograsim.logic.core.components.CoreClock; import net.mograsim.logic.model.model.ViewModelModifiable; -import net.mograsim.logic.model.model.components.GUIComponent; +import net.mograsim.logic.model.model.components.ModelComponent; import net.mograsim.logic.model.model.components.Orientation; import net.mograsim.logic.model.model.components.OrientationCalculator; import net.mograsim.logic.model.model.wires.Pin; @@ -19,11 +19,11 @@ import net.mograsim.logic.model.model.wires.PinUsage; import net.mograsim.logic.model.modeladapter.ViewLogicModelAdapter; import net.mograsim.logic.model.modeladapter.componentadapters.ClockAdapter; import net.mograsim.logic.model.serializing.IdentifyParams; -import net.mograsim.logic.model.serializing.IndirectGUIComponentCreator; +import net.mograsim.logic.model.serializing.IndirectModelComponentCreator; import net.mograsim.logic.model.util.JsonHandler; import net.mograsim.preferences.Preferences; -public class GUIClock extends GUIComponent +public class ModelClock extends ModelComponent { private static final double width = 20; private static final double height = 20; @@ -32,16 +32,16 @@ public class GUIClock extends GUIComponent private final Pin outputPin; private final LogicObserver logicObs; - private GUIClockParams params; + private ModelClockParams params; private OrientationCalculator oc; private CoreClock clock; - public GUIClock(ViewModelModifiable model, GUIClockParams params) + public ModelClock(ViewModelModifiable model, ModelClockParams params) { this(model, params, null); } - public GUIClock(ViewModelModifiable model, GUIClockParams params, String name) + public ModelClock(ViewModelModifiable model, ModelClockParams params, String name) { super(model, name); this.params = params; @@ -131,11 +131,11 @@ public class GUIClock extends GUIComponent @Override public String getIDForSerializing(IdentifyParams idParams) { - return "GUIClock"; + return "Clock"; } @Override - public GUIClockParams getParamsForSerializing(IdentifyParams idParams) + public ModelClockParams getParamsForSerializing(IdentifyParams idParams) { return params; } @@ -143,21 +143,21 @@ public class GUIClock extends GUIComponent static { ViewLogicModelAdapter.addComponentAdapter(new ClockAdapter()); - IndirectGUIComponentCreator.setComponentSupplier(GUIClock.class.getName(), (m, p, n) -> + IndirectModelComponentCreator.setComponentSupplier(ModelClock.class.getName(), (m, p, n) -> { - GUIClockParams params = JsonHandler.fromJsonTree(p, GUIClockParams.class); + ModelClockParams params = JsonHandler.fromJsonTree(p, ModelClockParams.class); if (params == null) throw new JsonSyntaxException("Invalid!!!"); - return new GUIClock(m, params, n); + return new ModelClock(m, params, n); }); } - public static class GUIClockParams + public static class ModelClockParams { int delta; Orientation orientation; - public GUIClockParams(int delta, Orientation orientation) + public ModelClockParams(int delta, Orientation orientation) { this.delta = delta; this.orientation = orientation; diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUIFixedOutput.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/ModelFixedOutput.java similarity index 81% rename from net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUIFixedOutput.java rename to net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/ModelFixedOutput.java index 651daba9..b052dedd 100644 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUIFixedOutput.java +++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/ModelFixedOutput.java @@ -11,17 +11,17 @@ import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle; import net.mograsim.logic.core.types.BitVector; import net.mograsim.logic.core.types.BitVectorFormatter; import net.mograsim.logic.model.model.ViewModelModifiable; -import net.mograsim.logic.model.model.components.GUIComponent; +import net.mograsim.logic.model.model.components.ModelComponent; import net.mograsim.logic.model.model.wires.Pin; import net.mograsim.logic.model.model.wires.PinUsage; import net.mograsim.logic.model.modeladapter.ViewLogicModelAdapter; import net.mograsim.logic.model.modeladapter.componentadapters.FixedOutputAdapter; import net.mograsim.logic.model.serializing.IdentifyParams; -import net.mograsim.logic.model.serializing.IndirectGUIComponentCreator; +import net.mograsim.logic.model.serializing.IndirectModelComponentCreator; import net.mograsim.logic.model.util.JsonHandler; import net.mograsim.preferences.Preferences; -public class GUIFixedOutput extends GUIComponent +public class ModelFixedOutput extends ModelComponent { private static final double width = 20; private static final double height = 20; @@ -29,7 +29,7 @@ public class GUIFixedOutput extends GUIComponent public final BitVector bits; - public GUIFixedOutput(ViewModelModifiable model, BitVector bits, String name) + public ModelFixedOutput(ViewModelModifiable model, BitVector bits, String name) { super(model, name); this.bits = bits; @@ -40,7 +40,7 @@ public class GUIFixedOutput extends GUIComponent @Override public String getIDForSerializing(IdentifyParams idParams) { - return "GUIFixedOutput"; + return "FixedOutput"; } @Override @@ -71,7 +71,7 @@ public class GUIFixedOutput extends GUIComponent static { ViewLogicModelAdapter.addComponentAdapter(new FixedOutputAdapter()); - IndirectGUIComponentCreator.setComponentSupplier(GUIFixedOutput.class.getCanonicalName(), - (m, p, n) -> new GUIFixedOutput(m, Objects.requireNonNull(JsonHandler.fromJsonTree(p, BitVector.class)), n)); + IndirectModelComponentCreator.setComponentSupplier(ModelFixedOutput.class.getCanonicalName(), + (m, p, n) -> new ModelFixedOutput(m, Objects.requireNonNull(JsonHandler.fromJsonTree(p, BitVector.class)), n)); } } \ No newline at end of file diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUIManualSwitch.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/ModelManualSwitch.java similarity index 90% rename from net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUIManualSwitch.java rename to net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/ModelManualSwitch.java index 48bff90f..d0a0b15b 100644 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUIManualSwitch.java +++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/ModelManualSwitch.java @@ -12,16 +12,16 @@ import net.mograsim.logic.core.types.Bit; import net.mograsim.logic.core.types.BitVector; import net.mograsim.logic.core.types.BitVectorFormatter; import net.mograsim.logic.model.model.ViewModelModifiable; -import net.mograsim.logic.model.model.components.GUIComponent; +import net.mograsim.logic.model.model.components.ModelComponent; import net.mograsim.logic.model.model.wires.Pin; import net.mograsim.logic.model.model.wires.PinUsage; import net.mograsim.logic.model.modeladapter.ViewLogicModelAdapter; import net.mograsim.logic.model.modeladapter.componentadapters.ManualSwitchAdapter; import net.mograsim.logic.model.serializing.IdentifyParams; -import net.mograsim.logic.model.serializing.IndirectGUIComponentCreator; +import net.mograsim.logic.model.serializing.IndirectModelComponentCreator; import net.mograsim.preferences.Preferences; -public class GUIManualSwitch extends GUIComponent +public class ModelManualSwitch extends ModelComponent { private static final double width = 20; private static final double height = 15; @@ -34,12 +34,12 @@ public class GUIManualSwitch extends GUIComponent private final LogicObserver logicObs; private CoreManualSwitch logicSwitch; - public GUIManualSwitch(ViewModelModifiable model, int logicWidth) + public ModelManualSwitch(ViewModelModifiable model, int logicWidth) { this(model, logicWidth, null); } - public GUIManualSwitch(ViewModelModifiable model, int logicWidth, String name) + public ModelManualSwitch(ViewModelModifiable model, int logicWidth, String name) { super(model, name); this.logicWidth = logicWidth; @@ -165,7 +165,7 @@ public class GUIManualSwitch extends GUIComponent @Override public String getIDForSerializing(IdentifyParams idParams) { - return "GUIManualSwitch"; + return "ManualSwitch"; } @Override @@ -177,7 +177,7 @@ public class GUIManualSwitch extends GUIComponent static { ViewLogicModelAdapter.addComponentAdapter(new ManualSwitchAdapter()); - IndirectGUIComponentCreator.setComponentSupplier(GUIManualSwitch.class.getName(), - (m, p, n) -> new GUIManualSwitch(m, p.getAsInt(), n)); + IndirectModelComponentCreator.setComponentSupplier(ModelManualSwitch.class.getName(), + (m, p, n) -> new ModelManualSwitch(m, p.getAsInt(), n)); } } \ No newline at end of file diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUIMerger.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/ModelMerger.java similarity index 88% rename from net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUIMerger.java rename to net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/ModelMerger.java index 804f871d..c2856e13 100644 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUIMerger.java +++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/ModelMerger.java @@ -7,18 +7,18 @@ import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle; import net.mograsim.logic.core.types.BitVectorFormatter; import net.mograsim.logic.core.wires.CoreWire.ReadEnd; import net.mograsim.logic.model.model.ViewModelModifiable; -import net.mograsim.logic.model.model.components.GUIComponent; +import net.mograsim.logic.model.model.components.ModelComponent; import net.mograsim.logic.model.model.wires.Pin; import net.mograsim.logic.model.model.wires.PinUsage; import net.mograsim.logic.model.modeladapter.ViewLogicModelAdapter; import net.mograsim.logic.model.modeladapter.componentadapters.MergerAdapter; import net.mograsim.logic.model.serializing.IdentifyParams; -import net.mograsim.logic.model.serializing.IndirectGUIComponentCreator; +import net.mograsim.logic.model.serializing.IndirectModelComponentCreator; import net.mograsim.preferences.ColorDefinition; import net.mograsim.preferences.ColorManager; import net.mograsim.preferences.Preferences; -public class GUIMerger extends GUIComponent +public class ModelMerger extends ModelComponent { private static final double width = 10; private static final double heightPerPin = 10; @@ -29,12 +29,12 @@ public class GUIMerger extends GUIComponent private final ReadEnd[] inputEnds; private ReadEnd outputEnd; - public GUIMerger(ViewModelModifiable model, int logicWidth) + public ModelMerger(ViewModelModifiable model, int logicWidth) { this(model, logicWidth, null); } - public GUIMerger(ViewModelModifiable model, int logicWidth, String name) + public ModelMerger(ViewModelModifiable model, int logicWidth, String name) { super(model, name); this.logicWidth = logicWidth; @@ -82,7 +82,7 @@ public class GUIMerger extends GUIComponent @Override public String getIDForSerializing(IdentifyParams idParams) { - return "GUIMerger"; + return "Merger"; } @Override @@ -105,7 +105,7 @@ public class GUIMerger extends GUIComponent static { ViewLogicModelAdapter.addComponentAdapter(new MergerAdapter()); - IndirectGUIComponentCreator.setComponentSupplier(GUIMerger.class.getCanonicalName(), - (m, p, n) -> new GUIMerger(m, p.getAsInt(), n)); + IndirectModelComponentCreator.setComponentSupplier(ModelMerger.class.getCanonicalName(), + (m, p, n) -> new ModelMerger(m, p.getAsInt(), n)); } } \ No newline at end of file diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/ModelNandGate.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/ModelNandGate.java new file mode 100644 index 00000000..f2acc944 --- /dev/null +++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/ModelNandGate.java @@ -0,0 +1,28 @@ +package net.mograsim.logic.model.model.components.atomic; + +import net.mograsim.logic.core.components.gates.CoreNandGate; +import net.mograsim.logic.model.model.ViewModelModifiable; +import net.mograsim.logic.model.modeladapter.ViewLogicModelAdapter; +import net.mograsim.logic.model.modeladapter.componentadapters.SimpleGateAdapter; +import net.mograsim.logic.model.serializing.IndirectModelComponentCreator; + +public class ModelNandGate extends SimpleRectangularModelGate +{ + public ModelNandGate(ViewModelModifiable model, int logicWidth) + { + this(model, logicWidth, null); + } + + public ModelNandGate(ViewModelModifiable model, int logicWidth, String name) + { + super(model, "NandGate", "&", true, logicWidth, name); + setInputCount(2);// TODO make variable + } + + static + { + ViewLogicModelAdapter.addComponentAdapter(new SimpleGateAdapter<>(ModelNandGate.class, CoreNandGate::new)); + IndirectModelComponentCreator.setComponentSupplier(ModelNandGate.class.getCanonicalName(), + (m, p, n) -> new ModelNandGate(m, p.getAsInt(), n)); + } +} \ No newline at end of file diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/ModelNotGate.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/ModelNotGate.java new file mode 100644 index 00000000..0262c8f3 --- /dev/null +++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/ModelNotGate.java @@ -0,0 +1,29 @@ +package net.mograsim.logic.model.model.components.atomic; + +import net.mograsim.logic.core.components.gates.CoreNotGate; +import net.mograsim.logic.model.model.ViewModelModifiable; +import net.mograsim.logic.model.modeladapter.ViewLogicModelAdapter; +import net.mograsim.logic.model.modeladapter.componentadapters.SimpleGateAdapter; +import net.mograsim.logic.model.serializing.IndirectModelComponentCreator; + +public class ModelNotGate extends SimpleRectangularModelGate +{ + public ModelNotGate(ViewModelModifiable model, int logicWidth) + { + this(model, logicWidth, null); + } + + public ModelNotGate(ViewModelModifiable model, int logicWidth, String name) + { + super(model, "NotGate", "1", true, logicWidth, name); + setInputCount(1); + } + + static + { + ViewLogicModelAdapter + .addComponentAdapter(new SimpleGateAdapter<>(ModelNotGate.class, (t, p, o, i) -> new CoreNotGate(t, p, i[0], o))); + IndirectModelComponentCreator.setComponentSupplier(ModelNotGate.class.getCanonicalName(), + (m, p, n) -> new ModelNotGate(m, p.getAsInt(), n)); + } +} \ No newline at end of file diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/ModelOrGate.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/ModelOrGate.java new file mode 100644 index 00000000..de0aa7f7 --- /dev/null +++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/ModelOrGate.java @@ -0,0 +1,28 @@ +package net.mograsim.logic.model.model.components.atomic; + +import net.mograsim.logic.core.components.gates.CoreOrGate; +import net.mograsim.logic.model.model.ViewModelModifiable; +import net.mograsim.logic.model.modeladapter.ViewLogicModelAdapter; +import net.mograsim.logic.model.modeladapter.componentadapters.SimpleGateAdapter; +import net.mograsim.logic.model.serializing.IndirectModelComponentCreator; + +public class ModelOrGate extends SimpleRectangularModelGate +{ + public ModelOrGate(ViewModelModifiable model, int logicWidth) + { + this(model, logicWidth, null); + } + + public ModelOrGate(ViewModelModifiable model, int logicWidth, String name) + { + super(model, "OrGate", "\u22651", false, logicWidth, name);// ">=1" + setInputCount(2); + } + + static + { + ViewLogicModelAdapter.addComponentAdapter(new SimpleGateAdapter<>(ModelOrGate.class, CoreOrGate::new)); + IndirectModelComponentCreator.setComponentSupplier(ModelOrGate.class.getCanonicalName(), + (m, p, n) -> new ModelOrGate(m, p.getAsInt(), n)); + } +} \ No newline at end of file diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUISplitter.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/ModelSplitter.java similarity index 87% rename from net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUISplitter.java rename to net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/ModelSplitter.java index 4821c919..2f7a98de 100644 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUISplitter.java +++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/ModelSplitter.java @@ -7,18 +7,18 @@ import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle; import net.mograsim.logic.core.types.BitVectorFormatter; import net.mograsim.logic.core.wires.CoreWire.ReadEnd; import net.mograsim.logic.model.model.ViewModelModifiable; -import net.mograsim.logic.model.model.components.GUIComponent; +import net.mograsim.logic.model.model.components.ModelComponent; import net.mograsim.logic.model.model.wires.Pin; import net.mograsim.logic.model.model.wires.PinUsage; import net.mograsim.logic.model.modeladapter.ViewLogicModelAdapter; import net.mograsim.logic.model.modeladapter.componentadapters.SplitterAdapter; import net.mograsim.logic.model.serializing.IdentifyParams; -import net.mograsim.logic.model.serializing.IndirectGUIComponentCreator; +import net.mograsim.logic.model.serializing.IndirectModelComponentCreator; import net.mograsim.preferences.ColorDefinition; import net.mograsim.preferences.ColorManager; import net.mograsim.preferences.Preferences; -public class GUISplitter extends GUIComponent +public class ModelSplitter extends ModelComponent { private static final double width = 10; private static final double heightPerPin = 10; @@ -29,12 +29,12 @@ public class GUISplitter extends GUIComponent private ReadEnd inputEnd; private final ReadEnd[] outputEnds; - public GUISplitter(ViewModelModifiable model, int logicWidth) + public ModelSplitter(ViewModelModifiable model, int logicWidth) { this(model, logicWidth, null); } - public GUISplitter(ViewModelModifiable model, int logicWidth, String name) + public ModelSplitter(ViewModelModifiable model, int logicWidth, String name) { super(model, name); this.logicWidth = logicWidth; @@ -82,7 +82,7 @@ public class GUISplitter extends GUIComponent @Override public String getIDForSerializing(IdentifyParams idParams) { - return "GUISplitter"; + return "Splitter"; } @Override @@ -105,7 +105,7 @@ public class GUISplitter extends GUIComponent static { ViewLogicModelAdapter.addComponentAdapter(new SplitterAdapter()); - IndirectGUIComponentCreator.setComponentSupplier(GUISplitter.class.getCanonicalName(), - (m, p, n) -> new GUISplitter(m, p.getAsInt(), n)); + IndirectModelComponentCreator.setComponentSupplier(ModelSplitter.class.getCanonicalName(), + (m, p, n) -> new ModelSplitter(m, p.getAsInt(), n)); } } \ No newline at end of file diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/TextComponent.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/ModelTextComponent.java similarity index 75% rename from net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/TextComponent.java rename to net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/ModelTextComponent.java index f2507022..628cb13a 100644 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/TextComponent.java +++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/ModelTextComponent.java @@ -6,25 +6,25 @@ import net.haspamelodica.swt.helper.gcs.GeneralGC; import net.haspamelodica.swt.helper.swtobjectwrappers.Point; import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle; import net.mograsim.logic.model.model.ViewModelModifiable; -import net.mograsim.logic.model.model.components.GUIComponent; +import net.mograsim.logic.model.model.components.ModelComponent; import net.mograsim.logic.model.modeladapter.ViewLogicModelAdapter; import net.mograsim.logic.model.modeladapter.componentadapters.NoLogicAdapter; import net.mograsim.logic.model.serializing.IdentifyParams; -import net.mograsim.logic.model.serializing.IndirectGUIComponentCreator; +import net.mograsim.logic.model.serializing.IndirectModelComponentCreator; import net.mograsim.preferences.Preferences; //TODO clean size calculation mess -public class TextComponent extends GUIComponent +public class ModelTextComponent extends ModelComponent { private final String text; private boolean calculatedSize; - public TextComponent(ViewModelModifiable model, String text) + public ModelTextComponent(ViewModelModifiable model, String text) { this(model, text, null); } - public TextComponent(ViewModelModifiable model, String text, String name) + public ModelTextComponent(ViewModelModifiable model, String text, String name) { super(model, name); this.text = text; @@ -65,8 +65,8 @@ public class TextComponent extends GUIComponent static { - ViewLogicModelAdapter.addComponentAdapter(new NoLogicAdapter<>(TextComponent.class)); - IndirectGUIComponentCreator.setComponentSupplier(TextComponent.class.getName(), - (m, p, n) -> new TextComponent(m, p.getAsString(), n)); + ViewLogicModelAdapter.addComponentAdapter(new NoLogicAdapter<>(ModelTextComponent.class)); + IndirectModelComponentCreator.setComponentSupplier(ModelTextComponent.class.getName(), + (m, p, n) -> new ModelTextComponent(m, p.getAsString(), n)); } } diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUITriStateBuffer.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/ModelTriStateBuffer.java similarity index 75% rename from net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUITriStateBuffer.java rename to net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/ModelTriStateBuffer.java index 7f04102c..04f7caee 100644 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUITriStateBuffer.java +++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/ModelTriStateBuffer.java @@ -7,7 +7,7 @@ import com.google.gson.JsonSyntaxException; import net.haspamelodica.swt.helper.gcs.GeneralGC; import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle; import net.mograsim.logic.model.model.ViewModelModifiable; -import net.mograsim.logic.model.model.components.GUIComponent; +import net.mograsim.logic.model.model.components.ModelComponent; import net.mograsim.logic.model.model.components.Orientation; import net.mograsim.logic.model.model.components.OrientationCalculator; import net.mograsim.logic.model.model.wires.Pin; @@ -15,11 +15,11 @@ import net.mograsim.logic.model.model.wires.PinUsage; import net.mograsim.logic.model.modeladapter.ViewLogicModelAdapter; import net.mograsim.logic.model.modeladapter.componentadapters.TriStateBufferAdapter; import net.mograsim.logic.model.serializing.IdentifyParams; -import net.mograsim.logic.model.serializing.IndirectGUIComponentCreator; +import net.mograsim.logic.model.serializing.IndirectModelComponentCreator; import net.mograsim.logic.model.util.JsonHandler; import net.mograsim.preferences.Preferences; -public class GUITriStateBuffer extends GUIComponent +public class ModelTriStateBuffer extends ModelComponent { private static final double width = 20; @@ -29,15 +29,15 @@ public class GUITriStateBuffer extends GUIComponent private Pin enable; private double[] path; - private GUITriStateBufferParams params; + private ModelTriStateBufferParams params; private OrientationCalculator oc; - public GUITriStateBuffer(ViewModelModifiable model, GUITriStateBufferParams params) + public ModelTriStateBuffer(ViewModelModifiable model, ModelTriStateBufferParams params) { this(model, params, null); } - public GUITriStateBuffer(ViewModelModifiable model, GUITriStateBufferParams params, String name) + public ModelTriStateBuffer(ViewModelModifiable model, ModelTriStateBufferParams params, String name) { super(model, name); this.params = params; @@ -89,11 +89,11 @@ public class GUITriStateBuffer extends GUIComponent @Override public String getIDForSerializing(IdentifyParams idParams) { - return "GUITriStateBuffer"; + return "TriStateBuffer"; } @Override - public GUITriStateBufferParams getParamsForSerializing(IdentifyParams idParams) + public ModelTriStateBufferParams getParamsForSerializing(IdentifyParams idParams) { return params; } @@ -101,21 +101,21 @@ public class GUITriStateBuffer extends GUIComponent static { ViewLogicModelAdapter.addComponentAdapter(new TriStateBufferAdapter()); - IndirectGUIComponentCreator.setComponentSupplier(GUITriStateBuffer.class.getName(), (m, p, n) -> + IndirectModelComponentCreator.setComponentSupplier(ModelTriStateBuffer.class.getName(), (m, p, n) -> { - GUITriStateBufferParams params = JsonHandler.fromJsonTree(p, GUITriStateBufferParams.class); + ModelTriStateBufferParams params = JsonHandler.fromJsonTree(p, ModelTriStateBufferParams.class); if (params == null) throw new JsonSyntaxException("Invalid!!!"); - return new GUITriStateBuffer(m, params, n); + return new ModelTriStateBuffer(m, params, n); }); } - public static class GUITriStateBufferParams + public static class ModelTriStateBufferParams { int logicWidth; Orientation orientation; - public GUITriStateBufferParams(int logicWidth, Orientation orientation) + public ModelTriStateBufferParams(int logicWidth, Orientation orientation) { this.logicWidth = logicWidth; this.orientation = orientation; diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/SimpleRectangularHardcodedGUIComponent.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/SimpleRectangularHardcodedModelComponent.java similarity index 88% rename from net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/SimpleRectangularHardcodedGUIComponent.java rename to net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/SimpleRectangularHardcodedModelComponent.java index 431240d7..cad271cc 100644 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/SimpleRectangularHardcodedGUIComponent.java +++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/SimpleRectangularHardcodedModelComponent.java @@ -8,10 +8,10 @@ import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle; import net.mograsim.logic.core.wires.CoreWire.ReadEnd; import net.mograsim.logic.core.wires.CoreWire.ReadWriteEnd; import net.mograsim.logic.model.model.ViewModelModifiable; -import net.mograsim.logic.model.model.components.GUIComponent; +import net.mograsim.logic.model.model.components.ModelComponent; import net.mograsim.logic.model.model.wires.Pin; import net.mograsim.logic.model.modeladapter.ViewLogicModelAdapter; -import net.mograsim.logic.model.modeladapter.componentadapters.SimpleRectangularHardcodedGUIComponentAdapter; +import net.mograsim.logic.model.modeladapter.componentadapters.SimpleRectangularHardcodedModelComponentAdapter; import net.mograsim.logic.model.serializing.IdentifyParams; import net.mograsim.logic.model.snippets.HighLevelStateHandler; import net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer; @@ -21,7 +21,7 @@ import net.mograsim.logic.model.snippets.symbolrenderers.PinNamesSymbolRenderer; import net.mograsim.logic.model.snippets.symbolrenderers.PinNamesSymbolRenderer.PinNamesParams; import net.mograsim.logic.model.snippets.symbolrenderers.PinNamesSymbolRenderer.PinNamesParams.Position; -public abstract class SimpleRectangularHardcodedGUIComponent extends GUIComponent +public abstract class SimpleRectangularHardcodedModelComponent extends ModelComponent { private static final double centerTextHeight = 5; private static final double pinNamesHeight = 3.5; @@ -38,7 +38,7 @@ public abstract class SimpleRectangularHardcodedGUIComponent extends GUIComponen // creation and destruction - public SimpleRectangularHardcodedGUIComponent(ViewModelModifiable model, String id, String name, String centerText) + public SimpleRectangularHardcodedModelComponent(ViewModelModifiable model, String id, String name, String centerText) { super(model, name); this.id = id; @@ -57,7 +57,7 @@ public abstract class SimpleRectangularHardcodedGUIComponent extends GUIComponen @Override public String getIDForSerializing(IdentifyParams idParams) { - return null;// we don't need to serialize this; it's implicit since we are a SimpleRectangularHardcodedGUIComponent + return null;// we don't need to serialize this; it's implicit since we are a SimpleRectangularHardcodedModelComponent } @Override @@ -69,13 +69,13 @@ public abstract class SimpleRectangularHardcodedGUIComponent extends GUIComponen @Override public Object getHighLevelState(String stateID) { - return SimpleRectangularHardcodedGUIComponent.this.getHighLevelState(state.get(), stateID); + return SimpleRectangularHardcodedModelComponent.this.getHighLevelState(state.get(), stateID); } @Override public void setHighLevelState(String stateID, Object newState) { - state.updateAndGet(s -> SimpleRectangularHardcodedGUIComponent.this.setHighLevelState(s, stateID, newState)); + state.updateAndGet(s -> SimpleRectangularHardcodedModelComponent.this.setHighLevelState(s, stateID, newState)); recalculate.run(); } }); @@ -148,6 +148,6 @@ public abstract class SimpleRectangularHardcodedGUIComponent extends GUIComponen static { - ViewLogicModelAdapter.addComponentAdapter(new SimpleRectangularHardcodedGUIComponentAdapter()); + ViewLogicModelAdapter.addComponentAdapter(new SimpleRectangularHardcodedModelComponentAdapter()); } } \ No newline at end of file diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/SimpleRectangularGUIGate.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/SimpleRectangularModelGate.java similarity index 88% rename from net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/SimpleRectangularGUIGate.java rename to net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/SimpleRectangularModelGate.java index 9b72cb6c..890c482f 100644 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/SimpleRectangularGUIGate.java +++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/SimpleRectangularModelGate.java @@ -12,14 +12,14 @@ import net.haspamelodica.swt.helper.swtobjectwrappers.Font; import net.haspamelodica.swt.helper.swtobjectwrappers.Point; import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle; import net.mograsim.logic.model.model.ViewModelModifiable; -import net.mograsim.logic.model.model.components.GUIComponent; +import net.mograsim.logic.model.model.components.ModelComponent; import net.mograsim.logic.model.model.wires.MovablePin; import net.mograsim.logic.model.model.wires.Pin; import net.mograsim.logic.model.model.wires.PinUsage; import net.mograsim.logic.model.serializing.IdentifyParams; import net.mograsim.preferences.Preferences; -public class SimpleRectangularGUIGate extends GUIComponent +public class SimpleRectangularModelGate extends ModelComponent { private static final double width = 20; private static final double pinDistance = 10; @@ -36,7 +36,7 @@ public class SimpleRectangularGUIGate extends GUIComponent private MovablePin outputPin; private final List inputPins; - protected SimpleRectangularGUIGate(ViewModelModifiable model, String id, String label, boolean isInverted, int logicWidth, String name) + protected SimpleRectangularModelGate(ViewModelModifiable model, String id, String label, boolean isInverted, int logicWidth, String name) { super(model, name); this.id = id; @@ -98,10 +98,10 @@ public class SimpleRectangularGUIGate extends GUIComponent } /** - * {@link SimpleRectangularGUIGate}s implementation returns a {@link JsonPrimitive} of type int containing the {@link #logicWidth} of + * {@link SimpleRectangularModelGate}s implementation returns a {@link JsonPrimitive} of type int containing the {@link #logicWidth} of * this component. * - * @see GUIComponent#getParamsForSerializing() + * @see ModelComponent#getParamsForSerializing() */ @Override public Integer getParamsForSerializing(IdentifyParams idParams) diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/submodels/SubmodelComponent.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/submodels/SubmodelComponent.java index f67be7d3..7eaba805 100644 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/submodels/SubmodelComponent.java +++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/submodels/SubmodelComponent.java @@ -13,12 +13,12 @@ import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle; import net.mograsim.logic.model.LogicUIRenderer; import net.mograsim.logic.model.model.ViewModel; import net.mograsim.logic.model.model.ViewModelModifiable; -import net.mograsim.logic.model.model.components.GUIComponent; +import net.mograsim.logic.model.model.components.ModelComponent; import net.mograsim.logic.model.model.wires.MovablePin; import net.mograsim.logic.model.model.wires.Pin; import net.mograsim.logic.model.model.wires.PinUsage; import net.mograsim.logic.model.serializing.IdentifyParams; -import net.mograsim.logic.model.serializing.IndirectGUIComponentCreator; +import net.mograsim.logic.model.serializing.IndirectModelComponentCreator; import net.mograsim.logic.model.serializing.SubmodelComponentParams; import net.mograsim.logic.model.serializing.SubmodelComponentSerializer; import net.mograsim.logic.model.snippets.Renderer; @@ -26,10 +26,10 @@ import net.mograsim.logic.model.util.JsonHandler; import net.mograsim.preferences.Preferences; /** - * A {@link GUIComponent} consisting of another model. A SubmodelComponent can have so-called "interface pins" connecting the + * A {@link ModelComponent} consisting of another model. A SubmodelComponent can have so-called "interface pins" connecting the * inner and outer models. */ -public abstract class SubmodelComponent extends GUIComponent +public abstract class SubmodelComponent extends ModelComponent { public static final String SUBMODEL_INTERFACE_NAME = "_submodelinterface"; /** @@ -356,7 +356,7 @@ public abstract class SubmodelComponent extends GUIComponent { double scaledX = (x - getPosX()) / submodelScale; double scaledY = (y - getPosY()) / submodelScale; - for (GUIComponent component : submodel.getComponentsByName().values()) + for (ModelComponent component : submodel.getComponentsByName().values()) if (component.getBounds().contains(scaledX, scaledY) && component.clicked(scaledX, scaledY)) return true; return false; @@ -449,7 +449,7 @@ public abstract class SubmodelComponent extends GUIComponent static { - IndirectGUIComponentCreator.setComponentSupplier(SubmodelComponent.class.getCanonicalName(), + IndirectModelComponentCreator.setComponentSupplier(SubmodelComponent.class.getCanonicalName(), (m, p, n) -> SubmodelComponentSerializer.deserialize(m, JsonHandler.fromJsonTree(p, SubmodelComponentParams.class), n)); } } \ No newline at end of file diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/submodels/SubmodelInterface.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/submodels/SubmodelInterface.java index 9c4c46d1..d2e6b3de 100644 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/submodels/SubmodelInterface.java +++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/submodels/SubmodelInterface.java @@ -3,11 +3,11 @@ package net.mograsim.logic.model.model.components.submodels; import net.haspamelodica.swt.helper.gcs.GeneralGC; import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle; import net.mograsim.logic.model.model.ViewModelModifiable; -import net.mograsim.logic.model.model.components.GUIComponent; +import net.mograsim.logic.model.model.components.ModelComponent; import net.mograsim.logic.model.model.wires.Pin; import net.mograsim.logic.model.serializing.IdentifyParams; -public class SubmodelInterface extends GUIComponent +public class SubmodelInterface extends ModelComponent { public SubmodelInterface(ViewModelModifiable model, String name) { @@ -30,7 +30,7 @@ public class SubmodelInterface extends GUIComponent * This method is only marked public in {@link SubmodelInterface} for {@link SubmodelComponent} to be able to add / remove pins to / * from a SubmodelInterface.
* - * @see GUIComponent#removePin(Pin) + * @see ModelComponent#removePin(Pin) * * @author Daniel Kirschten */ @@ -45,7 +45,7 @@ public class SubmodelInterface extends GUIComponent * This method is only marked public in {@link SubmodelInterface} for {@link SubmodelComponent} to be able to add / remove pins to / * from a SubmodelInterface.
* - * @see GUIComponent#removePin(Pin) + * @see ModelComponent#removePin(Pin) * * @author Daniel Kirschten */ diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/wires/GUIWire.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/wires/ModelWire.java similarity index 71% rename from net.mograsim.logic.model/src/net/mograsim/logic/model/model/wires/GUIWire.java rename to net.mograsim.logic.model/src/net/mograsim/logic/model/model/wires/ModelWire.java index e4b60105..1d7c9a44 100644 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/wires/GUIWire.java +++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/wires/ModelWire.java @@ -25,7 +25,7 @@ import net.mograsim.preferences.Preferences; * * @author Daniel Kirschten */ -public class GUIWire +public class ModelWire { /** * The model this wire is a part of. @@ -62,175 +62,175 @@ public class GUIWire */ private double[] effectivePath; - private final List> pathChangedListeners; + private final List> pathChangedListeners; /** * A LogicObserver calling redrawListeners. Used for logic model bindings. */ private final LogicObserver logicObs; /** - * A ReadEnd of the logic wire this GUI wire currently is bound to. + * A ReadEnd of the logic wire this model wire currently is bound to. */ private ReadEnd end; // creation and destruction /** - * Creates a new {@link GUIWire} with automatic interpolation and using the default name. + * Creates a new {@link ModelWire} with automatic interpolation and using the default name. * * @author Daniel Kirschten */ - public GUIWire(ViewModelModifiable model, WireCrossPoint pin1, WireCrossPoint pin2) + public ModelWire(ViewModelModifiable model, ModelWireCrossPoint pin1, ModelWireCrossPoint pin2) { this(model, null, pin1, pin2); } /** - * Creates a new {@link GUIWire} with automatic interpolation and using the default name. + * Creates a new {@link ModelWire} with automatic interpolation and using the default name. * * @author Daniel Kirschten */ - public GUIWire(ViewModelModifiable model, WireCrossPoint pin1, Pin pin2) + public ModelWire(ViewModelModifiable model, ModelWireCrossPoint pin1, Pin pin2) { this(model, null, pin1, pin2); } /** - * Creates a new {@link GUIWire} with automatic interpolation and using the default name. + * Creates a new {@link ModelWire} with automatic interpolation and using the default name. * * @author Daniel Kirschten */ - public GUIWire(ViewModelModifiable model, Pin pin1, WireCrossPoint pin2) + public ModelWire(ViewModelModifiable model, Pin pin1, ModelWireCrossPoint pin2) { this(model, null, pin1, pin2); } /** - * Creates a new {@link GUIWire} with automatic interpolation and using the default name. + * Creates a new {@link ModelWire} with automatic interpolation and using the default name. * * @author Daniel Kirschten */ - public GUIWire(ViewModelModifiable model, Pin pin1, Pin pin2) + public ModelWire(ViewModelModifiable model, Pin pin1, Pin pin2) { this(model, null, pin1, pin2); } /** - * Creates a new {@link GUIWire} without automatic interpolation and using the default name. + * Creates a new {@link ModelWire} without automatic interpolation and using the default name. * * @author Daniel Kirschten */ - public GUIWire(ViewModelModifiable model, WireCrossPoint pin1, WireCrossPoint pin2, Point... path) + public ModelWire(ViewModelModifiable model, ModelWireCrossPoint pin1, ModelWireCrossPoint pin2, Point... path) { this(model, null, pin1, pin2, path); } /** - * Creates a new {@link GUIWire} without automatic interpolation and using the default name. + * Creates a new {@link ModelWire} without automatic interpolation and using the default name. * * @author Daniel Kirschten */ - public GUIWire(ViewModelModifiable model, WireCrossPoint pin1, Pin pin2, Point... path) + public ModelWire(ViewModelModifiable model, ModelWireCrossPoint pin1, Pin pin2, Point... path) { this(model, null, pin1, pin2, path); } /** - * Creates a new {@link GUIWire} without automatic interpolation and using the default name. + * Creates a new {@link ModelWire} without automatic interpolation and using the default name. * * @author Daniel Kirschten */ - public GUIWire(ViewModelModifiable model, Pin pin1, WireCrossPoint pin2, Point... path) + public ModelWire(ViewModelModifiable model, Pin pin1, ModelWireCrossPoint pin2, Point... path) { this(model, null, pin1, pin2, path); } /** - * Creates a new {@link GUIWire} without automatic interpolation and using the default name. + * Creates a new {@link ModelWire} without automatic interpolation and using the default name. * * @author Daniel Kirschten */ - public GUIWire(ViewModelModifiable model, Pin pin1, Pin pin2, Point... path) + public ModelWire(ViewModelModifiable model, Pin pin1, Pin pin2, Point... path) { this(model, null, pin1, pin2, path); } /** - * Creates a new {@link GUIWire} with automatic interpolation. + * Creates a new {@link ModelWire} with automatic interpolation. * * @author Daniel Kirschten */ - public GUIWire(ViewModelModifiable model, String name, WireCrossPoint pin1, WireCrossPoint pin2) + public ModelWire(ViewModelModifiable model, String name, ModelWireCrossPoint pin1, ModelWireCrossPoint pin2) { this(model, name, pin1, pin2, (Point[]) null); } /** - * Creates a new {@link GUIWire} with automatic interpolation. + * Creates a new {@link ModelWire} with automatic interpolation. * * @author Daniel Kirschten */ - public GUIWire(ViewModelModifiable model, String name, WireCrossPoint pin1, Pin pin2) + public ModelWire(ViewModelModifiable model, String name, ModelWireCrossPoint pin1, Pin pin2) { this(model, name, pin1, pin2, (Point[]) null); } /** - * Creates a new {@link GUIWire} with automatic interpolation. + * Creates a new {@link ModelWire} with automatic interpolation. * * @author Daniel Kirschten */ - public GUIWire(ViewModelModifiable model, String name, Pin pin1, WireCrossPoint pin2) + public ModelWire(ViewModelModifiable model, String name, Pin pin1, ModelWireCrossPoint pin2) { this(model, name, pin1, pin2, (Point[]) null); } /** - * Creates a new {@link GUIWire} with automatic interpolation. + * Creates a new {@link ModelWire} with automatic interpolation. * * @author Daniel Kirschten */ - public GUIWire(ViewModelModifiable model, String name, Pin pin1, Pin pin2) + public ModelWire(ViewModelModifiable model, String name, Pin pin1, Pin pin2) { this(model, name, pin1, pin2, (Point[]) null); } /** - * Creates a new {@link GUIWire} without automatic interpolation. + * Creates a new {@link ModelWire} without automatic interpolation. * * @author Daniel Kirschten */ - public GUIWire(ViewModelModifiable model, String name, WireCrossPoint pin1, WireCrossPoint pin2, Point... path) + public ModelWire(ViewModelModifiable model, String name, ModelWireCrossPoint pin1, ModelWireCrossPoint pin2, Point... path) { this(model, name, pin1.getPin(), pin2.getPin(), path); } /** - * Creates a new {@link GUIWire} without automatic interpolation. + * Creates a new {@link ModelWire} without automatic interpolation. * * @author Daniel Kirschten */ - public GUIWire(ViewModelModifiable model, String name, WireCrossPoint pin1, Pin pin2, Point... path) + public ModelWire(ViewModelModifiable model, String name, ModelWireCrossPoint pin1, Pin pin2, Point... path) { this(model, name, pin1.getPin(), pin2, path); } /** - * Creates a new {@link GUIWire} without automatic interpolation. + * Creates a new {@link ModelWire} without automatic interpolation. * * @author Daniel Kirschten */ - public GUIWire(ViewModelModifiable model, String name, Pin pin1, WireCrossPoint pin2, Point... path) + public ModelWire(ViewModelModifiable model, String name, Pin pin1, ModelWireCrossPoint pin2, Point... path) { this(model, name, pin1, pin2.getPin(), path); } /** - * Creates a new {@link GUIWire} without automatic interpolation. + * Creates a new {@link ModelWire} without automatic interpolation. * * @author Daniel Kirschten */ - public GUIWire(ViewModelModifiable model, String name, Pin pin1, Pin pin2, Point... path) + public ModelWire(ViewModelModifiable model, String name, Pin pin1, Pin pin2, Point... path) { this.model = model; this.name = name == null ? model.getDefaultWireName() : name; @@ -257,7 +257,7 @@ public class GUIWire } /** - * Destroys this wire. This method is called from {@link ViewModelModifiable#wireDestroyed(GUIWire) wireDestroyed()} of the model this + * Destroys this wire. This method is called from {@link ViewModelModifiable#wireDestroyed(ModelWire) wireDestroyed()} of the model this * wire is a part of. * * @author Daniel Kirschten @@ -466,8 +466,8 @@ public class GUIWire // logic model binding /** - * Binds this {@link GUIWire} to the given {@link ReadEnd}: The color of this {@link GUIWire} will now depend on the state of the given - * {@link ReadEnd}, and further changes of the given {@link ReadEnd} will result in readrawListeners being called.
+ * Binds this {@link ModelWire} to the given {@link ReadEnd}: The color of this {@link ModelWire} will now depend on the state of the + * given {@link ReadEnd}, and further changes of the given {@link ReadEnd} will result in readrawListeners being called.
* The argument can be null, in which case the old binding is stopped. * * @author Daniel Kirschten @@ -482,7 +482,7 @@ public class GUIWire } /** - * Returns whether this {@link GUIWire} has a logic model binding or not. + * Returns whether this {@link ModelWire} has a logic model binding or not. * * @author Daniel Kirschten */ @@ -492,8 +492,8 @@ public class GUIWire } /** - * If this {@link GUIWire} has a logic model binding, delegates to {@link CoreWire#forceValues(BitVector)} for the {@link CoreWire} - * corresponding to this {@link GUIWire}. + * If this {@link ModelWire} has a logic model binding, delegates to {@link CoreWire#forceValues(BitVector)} for the {@link CoreWire} + * corresponding to this {@link ModelWire}. * * @author Daniel Kirschten */ @@ -503,8 +503,8 @@ public class GUIWire } /** - * If this {@link GUIWire} has a logic model binding, delegates to {@link ReadEnd#getValues()} for the {@link ReadEnd} corresponding to - * this {@link GUIWire}. + * If this {@link ModelWire} has a logic model binding, delegates to {@link ReadEnd#getValues()} for the {@link ReadEnd} corresponding + * to this {@link ModelWire}. * * @author Daniel Kirschten */ @@ -516,9 +516,9 @@ public class GUIWire // listeners // @formatter:off - public void addPathChangedListener (Consumer listener) {pathChangedListeners.add (listener);} + public void addPathChangedListener (Consumer listener) {pathChangedListeners.add (listener);} - public void removePathChangedListener(Consumer listener) {pathChangedListeners.remove(listener);} + public void removePathChangedListener(Consumer listener) {pathChangedListeners.remove(listener);} private void callPathChangedListeners() {pathChangedListeners.forEach(l -> l.accept(this));} // @formatter:on @@ -526,6 +526,6 @@ public class GUIWire @Override public String toString() { - return "GUIWire [" + pin1 + "---" + pin2 + ", value=" + (end == null ? "null" : end.getValues()) + "]"; + return "ModelWire [" + pin1 + "---" + pin2 + ", value=" + (end == null ? "null" : end.getValues()) + "]"; } } \ No newline at end of file diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/wires/WireCrossPoint.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/wires/ModelWireCrossPoint.java similarity index 69% rename from net.mograsim.logic.model/src/net/mograsim/logic/model/model/wires/WireCrossPoint.java rename to net.mograsim.logic.model/src/net/mograsim/logic/model/model/wires/ModelWireCrossPoint.java index d8863c21..f8d32ac5 100644 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/wires/WireCrossPoint.java +++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/wires/ModelWireCrossPoint.java @@ -6,22 +6,22 @@ import net.mograsim.logic.core.LogicObserver; import net.mograsim.logic.core.types.BitVectorFormatter; import net.mograsim.logic.core.wires.CoreWire.ReadEnd; import net.mograsim.logic.model.model.ViewModelModifiable; -import net.mograsim.logic.model.model.components.GUIComponent; +import net.mograsim.logic.model.model.components.ModelComponent; import net.mograsim.logic.model.serializing.IdentifyParams; -import net.mograsim.logic.model.serializing.IndirectGUIComponentCreator; +import net.mograsim.logic.model.serializing.IndirectModelComponentCreator; import net.mograsim.preferences.ColorDefinition; import net.mograsim.preferences.ColorManager; /** - * A {@link GUIComponent} with only one pin. Is used to create wires connecting more than two pins.
+ * A {@link ModelComponent} with only one pin. Is used to create wires connecting more than two pins.
* Example: There are three pins P1, P2, P3 that need to be connected. Solution: Create a - * WireCrossPoint (WCP) and create the GUIWires P1-WCP, P2-WCP, + * ModelWireCrossPoint (WCP) and create the ModelWires P1-WCP, P2-WCP, * P3-WCP.
* Cross points are drawn as circles. The pin of cross points is in the center of this circle. * * @author Daniel Kirschten */ -public class WireCrossPoint extends GUIComponent +public class ModelWireCrossPoint extends ModelComponent { private static final int CIRCLE_RADIUS = 1; private static final int CIRCLE_DIAM = CIRCLE_RADIUS * 2; @@ -46,12 +46,12 @@ public class WireCrossPoint extends GUIComponent // creation and destruction - public WireCrossPoint(ViewModelModifiable model, int logicWidth) + public ModelWireCrossPoint(ViewModelModifiable model, int logicWidth) { this(model, logicWidth, null); } - public WireCrossPoint(ViewModelModifiable model, int logicWidth, String name) + public ModelWireCrossPoint(ViewModelModifiable model, int logicWidth, String name) { super(model, name); this.logicWidth = logicWidth; @@ -71,7 +71,7 @@ public class WireCrossPoint extends GUIComponent // "graphical" operations /** - * Moves the center (and therefore the pin) of this {@link WireCrossPoint} to the given location. + * Moves the center (and therefore the pin) of this {@link ModelWireCrossPoint} to the given location. * * @author Daniel Kirschten */ @@ -92,8 +92,9 @@ public class WireCrossPoint extends GUIComponent // logic model binding /** - * Binds this {@link WireCrossPoint} to the given {@link ReadEnd}: The color of this {@link WireCrossPoint} will now depend on the state - * of the given {@link ReadEnd}, and further changes of the given {@link ReadEnd} will result in readrawListeners being called.
+ * Binds this {@link ModelWireCrossPoint} to the given {@link ReadEnd}: The color of this {@link ModelWireCrossPoint} will now depend on + * the state of the given {@link ReadEnd}, and further changes of the given {@link ReadEnd} will result in readrawListeners being + * called.
* The argument can be null, in which case the old binding is stopped. * * @author Daniel Kirschten @@ -108,7 +109,7 @@ public class WireCrossPoint extends GUIComponent } /** - * Returns whether this {@link WireCrossPoint} has a logic model binding or not. + * Returns whether this {@link ModelWireCrossPoint} has a logic model binding or not. */ public boolean hasLogicModelBinding() { @@ -131,7 +132,7 @@ public class WireCrossPoint extends GUIComponent static { - IndirectGUIComponentCreator.setComponentSupplier(WireCrossPoint.class.getCanonicalName(), - (m, p, n) -> new WireCrossPoint(m, p.getAsInt(), n)); + IndirectModelComponentCreator.setComponentSupplier(ModelWireCrossPoint.class.getCanonicalName(), + (m, p, n) -> new ModelWireCrossPoint(m, p.getAsInt(), n)); } } \ No newline at end of file diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/wires/MovablePin.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/wires/MovablePin.java index ba6d3b7e..4ec62c7a 100644 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/wires/MovablePin.java +++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/wires/MovablePin.java @@ -1,6 +1,6 @@ package net.mograsim.logic.model.model.wires; -import net.mograsim.logic.model.model.components.GUIComponent; +import net.mograsim.logic.model.model.components.ModelComponent; /** * Exactly like {@link Pin}, but {@link #setRelPos(double, double) setRelPos(...)} is public. @@ -9,7 +9,7 @@ import net.mograsim.logic.model.model.components.GUIComponent; */ public class MovablePin extends Pin { - public MovablePin(GUIComponent component, String name, int logicWidth, PinUsage usage, double relX, double relY) + public MovablePin(ModelComponent component, String name, int logicWidth, PinUsage usage, double relX, double relY) { super(component, name, logicWidth, usage, relX, relY); } diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/wires/Pin.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/wires/Pin.java index 0c63d389..38ba2045 100644 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/wires/Pin.java +++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/wires/Pin.java @@ -6,24 +6,24 @@ import java.util.Objects; import java.util.function.Consumer; import net.haspamelodica.swt.helper.swtobjectwrappers.Point; -import net.mograsim.logic.model.model.components.GUIComponent; +import net.mograsim.logic.model.model.components.ModelComponent; /** - * A connection interface between a GUIComponent and the rest of a ViewModel. Pins usually are created by {@link GUIComponent}s themselves. - *
- * A pin has a name identifying it. Pin names are unique for a {@link GUIComponent}: Every pin of a {@link GUIComponent} has a different - * name, but different {@link GUIComponent}s can have pins with the same name. + * A connection interface between a ModelComponent and the rest of a ViewModel. Pins usually are created by {@link ModelComponent}s + * themselves.
+ * A pin has a name identifying it. Pin names are unique for a {@link ModelComponent}: Every pin of a {@link ModelComponent} has a different + * name, but different {@link ModelComponent}s can have pins with the same name. * * @author Daniel Kirschten */ public class Pin { /** - * The {@link GUIComponent} this pin belongs to. + * The {@link ModelComponent} this pin belongs to. */ - public final GUIComponent component; + public final ModelComponent component; /** - * The name identifying this pin. Is unique for a {@link GUIComponent}. + * The name identifying this pin. Is unique for a {@link ModelComponent}. */ public final String name; /** @@ -51,11 +51,12 @@ public class Pin // creation and destruction /** - * Creates a new pin. Usually it is not needed to call this constructor manually, as {@link GUIComponent}s create their pins themselves. + * Creates a new pin. Usually it is not needed to call this constructor manually, as {@link ModelComponent}s create their pins + * themselves. * * @author Daniel Kirschten */ - public Pin(GUIComponent component, String name, int logicWidth, PinUsage usage, double relX, double relY) + public Pin(ModelComponent component, String name, int logicWidth, PinUsage usage, double relX, double relY) { this.component = component; this.name = name; diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/modeladapter/ViewLogicModelAdapter.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/modeladapter/ViewLogicModelAdapter.java index 8c337cd2..ffeff19a 100644 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/modeladapter/ViewLogicModelAdapter.java +++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/modeladapter/ViewLogicModelAdapter.java @@ -14,19 +14,19 @@ import net.mograsim.logic.core.timeline.Timeline; import net.mograsim.logic.core.wires.CoreWire; import net.mograsim.logic.core.wires.CoreWire.ReadEnd; import net.mograsim.logic.model.model.ViewModel; -import net.mograsim.logic.model.model.components.GUIComponent; +import net.mograsim.logic.model.model.components.ModelComponent; import net.mograsim.logic.model.model.components.submodels.SubmodelComponent; import net.mograsim.logic.model.model.components.submodels.SubmodelInterface; -import net.mograsim.logic.model.model.wires.GUIWire; +import net.mograsim.logic.model.model.wires.ModelWire; import net.mograsim.logic.model.model.wires.Pin; -import net.mograsim.logic.model.model.wires.WireCrossPoint; +import net.mograsim.logic.model.model.wires.ModelWireCrossPoint; import net.mograsim.logic.model.modeladapter.componentadapters.ComponentAdapter; public class ViewLogicModelAdapter { - private final static Map, ComponentAdapter> componentAdapters = new HashMap<>(); + private final static Map, ComponentAdapter> componentAdapters = new HashMap<>(); - public static void addComponentAdapter(ComponentAdapter componentAdapter) + public static void addComponentAdapter(ComponentAdapter componentAdapter) { componentAdapters.put(componentAdapter.getSupportedClass(), componentAdapter); } @@ -43,25 +43,25 @@ public class ViewLogicModelAdapter private static void convert(ViewModel viewModel, LogicModelParameters params, Timeline timeline, Map externalWires) { - Map logicWiresPerPin = convertWires(getAllPins(viewModel), viewModel.getWiresByName().values(), externalWires, params, - timeline); + Map logicWiresPerPin = convertWires(getAllPins(viewModel), viewModel.getWiresByName().values(), externalWires, + params, timeline); Map logicWiresPerPinUnmodifiable = Collections.unmodifiableMap(logicWiresPerPin); - for (GUIComponent guiComp : viewModel.getComponentsByName().values()) + for (ModelComponent modelComp : viewModel.getComponentsByName().values()) { - if (guiComp instanceof SubmodelComponent) + if (modelComp instanceof SubmodelComponent) { - SubmodelComponent guiCompCasted = (SubmodelComponent) guiComp; - Map supermodelPins = guiCompCasted.getSupermodelPins(); - Map 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) + SubmodelComponent modelCompCasted = (SubmodelComponent) modelComp; + Map supermodelPins = modelCompCasted.getSupermodelPins(); + Map externalWiresForSubmodel = supermodelPins.entrySet().stream().collect( + Collectors.toMap(e -> modelCompCasted.getSubmodelPin(e.getKey()), e -> logicWiresPerPin.get(e.getValue()))); + convert(modelCompCasted.submodel, params, timeline, externalWiresForSubmodel); + } else if (modelComp instanceof ModelWireCrossPoint) { - WireCrossPoint guiCompCasted = (WireCrossPoint) guiComp; - guiCompCasted.setLogicModelBinding(logicWiresPerPin.get(guiCompCasted.getPin()).createReadOnlyEnd()); - } else if (!(guiComp instanceof SubmodelInterface))// nothing to do for SubmodelInterfaces - createAndLinkComponent(timeline, params, guiComp, logicWiresPerPinUnmodifiable); + ModelWireCrossPoint modelCompCasted = (ModelWireCrossPoint) modelComp; + modelCompCasted.setLogicModelBinding(logicWiresPerPin.get(modelCompCasted.getPin()).createReadOnlyEnd()); + } else if (!(modelComp instanceof SubmodelInterface))// nothing to do for SubmodelInterfaces + createAndLinkComponent(timeline, params, modelComp, logicWiresPerPinUnmodifiable); } } @@ -71,17 +71,17 @@ public class ViewLogicModelAdapter .collect(Collectors.toSet()); } - private static Map convertWires(Set allPins, Collection wires, Map externalWires, + private static Map convertWires(Set allPins, Collection wires, Map externalWires, LogicModelParameters params, Timeline timeline) { Map> connectedPinGroups = getConnectedPinGroups(allPins, wires); Map logicWiresPerPin = createLogicWires(params, timeline, connectedPinGroups, externalWires); - setGUIWiresLogicModelBinding(wires, logicWiresPerPin); + setModelWiresLogicModelBinding(wires, logicWiresPerPin); return logicWiresPerPin; } - private static Map createLogicWires(LogicModelParameters params, Timeline timeline, Map> connectedPinGroups, - Map externalWires) + private static Map createLogicWires(LogicModelParameters params, Timeline timeline, + Map> connectedPinGroups, Map externalWires) { Map logicWiresPerPin = new HashMap<>(); Map, CoreWire> logicWiresPerPinGroup = new HashMap<>(); @@ -106,15 +106,15 @@ public class ViewLogicModelAdapter return logicWiresPerPin; } - private static void setGUIWiresLogicModelBinding(Collection wires, Map logicWiresPerPin) + private static void setModelWiresLogicModelBinding(Collection wires, Map logicWiresPerPin) { - Map guiWireSharedReadEnd = logicWiresPerPin.values().stream().distinct() + Map modelWireSharedReadEnd = logicWiresPerPin.values().stream().distinct() .collect(Collectors.toMap(Function.identity(), CoreWire::createReadOnlyEnd)); - for (GUIWire guiWire : wires) - guiWire.setLogicModelBinding(guiWireSharedReadEnd.get(logicWiresPerPin.get(guiWire.getPin1()))); + for (ModelWire modelWire : wires) + modelWire.setLogicModelBinding(modelWireSharedReadEnd.get(logicWiresPerPin.get(modelWire.getPin1()))); } - private static Map> getConnectedPinGroups(Set allPins, Collection wires) + private static Map> getConnectedPinGroups(Set allPins, Collection wires) { Map> connectedPinsPerPin = new HashMap<>(); @@ -143,19 +143,19 @@ public class ViewLogicModelAdapter } @SuppressWarnings("unchecked") - private static void createAndLinkComponent(Timeline timeline, LogicModelParameters params, - GUIComponent guiComponent, Map logicWiresPerPin) + private static void createAndLinkComponent(Timeline timeline, LogicModelParameters params, + ModelComponent modelComponent, Map logicWiresPerPin) { - Class cls = guiComponent.getClass(); + Class cls = modelComponent.getClass(); ComponentAdapter adapter = null; - while (cls != GUIComponent.class && adapter == null) + while (cls != ModelComponent.class && adapter == null) { adapter = (ComponentAdapter) componentAdapters.get(cls); cls = cls.getSuperclass(); } if (adapter == null) - throw new IllegalArgumentException("Unknown component class: " + guiComponent.getClass()); - adapter.createAndLinkComponent(timeline, params, (G) guiComponent, logicWiresPerPin); + throw new IllegalArgumentException("Unknown component class: " + modelComponent.getClass()); + adapter.createAndLinkComponent(timeline, params, (G) modelComponent, logicWiresPerPin); } private ViewLogicModelAdapter() diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/modeladapter/componentadapters/BitDisplayAdapter.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/modeladapter/componentadapters/BitDisplayAdapter.java index 2303679b..db24aff5 100644 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/modeladapter/componentadapters/BitDisplayAdapter.java +++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/modeladapter/componentadapters/BitDisplayAdapter.java @@ -6,24 +6,24 @@ import net.mograsim.logic.core.components.CoreBitDisplay; import net.mograsim.logic.core.timeline.Timeline; import net.mograsim.logic.core.wires.CoreWire; import net.mograsim.logic.core.wires.CoreWire.ReadEnd; -import net.mograsim.logic.model.model.components.atomic.GUIBitDisplay; +import net.mograsim.logic.model.model.components.atomic.ModelBitDisplay; import net.mograsim.logic.model.model.wires.Pin; import net.mograsim.logic.model.modeladapter.LogicModelParameters; -public class BitDisplayAdapter implements ComponentAdapter +public class BitDisplayAdapter implements ComponentAdapter { @Override - public Class getSupportedClass() + public Class getSupportedClass() { - return GUIBitDisplay.class; + return ModelBitDisplay.class; } @Override - public void createAndLinkComponent(Timeline timeline, LogicModelParameters params, GUIBitDisplay guiComponent, + public void createAndLinkComponent(Timeline timeline, LogicModelParameters params, ModelBitDisplay modelComponent, Map logicWiresPerPin) { - ReadEnd end = logicWiresPerPin.get(guiComponent.getInputPin()).createReadOnlyEnd(); + ReadEnd end = logicWiresPerPin.get(modelComponent.getInputPin()).createReadOnlyEnd(); CoreBitDisplay bitDisplay = new CoreBitDisplay(timeline, end); - guiComponent.setLogicModelBinding(bitDisplay); + modelComponent.setLogicModelBinding(bitDisplay); } } \ No newline at end of file diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/modeladapter/componentadapters/ClockAdapter.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/modeladapter/componentadapters/ClockAdapter.java index 3066d35c..10560f08 100644 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/modeladapter/componentadapters/ClockAdapter.java +++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/modeladapter/componentadapters/ClockAdapter.java @@ -6,25 +6,26 @@ import net.mograsim.logic.core.components.CoreClock; import net.mograsim.logic.core.timeline.Timeline; import net.mograsim.logic.core.wires.CoreWire; import net.mograsim.logic.core.wires.CoreWire.ReadWriteEnd; -import net.mograsim.logic.model.model.components.atomic.GUIClock; +import net.mograsim.logic.model.model.components.atomic.ModelClock; import net.mograsim.logic.model.model.wires.Pin; import net.mograsim.logic.model.modeladapter.LogicModelParameters; -public class ClockAdapter implements ComponentAdapter +public class ClockAdapter implements ComponentAdapter { @Override - public Class getSupportedClass() + public Class getSupportedClass() { - return GUIClock.class; + return ModelClock.class; } @Override - public void createAndLinkComponent(Timeline timeline, LogicModelParameters params, GUIClock guiClock, Map logicWiresPerPin) + public void createAndLinkComponent(Timeline timeline, LogicModelParameters params, ModelClock modelClock, + Map logicWiresPerPin) { - ReadWriteEnd out = logicWiresPerPin.get(guiClock.getOutputPin()).createReadWriteEnd(); - CoreClock c = new CoreClock(timeline, out, guiClock.getDelta()); - guiClock.setLogicModelBinding(c); + ReadWriteEnd out = logicWiresPerPin.get(modelClock.getOutputPin()).createReadWriteEnd(); + CoreClock c = new CoreClock(timeline, out, modelClock.getDelta()); + modelClock.setLogicModelBinding(c); } } \ No newline at end of file diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/modeladapter/componentadapters/ComponentAdapter.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/modeladapter/componentadapters/ComponentAdapter.java index 5ebe01b2..7849d4d0 100644 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/modeladapter/componentadapters/ComponentAdapter.java +++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/modeladapter/componentadapters/ComponentAdapter.java @@ -4,13 +4,14 @@ import java.util.Map; import net.mograsim.logic.core.timeline.Timeline; import net.mograsim.logic.core.wires.CoreWire; -import net.mograsim.logic.model.model.components.GUIComponent; +import net.mograsim.logic.model.model.components.ModelComponent; import net.mograsim.logic.model.model.wires.Pin; import net.mograsim.logic.model.modeladapter.LogicModelParameters; -public interface ComponentAdapter +public interface ComponentAdapter { public Class getSupportedClass(); - public void createAndLinkComponent(Timeline timeline, LogicModelParameters params, G guiComponent, Map logicWiresPerPin); + public void createAndLinkComponent(Timeline timeline, LogicModelParameters params, G modelComponent, + Map logicWiresPerPin); } \ No newline at end of file diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/modeladapter/componentadapters/FixedOutputAdapter.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/modeladapter/componentadapters/FixedOutputAdapter.java index 618bbfc5..f6a3c0e5 100644 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/modeladapter/componentadapters/FixedOutputAdapter.java +++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/modeladapter/componentadapters/FixedOutputAdapter.java @@ -4,22 +4,22 @@ import java.util.Map; import net.mograsim.logic.core.timeline.Timeline; import net.mograsim.logic.core.wires.CoreWire; -import net.mograsim.logic.model.model.components.atomic.GUIFixedOutput; +import net.mograsim.logic.model.model.components.atomic.ModelFixedOutput; import net.mograsim.logic.model.model.wires.Pin; import net.mograsim.logic.model.modeladapter.LogicModelParameters; -public class FixedOutputAdapter implements ComponentAdapter +public class FixedOutputAdapter implements ComponentAdapter { @Override - public Class getSupportedClass() + public Class getSupportedClass() { - return GUIFixedOutput.class; + return ModelFixedOutput.class; } @Override - public void createAndLinkComponent(Timeline timeline, LogicModelParameters params, GUIFixedOutput guiComponent, + public void createAndLinkComponent(Timeline timeline, LogicModelParameters params, ModelFixedOutput modelComponent, Map logicWiresPerPin) { - logicWiresPerPin.get(guiComponent.getPin("out")).createReadWriteEnd().feedSignals(guiComponent.bits); + logicWiresPerPin.get(modelComponent.getPin("out")).createReadWriteEnd().feedSignals(modelComponent.bits); } } \ No newline at end of file diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/modeladapter/componentadapters/ManualSwitchAdapter.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/modeladapter/componentadapters/ManualSwitchAdapter.java index 0350ad6b..ac00c5b6 100644 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/modeladapter/componentadapters/ManualSwitchAdapter.java +++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/modeladapter/componentadapters/ManualSwitchAdapter.java @@ -6,24 +6,24 @@ import net.mograsim.logic.core.components.CoreManualSwitch; import net.mograsim.logic.core.timeline.Timeline; import net.mograsim.logic.core.wires.CoreWire; import net.mograsim.logic.core.wires.CoreWire.ReadWriteEnd; -import net.mograsim.logic.model.model.components.atomic.GUIManualSwitch; +import net.mograsim.logic.model.model.components.atomic.ModelManualSwitch; import net.mograsim.logic.model.model.wires.Pin; import net.mograsim.logic.model.modeladapter.LogicModelParameters; -public class ManualSwitchAdapter implements ComponentAdapter +public class ManualSwitchAdapter implements ComponentAdapter { @Override - public Class getSupportedClass() + public Class getSupportedClass() { - return GUIManualSwitch.class; + return ModelManualSwitch.class; } @Override - public void createAndLinkComponent(Timeline timeline, LogicModelParameters params, GUIManualSwitch guiComponent, + public void createAndLinkComponent(Timeline timeline, LogicModelParameters params, ModelManualSwitch modelComponent, Map logicWiresPerPin) { - ReadWriteEnd end = logicWiresPerPin.get(guiComponent.getOutputPin()).createReadWriteEnd(); + ReadWriteEnd end = logicWiresPerPin.get(modelComponent.getOutputPin()).createReadWriteEnd(); CoreManualSwitch manualSwitch = new CoreManualSwitch(timeline, end); - guiComponent.setLogicModelBinding(manualSwitch); + modelComponent.setLogicModelBinding(manualSwitch); } } \ No newline at end of file diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/modeladapter/componentadapters/MergerAdapter.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/modeladapter/componentadapters/MergerAdapter.java index fcbd615c..4b2834d1 100644 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/modeladapter/componentadapters/MergerAdapter.java +++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/modeladapter/componentadapters/MergerAdapter.java @@ -5,30 +5,30 @@ import java.util.Map; import net.mograsim.logic.core.timeline.Timeline; import net.mograsim.logic.core.wires.CoreWire; import net.mograsim.logic.core.wires.CoreWire.ReadEnd; -import net.mograsim.logic.model.model.components.atomic.GUIMerger; +import net.mograsim.logic.model.model.components.atomic.ModelMerger; import net.mograsim.logic.model.model.wires.Pin; import net.mograsim.logic.model.modeladapter.LogicModelParameters; -public class MergerAdapter implements ComponentAdapter +public class MergerAdapter implements ComponentAdapter { @Override - public Class getSupportedClass() + public Class getSupportedClass() { - return GUIMerger.class; + return ModelMerger.class; } @Override - public void createAndLinkComponent(Timeline timeline, LogicModelParameters params, GUIMerger guiComponent, + public void createAndLinkComponent(Timeline timeline, LogicModelParameters params, ModelMerger modelComponent, Map logicWiresPerPin) { - CoreWire output = logicWiresPerPin.get(guiComponent.getPin("O")); - ReadEnd[] inputEnds = new ReadEnd[guiComponent.logicWidth]; - for (int i = 0; i < guiComponent.logicWidth; i++) + CoreWire output = logicWiresPerPin.get(modelComponent.getPin("O")); + ReadEnd[] inputEnds = new ReadEnd[modelComponent.logicWidth]; + for (int i = 0; i < modelComponent.logicWidth; i++) { - CoreWire input = logicWiresPerPin.get(guiComponent.getPin("I" + (guiComponent.logicWidth - 1 - i))); + CoreWire input = logicWiresPerPin.get(modelComponent.getPin("I" + (modelComponent.logicWidth - 1 - i))); CoreWire.fuse(input, output, 0, i); inputEnds[i] = input.createReadOnlyEnd(); } - guiComponent.setLogicModelBinding(inputEnds, output.createReadOnlyEnd()); + modelComponent.setLogicModelBinding(inputEnds, output.createReadOnlyEnd()); } } \ No newline at end of file diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/modeladapter/componentadapters/NoLogicAdapter.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/modeladapter/componentadapters/NoLogicAdapter.java index ef2375c6..20c1aef2 100644 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/modeladapter/componentadapters/NoLogicAdapter.java +++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/modeladapter/componentadapters/NoLogicAdapter.java @@ -4,32 +4,33 @@ import java.util.Map; import net.mograsim.logic.core.timeline.Timeline; import net.mograsim.logic.core.wires.CoreWire; -import net.mograsim.logic.model.model.components.GUIComponent; +import net.mograsim.logic.model.model.components.ModelComponent; import net.mograsim.logic.model.model.wires.Pin; import net.mograsim.logic.model.modeladapter.LogicModelParameters; /** - * For GUIComponents that do not have any simulation logic behaviour + * For ModelComponents that do not have any simulation logic behaviour * * @author Christian Femers */ -public class NoLogicAdapter implements ComponentAdapter +public class NoLogicAdapter implements ComponentAdapter { - private final Class guiComponentClass; + private final Class modelComponentClass; - public NoLogicAdapter(Class guiComponentClass) + public NoLogicAdapter(Class modelComponentClass) { - this.guiComponentClass = guiComponentClass; + this.modelComponentClass = modelComponentClass; } @Override public Class getSupportedClass() { - return guiComponentClass; + return modelComponentClass; } @Override - public void createAndLinkComponent(Timeline timeline, LogicModelParameters params, T guiComponent, Map logicWiresPerPin) + public void createAndLinkComponent(Timeline timeline, LogicModelParameters params, T modelComponent, + Map logicWiresPerPin) { // do nothing } diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/modeladapter/componentadapters/SimpleGateAdapter.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/modeladapter/componentadapters/SimpleGateAdapter.java index fc981cac..80830bdd 100644 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/modeladapter/componentadapters/SimpleGateAdapter.java +++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/modeladapter/componentadapters/SimpleGateAdapter.java @@ -7,11 +7,11 @@ import net.mograsim.logic.core.timeline.Timeline; import net.mograsim.logic.core.wires.CoreWire; import net.mograsim.logic.core.wires.CoreWire.ReadEnd; import net.mograsim.logic.core.wires.CoreWire.ReadWriteEnd; -import net.mograsim.logic.model.model.components.atomic.SimpleRectangularGUIGate; +import net.mograsim.logic.model.model.components.atomic.SimpleRectangularModelGate; import net.mograsim.logic.model.model.wires.Pin; import net.mograsim.logic.model.modeladapter.LogicModelParameters; -public class SimpleGateAdapter implements ComponentAdapter +public class SimpleGateAdapter implements ComponentAdapter { private final Class supportedClass; private final ComponentConstructor constructor; @@ -29,15 +29,16 @@ public class SimpleGateAdapter implements Co } @Override - public void createAndLinkComponent(Timeline timeline, LogicModelParameters params, G guiComponent, Map logicWiresPerPin) + public void createAndLinkComponent(Timeline timeline, LogicModelParameters params, G modelComponent, + Map logicWiresPerPin) { - ReadWriteEnd out = logicWiresPerPin.get(guiComponent.getPin("Y")).createReadWriteEnd(); + ReadWriteEnd out = logicWiresPerPin.get(modelComponent.getPin("Y")).createReadWriteEnd(); // TODO can we do this prettier? - int inputPinCount = guiComponent.getPins().size() - 1; + int inputPinCount = modelComponent.getPins().size() - 1; ReadEnd[] ins = new ReadEnd[inputPinCount]; for (int i = 0; i < inputPinCount; i++) - ins[i] = logicWiresPerPin.get(guiComponent.getPin(String.valueOf((char) ('A' + i)))).createReadOnlyEnd(); + ins[i] = logicWiresPerPin.get(modelComponent.getPin(String.valueOf((char) ('A' + i)))).createReadOnlyEnd(); constructor.newComponent(timeline, params.gateProcessTime, out, ins); } 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/SimpleRectangularHardcodedModelComponentAdapter.java similarity index 68% rename from net.mograsim.logic.model/src/net/mograsim/logic/model/modeladapter/componentadapters/SimpleRectangularHardcodedGUIComponentAdapter.java rename to net.mograsim.logic.model/src/net/mograsim/logic/model/modeladapter/componentadapters/SimpleRectangularHardcodedModelComponentAdapter.java index 8634c0c2..1dab1d35 100644 --- 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/SimpleRectangularHardcodedModelComponentAdapter.java @@ -9,34 +9,34 @@ import net.mograsim.logic.core.timeline.Timeline; import net.mograsim.logic.core.wires.CoreWire; import net.mograsim.logic.core.wires.CoreWire.ReadEnd; import net.mograsim.logic.core.wires.CoreWire.ReadWriteEnd; -import net.mograsim.logic.model.model.components.atomic.SimpleRectangularHardcodedGUIComponent; +import net.mograsim.logic.model.model.components.atomic.SimpleRectangularHardcodedModelComponent; import net.mograsim.logic.model.model.wires.Pin; import net.mograsim.logic.model.model.wires.PinUsage; import net.mograsim.logic.model.modeladapter.LogicModelParameters; -public class SimpleRectangularHardcodedGUIComponentAdapter implements ComponentAdapter +public class SimpleRectangularHardcodedModelComponentAdapter implements ComponentAdapter { @Override - public Class getSupportedClass() + public Class getSupportedClass() { - return SimpleRectangularHardcodedGUIComponent.class; + return SimpleRectangularHardcodedModelComponent.class; } @Override - public void createAndLinkComponent(Timeline timeline, LogicModelParameters params, SimpleRectangularHardcodedGUIComponent guiComponent, - Map logicWiresPerPin) + public void createAndLinkComponent(Timeline timeline, LogicModelParameters params, + SimpleRectangularHardcodedModelComponent modelComponent, Map logicWiresPerPin) { Map readEnds = new HashMap<>(); Map readWriteEnds = new HashMap<>(); AtomicReference state = new AtomicReference<>(); - Runnable recalculate = () -> state.updateAndGet(s -> guiComponent.recalculate(s, readEnds, readWriteEnds)); + Runnable recalculate = () -> state.updateAndGet(s -> modelComponent.recalculate(s, readEnds, readWriteEnds)); LogicObserver logicObs = c -> timeline.addEvent(e -> recalculate.run(), params.gateProcessTime); - guiComponent.setLogicModelBindingAndResetState(state, recalculate); + modelComponent.setLogicModelBindingAndResetState(state, recalculate); - for (Pin pin : guiComponent.getPins().values()) + for (Pin pin : modelComponent.getPins().values()) { CoreWire wire = logicWiresPerPin.get(pin); ReadEnd end; diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/modeladapter/componentadapters/SplitterAdapter.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/modeladapter/componentadapters/SplitterAdapter.java index ab371958..bfe8308c 100644 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/modeladapter/componentadapters/SplitterAdapter.java +++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/modeladapter/componentadapters/SplitterAdapter.java @@ -5,30 +5,30 @@ import java.util.Map; import net.mograsim.logic.core.timeline.Timeline; import net.mograsim.logic.core.wires.CoreWire; import net.mograsim.logic.core.wires.CoreWire.ReadEnd; -import net.mograsim.logic.model.model.components.atomic.GUISplitter; +import net.mograsim.logic.model.model.components.atomic.ModelSplitter; import net.mograsim.logic.model.model.wires.Pin; import net.mograsim.logic.model.modeladapter.LogicModelParameters; -public class SplitterAdapter implements ComponentAdapter +public class SplitterAdapter implements ComponentAdapter { @Override - public Class getSupportedClass() + public Class getSupportedClass() { - return GUISplitter.class; + return ModelSplitter.class; } @Override - public void createAndLinkComponent(Timeline timeline, LogicModelParameters params, GUISplitter guiComponent, + public void createAndLinkComponent(Timeline timeline, LogicModelParameters params, ModelSplitter modelComponent, Map logicWiresPerPin) { - CoreWire input = logicWiresPerPin.get(guiComponent.getPin("I")); - ReadEnd[] outputEnds = new ReadEnd[guiComponent.logicWidth]; - for (int i = 0; i < guiComponent.logicWidth; i++) + CoreWire input = logicWiresPerPin.get(modelComponent.getPin("I")); + ReadEnd[] outputEnds = new ReadEnd[modelComponent.logicWidth]; + for (int i = 0; i < modelComponent.logicWidth; i++) { - CoreWire output = logicWiresPerPin.get(guiComponent.getPin("O" + (guiComponent.logicWidth - 1 - i))); + CoreWire output = logicWiresPerPin.get(modelComponent.getPin("O" + (modelComponent.logicWidth - 1 - i))); CoreWire.fuse(input, output, i, 0); outputEnds[i] = output.createReadOnlyEnd(); } - guiComponent.setLogicModelBinding(input.createReadOnlyEnd(), outputEnds); + modelComponent.setLogicModelBinding(input.createReadOnlyEnd(), outputEnds); } } \ No newline at end of file diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/modeladapter/componentadapters/TriStateBufferAdapter.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/modeladapter/componentadapters/TriStateBufferAdapter.java index fce74726..1263e0ad 100644 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/modeladapter/componentadapters/TriStateBufferAdapter.java +++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/modeladapter/componentadapters/TriStateBufferAdapter.java @@ -7,26 +7,26 @@ import net.mograsim.logic.core.timeline.Timeline; import net.mograsim.logic.core.wires.CoreWire; import net.mograsim.logic.core.wires.CoreWire.ReadEnd; import net.mograsim.logic.core.wires.CoreWire.ReadWriteEnd; -import net.mograsim.logic.model.model.components.atomic.GUITriStateBuffer; +import net.mograsim.logic.model.model.components.atomic.ModelTriStateBuffer; import net.mograsim.logic.model.model.wires.Pin; import net.mograsim.logic.model.modeladapter.LogicModelParameters; -public class TriStateBufferAdapter implements ComponentAdapter +public class TriStateBufferAdapter implements ComponentAdapter { @Override - public Class getSupportedClass() + public Class getSupportedClass() { - return GUITriStateBuffer.class; + return ModelTriStateBuffer.class; } @SuppressWarnings("unused") @Override - public void createAndLinkComponent(Timeline timeline, LogicModelParameters params, GUITriStateBuffer guiTsb, + public void createAndLinkComponent(Timeline timeline, LogicModelParameters params, ModelTriStateBuffer modelTsb, Map logicWiresPerPin) { - ReadEnd in = logicWiresPerPin.get(guiTsb.getPin("IN")).createReadOnlyEnd(); - ReadEnd enable = logicWiresPerPin.get(guiTsb.getPin("EN")).createReadOnlyEnd(); - ReadWriteEnd out = logicWiresPerPin.get(guiTsb.getPin("OUT")).createReadWriteEnd(); + ReadEnd in = logicWiresPerPin.get(modelTsb.getPin("IN")).createReadOnlyEnd(); + ReadEnd enable = logicWiresPerPin.get(modelTsb.getPin("EN")).createReadOnlyEnd(); + ReadWriteEnd out = logicWiresPerPin.get(modelTsb.getPin("OUT")).createReadWriteEnd(); new CoreTriStateBuffer(timeline, params.gateProcessTime, in, out, enable); } } diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/IndirectGUIComponentCreator.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/IndirectModelComponentCreator.java similarity index 90% rename from net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/IndirectGUIComponentCreator.java rename to net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/IndirectModelComponentCreator.java index c6d1529f..b6585742 100644 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/IndirectGUIComponentCreator.java +++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/IndirectModelComponentCreator.java @@ -13,11 +13,11 @@ import com.google.gson.JsonNull; import com.google.gson.JsonObject; import net.mograsim.logic.model.model.ViewModelModifiable; -import net.mograsim.logic.model.model.components.GUIComponent; +import net.mograsim.logic.model.model.components.ModelComponent; import net.mograsim.logic.model.model.components.submodels.SubmodelComponent; import net.mograsim.logic.model.util.JsonHandler; -public class IndirectGUIComponentCreator +public class IndirectModelComponentCreator { private static final Map standardComponentIDs = new HashMap<>(); private static final Map standardComponentIDsUnmodifiable = Collections.unmodifiableMap(standardComponentIDs); @@ -29,8 +29,8 @@ public class IndirectGUIComponentCreator private static final ResourceLoader defaultResourceLoader; static { - defaultResourceLoader = ClassLoaderBasedResourceLoader.create(IndirectGUIComponentCreator.class.getClassLoader()); - loadStandardComponentIDs(IndirectGUIComponentCreator.class.getResourceAsStream("standardComponentIDMapping.json")); + defaultResourceLoader = ClassLoaderBasedResourceLoader.create(IndirectModelComponentCreator.class.getClassLoader()); + loadStandardComponentIDs(IndirectModelComponentCreator.class.getResourceAsStream("standardComponentIDMapping.json")); } public static void loadStandardComponentIDs(InputStream standardComponentIdMappingStream) @@ -76,22 +76,22 @@ public class IndirectGUIComponentCreator componentSuppliers.put(id, componentSupplier); } - public static GUIComponent createComponent(ViewModelModifiable model, String id) + public static ModelComponent createComponent(ViewModelModifiable model, String id) { return createComponent(model, id, (String) null); } - public static GUIComponent createComponent(ViewModelModifiable model, String id, String name) + public static ModelComponent createComponent(ViewModelModifiable model, String id, String name) { return createComponent(model, id, JsonNull.INSTANCE, name); } - public static GUIComponent createComponent(ViewModelModifiable model, String id, JsonElement params) + public static ModelComponent createComponent(ViewModelModifiable model, String id, JsonElement params) { return createComponent(model, id, params, null); } - public static GUIComponent createComponent(ViewModelModifiable model, String id, JsonElement params, String name) + public static ModelComponent createComponent(ViewModelModifiable model, String id, JsonElement params, String name) { if (id == null) throw new NullPointerException("Component ID is null"); @@ -217,6 +217,6 @@ public class IndirectGUIComponentCreator public static interface ComponentSupplier { - public GUIComponent create(ViewModelModifiable model, JsonElement params, String name); + public ModelComponent create(ViewModelModifiable model, JsonElement params, String name); } } \ No newline at end of file diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/LegacySubmodelComponentSerializer.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/LegacySubmodelComponentSerializer.java index dc5d4207..f456aad2 100644 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/LegacySubmodelComponentSerializer.java +++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/LegacySubmodelComponentSerializer.java @@ -10,9 +10,9 @@ import com.google.gson.JsonElement; import net.haspamelodica.swt.helper.swtobjectwrappers.Point; import net.mograsim.logic.model.model.ViewModelModifiable; -import net.mograsim.logic.model.model.components.GUIComponent; +import net.mograsim.logic.model.model.components.ModelComponent; import net.mograsim.logic.model.model.components.submodels.SubmodelComponent; -import net.mograsim.logic.model.model.wires.GUIWire; +import net.mograsim.logic.model.model.wires.ModelWire; import net.mograsim.logic.model.model.wires.MovablePin; import net.mograsim.logic.model.model.wires.Pin; import net.mograsim.logic.model.model.wires.PinUsage; @@ -163,7 +163,7 @@ public final class LegacySubmodelComponentSerializer * @author Fabian Stemmler * @author Daniel Kirschten */ - @SuppressWarnings("unused") // for GUIWire being created + @SuppressWarnings("unused") // for ModelWire being created public static SubmodelComponent deserialize(ViewModelModifiable model, LegacySubmodelComponentParams params, String name, String idForSerializingOverride, JsonElement paramsForSerializingOverride) { @@ -177,19 +177,19 @@ public final class LegacySubmodelComponentSerializer iPinParams.location.y)); LegacySubmodelParameters submodelParams = params.submodel; ViewModelModifiable submodelModifiable = comp.getSubmodelModifiable(); - Map componentsByName = submodelModifiable.getComponentsByName(); - GUIComponent[] components = new GUIComponent[submodelParams.subComps.length]; + Map componentsByName = submodelModifiable.getComponentsByName(); + ModelComponent[] components = new ModelComponent[submodelParams.subComps.length]; for (int i = 0; i < components.length; i++) { LegacyInnerComponentParams cParams = submodelParams.subComps[i]; - components[i] = IndirectGUIComponentCreator.createComponent(submodelModifiable, cParams.id, cParams.params, cParams.name); + components[i] = IndirectModelComponentCreator.createComponent(submodelModifiable, cParams.id, cParams.params, cParams.name); components[i].moveTo(cParams.pos.x, cParams.pos.y); } for (int i = 0; i < submodelParams.innerWires.length; i++) { LegacyInnerWireParams innerWire = submodelParams.innerWires[i]; - new GUIWire(submodelModifiable, innerWire.name, componentsByName.get(innerWire.pin1.compName).getPin(innerWire.pin1.pinName), + new ModelWire(submodelModifiable, innerWire.name, componentsByName.get(innerWire.pin1.compName).getPin(innerWire.pin1.pinName), componentsByName.get(innerWire.pin2.compName).getPin(innerWire.pin2.pinName), innerWire.path); } comp.setSymbolRenderer(SubmodelComponentSnippetSuppliers.symbolRendererSupplier.getSnippetSupplier(params.symbolRendererSnippetID) @@ -211,7 +211,7 @@ public final class LegacySubmodelComponentSerializer * If this case doesn't apply (e.g. if the subcomponent is not a SubmodelComponent; or it is a * SubmodelComponent, but hasn't been deserialized; or it has no * {@link DeserializedSubmodelComponent#idForSerializingOverride idForSerializingOverride} set), the ID defined by idGetter - * and the params obtained by {@link GUIComponent#getParamsForSerializing() getParams()} are written.
+ * and the params obtained by {@link ModelComponent#getParamsForSerializing() getParams()} are written.
* CodeSnippets are serialized using the ID defined by idGetter and the params obtained by the respective * getParamsForSerializing methods ({@link Renderer#getParamsForSerializing()}). * @@ -223,11 +223,11 @@ public final class LegacySubmodelComponentSerializer LegacySubmodelParameters submodelParams = new LegacySubmodelParameters(); submodelParams.innerScale = comp.getSubmodelScale(); - Map components = new HashMap<>(comp.submodel.getComponentsByName()); + Map components = new HashMap<>(comp.submodel.getComponentsByName()); components.remove(SubmodelComponent.SUBMODEL_INTERFACE_NAME); LegacyInnerComponentParams[] componentParams = new LegacyInnerComponentParams[components.size()]; int i1 = 0; - for (GUIComponent innerComponent : components.values()) + for (ModelComponent innerComponent : components.values()) { LegacyInnerComponentParams innerComponentParams = new LegacyInnerComponentParams(); componentParams[i1] = innerComponentParams; @@ -248,10 +248,10 @@ public final class LegacySubmodelComponentSerializer } submodelParams.subComps = componentParams; - Collection wires = comp.submodel.getWiresByName().values(); + Collection wires = comp.submodel.getWiresByName().values(); LegacyInnerWireParams wireParams[] = new LegacyInnerWireParams[wires.size()]; i1 = 0; - for (GUIWire innerWire : wires) + for (ModelWire innerWire : wires) { LegacyInnerWireParams innerWireParams = new LegacyInnerWireParams(); wireParams[i1] = innerWireParams; diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/ResourceLoader.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/ResourceLoader.java index ff7fd07f..f15b475e 100644 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/ResourceLoader.java +++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/ResourceLoader.java @@ -3,10 +3,10 @@ package net.mograsim.logic.model.serializing; import java.io.IOException; import java.io.InputStream; -import net.mograsim.logic.model.model.components.GUIComponent; +import net.mograsim.logic.model.model.components.ModelComponent; /** - * For loading JSON {@link GUIComponent}s from other OSGI-Modules or jar-Files. + * For loading JSON {@link ModelComponent}s from other OSGI-Modules or jar-Files. */ public interface ResourceLoader { diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/SubmodelComponentSerializer.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/SubmodelComponentSerializer.java index 84e9fdb0..d09ed4a4 100644 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/SubmodelComponentSerializer.java +++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/SubmodelComponentSerializer.java @@ -158,7 +158,7 @@ public final class SubmodelComponentSerializer * @author Fabian Stemmler * @author Daniel Kirschten */ - @SuppressWarnings("unused") // for GUIWire being created + @SuppressWarnings("unused") // for ModelWire being created public static SubmodelComponent deserialize(ViewModelModifiable model, SubmodelComponentParams params, String name, String idForSerializingOverride, JsonElement paramsForSerializingOverride) { diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/ViewModelSerializer.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/ViewModelSerializer.java index 61d4915e..443fe050 100644 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/ViewModelSerializer.java +++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/ViewModelSerializer.java @@ -14,9 +14,9 @@ import com.google.gson.JsonElement; import net.haspamelodica.swt.helper.swtobjectwrappers.Point; import net.mograsim.logic.model.model.ViewModel; import net.mograsim.logic.model.model.ViewModelModifiable; -import net.mograsim.logic.model.model.components.GUIComponent; +import net.mograsim.logic.model.model.components.ModelComponent; import net.mograsim.logic.model.model.components.submodels.SubmodelComponent; -import net.mograsim.logic.model.model.wires.GUIWire; +import net.mograsim.logic.model.model.wires.ModelWire; import net.mograsim.logic.model.serializing.ViewModelParams.ComponentParams; import net.mograsim.logic.model.serializing.ViewModelParams.WireParams; import net.mograsim.logic.model.serializing.ViewModelParams.WireParams.PinParams; @@ -101,22 +101,22 @@ public class ViewModelSerializer * @author Fabian Stemmler * @author Daniel Kirschten */ - @SuppressWarnings("unused") // for GUIWire being created + @SuppressWarnings("unused") // for ModelWire being created public static void deserialize(ViewModelModifiable model, ViewModelParams params) { - Map componentsByName = model.getComponentsByName(); - GUIComponent[] components = new GUIComponent[params.components.length]; + Map componentsByName = model.getComponentsByName(); + ModelComponent[] components = new ModelComponent[params.components.length]; for (int i = 0; i < components.length; i++) { ComponentParams compParams = params.components[i]; - components[i] = IndirectGUIComponentCreator.createComponent(model, compParams.id, compParams.params, compParams.name); + components[i] = IndirectModelComponentCreator.createComponent(model, compParams.id, compParams.params, compParams.name); components[i].moveTo(compParams.pos.x, compParams.pos.y); } for (int i = 0; i < params.wires.length; i++) { WireParams wire = params.wires[i]; - new GUIWire(model, wire.name, componentsByName.get(wire.pin1.compName).getPin(wire.pin1.pinName), + new ModelWire(model, wire.name, componentsByName.get(wire.pin1.compName).getPin(wire.pin1.pinName), componentsByName.get(wire.pin2.compName).getPin(wire.pin2.pinName), wire.path); } } @@ -131,7 +131,7 @@ public class ViewModelSerializer * {@link DeserializedSubmodelComponent#paramsForSerializingOverride paramsForSerializingOverride} are written.
* If this case doesn't apply (e.g. if the component is not a SubmodelComponent; or it is a SubmodelComponent, * but hasn't been deserialized; or it has no {@link DeserializedSubmodelComponent#idForSerializingOverride idForSerializingOverride} - * set), the ID defined by idGetter and the params obtained by {@link GUIComponent#getParamsForSerializing() getParams()} + * set), the ID defined by idGetter and the params obtained by {@link ModelComponent#getParamsForSerializing() getParams()} * are written. * * @author Fabian Stemmler @@ -141,10 +141,10 @@ public class ViewModelSerializer { ViewModelParams modelParams = new ViewModelParams(CURRENT_JSON_VERSION); - Map components = new HashMap<>(model.getComponentsByName()); + Map components = new HashMap<>(model.getComponentsByName()); components.remove(SubmodelComponent.SUBMODEL_INTERFACE_NAME); Set componentsParams = new HashSet<>(); - for (GUIComponent component : components.values()) + for (ModelComponent component : components.values()) { ComponentParams compParams = new ComponentParams(); componentsParams.add(compParams); @@ -165,9 +165,9 @@ public class ViewModelSerializer modelParams.components = componentsParams.toArray(ComponentParams[]::new); Arrays.sort(modelParams.components, Comparator.comparing(c -> c.name)); - Collection wires = model.getWiresByName().values(); + Collection wires = model.getWiresByName().values(); Set wiresParams = new HashSet<>(); - for (GUIWire innerWire : wires) + for (ModelWire innerWire : wires) { WireParams innerWireParams = new WireParams(); wiresParams.add(innerWireParams); diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/standardComponentIDMapping.json b/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/standardComponentIDMapping.json index 8fa63b0f..aadc0b20 100644 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/standardComponentIDMapping.json +++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/standardComponentIDMapping.json @@ -1,15 +1,15 @@ mograsim version: 0.1.3 { - "GUIAndGate": "class:net.mograsim.logic.model.model.components.atomic.GUIAndGate", - "GUIBitDisplay": "class:net.mograsim.logic.model.model.components.atomic.GUIBitDisplay", - "GUIClock": "class:net.mograsim.logic.model.model.components.atomic.GUIClock", - "GUIFixedOutput": "class:net.mograsim.logic.model.model.components.atomic.GUIFixedOutput", - "GUIManualSwitch": "class:net.mograsim.logic.model.model.components.atomic.GUIManualSwitch", - "GUIMerger": "class:net.mograsim.logic.model.model.components.atomic.GUIMerger", - "GUINandGate": "class:net.mograsim.logic.model.model.components.atomic.GUINandGate", - "GUIOrGate": "class:net.mograsim.logic.model.model.components.atomic.GUIOrGate", - "GUISplitter": "class:net.mograsim.logic.model.model.components.atomic.GUISplitter", - "GUITriStateBuffer": "class:net.mograsim.logic.model.model.components.atomic.GUITriStateBuffer", - "TextComponent": "class:net.mograsim.logic.model.model.components.atomic.TextComponent", - "WireCrossPoint": "class:net.mograsim.logic.model.model.wires.WireCrossPoint" + "AndGate": "class:net.mograsim.logic.model.model.components.atomic.ModelAndGate", + "BitDisplay": "class:net.mograsim.logic.model.model.components.atomic.ModelBitDisplay", + "Clock": "class:net.mograsim.logic.model.model.components.atomic.ModelClock", + "FixedOutput": "class:net.mograsim.logic.model.model.components.atomic.ModelFixedOutput", + "ManualSwitch": "class:net.mograsim.logic.model.model.components.atomic.ModelManualSwitch", + "Merger": "class:net.mograsim.logic.model.model.components.atomic.ModelMerger", + "NandGate": "class:net.mograsim.logic.model.model.components.atomic.ModelNandGate", + "OrGate": "class:net.mograsim.logic.model.model.components.atomic.ModelOrGate", + "Splitter": "class:net.mograsim.logic.model.model.components.atomic.ModelSplitter", + "TriStateBuffer": "class:net.mograsim.logic.model.model.components.atomic.ModelTriStateBuffer", + "TextComponent": "class:net.mograsim.logic.model.model.components.atomic.ModelTextComponent", + "WireCrossPoint": "class:net.mograsim.logic.model.model.wires.ModelWireCrossPoint" } \ No newline at end of file diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/HighLevelStateHandler.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/HighLevelStateHandler.java index cbe58eb1..622df00b 100644 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/HighLevelStateHandler.java +++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/HighLevelStateHandler.java @@ -1,6 +1,6 @@ package net.mograsim.logic.model.snippets; -import net.mograsim.logic.model.model.components.GUIComponent; +import net.mograsim.logic.model.model.components.ModelComponent; import net.mograsim.logic.model.serializing.JSONSerializable; /** @@ -21,7 +21,7 @@ public interface HighLevelStateHandler extends JSONSerializable * See {@link HighLevelStateHandler} for an explanation of high-level state IDs. * * @see #setHighLevelState(String, Object) - * @see GUIComponent#getHighLevelState(String) + * @see ModelComponent#getHighLevelState(String) * * @author Daniel Kirschten */ @@ -32,7 +32,7 @@ public interface HighLevelStateHandler extends JSONSerializable * See {@link HighLevelStateHandler} for an explanation of high-level state IDs. * * @see #getHighLevelState(String) - * @see GUIComponent#setHighLevelState(String, Object) + * @see ModelComponent#setHighLevelState(String, Object) * * @author Daniel Kirschten */ diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/SubmodelComponentSnippetSuppliers.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/SubmodelComponentSnippetSuppliers.java index 394eec0c..860557fd 100644 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/SubmodelComponentSnippetSuppliers.java +++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/SubmodelComponentSnippetSuppliers.java @@ -4,7 +4,7 @@ import java.io.IOException; import java.io.InputStream; import java.util.Map; -import net.mograsim.logic.model.model.components.GUIComponent; +import net.mograsim.logic.model.model.components.ModelComponent; import net.mograsim.logic.model.model.components.submodels.SubmodelComponent; import net.mograsim.logic.model.snippets.highlevelstatehandlers.DefaultHighLevelStateHandler; import net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer; @@ -13,8 +13,8 @@ import net.mograsim.logic.model.util.JsonHandler; public class SubmodelComponentSnippetSuppliers { - public static final CodeSnippetSupplier symbolRendererSupplier; - public static final CodeSnippetSupplier outlineRendererSupplier; + public static final CodeSnippetSupplier symbolRendererSupplier; + public static final CodeSnippetSupplier outlineRendererSupplier; public static final CodeSnippetSupplier highLevelStateHandlerSupplier; static diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/highlevelstatehandlers/standard/atomic/DelegatingAtomicHighLevelStateHandler.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/highlevelstatehandlers/standard/atomic/DelegatingAtomicHighLevelStateHandler.java index 25291797..7a568827 100644 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/highlevelstatehandlers/standard/atomic/DelegatingAtomicHighLevelStateHandler.java +++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/highlevelstatehandlers/standard/atomic/DelegatingAtomicHighLevelStateHandler.java @@ -1,6 +1,6 @@ package net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic; -import net.mograsim.logic.model.model.components.GUIComponent; +import net.mograsim.logic.model.model.components.ModelComponent; import net.mograsim.logic.model.model.components.submodels.SubmodelComponent; import net.mograsim.logic.model.serializing.IdentifyParams; import net.mograsim.logic.model.snippets.SnippetDefinintion; @@ -10,7 +10,7 @@ import net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.Standar public class DelegatingAtomicHighLevelStateHandler implements AtomicHighLevelStateHandler { private final SubmodelComponent parentComponent; - private GUIComponent delegateTarget; + private ModelComponent delegateTarget; private String subStateID; public DelegatingAtomicHighLevelStateHandler(HighLevelStateHandlerContext context) @@ -32,13 +32,13 @@ public class DelegatingAtomicHighLevelStateHandler implements AtomicHighLevelSta } } - public void set(GUIComponent delegateTarget, String subStateID) + public void set(ModelComponent delegateTarget, String subStateID) { setDelegateTarget(delegateTarget); setSubStateID(subStateID); } - public void setDelegateTarget(GUIComponent delegateTarget) + public void setDelegateTarget(ModelComponent delegateTarget) { if (delegateTarget == null) this.delegateTarget = parentComponent; diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/highlevelstatehandlers/standard/atomic/WireForcingAtomicHighLevelStateHandler.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/highlevelstatehandlers/standard/atomic/WireForcingAtomicHighLevelStateHandler.java index c1e8faf1..cd09bd8e 100644 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/highlevelstatehandlers/standard/atomic/WireForcingAtomicHighLevelStateHandler.java +++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/highlevelstatehandlers/standard/atomic/WireForcingAtomicHighLevelStateHandler.java @@ -9,7 +9,7 @@ import java.util.stream.Collectors; import net.mograsim.logic.core.types.Bit; import net.mograsim.logic.core.types.BitVector; import net.mograsim.logic.model.model.components.submodels.SubmodelComponent; -import net.mograsim.logic.model.model.wires.GUIWire; +import net.mograsim.logic.model.model.wires.ModelWire; import net.mograsim.logic.model.serializing.IdentifyParams; import net.mograsim.logic.model.snippets.SnippetDefinintion; import net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.HighLevelStateHandlerContext; @@ -19,8 +19,8 @@ public class WireForcingAtomicHighLevelStateHandler implements AtomicHighLevelSt { private SubmodelComponent component; private int logicWidth; - private final List wiresToForce; - private final List wiresToForceInverted; + private final List wiresToForce; + private final List wiresToForceInverted; public WireForcingAtomicHighLevelStateHandler(HighLevelStateHandlerContext context) { @@ -34,27 +34,27 @@ public class WireForcingAtomicHighLevelStateHandler implements AtomicHighLevelSt this.wiresToForceInverted = new ArrayList<>(); if (params != null) { - Map wiresByName = component.submodel.getWiresByName(); - setWiresToForce(params.wiresToForce.stream().map((Function) wiresByName::get).collect(Collectors.toList()), - params.wiresToForceInverted.stream().map((Function) wiresByName::get).collect(Collectors.toList())); + Map wiresByName = component.submodel.getWiresByName(); + setWiresToForce(params.wiresToForce.stream().map((Function) wiresByName::get).collect(Collectors.toList()), + params.wiresToForceInverted.stream().map((Function) wiresByName::get).collect(Collectors.toList())); } } - public void set(List wiresToForce, List wiresToForceInverted) + public void set(List wiresToForce, List wiresToForceInverted) { setWiresToForce(wiresToForce, wiresToForceInverted); } - public void setWiresToForce(List wiresToForce, List wiresToForceInverted) + public void setWiresToForce(List wiresToForce, List wiresToForceInverted) { clearWiresToForce(); - for (GUIWire wire : wiresToForce) + for (ModelWire wire : wiresToForce) addWireToForce(wire, false); - for (GUIWire wire : wiresToForceInverted) + for (ModelWire wire : wiresToForceInverted) addWireToForce(wire, true); } - public void addWireToForce(GUIWire wire, boolean inverted) + public void addWireToForce(ModelWire wire, boolean inverted) { if (component.submodel.getWiresByName().get(wire.name) != wire) throw new IllegalArgumentException("Can only force wires belonging to the parent component of this handler"); @@ -79,11 +79,11 @@ public class WireForcingAtomicHighLevelStateHandler implements AtomicHighLevelSt public Object getHighLevelState() { BitVector result = BitVector.of(Bit.ZERO, logicWidth); - for (GUIWire wire : wiresToForceInverted) + for (ModelWire wire : wiresToForceInverted) if (wire.hasLogicModelBinding()) result = result.or(wire.getWireValues()); result = result.not(); - for (GUIWire wire : wiresToForce) + for (ModelWire wire : wiresToForce) if (wire.hasLogicModelBinding()) result = result.and(wire.getWireValues()); return result; @@ -97,11 +97,11 @@ public class WireForcingAtomicHighLevelStateHandler implements AtomicHighLevelSt vector = BitVector.of((Bit) newState); else vector = (BitVector) newState; - for (GUIWire wire : wiresToForce) + for (ModelWire wire : wiresToForce) if (wire.hasLogicModelBinding()) wire.forceWireValues(vector); vector = vector.not(); - for (GUIWire wire : wiresToForceInverted) + for (ModelWire wire : wiresToForceInverted) if (wire.hasLogicModelBinding()) wire.forceWireValues(vector); } diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/highlevelstatehandlers/standard/subcomponent/DelegatingSubcomponentHighLevelStateHandler.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/highlevelstatehandlers/standard/subcomponent/DelegatingSubcomponentHighLevelStateHandler.java index 80e76b07..0d1fd655 100644 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/highlevelstatehandlers/standard/subcomponent/DelegatingSubcomponentHighLevelStateHandler.java +++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/highlevelstatehandlers/standard/subcomponent/DelegatingSubcomponentHighLevelStateHandler.java @@ -1,6 +1,6 @@ package net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent; -import net.mograsim.logic.model.model.components.GUIComponent; +import net.mograsim.logic.model.model.components.ModelComponent; import net.mograsim.logic.model.model.components.submodels.SubmodelComponent; import net.mograsim.logic.model.serializing.IdentifyParams; import net.mograsim.logic.model.snippets.SnippetDefinintion; @@ -10,7 +10,7 @@ import net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.Standar public class DelegatingSubcomponentHighLevelStateHandler implements SubcomponentHighLevelStateHandler { private final SubmodelComponent parentComponent; - private GUIComponent delegateTarget; + private ModelComponent delegateTarget; private String prefix; public DelegatingSubcomponentHighLevelStateHandler(HighLevelStateHandlerContext context) @@ -33,13 +33,13 @@ public class DelegatingSubcomponentHighLevelStateHandler implements Subcomponent } } - public void set(GUIComponent delegateTarget, String prefix) + public void set(ModelComponent delegateTarget, String prefix) { setDelegateTarget(delegateTarget); setPrefix(prefix); } - public void setDelegateTarget(GUIComponent delegateTarget) + public void setDelegateTarget(ModelComponent delegateTarget) { if (delegateTarget == null) this.delegateTarget = parentComponent; diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/outlinerenderers/DefaultOutlineRenderer.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/outlinerenderers/DefaultOutlineRenderer.java index 5207bc93..90f25a41 100644 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/outlinerenderers/DefaultOutlineRenderer.java +++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/outlinerenderers/DefaultOutlineRenderer.java @@ -2,7 +2,7 @@ package net.mograsim.logic.model.snippets.outlinerenderers; import net.haspamelodica.swt.helper.gcs.GeneralGC; import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle; -import net.mograsim.logic.model.model.components.GUIComponent; +import net.mograsim.logic.model.model.components.ModelComponent; import net.mograsim.logic.model.serializing.IdentifyParams; import net.mograsim.logic.model.snippets.Renderer; import net.mograsim.logic.model.snippets.SnippetDefinintion; @@ -13,14 +13,14 @@ import net.mograsim.preferences.Preferences; public class DefaultOutlineRenderer implements Renderer { - private final GUIComponent component; + private final ModelComponent component; - public DefaultOutlineRenderer(GUIComponent component) + public DefaultOutlineRenderer(ModelComponent component) { this(component, null); } - public DefaultOutlineRenderer(GUIComponent component, @SuppressWarnings("unused") Void params) + public DefaultOutlineRenderer(ModelComponent component, @SuppressWarnings("unused") Void params) { this.component = component; } diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/symbolrenderers/CenteredTextSymbolRenderer.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/symbolrenderers/CenteredTextSymbolRenderer.java index 196400dd..9a6599a6 100644 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/symbolrenderers/CenteredTextSymbolRenderer.java +++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/symbolrenderers/CenteredTextSymbolRenderer.java @@ -4,7 +4,7 @@ import net.haspamelodica.swt.helper.gcs.GeneralGC; import net.haspamelodica.swt.helper.swtobjectwrappers.Font; import net.haspamelodica.swt.helper.swtobjectwrappers.Point; import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle; -import net.mograsim.logic.model.model.components.GUIComponent; +import net.mograsim.logic.model.model.components.ModelComponent; import net.mograsim.logic.model.serializing.IdentifyParams; import net.mograsim.logic.model.snippets.Renderer; import net.mograsim.logic.model.snippets.SnippetDefinintion; @@ -20,11 +20,11 @@ import net.mograsim.preferences.Preferences; */ public class CenteredTextSymbolRenderer implements Renderer { - private final GUIComponent component; + private final ModelComponent component; private final String text; private final double fontHeight; - public CenteredTextSymbolRenderer(GUIComponent component, CenteredTextParams params) + public CenteredTextSymbolRenderer(ModelComponent component, CenteredTextParams params) { this.component = component; this.text = params.text; diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/symbolrenderers/DefaultSymbolRenderer.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/symbolrenderers/DefaultSymbolRenderer.java index 0ff502ec..28ad8a86 100644 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/symbolrenderers/DefaultSymbolRenderer.java +++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/symbolrenderers/DefaultSymbolRenderer.java @@ -3,7 +3,7 @@ package net.mograsim.logic.model.snippets.symbolrenderers; import net.haspamelodica.swt.helper.gcs.GeneralGC; import net.haspamelodica.swt.helper.swtobjectwrappers.Point; import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle; -import net.mograsim.logic.model.model.components.GUIComponent; +import net.mograsim.logic.model.model.components.ModelComponent; import net.mograsim.logic.model.serializing.IdentifyParams; import net.mograsim.logic.model.snippets.Renderer; import net.mograsim.logic.model.snippets.SnippetDefinintion; @@ -16,14 +16,14 @@ public class DefaultSymbolRenderer implements Renderer { private static final String id = ""; - private final GUIComponent component; + private final ModelComponent component; - public DefaultSymbolRenderer(GUIComponent component) + public DefaultSymbolRenderer(ModelComponent component) { this(component, null); } - public DefaultSymbolRenderer(GUIComponent component, @SuppressWarnings("unused") Void params) + public DefaultSymbolRenderer(ModelComponent component, @SuppressWarnings("unused") Void params) { this.component = component; } diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/symbolrenderers/PinNamesSymbolRenderer.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/symbolrenderers/PinNamesSymbolRenderer.java index eff5fb66..a6380135 100644 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/symbolrenderers/PinNamesSymbolRenderer.java +++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/symbolrenderers/PinNamesSymbolRenderer.java @@ -7,7 +7,7 @@ import net.haspamelodica.swt.helper.gcs.GeneralGC; import net.haspamelodica.swt.helper.swtobjectwrappers.Font; import net.haspamelodica.swt.helper.swtobjectwrappers.Point; import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle; -import net.mograsim.logic.model.model.components.GUIComponent; +import net.mograsim.logic.model.model.components.ModelComponent; import net.mograsim.logic.model.model.wires.Pin; import net.mograsim.logic.model.serializing.IdentifyParams; import net.mograsim.logic.model.snippets.Renderer; @@ -17,12 +17,12 @@ import net.mograsim.logic.model.snippets.symbolrenderers.PinNamesSymbolRenderer. public class PinNamesSymbolRenderer implements Renderer { - private final GUIComponent component; + private final ModelComponent component; private final Map pinPositions; private final double pinLabelHeight; private final double pinLabelMargin; - public PinNamesSymbolRenderer(GUIComponent component, PinNamesParams params) + public PinNamesSymbolRenderer(ModelComponent component, PinNamesParams params) { this.component = component; this.pinPositions = new HashMap<>(); diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/symbolrenderers/SimpleRectangularLikeSymbolRenderer.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/symbolrenderers/SimpleRectangularLikeSymbolRenderer.java index f72375e5..d57203ab 100644 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/symbolrenderers/SimpleRectangularLikeSymbolRenderer.java +++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/symbolrenderers/SimpleRectangularLikeSymbolRenderer.java @@ -8,7 +8,7 @@ import net.haspamelodica.swt.helper.gcs.GeneralGC; import net.haspamelodica.swt.helper.swtobjectwrappers.Font; import net.haspamelodica.swt.helper.swtobjectwrappers.Point; import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle; -import net.mograsim.logic.model.model.components.GUIComponent; +import net.mograsim.logic.model.model.components.ModelComponent; import net.mograsim.logic.model.model.wires.Pin; import net.mograsim.logic.model.serializing.IdentifyParams; import net.mograsim.logic.model.snippets.Renderer; @@ -26,14 +26,14 @@ import net.mograsim.preferences.Preferences; */ public class SimpleRectangularLikeSymbolRenderer implements Renderer { - private final GUIComponent component; + private final ModelComponent component; private final String centerText; private final double centerTextHeight; private final double horizontalComponentCenter; private final double pinLabelHeight; private final double pinLabelMargin; - public SimpleRectangularLikeSymbolRenderer(GUIComponent component, SimpleRectangularLikeParams params) + public SimpleRectangularLikeSymbolRenderer(ModelComponent component, SimpleRectangularLikeParams params) { this.component = component; this.centerText = params.centerText; diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/util/ModellingTool.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/util/ModellingTool.java index 1f19edb7..06ce3ca6 100644 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/util/ModellingTool.java +++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/util/ModellingTool.java @@ -1,10 +1,10 @@ package net.mograsim.logic.model.util; import net.mograsim.logic.model.model.ViewModelModifiable; -import net.mograsim.logic.model.model.components.GUIComponent; -import net.mograsim.logic.model.model.wires.GUIWire; +import net.mograsim.logic.model.model.components.ModelComponent; +import net.mograsim.logic.model.model.wires.ModelWire; import net.mograsim.logic.model.model.wires.Pin; -import net.mograsim.logic.model.model.wires.WireCrossPoint; +import net.mograsim.logic.model.model.wires.ModelWireCrossPoint; public class ModellingTool { @@ -15,94 +15,94 @@ public class ModellingTool this.model = model; } - public GUIWire connect(GUIComponent a, GUIComponent b, String pinA, String pinB) + public ModelWire connect(ModelComponent a, ModelComponent b, String pinA, String pinB) { return connect(null, a, b, pinA, pinB); } - public GUIWire connect(WireCrossPoint a, GUIComponent b, String pinB) + public ModelWire connect(ModelWireCrossPoint a, ModelComponent b, String pinB) { return connect(null, a, b, pinB); } - public GUIWire connect(Pin a, GUIComponent b, String pinB) + public ModelWire connect(Pin a, ModelComponent b, String pinB) { return connect(null, a, b, pinB); } - public GUIWire connect(GUIComponent a, WireCrossPoint b, String pinA) + public ModelWire connect(ModelComponent a, ModelWireCrossPoint b, String pinA) { return connect(null, a, b, pinA); } - public GUIWire connect(WireCrossPoint a, WireCrossPoint b) + public ModelWire connect(ModelWireCrossPoint a, ModelWireCrossPoint b) { return connect(null, a, b); } - public GUIWire connect(Pin a, WireCrossPoint b) + public ModelWire connect(Pin a, ModelWireCrossPoint b) { return connect(null, a, b); } - public GUIWire connect(GUIComponent a, Pin b, String pinA) + public ModelWire connect(ModelComponent a, Pin b, String pinA) { return connect(null, a, b, pinA); } - public GUIWire connect(WireCrossPoint a, Pin b) + public ModelWire connect(ModelWireCrossPoint a, Pin b) { return connect(null, a, b); } - public GUIWire connect(Pin a, Pin b) + public ModelWire connect(Pin a, Pin b) { return connect(null, a, b); } - public GUIWire connect(String name, GUIComponent a, GUIComponent b, String pinA, String pinB) + public ModelWire connect(String name, ModelComponent a, ModelComponent b, String pinA, String pinB) { return connect(name, a.getPin(pinA), b.getPin(pinB)); } - public GUIWire connect(String name, WireCrossPoint a, GUIComponent b, String pinB) + public ModelWire connect(String name, ModelWireCrossPoint a, ModelComponent b, String pinB) { return connect(name, a.getPin(), b.getPin(pinB)); } - public GUIWire connect(String name, Pin a, GUIComponent b, String pinB) + public ModelWire connect(String name, Pin a, ModelComponent b, String pinB) { return connect(name, a, b.getPin(pinB)); } - public GUIWire connect(String name, GUIComponent a, WireCrossPoint b, String pinA) + public ModelWire connect(String name, ModelComponent a, ModelWireCrossPoint b, String pinA) { return connect(name, a.getPin(pinA), b.getPin()); } - public GUIWire connect(String name, WireCrossPoint a, WireCrossPoint b) + public ModelWire connect(String name, ModelWireCrossPoint a, ModelWireCrossPoint b) { return connect(name, a.getPin(), b.getPin()); } - public GUIWire connect(String name, Pin a, WireCrossPoint b) + public ModelWire connect(String name, Pin a, ModelWireCrossPoint b) { return connect(name, a, b.getPin()); } - public GUIWire connect(String name, GUIComponent a, Pin b, String pinA) + public ModelWire connect(String name, ModelComponent a, Pin b, String pinA) { return connect(name, a.getPin(pinA), b); } - public GUIWire connect(String name, WireCrossPoint a, Pin b) + public ModelWire connect(String name, ModelWireCrossPoint a, Pin b) { return connect(name, a.getPin(), b); } - public GUIWire connect(String name, Pin a, Pin b) + public ModelWire connect(String name, Pin a, Pin b) { - return new GUIWire(model, name, a, b); + return new ModelWire(model, name, a, b); } public static ModellingTool createFor(ViewModelModifiable model) diff --git a/net.mograsim.machine/src/net/mograsim/machine/standard/memory/GUIMemoryWA.java b/net.mograsim.machine/src/net/mograsim/machine/standard/memory/ModelMemoryWA.java similarity index 76% rename from net.mograsim.machine/src/net/mograsim/machine/standard/memory/GUIMemoryWA.java rename to net.mograsim.machine/src/net/mograsim/machine/standard/memory/ModelMemoryWA.java index bd5eba89..8da1dbb2 100644 --- a/net.mograsim.machine/src/net/mograsim/machine/standard/memory/GUIMemoryWA.java +++ b/net.mograsim.machine/src/net/mograsim/machine/standard/memory/ModelMemoryWA.java @@ -3,13 +3,13 @@ package net.mograsim.machine.standard.memory; import net.haspamelodica.swt.helper.gcs.GeneralGC; import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle; import net.mograsim.logic.model.model.ViewModelModifiable; -import net.mograsim.logic.model.model.components.GUIComponent; -import net.mograsim.logic.model.model.components.atomic.GUIAndGate; +import net.mograsim.logic.model.model.components.ModelComponent; +import net.mograsim.logic.model.model.components.atomic.ModelAndGate; import net.mograsim.logic.model.model.wires.Pin; import net.mograsim.logic.model.model.wires.PinUsage; import net.mograsim.logic.model.modeladapter.ViewLogicModelAdapter; import net.mograsim.logic.model.serializing.IdentifyParams; -import net.mograsim.logic.model.serializing.IndirectGUIComponentCreator; +import net.mograsim.logic.model.serializing.IndirectModelComponentCreator; import net.mograsim.logic.model.snippets.Renderer; import net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer; import net.mograsim.logic.model.snippets.symbolrenderers.CenteredTextSymbolRenderer; @@ -17,7 +17,7 @@ import net.mograsim.logic.model.snippets.symbolrenderers.CenteredTextSymbolRende import net.mograsim.logic.model.util.JsonHandler; import net.mograsim.machine.MainMemoryDefinition; -public class GUIMemoryWA extends GUIComponent +public class ModelMemoryWA extends ModelComponent { private final MainMemoryDefinition definition; private final Pin addrPin, dataPin, rWPin; @@ -26,7 +26,7 @@ public class GUIMemoryWA extends GUIComponent private Renderer symbolRenderer; private Renderer outlineRenderer; - public GUIMemoryWA(ViewModelModifiable model, MainMemoryDefinition definition, String name) + public ModelMemoryWA(ViewModelModifiable model, MainMemoryDefinition definition, String name) { super(model, name); this.definition = definition; @@ -84,13 +84,13 @@ public class GUIMemoryWA extends GUIComponent @Override public String getIDForSerializing(IdentifyParams idParams) { - return "GUIMemoryWA";//TODO + return "MemoryWA"; } @Override - public GUIMemoryWAParams getParamsForSerializing(IdentifyParams idParams) + public ModelMemoryWAParams getParamsForSerializing(IdentifyParams idParams) { - GUIMemoryWAParams params = new GUIMemoryWAParams(); + ModelMemoryWAParams params = new ModelMemoryWAParams(); params.addrBits = definition.getMemoryAddressBits(); params.cellWidth = definition.getCellWidth(); params.minAddr = definition.getMinimalAddress(); @@ -101,14 +101,14 @@ public class GUIMemoryWA extends GUIComponent static { ViewLogicModelAdapter.addComponentAdapter(new WordAddressableMemoryAdapter()); - IndirectGUIComponentCreator.setComponentSupplier(GUIAndGate.class.getCanonicalName(), (m, p, n) -> + IndirectModelComponentCreator.setComponentSupplier(ModelAndGate.class.getCanonicalName(), (m, p, n) -> { - GUIMemoryWAParams params = JsonHandler.fromJsonTree(p, GUIMemoryWAParams.class); - return new GUIMemoryWA(m, MainMemoryDefinition.create(params.addrBits, params.cellWidth, params.minAddr, params.maxAddr), n); + ModelMemoryWAParams params = JsonHandler.fromJsonTree(p, ModelMemoryWAParams.class); + return new ModelMemoryWA(m, MainMemoryDefinition.create(params.addrBits, params.cellWidth, params.minAddr, params.maxAddr), n); }); } - public static class GUIMemoryWAParams + public static class ModelMemoryWAParams { public int addrBits; public int cellWidth; diff --git a/net.mograsim.machine/src/net/mograsim/machine/standard/memory/WordAddressableMemoryAdapter.java b/net.mograsim.machine/src/net/mograsim/machine/standard/memory/WordAddressableMemoryAdapter.java index bf6cb4f9..8d76f93a 100644 --- a/net.mograsim.machine/src/net/mograsim/machine/standard/memory/WordAddressableMemoryAdapter.java +++ b/net.mograsim.machine/src/net/mograsim/machine/standard/memory/WordAddressableMemoryAdapter.java @@ -10,24 +10,24 @@ import net.mograsim.logic.model.model.wires.Pin; import net.mograsim.logic.model.modeladapter.LogicModelParameters; import net.mograsim.logic.model.modeladapter.componentadapters.ComponentAdapter; -public class WordAddressableMemoryAdapter implements ComponentAdapter +public class WordAddressableMemoryAdapter implements ComponentAdapter { @Override - public Class getSupportedClass() + public Class getSupportedClass() { - return GUIMemoryWA.class; + return ModelMemoryWA.class; } @SuppressWarnings("unused") @Override - public void createAndLinkComponent(Timeline timeline, LogicModelParameters params, GUIMemoryWA guiComponent, + public void createAndLinkComponent(Timeline timeline, LogicModelParameters params, ModelMemoryWA modelComponent, Map logicWiresPerPin) { - ReadWriteEnd data = logicWiresPerPin.get(guiComponent.getDataPin()).createReadWriteEnd(); - ReadEnd address = logicWiresPerPin.get(guiComponent.getAddressPin()).createReadOnlyEnd(); - ReadEnd mode = logicWiresPerPin.get(guiComponent.getReadWritePin()).createReadOnlyEnd(); - new WordAddressableMemoryComponent(timeline, 2, guiComponent.getDefinition(), data, mode, address); + ReadWriteEnd data = logicWiresPerPin.get(modelComponent.getDataPin()).createReadWriteEnd(); + ReadEnd address = logicWiresPerPin.get(modelComponent.getAddressPin()).createReadOnlyEnd(); + ReadEnd mode = logicWiresPerPin.get(modelComponent.getReadWritePin()).createReadOnlyEnd(); + new WordAddressableMemoryComponent(timeline, 2, modelComponent.getDefinition(), data, mode, address); } } diff --git a/net.mograsim.plugin.core/src/net/mograsim/plugin/SimulationPreview.java b/net.mograsim.plugin.core/src/net/mograsim/plugin/SimulationPreview.java index 42fada84..f669a49a 100644 --- a/net.mograsim.plugin.core/src/net/mograsim/plugin/SimulationPreview.java +++ b/net.mograsim.plugin.core/src/net/mograsim/plugin/SimulationPreview.java @@ -10,11 +10,11 @@ import net.mograsim.logic.core.timeline.Timeline; import net.mograsim.logic.model.LogicExecuter; import net.mograsim.logic.model.LogicUICanvas; import net.mograsim.logic.model.model.ViewModelModifiable; -import net.mograsim.logic.model.model.components.atomic.GUIManualSwitch; -import net.mograsim.logic.model.model.components.atomic.GUINotGate; -import net.mograsim.logic.model.model.components.atomic.GUIOrGate; -import net.mograsim.logic.model.model.wires.GUIWire; -import net.mograsim.logic.model.model.wires.WireCrossPoint; +import net.mograsim.logic.model.model.components.atomic.ModelManualSwitch; +import net.mograsim.logic.model.model.components.atomic.ModelNotGate; +import net.mograsim.logic.model.model.components.atomic.ModelOrGate; +import net.mograsim.logic.model.model.wires.ModelWire; +import net.mograsim.logic.model.model.wires.ModelWireCrossPoint; import net.mograsim.logic.model.modeladapter.LogicModelParameters; import net.mograsim.logic.model.modeladapter.ViewLogicModelAdapter; import net.mograsim.preferences.Preferences; @@ -41,44 +41,44 @@ public class SimulationPreview implements IThemePreview params.gateProcessTime = 50; params.wireTravelTime = 10; - GUIManualSwitch rIn = new GUIManualSwitch(model, 1); + ModelManualSwitch rIn = new ModelManualSwitch(model, 1); rIn.moveTo(10, 10); - GUIManualSwitch sIn = new GUIManualSwitch(model, 1); + ModelManualSwitch sIn = new ModelManualSwitch(model, 1); sIn.moveTo(10, 70); - GUIOrGate or1 = new GUIOrGate(model, 1); + ModelOrGate or1 = new ModelOrGate(model, 1); or1.moveTo(70, 12.5); - new GUIWire(model, rIn.getOutputPin(), or1.getPin("A")); + new ModelWire(model, rIn.getOutputPin(), or1.getPin("A")); - GUIOrGate or2 = new GUIOrGate(model, 1); + ModelOrGate or2 = new ModelOrGate(model, 1); or2.moveTo(70, 62.5); - new GUIWire(model, sIn.getOutputPin(), or2.getPin("B")); + new ModelWire(model, sIn.getOutputPin(), or2.getPin("B")); - GUINotGate not1 = new GUINotGate(model, 1); + ModelNotGate not1 = new ModelNotGate(model, 1); not1.moveTo(110, 17.5); - new GUIWire(model, or1.getPin("Y"), not1.getPin("A")); + new ModelWire(model, or1.getPin("Y"), not1.getPin("A")); - GUINotGate not2 = new GUINotGate(model, 1); + ModelNotGate not2 = new ModelNotGate(model, 1); not2.moveTo(110, 67.5); - new GUIWire(model, or2.getPin("Y"), not2.getPin("A")); + new ModelWire(model, or2.getPin("Y"), not2.getPin("A")); - WireCrossPoint p1 = new WireCrossPoint(model, 1); + ModelWireCrossPoint p1 = new ModelWireCrossPoint(model, 1); p1.moveCenterTo(140, 22.5); - new GUIWire(model, not1.getPin("Y"), p1); - new GUIWire(model, p1, or2.getPin("A"), new Point(140, 35), new Point(50, 60), new Point(50, 67.5)); + new ModelWire(model, not1.getPin("Y"), p1); + new ModelWire(model, p1, or2.getPin("A"), new Point(140, 35), new Point(50, 60), new Point(50, 67.5)); - WireCrossPoint p2 = new WireCrossPoint(model, 1); + ModelWireCrossPoint p2 = new ModelWireCrossPoint(model, 1); p2.moveCenterTo(140, 72.5); - new GUIWire(model, not2.getPin("Y"), p2); - new GUIWire(model, p2, or1.getPin("B"), new Point(140, 60), new Point(50, 35), new Point(50, 27.5)); + new ModelWire(model, not2.getPin("Y"), p2); + new ModelWire(model, p2, or1.getPin("B"), new Point(140, 60), new Point(50, 35), new Point(50, 27.5)); - WireCrossPoint o1 = new WireCrossPoint(model, 1); + ModelWireCrossPoint o1 = new ModelWireCrossPoint(model, 1); o1.moveCenterTo(150, 22.5); - new GUIWire(model, p1, o1); + new ModelWire(model, p1, o1); - WireCrossPoint o2 = new WireCrossPoint(model, 1); + ModelWireCrossPoint o2 = new ModelWireCrossPoint(model, 1); o2.moveCenterTo(150, 72.5); - new GUIWire(model, p2, o2); + new ModelWire(model, p2, o2); Timeline t = ViewLogicModelAdapter.convert(model, params); exec = new LogicExecuter(t); -- 2.17.1