From 7d79c13e0d6979b212b24ed21845f9178f01249a Mon Sep 17 00:00:00 2001 From: Daniel Kirschten Date: Wed, 28 Aug 2019 10:27:06 +0200 Subject: [PATCH] Replaced verbose component IDs with default component IDs --- .../components/GUI_rsLatch.json | 8 +- .../components/GUIand.json | 4 +- .../components/GUIand41.json | 4 +- .../components/GUIandor414.json | 4 +- .../components/GUIdemux2.json | 4 +- .../components/GUIdff.json | 8 +- .../components/GUIdff4.json | 16 +-- .../components/GUIdff4_invwe.json | 16 +-- .../components/GUIdlatch.json | 8 +- .../components/GUIdlatch4.json | 16 +-- .../components/GUIfulladder.json | 4 +- .../components/GUIhalfadder.json | 4 +- .../components/GUImux1.json | 4 +- .../components/GUImux1_4.json | 4 +- .../components/GUImux2_4.json | 6 +- .../components/GUImux3.json | 10 +- .../components/GUInand3.json | 4 +- .../components/GUInot4.json | 4 +- .../components/GUIor4.json | 4 +- .../components/GUIor_4.json | 4 +- .../components/GUIram2.json | 16 +-- .../components/GUIram4.json | 48 ++++----- .../components/GUIsel2_4.json | 4 +- .../components/GUIsel3_4.json | 4 +- .../components/GUIxor.json | 4 +- .../components/am2901/GUIAm2901.json | 10 +- .../am2901/GUIAm2901ALUFuncDecode.json | 4 +- .../am2901/GUIAm2901ALUInclDecode.json | 4 +- ...ALUInclSourceDecodeInclFunctionDecode.json | 4 +- .../components/am2901/GUIAm2901ALUOneBit.json | 4 +- .../am2901/GUIAm2901DestDecode.json | 4 +- .../am2901/GUIAm2901SourceDecode.json | 4 +- .../components/am2904/GUIAm2904.json | 100 +++++++++--------- .../components/am2904/GUIAm2904TestLogic.json | 42 ++++---- .../components/am2910/GUIAm2910.json | 56 +++++----- .../components/am2910/GUIAm2910_old.json | 54 +++++----- .../components/GUI_rsLatch.json | 8 +- .../components/GUIand.json | 4 +- .../components/GUIand41.json | 4 +- .../components/GUIandor414.json | 4 +- .../components/GUIdemux2.json | 4 +- .../components/GUIdff.json | 8 +- .../components/GUIdff4.json | 16 +-- .../components/GUIdff4_invwe.json | 16 +-- .../components/GUIdlatch.json | 8 +- .../components/GUIdlatch4.json | 16 +-- .../components/GUIfulladder.json | 4 +- .../components/GUIhalfadder.json | 4 +- .../components/GUImux1.json | 4 +- .../components/GUImux1_4.json | 4 +- .../components/GUImux2_4.json | 6 +- .../components/GUImux3.json | 10 +- .../components/GUInand3.json | 4 +- .../components/GUInot4.json | 4 +- .../components/GUIor4.json | 4 +- .../components/GUIor_4.json | 4 +- .../components/GUIram2.json | 16 +-- .../components/GUIram4.json | 48 ++++----- .../components/GUIsel2_4.json | 4 +- .../components/GUIsel3_4.json | 4 +- .../components/GUIxor.json | 4 +- .../components/am2901/GUIAm2901.json | 10 +- .../am2901/GUIAm2901ALUFuncDecode.json | 4 +- .../am2901/GUIAm2901ALUInclDecode.json | 4 +- ...ALUInclSourceDecodeInclFunctionDecode.json | 4 +- .../components/am2901/GUIAm2901ALUOneBit.json | 4 +- .../am2901/GUIAm2901DestDecode.json | 4 +- .../am2901/GUIAm2901SourceDecode.json | 4 +- .../components/am2904/GUIAm2904.json | 100 +++++++++--------- .../components/am2904/GUIAm2904TestLogic.json | 42 ++++---- .../components/am2910/GUIAm2910.json | 56 +++++----- .../components/am2910/GUIAm2910_old.json | 54 +++++----- .../standardComponentIDMapping.json | 2 +- .../standard/standardSnippetIDMapping.json | 1 + 74 files changed, 500 insertions(+), 499 deletions(-) diff --git a/net.mograsim.logic.model.am2900/components/GUI_rsLatch.json b/net.mograsim.logic.model.am2900/components/GUI_rsLatch.json index 4199e45f..6f679a91 100644 --- a/net.mograsim.logic.model.am2900/components/GUI_rsLatch.json +++ b/net.mograsim.logic.model.am2900/components/GUI_rsLatch.json @@ -219,7 +219,7 @@ mograsim version: 0.1.3 } ] }, - "symbolRendererSnippetID": "class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer", + "symbolRendererSnippetID": "simpleRectangularLike", "symbolRendererParams": { "centerText": "_rsLatch", "centerTextHeight": 5.0, @@ -227,13 +227,13 @@ mograsim version: 0.1.3 "pinLabelHeight": 3.5, "pinLabelMargin": 0.5 }, - "outlineRendererSnippetID": "class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer", - "highLevelStateHandlerSnippetID": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.StandardHighLevelStateHandler", + "outlineRendererSnippetID": "default", + "highLevelStateHandlerSnippetID": "standard", "highLevelStateHandlerParams": { "subcomponentHighLevelStates": {}, "atomicHighLevelStates": { "q": { - "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.WireForcingAtomicHighLevelStateHandler", + "id": "wireForcing", "params": { "wiresToForce": [ "q" diff --git a/net.mograsim.logic.model.am2900/components/GUIand.json b/net.mograsim.logic.model.am2900/components/GUIand.json index 6ec536a3..ef577973 100644 --- a/net.mograsim.logic.model.am2900/components/GUIand.json +++ b/net.mograsim.logic.model.am2900/components/GUIand.json @@ -141,7 +141,7 @@ mograsim version: 0.1.3 } ] }, - "symbolRendererSnippetID": "class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer", + "symbolRendererSnippetID": "simpleRectangularLike", "symbolRendererParams": { "centerText": "GUIand", "centerTextHeight": 5.0, @@ -149,5 +149,5 @@ mograsim version: 0.1.3 "pinLabelHeight": 3.5, "pinLabelMargin": 0.5 }, - "outlineRendererSnippetID": "class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer" + "outlineRendererSnippetID": "default" } \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/components/GUIand41.json b/net.mograsim.logic.model.am2900/components/GUIand41.json index 95776814..87b73945 100644 --- a/net.mograsim.logic.model.am2900/components/GUIand41.json +++ b/net.mograsim.logic.model.am2900/components/GUIand41.json @@ -332,7 +332,7 @@ mograsim version: 0.1.3 } ] }, - "symbolRendererSnippetID": "class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer", + "symbolRendererSnippetID": "simpleRectangularLike", "symbolRendererParams": { "centerText": "GUIand41", "centerTextHeight": 5.0, @@ -340,5 +340,5 @@ mograsim version: 0.1.3 "pinLabelHeight": 3.5, "pinLabelMargin": 0.5 }, - "outlineRendererSnippetID": "class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer" + "outlineRendererSnippetID": "default" } \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/components/GUIandor414.json b/net.mograsim.logic.model.am2900/components/GUIandor414.json index c6dc8210..bd61b9df 100644 --- a/net.mograsim.logic.model.am2900/components/GUIandor414.json +++ b/net.mograsim.logic.model.am2900/components/GUIandor414.json @@ -493,7 +493,7 @@ mograsim version: 0.1.3 } ] }, - "symbolRendererSnippetID": "class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer", + "symbolRendererSnippetID": "simpleRectangularLike", "symbolRendererParams": { "centerText": "GUIandor414", "centerTextHeight": 5.0, @@ -501,5 +501,5 @@ mograsim version: 0.1.3 "pinLabelHeight": 3.5, "pinLabelMargin": 0.5 }, - "outlineRendererSnippetID": "class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer" + "outlineRendererSnippetID": "default" } \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/components/GUIdemux2.json b/net.mograsim.logic.model.am2900/components/GUIdemux2.json index 55e3c8a1..3523e99e 100644 --- a/net.mograsim.logic.model.am2900/components/GUIdemux2.json +++ b/net.mograsim.logic.model.am2900/components/GUIdemux2.json @@ -524,7 +524,7 @@ mograsim version: 0.1.3 } ] }, - "symbolRendererSnippetID": "class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer", + "symbolRendererSnippetID": "simpleRectangularLike", "symbolRendererParams": { "centerText": "GUIdemux2", "centerTextHeight": 5.0, @@ -532,5 +532,5 @@ mograsim version: 0.1.3 "pinLabelHeight": 3.5, "pinLabelMargin": 0.5 }, - "outlineRendererSnippetID": "class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer" + "outlineRendererSnippetID": "default" } \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/components/GUIdff.json b/net.mograsim.logic.model.am2900/components/GUIdff.json index 345b126e..66af673f 100644 --- a/net.mograsim.logic.model.am2900/components/GUIdff.json +++ b/net.mograsim.logic.model.am2900/components/GUIdff.json @@ -332,7 +332,7 @@ mograsim version: 0.1.3 } ] }, - "symbolRendererSnippetID": "class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer", + "symbolRendererSnippetID": "simpleRectangularLike", "symbolRendererParams": { "centerText": "GUIdff", "centerTextHeight": 5.0, @@ -340,13 +340,13 @@ mograsim version: 0.1.3 "pinLabelHeight": 3.5, "pinLabelMargin": 0.5 }, - "outlineRendererSnippetID": "class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer", - "highLevelStateHandlerSnippetID": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.StandardHighLevelStateHandler", + "outlineRendererSnippetID": "default", + "highLevelStateHandlerSnippetID": "standard", "highLevelStateHandlerParams": { "subcomponentHighLevelStates": {}, "atomicHighLevelStates": { "q": { - "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.DelegatingAtomicHighLevelStateHandler", + "id": "delegating", "params": { "delegateTarget": "GUI_rsLatch#1", "subStateID": "q" diff --git a/net.mograsim.logic.model.am2900/components/GUIdff4.json b/net.mograsim.logic.model.am2900/components/GUIdff4.json index 4064f93e..d03fafec 100644 --- a/net.mograsim.logic.model.am2900/components/GUIdff4.json +++ b/net.mograsim.logic.model.am2900/components/GUIdff4.json @@ -653,7 +653,7 @@ mograsim version: 0.1.3 } ] }, - "symbolRendererSnippetID": "class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer", + "symbolRendererSnippetID": "simpleRectangularLike", "symbolRendererParams": { "centerText": "D flip flop\n4 bit", "centerTextHeight": 5.0, @@ -661,27 +661,27 @@ mograsim version: 0.1.3 "pinLabelHeight": 3.5, "pinLabelMargin": 0.5 }, - "outlineRendererSnippetID": "class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer", - "highLevelStateHandlerSnippetID": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.StandardHighLevelStateHandler", + "outlineRendererSnippetID": "default", + "highLevelStateHandlerSnippetID": "standard", "highLevelStateHandlerParams": { "subcomponentHighLevelStates": {}, "atomicHighLevelStates": { "q1": { - "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.DelegatingAtomicHighLevelStateHandler", + "id": "delegating", "params": { "delegateTarget": "GUIdff#0", "subStateID": "q" } }, "q2": { - "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.DelegatingAtomicHighLevelStateHandler", + "id": "delegating", "params": { "delegateTarget": "GUIdff#1", "subStateID": "q" } }, "q": { - "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.BitVectorSplittingAtomicHighLevelStateHandler", + "id": "bitVectorSplitting", "params": { "vectorPartTargets": [ "q1", @@ -698,14 +698,14 @@ mograsim version: 0.1.3 } }, "q3": { - "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.DelegatingAtomicHighLevelStateHandler", + "id": "delegating", "params": { "delegateTarget": "GUIdff#2", "subStateID": "q" } }, "q4": { - "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.DelegatingAtomicHighLevelStateHandler", + "id": "delegating", "params": { "delegateTarget": "GUIdff#3", "subStateID": "q" diff --git a/net.mograsim.logic.model.am2900/components/GUIdff4_invwe.json b/net.mograsim.logic.model.am2900/components/GUIdff4_invwe.json index cb697d23..3108cc5f 100644 --- a/net.mograsim.logic.model.am2900/components/GUIdff4_invwe.json +++ b/net.mograsim.logic.model.am2900/components/GUIdff4_invwe.json @@ -662,7 +662,7 @@ mograsim version: 0.1.3 } ] }, - "symbolRendererSnippetID": "class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer", + "symbolRendererSnippetID": "simpleRectangularLike", "symbolRendererParams": { "centerText": "D flip flop\n4 bit", "centerTextHeight": 5.0, @@ -670,27 +670,27 @@ mograsim version: 0.1.3 "pinLabelHeight": 3.5, "pinLabelMargin": 0.5 }, - "outlineRendererSnippetID": "class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer", - "highLevelStateHandlerSnippetID": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.StandardHighLevelStateHandler", + "outlineRendererSnippetID": "default", + "highLevelStateHandlerSnippetID": "standard", "highLevelStateHandlerParams": { "subcomponentHighLevelStates": {}, "atomicHighLevelStates": { "q1": { - "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.DelegatingAtomicHighLevelStateHandler", + "id": "delegating", "params": { "delegateTarget": "GUIdff#0", "subStateID": "q" } }, "q2": { - "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.DelegatingAtomicHighLevelStateHandler", + "id": "delegating", "params": { "delegateTarget": "GUIdff#1", "subStateID": "q" } }, "q": { - "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.BitVectorSplittingAtomicHighLevelStateHandler", + "id": "bitVectorSplitting", "params": { "vectorPartTargets": [ "q1", @@ -707,14 +707,14 @@ mograsim version: 0.1.3 } }, "q3": { - "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.DelegatingAtomicHighLevelStateHandler", + "id": "delegating", "params": { "delegateTarget": "GUIdff#2", "subStateID": "q" } }, "q4": { - "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.DelegatingAtomicHighLevelStateHandler", + "id": "delegating", "params": { "delegateTarget": "GUIdff#3", "subStateID": "q" diff --git a/net.mograsim.logic.model.am2900/components/GUIdlatch.json b/net.mograsim.logic.model.am2900/components/GUIdlatch.json index 26c4071d..034ab797 100644 --- a/net.mograsim.logic.model.am2900/components/GUIdlatch.json +++ b/net.mograsim.logic.model.am2900/components/GUIdlatch.json @@ -237,7 +237,7 @@ mograsim version: 0.1.3 } ] }, - "symbolRendererSnippetID": "class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer", + "symbolRendererSnippetID": "simpleRectangularLike", "symbolRendererParams": { "centerText": "GUIdlatch", "centerTextHeight": 5.0, @@ -245,13 +245,13 @@ mograsim version: 0.1.3 "pinLabelHeight": 3.5, "pinLabelMargin": 0.5 }, - "outlineRendererSnippetID": "class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer", - "highLevelStateHandlerSnippetID": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.StandardHighLevelStateHandler", + "outlineRendererSnippetID": "default", + "highLevelStateHandlerSnippetID": "standard", "highLevelStateHandlerParams": { "subcomponentHighLevelStates": {}, "atomicHighLevelStates": { "q": { - "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.DelegatingAtomicHighLevelStateHandler", + "id": "delegating", "params": { "delegateTarget": "GUI_rsLatch#0", "subStateID": "q" diff --git a/net.mograsim.logic.model.am2900/components/GUIdlatch4.json b/net.mograsim.logic.model.am2900/components/GUIdlatch4.json index 28021dff..d798d7f5 100644 --- a/net.mograsim.logic.model.am2900/components/GUIdlatch4.json +++ b/net.mograsim.logic.model.am2900/components/GUIdlatch4.json @@ -332,7 +332,7 @@ mograsim version: 0.1.3 } ] }, - "symbolRendererSnippetID": "class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer", + "symbolRendererSnippetID": "simpleRectangularLike", "symbolRendererParams": { "centerText": "GUIdlatch4", "centerTextHeight": 5.0, @@ -340,27 +340,27 @@ mograsim version: 0.1.3 "pinLabelHeight": 3.5, "pinLabelMargin": 0.5 }, - "outlineRendererSnippetID": "class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer", - "highLevelStateHandlerSnippetID": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.StandardHighLevelStateHandler", + "outlineRendererSnippetID": "default", + "highLevelStateHandlerSnippetID": "standard", "highLevelStateHandlerParams": { "subcomponentHighLevelStates": {}, "atomicHighLevelStates": { "q1": { - "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.DelegatingAtomicHighLevelStateHandler", + "id": "delegating", "params": { "delegateTarget": "GUIdlatch#0", "subStateID": "q" } }, "q2": { - "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.DelegatingAtomicHighLevelStateHandler", + "id": "delegating", "params": { "delegateTarget": "GUIdlatch#1", "subStateID": "q" } }, "q": { - "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.BitVectorSplittingAtomicHighLevelStateHandler", + "id": "bitVectorSplitting", "params": { "vectorPartTargets": [ "q1", @@ -377,14 +377,14 @@ mograsim version: 0.1.3 } }, "q3": { - "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.DelegatingAtomicHighLevelStateHandler", + "id": "delegating", "params": { "delegateTarget": "GUIdlatch#2", "subStateID": "q" } }, "q4": { - "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.DelegatingAtomicHighLevelStateHandler", + "id": "delegating", "params": { "delegateTarget": "GUIdlatch#3", "subStateID": "q" diff --git a/net.mograsim.logic.model.am2900/components/GUIfulladder.json b/net.mograsim.logic.model.am2900/components/GUIfulladder.json index b509eb28..d4647013 100644 --- a/net.mograsim.logic.model.am2900/components/GUIfulladder.json +++ b/net.mograsim.logic.model.am2900/components/GUIfulladder.json @@ -185,7 +185,7 @@ mograsim version: 0.1.3 } ] }, - "symbolRendererSnippetID": "class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer", + "symbolRendererSnippetID": "simpleRectangularLike", "symbolRendererParams": { "centerText": "GUIfulladder", "centerTextHeight": 5.0, @@ -193,5 +193,5 @@ mograsim version: 0.1.3 "pinLabelHeight": 3.5, "pinLabelMargin": 0.5 }, - "outlineRendererSnippetID": "class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer" + "outlineRendererSnippetID": "default" } \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/components/GUIhalfadder.json b/net.mograsim.logic.model.am2900/components/GUIhalfadder.json index 8ca9ccd8..d0a0fa20 100644 --- a/net.mograsim.logic.model.am2900/components/GUIhalfadder.json +++ b/net.mograsim.logic.model.am2900/components/GUIhalfadder.json @@ -319,7 +319,7 @@ mograsim version: 0.1.3 } ] }, - "symbolRendererSnippetID": "class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer", + "symbolRendererSnippetID": "simpleRectangularLike", "symbolRendererParams": { "centerText": "GUIhalfadder", "centerTextHeight": 5.0, @@ -327,5 +327,5 @@ mograsim version: 0.1.3 "pinLabelHeight": 3.5, "pinLabelMargin": 0.5 }, - "outlineRendererSnippetID": "class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer" + "outlineRendererSnippetID": "default" } \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/components/GUImux1.json b/net.mograsim.logic.model.am2900/components/GUImux1.json index b75d9f1a..c0d53e56 100644 --- a/net.mograsim.logic.model.am2900/components/GUImux1.json +++ b/net.mograsim.logic.model.am2900/components/GUImux1.json @@ -230,7 +230,7 @@ mograsim version: 0.1.3 } ] }, - "symbolRendererSnippetID": "class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer", + "symbolRendererSnippetID": "simpleRectangularLike", "symbolRendererParams": { "centerText": "GUImux1", "centerTextHeight": 5.0, @@ -238,5 +238,5 @@ mograsim version: 0.1.3 "pinLabelHeight": 3.5, "pinLabelMargin": 0.5 }, - "outlineRendererSnippetID": "class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer" + "outlineRendererSnippetID": "default" } \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/components/GUImux1_4.json b/net.mograsim.logic.model.am2900/components/GUImux1_4.json index b9f66127..c90cd3eb 100644 --- a/net.mograsim.logic.model.am2900/components/GUImux1_4.json +++ b/net.mograsim.logic.model.am2900/components/GUImux1_4.json @@ -476,7 +476,7 @@ mograsim version: 0.1.3 } ] }, - "symbolRendererSnippetID": "class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer", + "symbolRendererSnippetID": "simpleRectangularLike", "symbolRendererParams": { "centerText": "GUImux1_4", "centerTextHeight": 5.0, @@ -484,5 +484,5 @@ mograsim version: 0.1.3 "pinLabelHeight": 3.5, "pinLabelMargin": 0.5 }, - "outlineRendererSnippetID": "class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer" + "outlineRendererSnippetID": "default" } \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/components/GUImux2_4.json b/net.mograsim.logic.model.am2900/components/GUImux2_4.json index f9648eee..042d9e1b 100644 --- a/net.mograsim.logic.model.am2900/components/GUImux2_4.json +++ b/net.mograsim.logic.model.am2900/components/GUImux2_4.json @@ -679,7 +679,7 @@ mograsim version: 0.1.3 } ] }, - "symbolRendererSnippetID": "class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer", + "symbolRendererSnippetID": "simpleRectangularLike", "symbolRendererParams": { "centerText": "GUImux1_4", "centerTextHeight": 5.0, @@ -687,6 +687,6 @@ mograsim version: 0.1.3 "pinLabelHeight": 3.5, "pinLabelMargin": 0.5 }, - "outlineRendererSnippetID": "class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer", - "highLevelStateHandlerSnippetID": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.DefaultHighLevelStateHandler" + "outlineRendererSnippetID": "default", + "highLevelStateHandlerSnippetID": "default" } \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/components/GUImux3.json b/net.mograsim.logic.model.am2900/components/GUImux3.json index 69181cde..3f6a8bc1 100644 --- a/net.mograsim.logic.model.am2900/components/GUImux3.json +++ b/net.mograsim.logic.model.am2900/components/GUImux3.json @@ -104,7 +104,7 @@ mograsim version: 0.1.3 "innerScale": 0.4, "subComps": [ { - "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", + "id": "WireCrossPoint", "name": "WireCrossPoint#1", "pos": { "x": 24.0, @@ -113,7 +113,7 @@ mograsim version: 0.1.3 "params": 1 }, { - "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", + "id": "WireCrossPoint", "name": "WireCrossPoint#0", "pos": { "x": 19.0, @@ -466,7 +466,7 @@ mograsim version: 0.1.3 } ] }, - "symbolRendererSnippetID": "class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer", + "symbolRendererSnippetID": "simpleRectangularLike", "symbolRendererParams": { "centerText": "GUImux3", "centerTextHeight": 5.0, @@ -474,6 +474,6 @@ mograsim version: 0.1.3 "pinLabelHeight": 3.5, "pinLabelMargin": 0.5 }, - "outlineRendererSnippetID": "class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer", - "highLevelStateHandlerSnippetID": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.DefaultHighLevelStateHandler" + "outlineRendererSnippetID": "default", + "highLevelStateHandlerSnippetID": "default" } \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/components/GUInand3.json b/net.mograsim.logic.model.am2900/components/GUInand3.json index 1bdc7ccd..e57eefee 100644 --- a/net.mograsim.logic.model.am2900/components/GUInand3.json +++ b/net.mograsim.logic.model.am2900/components/GUInand3.json @@ -201,7 +201,7 @@ mograsim version: 0.1.3 } ] }, - "symbolRendererSnippetID": "class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer", + "symbolRendererSnippetID": "simpleRectangularLike", "symbolRendererParams": { "centerText": "GUInand3", "centerTextHeight": 5.0, @@ -209,5 +209,5 @@ mograsim version: 0.1.3 "pinLabelHeight": 3.5, "pinLabelMargin": 0.5 }, - "outlineRendererSnippetID": "class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer" + "outlineRendererSnippetID": "default" } \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/components/GUInot4.json b/net.mograsim.logic.model.am2900/components/GUInot4.json index 0a3b7034..a7e95a32 100644 --- a/net.mograsim.logic.model.am2900/components/GUInot4.json +++ b/net.mograsim.logic.model.am2900/components/GUInot4.json @@ -379,7 +379,7 @@ mograsim version: 0.1.3 } ] }, - "symbolRendererSnippetID": "class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer", + "symbolRendererSnippetID": "simpleRectangularLike", "symbolRendererParams": { "centerText": "GUInot4", "centerTextHeight": 5.0, @@ -387,5 +387,5 @@ mograsim version: 0.1.3 "pinLabelHeight": 3.5, "pinLabelMargin": 0.5 }, - "outlineRendererSnippetID": "class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer" + "outlineRendererSnippetID": "default" } \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/components/GUIor4.json b/net.mograsim.logic.model.am2900/components/GUIor4.json index fca69d6f..5b09418b 100644 --- a/net.mograsim.logic.model.am2900/components/GUIor4.json +++ b/net.mograsim.logic.model.am2900/components/GUIor4.json @@ -539,7 +539,7 @@ mograsim version: 0.1.3 } ] }, - "symbolRendererSnippetID": "class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer", + "symbolRendererSnippetID": "simpleRectangularLike", "symbolRendererParams": { "centerText": "GUIor4", "centerTextHeight": 5.0, @@ -547,5 +547,5 @@ mograsim version: 0.1.3 "pinLabelHeight": 3.5, "pinLabelMargin": 0.5 }, - "outlineRendererSnippetID": "class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer" + "outlineRendererSnippetID": "default" } \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/components/GUIor_4.json b/net.mograsim.logic.model.am2900/components/GUIor_4.json index 07a3e1e3..ed484c98 100644 --- a/net.mograsim.logic.model.am2900/components/GUIor_4.json +++ b/net.mograsim.logic.model.am2900/components/GUIor_4.json @@ -871,7 +871,7 @@ mograsim version: 0.1.3 } ] }, - "symbolRendererSnippetID": "class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer", + "symbolRendererSnippetID": "simpleRectangularLike", "symbolRendererParams": { "centerText": "GUIor_4", "centerTextHeight": 5.0, @@ -879,5 +879,5 @@ mograsim version: 0.1.3 "pinLabelHeight": 3.5, "pinLabelMargin": 0.5 }, - "outlineRendererSnippetID": "class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer" + "outlineRendererSnippetID": "default" } \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/components/GUIram2.json b/net.mograsim.logic.model.am2900/components/GUIram2.json index 31a01fba..ea3eff93 100644 --- a/net.mograsim.logic.model.am2900/components/GUIram2.json +++ b/net.mograsim.logic.model.am2900/components/GUIram2.json @@ -2951,7 +2951,7 @@ mograsim version: 0.1.3 } ] }, - "symbolRendererSnippetID": "class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer", + "symbolRendererSnippetID": "simpleRectangularLike", "symbolRendererParams": { "centerText": "GUIram2", "centerTextHeight": 5.0, @@ -2959,30 +2959,30 @@ mograsim version: 0.1.3 "pinLabelHeight": 3.5, "pinLabelMargin": 0.5 }, - "outlineRendererSnippetID": "class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer", - "highLevelStateHandlerSnippetID": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.StandardHighLevelStateHandler", + "outlineRendererSnippetID": "default", + "highLevelStateHandlerSnippetID": "standard", "highLevelStateHandlerParams": { "subcomponentHighLevelStates": { "c00": { - "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler", + "id": "delegating", "params": { "delegateTarget": "GUIdlatch4#0" } }, "c11": { - "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler", + "id": "delegating", "params": { "delegateTarget": "GUIdlatch4#3" } }, "c10": { - "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler", + "id": "delegating", "params": { "delegateTarget": "GUIdlatch4#2" } }, "c01": { - "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler", + "id": "delegating", "params": { "delegateTarget": "GUIdlatch4#1" } @@ -2990,7 +2990,7 @@ mograsim version: 0.1.3 }, "atomicHighLevelStates": { "q": { - "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.BitVectorSplittingAtomicHighLevelStateHandler", + "id": "bitVectorSplitting", "params": { "vectorPartTargets": [ "c11.q", diff --git a/net.mograsim.logic.model.am2900/components/GUIram4.json b/net.mograsim.logic.model.am2900/components/GUIram4.json index 05bfe9da..e5e71cc1 100644 --- a/net.mograsim.logic.model.am2900/components/GUIram4.json +++ b/net.mograsim.logic.model.am2900/components/GUIram4.json @@ -3331,7 +3331,7 @@ mograsim version: 0.1.3 } ] }, - "symbolRendererSnippetID": "class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer", + "symbolRendererSnippetID": "simpleRectangularLike", "symbolRendererParams": { "centerText": "GUIram4", "centerTextHeight": 5.0, @@ -3339,141 +3339,141 @@ mograsim version: 0.1.3 "pinLabelHeight": 3.5, "pinLabelMargin": 0.5 }, - "outlineRendererSnippetID": "class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer", - "highLevelStateHandlerSnippetID": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.StandardHighLevelStateHandler", + "outlineRendererSnippetID": "default", + "highLevelStateHandlerSnippetID": "standard", "highLevelStateHandlerParams": { "subcomponentHighLevelStates": { "c00": { - "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler", + "id": "delegating", "params": { "delegateTarget": "GUIram2#0" } }, "c11": { - "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler", + "id": "delegating", "params": { "delegateTarget": "GUIram2#3" } }, "c10": { - "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler", + "id": "delegating", "params": { "delegateTarget": "GUIram2#2" } }, "c01": { - "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler", + "id": "delegating", "params": { "delegateTarget": "GUIram2#1" } }, "c1000": { - "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler", + "id": "delegating", "params": { "delegateTarget": "GUIram2#0", "prefix": "c10" } }, "c1011": { - "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler", + "id": "delegating", "params": { "delegateTarget": "GUIram2#3", "prefix": "c10" } }, "c1110": { - "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler", + "id": "delegating", "params": { "delegateTarget": "GUIram2#2", "prefix": "c11" } }, "c1001": { - "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler", + "id": "delegating", "params": { "delegateTarget": "GUIram2#1", "prefix": "c10" } }, "c1100": { - "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler", + "id": "delegating", "params": { "delegateTarget": "GUIram2#0", "prefix": "c11" } }, "c1111": { - "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler", + "id": "delegating", "params": { "delegateTarget": "GUIram2#3", "prefix": "c11" } }, "c0000": { - "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler", + "id": "delegating", "params": { "delegateTarget": "GUIram2#0", "prefix": "c00" } }, "c0011": { - "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler", + "id": "delegating", "params": { "delegateTarget": "GUIram2#3", "prefix": "c00" } }, "c0110": { - "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler", + "id": "delegating", "params": { "delegateTarget": "GUIram2#2", "prefix": "c01" } }, "c0010": { - "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler", + "id": "delegating", "params": { "delegateTarget": "GUIram2#2", "prefix": "c00" } }, "c1010": { - "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler", + "id": "delegating", "params": { "delegateTarget": "GUIram2#2", "prefix": "c10" } }, "c0101": { - "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler", + "id": "delegating", "params": { "delegateTarget": "GUIram2#1", "prefix": "c01" } }, "c0001": { - "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler", + "id": "delegating", "params": { "delegateTarget": "GUIram2#1", "prefix": "c00" } }, "c0100": { - "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler", + "id": "delegating", "params": { "delegateTarget": "GUIram2#0", "prefix": "c01" } }, "c0111": { - "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler", + "id": "delegating", "params": { "delegateTarget": "GUIram2#3", "prefix": "c01" } }, "c1101": { - "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler", + "id": "delegating", "params": { "delegateTarget": "GUIram2#1", "prefix": "c11" @@ -3482,7 +3482,7 @@ mograsim version: 0.1.3 }, "atomicHighLevelStates": { "q": { - "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.BitVectorSplittingAtomicHighLevelStateHandler", + "id": "bitVectorSplitting", "params": { "vectorPartTargets": [ "c11.q", diff --git a/net.mograsim.logic.model.am2900/components/GUIsel2_4.json b/net.mograsim.logic.model.am2900/components/GUIsel2_4.json index 1693ebfa..ef717486 100644 --- a/net.mograsim.logic.model.am2900/components/GUIsel2_4.json +++ b/net.mograsim.logic.model.am2900/components/GUIsel2_4.json @@ -835,7 +835,7 @@ mograsim version: 0.1.3 } ] }, - "symbolRendererSnippetID": "class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer", + "symbolRendererSnippetID": "simpleRectangularLike", "symbolRendererParams": { "centerText": "GUIsel2_4", "centerTextHeight": 5.0, @@ -843,5 +843,5 @@ mograsim version: 0.1.3 "pinLabelHeight": 3.5, "pinLabelMargin": 0.5 }, - "outlineRendererSnippetID": "class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer" + "outlineRendererSnippetID": "default" } \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/components/GUIsel3_4.json b/net.mograsim.logic.model.am2900/components/GUIsel3_4.json index cb7c3b4c..494332c3 100644 --- a/net.mograsim.logic.model.am2900/components/GUIsel3_4.json +++ b/net.mograsim.logic.model.am2900/components/GUIsel3_4.json @@ -904,7 +904,7 @@ mograsim version: 0.1.3 } ] }, - "symbolRendererSnippetID": "class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer", + "symbolRendererSnippetID": "simpleRectangularLike", "symbolRendererParams": { "centerText": "GUIsel3_4", "centerTextHeight": 5.0, @@ -912,5 +912,5 @@ mograsim version: 0.1.3 "pinLabelHeight": 3.5, "pinLabelMargin": 0.5 }, - "outlineRendererSnippetID": "class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer" + "outlineRendererSnippetID": "default" } \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/components/GUIxor.json b/net.mograsim.logic.model.am2900/components/GUIxor.json index a15e5df5..82b991e3 100644 --- a/net.mograsim.logic.model.am2900/components/GUIxor.json +++ b/net.mograsim.logic.model.am2900/components/GUIxor.json @@ -268,7 +268,7 @@ mograsim version: 0.1.3 } ] }, - "symbolRendererSnippetID": "class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer", + "symbolRendererSnippetID": "simpleRectangularLike", "symbolRendererParams": { "centerText": "GUIxor", "centerTextHeight": 5.0, @@ -276,5 +276,5 @@ mograsim version: 0.1.3 "pinLabelHeight": 3.5, "pinLabelMargin": 0.5 }, - "outlineRendererSnippetID": "class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer" + "outlineRendererSnippetID": "default" } \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/components/am2901/GUIAm2901.json b/net.mograsim.logic.model.am2900/components/am2901/GUIAm2901.json index 02f17617..81536b1f 100644 --- a/net.mograsim.logic.model.am2900/components/am2901/GUIAm2901.json +++ b/net.mograsim.logic.model.am2900/components/am2901/GUIAm2901.json @@ -3391,7 +3391,7 @@ mograsim version: 0.1.3 } ] }, - "symbolRendererSnippetID": "class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer", + "symbolRendererSnippetID": "simpleRectangularLike", "symbolRendererParams": { "centerText": "GUIAm2901", "centerTextHeight": 5.0, @@ -3399,18 +3399,18 @@ mograsim version: 0.1.3 "pinLabelHeight": 3.5, "pinLabelMargin": 0.5 }, - "outlineRendererSnippetID": "class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer", - "highLevelStateHandlerSnippetID": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.StandardHighLevelStateHandler", + "outlineRendererSnippetID": "default", + "highLevelStateHandlerSnippetID": "standard", "highLevelStateHandlerParams": { "subcomponentHighLevelStates": { "qreg": { - "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler", + "id": "delegating", "params": { "delegateTarget": "GUIdff4#0" } }, "regs": { - "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler", + "id": "delegating", "params": { "delegateTarget": "GUIram4#0" } diff --git a/net.mograsim.logic.model.am2900/components/am2901/GUIAm2901ALUFuncDecode.json b/net.mograsim.logic.model.am2900/components/am2901/GUIAm2901ALUFuncDecode.json index a575c5ce..006a46ff 100644 --- a/net.mograsim.logic.model.am2900/components/am2901/GUIAm2901ALUFuncDecode.json +++ b/net.mograsim.logic.model.am2900/components/am2901/GUIAm2901ALUFuncDecode.json @@ -702,7 +702,7 @@ mograsim version: 0.1.3 } ] }, - "symbolRendererSnippetID": "class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer", + "symbolRendererSnippetID": "simpleRectangularLike", "symbolRendererParams": { "centerText": "GUIAm2901ALUFuncDecode", "centerTextHeight": 5.0, @@ -710,5 +710,5 @@ mograsim version: 0.1.3 "pinLabelHeight": 3.5, "pinLabelMargin": 0.5 }, - "outlineRendererSnippetID": "class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer" + "outlineRendererSnippetID": "default" } \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/components/am2901/GUIAm2901ALUInclDecode.json b/net.mograsim.logic.model.am2900/components/am2901/GUIAm2901ALUInclDecode.json index c6f61c4f..0f8ee57c 100644 --- a/net.mograsim.logic.model.am2900/components/am2901/GUIAm2901ALUInclDecode.json +++ b/net.mograsim.logic.model.am2900/components/am2901/GUIAm2901ALUInclDecode.json @@ -1509,7 +1509,7 @@ mograsim version: 0.1.3 } ] }, - "symbolRendererSnippetID": "class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer", + "symbolRendererSnippetID": "simpleRectangularLike", "symbolRendererParams": { "centerText": "GUIAm2901ALUInclDecode", "centerTextHeight": 5.0, @@ -1517,5 +1517,5 @@ mograsim version: 0.1.3 "pinLabelHeight": 3.5, "pinLabelMargin": 0.5 }, - "outlineRendererSnippetID": "class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer" + "outlineRendererSnippetID": "default" } \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/components/am2901/GUIAm2901ALUInclSourceDecodeInclFunctionDecode.json b/net.mograsim.logic.model.am2900/components/am2901/GUIAm2901ALUInclSourceDecodeInclFunctionDecode.json index 12e28505..71d2d2d6 100644 --- a/net.mograsim.logic.model.am2900/components/am2901/GUIAm2901ALUInclSourceDecodeInclFunctionDecode.json +++ b/net.mograsim.logic.model.am2900/components/am2901/GUIAm2901ALUInclSourceDecodeInclFunctionDecode.json @@ -1352,7 +1352,7 @@ mograsim version: 0.1.3 } ] }, - "symbolRendererSnippetID": "class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer", + "symbolRendererSnippetID": "simpleRectangularLike", "symbolRendererParams": { "centerText": "GUIAm2901ALUInclSourceDecodeInclFunctionDecode", "centerTextHeight": 5.0, @@ -1360,5 +1360,5 @@ mograsim version: 0.1.3 "pinLabelHeight": 3.5, "pinLabelMargin": 0.5 }, - "outlineRendererSnippetID": "class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer" + "outlineRendererSnippetID": "default" } \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/components/am2901/GUIAm2901ALUOneBit.json b/net.mograsim.logic.model.am2900/components/am2901/GUIAm2901ALUOneBit.json index 5abfdb5b..b32a2b18 100644 --- a/net.mograsim.logic.model.am2900/components/am2901/GUIAm2901ALUOneBit.json +++ b/net.mograsim.logic.model.am2900/components/am2901/GUIAm2901ALUOneBit.json @@ -532,7 +532,7 @@ mograsim version: 0.1.3 } ] }, - "symbolRendererSnippetID": "class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer", + "symbolRendererSnippetID": "simpleRectangularLike", "symbolRendererParams": { "centerText": "GUIAm2901ALUOneBit", "centerTextHeight": 5.0, @@ -540,5 +540,5 @@ mograsim version: 0.1.3 "pinLabelHeight": 3.5, "pinLabelMargin": 0.5 }, - "outlineRendererSnippetID": "class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer" + "outlineRendererSnippetID": "default" } \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/components/am2901/GUIAm2901DestDecode.json b/net.mograsim.logic.model.am2900/components/am2901/GUIAm2901DestDecode.json index 150c0992..38f5fa63 100644 --- a/net.mograsim.logic.model.am2900/components/am2901/GUIAm2901DestDecode.json +++ b/net.mograsim.logic.model.am2900/components/am2901/GUIAm2901DestDecode.json @@ -1072,7 +1072,7 @@ mograsim version: 0.1.3 } ] }, - "symbolRendererSnippetID": "class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer", + "symbolRendererSnippetID": "simpleRectangularLike", "symbolRendererParams": { "centerText": "GUIAm2901DestDecode", "centerTextHeight": 5.0, @@ -1080,5 +1080,5 @@ mograsim version: 0.1.3 "pinLabelHeight": 3.5, "pinLabelMargin": 0.5 }, - "outlineRendererSnippetID": "class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer" + "outlineRendererSnippetID": "default" } \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/components/am2901/GUIAm2901SourceDecode.json b/net.mograsim.logic.model.am2900/components/am2901/GUIAm2901SourceDecode.json index 8c086bfe..cb28db67 100644 --- a/net.mograsim.logic.model.am2900/components/am2901/GUIAm2901SourceDecode.json +++ b/net.mograsim.logic.model.am2900/components/am2901/GUIAm2901SourceDecode.json @@ -1116,7 +1116,7 @@ mograsim version: 0.1.3 } ] }, - "symbolRendererSnippetID": "class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer", + "symbolRendererSnippetID": "simpleRectangularLike", "symbolRendererParams": { "centerText": "Am2901SourceDecode", "centerTextHeight": 5.0, @@ -1124,5 +1124,5 @@ mograsim version: 0.1.3 "pinLabelHeight": 3.5, "pinLabelMargin": 0.5 }, - "outlineRendererSnippetID": "class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer" + "outlineRendererSnippetID": "default" } \ No newline at end of file diff --git a/net.mograsim.logic.model.am2900/components/am2904/GUIAm2904.json b/net.mograsim.logic.model.am2900/components/am2904/GUIAm2904.json index a1959d98..d86ee056 100644 --- a/net.mograsim.logic.model.am2900/components/am2904/GUIAm2904.json +++ b/net.mograsim.logic.model.am2900/components/am2904/GUIAm2904.json @@ -232,7 +232,7 @@ mograsim version: 0.1.3 "innerScale": 0.2, "subComps": [ { - "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", + "id": "WireCrossPoint", "name": "WireCrossPoint#14", "pos": { "x": 520.0, @@ -241,7 +241,7 @@ mograsim version: 0.1.3 "params": 4 }, { - "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", + "id": "WireCrossPoint", "name": "WireCrossPoint#13", "pos": { "x": 330.0, @@ -250,7 +250,7 @@ mograsim version: 0.1.3 "params": 1 }, { - "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", + "id": "WireCrossPoint", "name": "WireCrossPoint#16", "pos": { "x": 255.0, @@ -259,7 +259,7 @@ mograsim version: 0.1.3 "params": 4 }, { - "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", + "id": "WireCrossPoint", "name": "WireCrossPoint#15", "pos": { "x": 255.0, @@ -277,7 +277,7 @@ mograsim version: 0.1.3 "params": 1 }, { - "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", + "id": "WireCrossPoint", "name": "WireCrossPoint#1", "pos": { "x": 180.0, @@ -286,7 +286,7 @@ mograsim version: 0.1.3 "params": 4 }, { - "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", + "id": "WireCrossPoint", "name": "WireCrossPoint#0", "pos": { "x": 165.0, @@ -295,7 +295,7 @@ mograsim version: 0.1.3 "params": 1 }, { - "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", + "id": "WireCrossPoint", "name": "WireCrossPoint#3", "pos": { "x": 335.0, @@ -304,7 +304,7 @@ mograsim version: 0.1.3 "params": 4 }, { - "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", + "id": "WireCrossPoint", "name": "WireCrossPoint#2", "pos": { "x": 295.0, @@ -313,7 +313,7 @@ mograsim version: 0.1.3 "params": 4 }, { - "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", + "id": "WireCrossPoint", "name": "WireCrossPoint#5", "pos": { "x": 530.0, @@ -322,7 +322,7 @@ mograsim version: 0.1.3 "params": 4 }, { - "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", + "id": "WireCrossPoint", "name": "WireCrossPoint#4", "pos": { "x": 150.0, @@ -331,7 +331,7 @@ mograsim version: 0.1.3 "params": 1 }, { - "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", + "id": "WireCrossPoint", "name": "WireCrossPoint#7", "pos": { "x": 215.0, @@ -340,7 +340,7 @@ mograsim version: 0.1.3 "params": 1 }, { - "id": "class:net.mograsim.logic.model.model.components.atomic.GUITriStateBuffer", + "id": "GUITriStateBuffer", "name": "GUITriStateBuffer#0", "pos": { "x": 530.0, @@ -352,7 +352,7 @@ mograsim version: 0.1.3 } }, { - "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", + "id": "WireCrossPoint", "name": "WireCrossPoint#6", "pos": { "x": 120.0, @@ -361,7 +361,7 @@ mograsim version: 0.1.3 "params": 1 }, { - "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", + "id": "WireCrossPoint", "name": "WireCrossPoint#9", "pos": { "x": 215.0, @@ -370,7 +370,7 @@ mograsim version: 0.1.3 "params": 1 }, { - "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", + "id": "WireCrossPoint", "name": "WireCrossPoint#8", "pos": { "x": 215.0, @@ -387,7 +387,7 @@ mograsim version: 0.1.3 } }, { - "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", + "id": "WireCrossPoint", "name": "WireCrossPoint#10", "pos": { "x": 195.0, @@ -404,7 +404,7 @@ mograsim version: 0.1.3 } }, { - "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", + "id": "WireCrossPoint", "name": "WireCrossPoint#12", "pos": { "x": 195.0, @@ -421,7 +421,7 @@ mograsim version: 0.1.3 } }, { - "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", + "id": "WireCrossPoint", "name": "WireCrossPoint#11", "pos": { "x": 195.0, @@ -454,7 +454,7 @@ mograsim version: 0.1.3 } }, { - "id": "class:net.mograsim.logic.model.model.components.atomic.GUIMerger", + "id": "GUIMerger", "name": "GUIMerger#4", "pos": { "x": 25.0, @@ -463,7 +463,7 @@ mograsim version: 0.1.3 "params": 2 }, { - "id": "class:net.mograsim.logic.model.model.components.atomic.GUIMerger", + "id": "GUIMerger", "name": "GUIMerger#3", "pos": { "x": 510.0, @@ -480,7 +480,7 @@ mograsim version: 0.1.3 } }, { - "id": "class:net.mograsim.logic.model.model.components.atomic.GUIMerger", + "id": "GUIMerger", "name": "GUIMerger#2", "pos": { "x": 15.0, @@ -497,7 +497,7 @@ mograsim version: 0.1.3 } }, { - "id": "class:net.mograsim.logic.model.model.components.atomic.GUIMerger", + "id": "GUIMerger", "name": "GUIMerger#1", "pos": { "x": 25.0, @@ -514,7 +514,7 @@ mograsim version: 0.1.3 } }, { - "id": "class:net.mograsim.logic.model.model.components.atomic.GUIMerger", + "id": "GUIMerger", "name": "GUIMerger#0", "pos": { "x": 25.0, @@ -571,7 +571,7 @@ mograsim version: 0.1.3 } }, { - "id": "class:net.mograsim.logic.model.model.components.atomic.GUINandGate", + "id": "GUINandGate", "name": "GUINandGate#10", "pos": { "x": 340.0, @@ -580,7 +580,7 @@ mograsim version: 0.1.3 "params": 1 }, { - "id": "class:net.mograsim.logic.model.model.components.atomic.GUINandGate", + "id": "GUINandGate", "name": "GUINandGate#9", "pos": { "x": 205.0, @@ -589,7 +589,7 @@ mograsim version: 0.1.3 "params": 1 }, { - "id": "class:net.mograsim.logic.model.model.components.atomic.GUINandGate", + "id": "GUINandGate", "name": "GUINandGate#8", "pos": { "x": 205.0, @@ -598,7 +598,7 @@ mograsim version: 0.1.3 "params": 1 }, { - "id": "class:net.mograsim.logic.model.model.components.atomic.GUINandGate", + "id": "GUINandGate", "name": "GUINandGate#5", "pos": { "x": 225.0, @@ -607,7 +607,7 @@ mograsim version: 0.1.3 "params": 1 }, { - "id": "class:net.mograsim.logic.model.model.components.atomic.GUINandGate", + "id": "GUINandGate", "name": "GUINandGate#4", "pos": { "x": 225.0, @@ -616,7 +616,7 @@ mograsim version: 0.1.3 "params": 1 }, { - "id": "class:net.mograsim.logic.model.model.components.atomic.GUINandGate", + "id": "GUINandGate", "name": "GUINandGate#7", "pos": { "x": 205.0, @@ -625,7 +625,7 @@ mograsim version: 0.1.3 "params": 1 }, { - "id": "class:net.mograsim.logic.model.model.components.atomic.GUINandGate", + "id": "GUINandGate", "name": "GUINandGate#6", "pos": { "x": 205.0, @@ -634,7 +634,7 @@ mograsim version: 0.1.3 "params": 1 }, { - "id": "class:net.mograsim.logic.model.model.components.atomic.GUINandGate", + "id": "GUINandGate", "name": "GUINandGate#1", "pos": { "x": 130.0, @@ -643,7 +643,7 @@ mograsim version: 0.1.3 "params": 1 }, { - "id": "class:net.mograsim.logic.model.model.components.atomic.GUINandGate", + "id": "GUINandGate", "name": "GUINandGate#0", "pos": { "x": 190.0, @@ -652,7 +652,7 @@ mograsim version: 0.1.3 "params": 1 }, { - "id": "class:net.mograsim.logic.model.model.components.atomic.GUINandGate", + "id": "GUINandGate", "name": "GUINandGate#3", "pos": { "x": 225.0, @@ -661,7 +661,7 @@ mograsim version: 0.1.3 "params": 1 }, { - "id": "class:net.mograsim.logic.model.model.components.atomic.GUINandGate", + "id": "GUINandGate", "name": "GUINandGate#2", "pos": { "x": 225.0, @@ -670,7 +670,7 @@ mograsim version: 0.1.3 "params": 1 }, { - "id": "class:net.mograsim.logic.model.model.components.atomic.GUISplitter", + "id": "GUISplitter", "name": "GUISplitter#9", "pos": { "x": 240.0, @@ -679,7 +679,7 @@ mograsim version: 0.1.3 "params": 4 }, { - "id": "class:net.mograsim.logic.model.model.components.atomic.GUISplitter", + "id": "GUISplitter", "name": "GUISplitter#4", "pos": { "x": 395.0, @@ -688,7 +688,7 @@ mograsim version: 0.1.3 "params": 4 }, { - "id": "class:net.mograsim.logic.model.model.components.atomic.GUISplitter", + "id": "GUISplitter", "name": "GUISplitter#3", "pos": { "x": 450.0, @@ -697,7 +697,7 @@ mograsim version: 0.1.3 "params": 4 }, { - "id": "class:net.mograsim.logic.model.model.components.atomic.GUISplitter", + "id": "GUISplitter", "name": "GUISplitter#2", "pos": { "x": 395.0, @@ -706,7 +706,7 @@ mograsim version: 0.1.3 "params": 2 }, { - "id": "class:net.mograsim.logic.model.model.components.atomic.GUISplitter", + "id": "GUISplitter", "name": "GUISplitter#1", "pos": { "x": 555.0, @@ -715,7 +715,7 @@ mograsim version: 0.1.3 "params": 4 }, { - "id": "class:net.mograsim.logic.model.model.components.atomic.GUISplitter", + "id": "GUISplitter", "name": "GUISplitter#8", "pos": { "x": 445.0, @@ -724,7 +724,7 @@ mograsim version: 0.1.3 "params": 4 }, { - "id": "class:net.mograsim.logic.model.model.components.atomic.GUISplitter", + "id": "GUISplitter", "name": "GUISplitter#7", "pos": { "x": 445.0, @@ -733,7 +733,7 @@ mograsim version: 0.1.3 "params": 4 }, { - "id": "class:net.mograsim.logic.model.model.components.atomic.GUISplitter", + "id": "GUISplitter", "name": "GUISplitter#6", "pos": { "x": 285.0, @@ -742,7 +742,7 @@ mograsim version: 0.1.3 "params": 3 }, { - "id": "class:net.mograsim.logic.model.model.components.atomic.GUISplitter", + "id": "GUISplitter", "name": "GUISplitter#5", "pos": { "x": 395.0, @@ -751,7 +751,7 @@ mograsim version: 0.1.3 "params": 4 }, { - "id": "class:net.mograsim.logic.model.model.components.atomic.GUISplitter", + "id": "GUISplitter", "name": "GUISplitter#0", "pos": { "x": 10.0, @@ -760,7 +760,7 @@ mograsim version: 0.1.3 "params": 13 }, { - "id": "class:net.mograsim.logic.model.am2900.components.am2904.GUIAm2904RegCTInstrDecode", + "id": "GUIAm2904RegCTInstrDecode", "name": "GUIAm2904RegCTInstrDecode#0", "pos": { "x": 50.0, @@ -768,7 +768,7 @@ mograsim version: 0.1.3 } }, { - "id": "class:net.mograsim.logic.model.model.components.atomic.GUISplitter", + "id": "GUISplitter", "name": "GUISplitter#10", "pos": { "x": 445.0, @@ -777,7 +777,7 @@ mograsim version: 0.1.3 "params": 4 }, { - "id": "class:net.mograsim.logic.model.am2900.components.am2904.GUIAm2904ShiftInstrDecode", + "id": "GUIAm2904ShiftInstrDecode", "name": "GUIAm2904ShiftInstrDecode#0", "pos": { "x": 50.0, @@ -2717,7 +2717,7 @@ mograsim version: 0.1.3 } ] }, - "symbolRendererSnippetID": "class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer", + "symbolRendererSnippetID": "simpleRectangularLike", "symbolRendererParams": { "centerText": "Am2904", "centerTextHeight": 5.0, @@ -2725,8 +2725,8 @@ mograsim version: 0.1.3 "pinLabelHeight": 3.5, "pinLabelMargin": 0.5 }, - "outlineRendererSnippetID": "class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer", - "highLevelStateHandlerSnippetID": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.StandardHighLevelStateHandler", + "outlineRendererSnippetID": "default", + "highLevelStateHandlerSnippetID": "standard", "highLevelStateHandlerParams": { "subcomponentHighLevelStates": {}, "atomicHighLevelStates": {} diff --git a/net.mograsim.logic.model.am2900/components/am2904/GUIAm2904TestLogic.json b/net.mograsim.logic.model.am2900/components/am2904/GUIAm2904TestLogic.json index 26928e50..5b35584f 100644 --- a/net.mograsim.logic.model.am2900/components/am2904/GUIAm2904TestLogic.json +++ b/net.mograsim.logic.model.am2900/components/am2904/GUIAm2904TestLogic.json @@ -80,7 +80,7 @@ mograsim version: 0.1.3 "innerScale": 0.4, "subComps": [ { - "id": "class:net.mograsim.logic.model.model.components.atomic.GUINandGate", + "id": "GUINandGate", "name": "GUINandGate#1", "pos": { "x": 45.0, @@ -89,7 +89,7 @@ mograsim version: 0.1.3 "params": 1 }, { - "id": "class:net.mograsim.logic.model.model.components.atomic.GUINandGate", + "id": "GUINandGate", "name": "GUINandGate#0", "pos": { "x": 85.0, @@ -98,7 +98,7 @@ mograsim version: 0.1.3 "params": 1 }, { - "id": "class:net.mograsim.logic.model.model.components.atomic.GUINandGate", + "id": "GUINandGate", "name": "GUINandGate#3", "pos": { "x": 45.0, @@ -107,7 +107,7 @@ mograsim version: 0.1.3 "params": 1 }, { - "id": "class:net.mograsim.logic.model.model.components.atomic.GUINandGate", + "id": "GUINandGate", "name": "GUINandGate#2", "pos": { "x": 120.0, @@ -116,7 +116,7 @@ mograsim version: 0.1.3 "params": 1 }, { - "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", + "id": "WireCrossPoint", "name": "WireCrossPoint#1", "pos": { "x": 34.0, @@ -125,7 +125,7 @@ mograsim version: 0.1.3 "params": 1 }, { - "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", + "id": "WireCrossPoint", "name": "WireCrossPoint#0", "pos": { "x": 29.0, @@ -134,7 +134,7 @@ mograsim version: 0.1.3 "params": 1 }, { - "id": "class:net.mograsim.logic.model.model.components.atomic.GUISplitter", + "id": "GUISplitter", "name": "GUISplitter#0", "pos": { "x": 5.0, @@ -143,7 +143,7 @@ mograsim version: 0.1.3 "params": 4 }, { - "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", + "id": "WireCrossPoint", "name": "WireCrossPoint#3", "pos": { "x": 79.0, @@ -152,7 +152,7 @@ mograsim version: 0.1.3 "params": 1 }, { - "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", + "id": "WireCrossPoint", "name": "WireCrossPoint#2", "pos": { "x": 79.0, @@ -161,7 +161,7 @@ mograsim version: 0.1.3 "params": 1 }, { - "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", + "id": "WireCrossPoint", "name": "WireCrossPoint#5", "pos": { "x": 24.0, @@ -170,7 +170,7 @@ mograsim version: 0.1.3 "params": 1 }, { - "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", + "id": "WireCrossPoint", "name": "WireCrossPoint#4", "pos": { "x": 19.0, @@ -179,7 +179,7 @@ mograsim version: 0.1.3 "params": 1 }, { - "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", + "id": "WireCrossPoint", "name": "WireCrossPoint#7", "pos": { "x": 74.0, @@ -188,7 +188,7 @@ mograsim version: 0.1.3 "params": 1 }, { - "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", + "id": "WireCrossPoint", "name": "WireCrossPoint#6", "pos": { "x": 39.0, @@ -197,7 +197,7 @@ mograsim version: 0.1.3 "params": 1 }, { - "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", + "id": "WireCrossPoint", "name": "WireCrossPoint#9", "pos": { "x": 24.0, @@ -206,7 +206,7 @@ mograsim version: 0.1.3 "params": 1 }, { - "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", + "id": "WireCrossPoint", "name": "WireCrossPoint#8", "pos": { "x": 74.0, @@ -215,7 +215,7 @@ mograsim version: 0.1.3 "params": 1 }, { - "id": "class:net.mograsim.logic.model.model.components.atomic.GUINandGate", + "id": "GUINandGate", "name": "GUINandGate#5", "pos": { "x": 80.0, @@ -224,7 +224,7 @@ mograsim version: 0.1.3 "params": 1 }, { - "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", + "id": "WireCrossPoint", "name": "WireCrossPoint#10", "pos": { "x": 39.0, @@ -241,7 +241,7 @@ mograsim version: 0.1.3 } }, { - "id": "class:net.mograsim.logic.model.model.components.atomic.GUINandGate", + "id": "GUINandGate", "name": "GUINandGate#4", "pos": { "x": 80.0, @@ -748,7 +748,7 @@ mograsim version: 0.1.3 } ] }, - "symbolRendererSnippetID": "class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer", + "symbolRendererSnippetID": "simpleRectangularLike", "symbolRendererParams": { "centerText": "Test\nlogic", "centerTextHeight": 5.0, @@ -756,8 +756,8 @@ mograsim version: 0.1.3 "pinLabelHeight": 3.5, "pinLabelMargin": 0.5 }, - "outlineRendererSnippetID": "class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer", - "highLevelStateHandlerSnippetID": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.StandardHighLevelStateHandler", + "outlineRendererSnippetID": "default", + "highLevelStateHandlerSnippetID": "standard", "highLevelStateHandlerParams": { "subcomponentHighLevelStates": {}, "atomicHighLevelStates": {} diff --git a/net.mograsim.logic.model.am2900/components/am2910/GUIAm2910.json b/net.mograsim.logic.model.am2900/components/am2910/GUIAm2910.json index 647afc30..e410f3b4 100644 --- a/net.mograsim.logic.model.am2900/components/am2910/GUIAm2910.json +++ b/net.mograsim.logic.model.am2900/components/am2910/GUIAm2910.json @@ -112,7 +112,7 @@ mograsim version: 0.1.3 "innerScale": 0.2, "subComps": [ { - "id": "class:net.mograsim.logic.model.model.components.atomic.GUINandGate", + "id": "GUINandGate", "name": "GUINandGate#1", "pos": { "x": 10.0, @@ -121,7 +121,7 @@ mograsim version: 0.1.3 "params": 1 }, { - "id": "class:net.mograsim.logic.model.am2900.components.GUIram5_12", + "id": "GUIram5_12", "name": "GUIram5_12#0", "pos": { "x": 305.0, @@ -129,7 +129,7 @@ mograsim version: 0.1.3 } }, { - "id": "class:net.mograsim.logic.model.model.components.atomic.GUINandGate", + "id": "GUINandGate", "name": "GUINandGate#0", "pos": { "x": 40.0, @@ -138,7 +138,7 @@ mograsim version: 0.1.3 "params": 1 }, { - "id": "class:net.mograsim.logic.model.am2900.components.GUIdff12", + "id": "GUIdff12", "name": "GUIdff12#0", "pos": { "x": 305.0, @@ -146,7 +146,7 @@ mograsim version: 0.1.3 } }, { - "id": "class:net.mograsim.logic.model.am2900.components.GUIinc12", + "id": "GUIinc12", "name": "GUIinc12#0", "pos": { "x": 305.0, @@ -154,7 +154,7 @@ mograsim version: 0.1.3 } }, { - "id": "class:net.mograsim.logic.model.model.components.atomic.GUIBitDisplay", + "id": "GUIBitDisplay", "name": "GUIBitDisplay#3", "pos": { "x": 265.0, @@ -163,7 +163,7 @@ mograsim version: 0.1.3 "params": 12 }, { - "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", + "id": "WireCrossPoint", "name": "WireCrossPoint#1", "pos": { "x": 294.0, @@ -172,7 +172,7 @@ mograsim version: 0.1.3 "params": 1 }, { - "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", + "id": "WireCrossPoint", "name": "WireCrossPoint#0", "pos": { "x": 324.0, @@ -181,7 +181,7 @@ mograsim version: 0.1.3 "params": 12 }, { - "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", + "id": "WireCrossPoint", "name": "WireCrossPoint#3", "pos": { "x": 179.0, @@ -190,7 +190,7 @@ mograsim version: 0.1.3 "params": 12 }, { - "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", + "id": "WireCrossPoint", "name": "WireCrossPoint#2", "pos": { "x": 189.0, @@ -199,7 +199,7 @@ mograsim version: 0.1.3 "params": 12 }, { - "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", + "id": "WireCrossPoint", "name": "WireCrossPoint#5", "pos": { "x": 4.0, @@ -208,7 +208,7 @@ mograsim version: 0.1.3 "params": 1 }, { - "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", + "id": "WireCrossPoint", "name": "WireCrossPoint#4", "pos": { "x": 179.0, @@ -217,7 +217,7 @@ mograsim version: 0.1.3 "params": 12 }, { - "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", + "id": "WireCrossPoint", "name": "WireCrossPoint#7", "pos": { "x": 299.0, @@ -226,7 +226,7 @@ mograsim version: 0.1.3 "params": 1 }, { - "id": "class:net.mograsim.logic.model.model.components.atomic.GUITriStateBuffer", + "id": "GUITriStateBuffer", "name": "GUITriStateBuffer#0", "pos": { "x": 180.0, @@ -238,7 +238,7 @@ mograsim version: 0.1.3 } }, { - "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", + "id": "WireCrossPoint", "name": "WireCrossPoint#6", "pos": { "x": 299.0, @@ -247,7 +247,7 @@ mograsim version: 0.1.3 "params": 1 }, { - "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", + "id": "WireCrossPoint", "name": "WireCrossPoint#9", "pos": { "x": 299.0, @@ -256,7 +256,7 @@ mograsim version: 0.1.3 "params": 1 }, { - "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", + "id": "WireCrossPoint", "name": "WireCrossPoint#8", "pos": { "x": 299.0, @@ -265,7 +265,7 @@ mograsim version: 0.1.3 "params": 1 }, { - "id": "class:net.mograsim.logic.model.am2900.components.GUInor12", + "id": "GUInor12", "name": "GUInor12#0", "pos": { "x": 190.0, @@ -273,7 +273,7 @@ mograsim version: 0.1.3 } }, { - "id": "class:net.mograsim.logic.model.model.components.atomic.GUIBitDisplay", + "id": "GUIBitDisplay", "name": "GUIBitDisplay#0", "pos": { "x": 160.0, @@ -282,7 +282,7 @@ mograsim version: 0.1.3 "params": 12 }, { - "id": "class:net.mograsim.logic.model.am2900.components.am2910.GUIAm2910InstrPLA", + "id": "GUIAm2910InstrPLA", "name": "GUIAm2910InstrPLA#0", "pos": { "x": 80.0, @@ -290,7 +290,7 @@ mograsim version: 0.1.3 } }, { - "id": "class:net.mograsim.logic.model.am2900.components.am2910.GUIAm2910SP", + "id": "GUIAm2910SP", "name": "GUIAm2910SP#0", "pos": { "x": 305.0, @@ -298,7 +298,7 @@ mograsim version: 0.1.3 } }, { - "id": "class:net.mograsim.logic.model.model.components.atomic.GUIBitDisplay", + "id": "GUIBitDisplay", "name": "GUIBitDisplay#1", "pos": { "x": 260.0, @@ -307,7 +307,7 @@ mograsim version: 0.1.3 "params": 12 }, { - "id": "class:net.mograsim.logic.model.model.components.atomic.GUIBitDisplay", + "id": "GUIBitDisplay", "name": "GUIBitDisplay#2", "pos": { "x": 345.0, @@ -316,7 +316,7 @@ mograsim version: 0.1.3 "params": 12 }, { - "id": "class:net.mograsim.logic.model.am2900.components.GUIsel4_12", + "id": "GUIsel4_12", "name": "GUIsel4_12#0", "pos": { "x": 150.0, @@ -324,7 +324,7 @@ mograsim version: 0.1.3 } }, { - "id": "class:net.mograsim.logic.model.am2900.components.am2910.GUIAm2910RegCntr", + "id": "GUIAm2910RegCntr", "name": "GUIAm2910RegCntr#0", "pos": { "x": 160.0, @@ -1121,7 +1121,7 @@ mograsim version: 0.1.3 } ] }, - "symbolRendererSnippetID": "class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer", + "symbolRendererSnippetID": "simpleRectangularLike", "symbolRendererParams": { "centerText": "Am2910", "centerTextHeight": 5.0, @@ -1129,8 +1129,8 @@ mograsim version: 0.1.3 "pinLabelHeight": 3.5, "pinLabelMargin": 0.5 }, - "outlineRendererSnippetID": "class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer", - "highLevelStateHandlerSnippetID": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.StandardHighLevelStateHandler", + "outlineRendererSnippetID": "default", + "highLevelStateHandlerSnippetID": "standard", "highLevelStateHandlerParams": { "subcomponentHighLevelStates": {}, "atomicHighLevelStates": {} diff --git a/net.mograsim.logic.model.am2900/components/am2910/GUIAm2910_old.json b/net.mograsim.logic.model.am2900/components/am2910/GUIAm2910_old.json index ae71c6d0..20f9ac0d 100644 --- a/net.mograsim.logic.model.am2900/components/am2910/GUIAm2910_old.json +++ b/net.mograsim.logic.model.am2900/components/am2910/GUIAm2910_old.json @@ -104,7 +104,7 @@ mograsim version: 0.1.3 "innerScale": 0.2, "subComps": [ { - "id": "class:net.mograsim.logic.model.model.components.atomic.GUINandGate", + "id": "GUINandGate", "name": "GUINandGate#1", "pos": { "x": 10.0, @@ -113,7 +113,7 @@ mograsim version: 0.1.3 "params": 1 }, { - "id": "class:net.mograsim.logic.model.am2900.components.GUIram5_12", + "id": "GUIram5_12", "name": "GUIram5_12#0", "pos": { "x": 305.0, @@ -121,7 +121,7 @@ mograsim version: 0.1.3 } }, { - "id": "class:net.mograsim.logic.model.model.components.atomic.GUINandGate", + "id": "GUINandGate", "name": "GUINandGate#0", "pos": { "x": 40.0, @@ -130,7 +130,7 @@ mograsim version: 0.1.3 "params": 1 }, { - "id": "class:net.mograsim.logic.model.am2900.components.GUIdff12", + "id": "GUIdff12", "name": "GUIdff12#0", "pos": { "x": 305.0, @@ -138,7 +138,7 @@ mograsim version: 0.1.3 } }, { - "id": "class:net.mograsim.logic.model.am2900.components.GUIinc12", + "id": "GUIinc12", "name": "GUIinc12#0", "pos": { "x": 305.0, @@ -146,7 +146,7 @@ mograsim version: 0.1.3 } }, { - "id": "class:net.mograsim.logic.model.model.components.atomic.GUIBitDisplay", + "id": "GUIBitDisplay", "name": "GUIBitDisplay#3", "pos": { "x": 265.0, @@ -155,7 +155,7 @@ mograsim version: 0.1.3 "params": 12 }, { - "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", + "id": "WireCrossPoint", "name": "WireCrossPoint#1", "pos": { "x": 294.0, @@ -164,7 +164,7 @@ mograsim version: 0.1.3 "params": 1 }, { - "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", + "id": "WireCrossPoint", "name": "WireCrossPoint#0", "pos": { "x": 324.0, @@ -173,7 +173,7 @@ mograsim version: 0.1.3 "params": 12 }, { - "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", + "id": "WireCrossPoint", "name": "WireCrossPoint#3", "pos": { "x": 179.0, @@ -182,7 +182,7 @@ mograsim version: 0.1.3 "params": 12 }, { - "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", + "id": "WireCrossPoint", "name": "WireCrossPoint#2", "pos": { "x": 189.0, @@ -191,7 +191,7 @@ mograsim version: 0.1.3 "params": 12 }, { - "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", + "id": "WireCrossPoint", "name": "WireCrossPoint#5", "pos": { "x": 4.0, @@ -200,7 +200,7 @@ mograsim version: 0.1.3 "params": 1 }, { - "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", + "id": "WireCrossPoint", "name": "WireCrossPoint#4", "pos": { "x": 179.0, @@ -209,7 +209,7 @@ mograsim version: 0.1.3 "params": 12 }, { - "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", + "id": "WireCrossPoint", "name": "WireCrossPoint#7", "pos": { "x": 299.0, @@ -218,7 +218,7 @@ mograsim version: 0.1.3 "params": 1 }, { - "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", + "id": "WireCrossPoint", "name": "WireCrossPoint#6", "pos": { "x": 299.0, @@ -227,7 +227,7 @@ mograsim version: 0.1.3 "params": 1 }, { - "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", + "id": "WireCrossPoint", "name": "WireCrossPoint#9", "pos": { "x": 299.0, @@ -236,7 +236,7 @@ mograsim version: 0.1.3 "params": 1 }, { - "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", + "id": "WireCrossPoint", "name": "WireCrossPoint#8", "pos": { "x": 299.0, @@ -245,7 +245,7 @@ mograsim version: 0.1.3 "params": 1 }, { - "id": "class:net.mograsim.logic.model.am2900.components.GUIsel4_12", + "id": "GUIsel4_12", "name": "GUIsel4_12#0", "pos": { "x": 150.0, @@ -253,7 +253,7 @@ mograsim version: 0.1.3 } }, { - "id": "class:net.mograsim.logic.model.am2900.components.GUInor12", + "id": "GUInor12", "name": "GUInor12#0", "pos": { "x": 190.0, @@ -261,7 +261,7 @@ mograsim version: 0.1.3 } }, { - "id": "class:net.mograsim.logic.model.model.components.atomic.GUIBitDisplay", + "id": "GUIBitDisplay", "name": "GUIBitDisplay#0", "pos": { "x": 160.0, @@ -270,7 +270,7 @@ mograsim version: 0.1.3 "params": 12 }, { - "id": "class:net.mograsim.logic.model.am2900.components.am2910.GUIAm2910InstrPLA", + "id": "GUIAm2910InstrPLA", "name": "GUIAm2910InstrPLA#0", "pos": { "x": 80.0, @@ -278,7 +278,7 @@ mograsim version: 0.1.3 } }, { - "id": "class:net.mograsim.logic.model.am2900.components.am2910.GUIAm2910SP", + "id": "GUIAm2910SP", "name": "GUIAm2910SP#0", "pos": { "x": 305.0, @@ -286,7 +286,7 @@ mograsim version: 0.1.3 } }, { - "id": "class:net.mograsim.logic.model.model.components.atomic.GUIBitDisplay", + "id": "GUIBitDisplay", "name": "GUIBitDisplay#1", "pos": { "x": 260.0, @@ -295,7 +295,7 @@ mograsim version: 0.1.3 "params": 12 }, { - "id": "class:net.mograsim.logic.model.model.components.atomic.GUIBitDisplay", + "id": "GUIBitDisplay", "name": "GUIBitDisplay#2", "pos": { "x": 345.0, @@ -304,7 +304,7 @@ mograsim version: 0.1.3 "params": 12 }, { - "id": "class:net.mograsim.logic.model.am2900.components.am2910.GUIAm2910RegCntr", + "id": "GUIAm2910RegCntr", "name": "GUIAm2910RegCntr#0", "pos": { "x": 160.0, @@ -1072,7 +1072,7 @@ mograsim version: 0.1.3 } ] }, - "symbolRendererSnippetID": "class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer", + "symbolRendererSnippetID": "simpleRectangularLike", "symbolRendererParams": { "centerText": "Am2910", "centerTextHeight": 5.0, @@ -1080,8 +1080,8 @@ mograsim version: 0.1.3 "pinLabelHeight": 3.5, "pinLabelMargin": 0.5 }, - "outlineRendererSnippetID": "class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer", - "highLevelStateHandlerSnippetID": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.StandardHighLevelStateHandler", + "outlineRendererSnippetID": "default", + "highLevelStateHandlerSnippetID": "standard", "highLevelStateHandlerParams": { "subcomponentHighLevelStates": {}, "atomicHighLevelStates": {} diff --git a/net.mograsim.logic.model.editor/components/GUI_rsLatch.json b/net.mograsim.logic.model.editor/components/GUI_rsLatch.json index 4199e45f..6f679a91 100644 --- a/net.mograsim.logic.model.editor/components/GUI_rsLatch.json +++ b/net.mograsim.logic.model.editor/components/GUI_rsLatch.json @@ -219,7 +219,7 @@ mograsim version: 0.1.3 } ] }, - "symbolRendererSnippetID": "class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer", + "symbolRendererSnippetID": "simpleRectangularLike", "symbolRendererParams": { "centerText": "_rsLatch", "centerTextHeight": 5.0, @@ -227,13 +227,13 @@ mograsim version: 0.1.3 "pinLabelHeight": 3.5, "pinLabelMargin": 0.5 }, - "outlineRendererSnippetID": "class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer", - "highLevelStateHandlerSnippetID": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.StandardHighLevelStateHandler", + "outlineRendererSnippetID": "default", + "highLevelStateHandlerSnippetID": "standard", "highLevelStateHandlerParams": { "subcomponentHighLevelStates": {}, "atomicHighLevelStates": { "q": { - "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.WireForcingAtomicHighLevelStateHandler", + "id": "wireForcing", "params": { "wiresToForce": [ "q" diff --git a/net.mograsim.logic.model.editor/components/GUIand.json b/net.mograsim.logic.model.editor/components/GUIand.json index 6ec536a3..ef577973 100644 --- a/net.mograsim.logic.model.editor/components/GUIand.json +++ b/net.mograsim.logic.model.editor/components/GUIand.json @@ -141,7 +141,7 @@ mograsim version: 0.1.3 } ] }, - "symbolRendererSnippetID": "class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer", + "symbolRendererSnippetID": "simpleRectangularLike", "symbolRendererParams": { "centerText": "GUIand", "centerTextHeight": 5.0, @@ -149,5 +149,5 @@ mograsim version: 0.1.3 "pinLabelHeight": 3.5, "pinLabelMargin": 0.5 }, - "outlineRendererSnippetID": "class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer" + "outlineRendererSnippetID": "default" } \ No newline at end of file diff --git a/net.mograsim.logic.model.editor/components/GUIand41.json b/net.mograsim.logic.model.editor/components/GUIand41.json index 95776814..87b73945 100644 --- a/net.mograsim.logic.model.editor/components/GUIand41.json +++ b/net.mograsim.logic.model.editor/components/GUIand41.json @@ -332,7 +332,7 @@ mograsim version: 0.1.3 } ] }, - "symbolRendererSnippetID": "class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer", + "symbolRendererSnippetID": "simpleRectangularLike", "symbolRendererParams": { "centerText": "GUIand41", "centerTextHeight": 5.0, @@ -340,5 +340,5 @@ mograsim version: 0.1.3 "pinLabelHeight": 3.5, "pinLabelMargin": 0.5 }, - "outlineRendererSnippetID": "class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer" + "outlineRendererSnippetID": "default" } \ No newline at end of file diff --git a/net.mograsim.logic.model.editor/components/GUIandor414.json b/net.mograsim.logic.model.editor/components/GUIandor414.json index c6dc8210..bd61b9df 100644 --- a/net.mograsim.logic.model.editor/components/GUIandor414.json +++ b/net.mograsim.logic.model.editor/components/GUIandor414.json @@ -493,7 +493,7 @@ mograsim version: 0.1.3 } ] }, - "symbolRendererSnippetID": "class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer", + "symbolRendererSnippetID": "simpleRectangularLike", "symbolRendererParams": { "centerText": "GUIandor414", "centerTextHeight": 5.0, @@ -501,5 +501,5 @@ mograsim version: 0.1.3 "pinLabelHeight": 3.5, "pinLabelMargin": 0.5 }, - "outlineRendererSnippetID": "class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer" + "outlineRendererSnippetID": "default" } \ No newline at end of file diff --git a/net.mograsim.logic.model.editor/components/GUIdemux2.json b/net.mograsim.logic.model.editor/components/GUIdemux2.json index 55e3c8a1..3523e99e 100644 --- a/net.mograsim.logic.model.editor/components/GUIdemux2.json +++ b/net.mograsim.logic.model.editor/components/GUIdemux2.json @@ -524,7 +524,7 @@ mograsim version: 0.1.3 } ] }, - "symbolRendererSnippetID": "class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer", + "symbolRendererSnippetID": "simpleRectangularLike", "symbolRendererParams": { "centerText": "GUIdemux2", "centerTextHeight": 5.0, @@ -532,5 +532,5 @@ mograsim version: 0.1.3 "pinLabelHeight": 3.5, "pinLabelMargin": 0.5 }, - "outlineRendererSnippetID": "class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer" + "outlineRendererSnippetID": "default" } \ No newline at end of file diff --git a/net.mograsim.logic.model.editor/components/GUIdff.json b/net.mograsim.logic.model.editor/components/GUIdff.json index 345b126e..66af673f 100644 --- a/net.mograsim.logic.model.editor/components/GUIdff.json +++ b/net.mograsim.logic.model.editor/components/GUIdff.json @@ -332,7 +332,7 @@ mograsim version: 0.1.3 } ] }, - "symbolRendererSnippetID": "class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer", + "symbolRendererSnippetID": "simpleRectangularLike", "symbolRendererParams": { "centerText": "GUIdff", "centerTextHeight": 5.0, @@ -340,13 +340,13 @@ mograsim version: 0.1.3 "pinLabelHeight": 3.5, "pinLabelMargin": 0.5 }, - "outlineRendererSnippetID": "class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer", - "highLevelStateHandlerSnippetID": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.StandardHighLevelStateHandler", + "outlineRendererSnippetID": "default", + "highLevelStateHandlerSnippetID": "standard", "highLevelStateHandlerParams": { "subcomponentHighLevelStates": {}, "atomicHighLevelStates": { "q": { - "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.DelegatingAtomicHighLevelStateHandler", + "id": "delegating", "params": { "delegateTarget": "GUI_rsLatch#1", "subStateID": "q" diff --git a/net.mograsim.logic.model.editor/components/GUIdff4.json b/net.mograsim.logic.model.editor/components/GUIdff4.json index 4064f93e..d03fafec 100644 --- a/net.mograsim.logic.model.editor/components/GUIdff4.json +++ b/net.mograsim.logic.model.editor/components/GUIdff4.json @@ -653,7 +653,7 @@ mograsim version: 0.1.3 } ] }, - "symbolRendererSnippetID": "class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer", + "symbolRendererSnippetID": "simpleRectangularLike", "symbolRendererParams": { "centerText": "D flip flop\n4 bit", "centerTextHeight": 5.0, @@ -661,27 +661,27 @@ mograsim version: 0.1.3 "pinLabelHeight": 3.5, "pinLabelMargin": 0.5 }, - "outlineRendererSnippetID": "class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer", - "highLevelStateHandlerSnippetID": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.StandardHighLevelStateHandler", + "outlineRendererSnippetID": "default", + "highLevelStateHandlerSnippetID": "standard", "highLevelStateHandlerParams": { "subcomponentHighLevelStates": {}, "atomicHighLevelStates": { "q1": { - "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.DelegatingAtomicHighLevelStateHandler", + "id": "delegating", "params": { "delegateTarget": "GUIdff#0", "subStateID": "q" } }, "q2": { - "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.DelegatingAtomicHighLevelStateHandler", + "id": "delegating", "params": { "delegateTarget": "GUIdff#1", "subStateID": "q" } }, "q": { - "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.BitVectorSplittingAtomicHighLevelStateHandler", + "id": "bitVectorSplitting", "params": { "vectorPartTargets": [ "q1", @@ -698,14 +698,14 @@ mograsim version: 0.1.3 } }, "q3": { - "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.DelegatingAtomicHighLevelStateHandler", + "id": "delegating", "params": { "delegateTarget": "GUIdff#2", "subStateID": "q" } }, "q4": { - "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.DelegatingAtomicHighLevelStateHandler", + "id": "delegating", "params": { "delegateTarget": "GUIdff#3", "subStateID": "q" diff --git a/net.mograsim.logic.model.editor/components/GUIdff4_invwe.json b/net.mograsim.logic.model.editor/components/GUIdff4_invwe.json index cb697d23..3108cc5f 100644 --- a/net.mograsim.logic.model.editor/components/GUIdff4_invwe.json +++ b/net.mograsim.logic.model.editor/components/GUIdff4_invwe.json @@ -662,7 +662,7 @@ mograsim version: 0.1.3 } ] }, - "symbolRendererSnippetID": "class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer", + "symbolRendererSnippetID": "simpleRectangularLike", "symbolRendererParams": { "centerText": "D flip flop\n4 bit", "centerTextHeight": 5.0, @@ -670,27 +670,27 @@ mograsim version: 0.1.3 "pinLabelHeight": 3.5, "pinLabelMargin": 0.5 }, - "outlineRendererSnippetID": "class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer", - "highLevelStateHandlerSnippetID": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.StandardHighLevelStateHandler", + "outlineRendererSnippetID": "default", + "highLevelStateHandlerSnippetID": "standard", "highLevelStateHandlerParams": { "subcomponentHighLevelStates": {}, "atomicHighLevelStates": { "q1": { - "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.DelegatingAtomicHighLevelStateHandler", + "id": "delegating", "params": { "delegateTarget": "GUIdff#0", "subStateID": "q" } }, "q2": { - "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.DelegatingAtomicHighLevelStateHandler", + "id": "delegating", "params": { "delegateTarget": "GUIdff#1", "subStateID": "q" } }, "q": { - "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.BitVectorSplittingAtomicHighLevelStateHandler", + "id": "bitVectorSplitting", "params": { "vectorPartTargets": [ "q1", @@ -707,14 +707,14 @@ mograsim version: 0.1.3 } }, "q3": { - "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.DelegatingAtomicHighLevelStateHandler", + "id": "delegating", "params": { "delegateTarget": "GUIdff#2", "subStateID": "q" } }, "q4": { - "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.DelegatingAtomicHighLevelStateHandler", + "id": "delegating", "params": { "delegateTarget": "GUIdff#3", "subStateID": "q" diff --git a/net.mograsim.logic.model.editor/components/GUIdlatch.json b/net.mograsim.logic.model.editor/components/GUIdlatch.json index 26c4071d..034ab797 100644 --- a/net.mograsim.logic.model.editor/components/GUIdlatch.json +++ b/net.mograsim.logic.model.editor/components/GUIdlatch.json @@ -237,7 +237,7 @@ mograsim version: 0.1.3 } ] }, - "symbolRendererSnippetID": "class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer", + "symbolRendererSnippetID": "simpleRectangularLike", "symbolRendererParams": { "centerText": "GUIdlatch", "centerTextHeight": 5.0, @@ -245,13 +245,13 @@ mograsim version: 0.1.3 "pinLabelHeight": 3.5, "pinLabelMargin": 0.5 }, - "outlineRendererSnippetID": "class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer", - "highLevelStateHandlerSnippetID": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.StandardHighLevelStateHandler", + "outlineRendererSnippetID": "default", + "highLevelStateHandlerSnippetID": "standard", "highLevelStateHandlerParams": { "subcomponentHighLevelStates": {}, "atomicHighLevelStates": { "q": { - "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.DelegatingAtomicHighLevelStateHandler", + "id": "delegating", "params": { "delegateTarget": "GUI_rsLatch#0", "subStateID": "q" diff --git a/net.mograsim.logic.model.editor/components/GUIdlatch4.json b/net.mograsim.logic.model.editor/components/GUIdlatch4.json index 28021dff..d798d7f5 100644 --- a/net.mograsim.logic.model.editor/components/GUIdlatch4.json +++ b/net.mograsim.logic.model.editor/components/GUIdlatch4.json @@ -332,7 +332,7 @@ mograsim version: 0.1.3 } ] }, - "symbolRendererSnippetID": "class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer", + "symbolRendererSnippetID": "simpleRectangularLike", "symbolRendererParams": { "centerText": "GUIdlatch4", "centerTextHeight": 5.0, @@ -340,27 +340,27 @@ mograsim version: 0.1.3 "pinLabelHeight": 3.5, "pinLabelMargin": 0.5 }, - "outlineRendererSnippetID": "class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer", - "highLevelStateHandlerSnippetID": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.StandardHighLevelStateHandler", + "outlineRendererSnippetID": "default", + "highLevelStateHandlerSnippetID": "standard", "highLevelStateHandlerParams": { "subcomponentHighLevelStates": {}, "atomicHighLevelStates": { "q1": { - "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.DelegatingAtomicHighLevelStateHandler", + "id": "delegating", "params": { "delegateTarget": "GUIdlatch#0", "subStateID": "q" } }, "q2": { - "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.DelegatingAtomicHighLevelStateHandler", + "id": "delegating", "params": { "delegateTarget": "GUIdlatch#1", "subStateID": "q" } }, "q": { - "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.BitVectorSplittingAtomicHighLevelStateHandler", + "id": "bitVectorSplitting", "params": { "vectorPartTargets": [ "q1", @@ -377,14 +377,14 @@ mograsim version: 0.1.3 } }, "q3": { - "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.DelegatingAtomicHighLevelStateHandler", + "id": "delegating", "params": { "delegateTarget": "GUIdlatch#2", "subStateID": "q" } }, "q4": { - "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.DelegatingAtomicHighLevelStateHandler", + "id": "delegating", "params": { "delegateTarget": "GUIdlatch#3", "subStateID": "q" diff --git a/net.mograsim.logic.model.editor/components/GUIfulladder.json b/net.mograsim.logic.model.editor/components/GUIfulladder.json index b509eb28..d4647013 100644 --- a/net.mograsim.logic.model.editor/components/GUIfulladder.json +++ b/net.mograsim.logic.model.editor/components/GUIfulladder.json @@ -185,7 +185,7 @@ mograsim version: 0.1.3 } ] }, - "symbolRendererSnippetID": "class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer", + "symbolRendererSnippetID": "simpleRectangularLike", "symbolRendererParams": { "centerText": "GUIfulladder", "centerTextHeight": 5.0, @@ -193,5 +193,5 @@ mograsim version: 0.1.3 "pinLabelHeight": 3.5, "pinLabelMargin": 0.5 }, - "outlineRendererSnippetID": "class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer" + "outlineRendererSnippetID": "default" } \ No newline at end of file diff --git a/net.mograsim.logic.model.editor/components/GUIhalfadder.json b/net.mograsim.logic.model.editor/components/GUIhalfadder.json index 8ca9ccd8..d0a0fa20 100644 --- a/net.mograsim.logic.model.editor/components/GUIhalfadder.json +++ b/net.mograsim.logic.model.editor/components/GUIhalfadder.json @@ -319,7 +319,7 @@ mograsim version: 0.1.3 } ] }, - "symbolRendererSnippetID": "class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer", + "symbolRendererSnippetID": "simpleRectangularLike", "symbolRendererParams": { "centerText": "GUIhalfadder", "centerTextHeight": 5.0, @@ -327,5 +327,5 @@ mograsim version: 0.1.3 "pinLabelHeight": 3.5, "pinLabelMargin": 0.5 }, - "outlineRendererSnippetID": "class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer" + "outlineRendererSnippetID": "default" } \ No newline at end of file diff --git a/net.mograsim.logic.model.editor/components/GUImux1.json b/net.mograsim.logic.model.editor/components/GUImux1.json index b75d9f1a..c0d53e56 100644 --- a/net.mograsim.logic.model.editor/components/GUImux1.json +++ b/net.mograsim.logic.model.editor/components/GUImux1.json @@ -230,7 +230,7 @@ mograsim version: 0.1.3 } ] }, - "symbolRendererSnippetID": "class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer", + "symbolRendererSnippetID": "simpleRectangularLike", "symbolRendererParams": { "centerText": "GUImux1", "centerTextHeight": 5.0, @@ -238,5 +238,5 @@ mograsim version: 0.1.3 "pinLabelHeight": 3.5, "pinLabelMargin": 0.5 }, - "outlineRendererSnippetID": "class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer" + "outlineRendererSnippetID": "default" } \ No newline at end of file diff --git a/net.mograsim.logic.model.editor/components/GUImux1_4.json b/net.mograsim.logic.model.editor/components/GUImux1_4.json index b9f66127..c90cd3eb 100644 --- a/net.mograsim.logic.model.editor/components/GUImux1_4.json +++ b/net.mograsim.logic.model.editor/components/GUImux1_4.json @@ -476,7 +476,7 @@ mograsim version: 0.1.3 } ] }, - "symbolRendererSnippetID": "class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer", + "symbolRendererSnippetID": "simpleRectangularLike", "symbolRendererParams": { "centerText": "GUImux1_4", "centerTextHeight": 5.0, @@ -484,5 +484,5 @@ mograsim version: 0.1.3 "pinLabelHeight": 3.5, "pinLabelMargin": 0.5 }, - "outlineRendererSnippetID": "class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer" + "outlineRendererSnippetID": "default" } \ No newline at end of file diff --git a/net.mograsim.logic.model.editor/components/GUImux2_4.json b/net.mograsim.logic.model.editor/components/GUImux2_4.json index f9648eee..042d9e1b 100644 --- a/net.mograsim.logic.model.editor/components/GUImux2_4.json +++ b/net.mograsim.logic.model.editor/components/GUImux2_4.json @@ -679,7 +679,7 @@ mograsim version: 0.1.3 } ] }, - "symbolRendererSnippetID": "class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer", + "symbolRendererSnippetID": "simpleRectangularLike", "symbolRendererParams": { "centerText": "GUImux1_4", "centerTextHeight": 5.0, @@ -687,6 +687,6 @@ mograsim version: 0.1.3 "pinLabelHeight": 3.5, "pinLabelMargin": 0.5 }, - "outlineRendererSnippetID": "class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer", - "highLevelStateHandlerSnippetID": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.DefaultHighLevelStateHandler" + "outlineRendererSnippetID": "default", + "highLevelStateHandlerSnippetID": "default" } \ No newline at end of file diff --git a/net.mograsim.logic.model.editor/components/GUImux3.json b/net.mograsim.logic.model.editor/components/GUImux3.json index 69181cde..3f6a8bc1 100644 --- a/net.mograsim.logic.model.editor/components/GUImux3.json +++ b/net.mograsim.logic.model.editor/components/GUImux3.json @@ -104,7 +104,7 @@ mograsim version: 0.1.3 "innerScale": 0.4, "subComps": [ { - "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", + "id": "WireCrossPoint", "name": "WireCrossPoint#1", "pos": { "x": 24.0, @@ -113,7 +113,7 @@ mograsim version: 0.1.3 "params": 1 }, { - "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", + "id": "WireCrossPoint", "name": "WireCrossPoint#0", "pos": { "x": 19.0, @@ -466,7 +466,7 @@ mograsim version: 0.1.3 } ] }, - "symbolRendererSnippetID": "class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer", + "symbolRendererSnippetID": "simpleRectangularLike", "symbolRendererParams": { "centerText": "GUImux3", "centerTextHeight": 5.0, @@ -474,6 +474,6 @@ mograsim version: 0.1.3 "pinLabelHeight": 3.5, "pinLabelMargin": 0.5 }, - "outlineRendererSnippetID": "class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer", - "highLevelStateHandlerSnippetID": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.DefaultHighLevelStateHandler" + "outlineRendererSnippetID": "default", + "highLevelStateHandlerSnippetID": "default" } \ No newline at end of file diff --git a/net.mograsim.logic.model.editor/components/GUInand3.json b/net.mograsim.logic.model.editor/components/GUInand3.json index 1bdc7ccd..e57eefee 100644 --- a/net.mograsim.logic.model.editor/components/GUInand3.json +++ b/net.mograsim.logic.model.editor/components/GUInand3.json @@ -201,7 +201,7 @@ mograsim version: 0.1.3 } ] }, - "symbolRendererSnippetID": "class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer", + "symbolRendererSnippetID": "simpleRectangularLike", "symbolRendererParams": { "centerText": "GUInand3", "centerTextHeight": 5.0, @@ -209,5 +209,5 @@ mograsim version: 0.1.3 "pinLabelHeight": 3.5, "pinLabelMargin": 0.5 }, - "outlineRendererSnippetID": "class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer" + "outlineRendererSnippetID": "default" } \ No newline at end of file diff --git a/net.mograsim.logic.model.editor/components/GUInot4.json b/net.mograsim.logic.model.editor/components/GUInot4.json index 0a3b7034..a7e95a32 100644 --- a/net.mograsim.logic.model.editor/components/GUInot4.json +++ b/net.mograsim.logic.model.editor/components/GUInot4.json @@ -379,7 +379,7 @@ mograsim version: 0.1.3 } ] }, - "symbolRendererSnippetID": "class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer", + "symbolRendererSnippetID": "simpleRectangularLike", "symbolRendererParams": { "centerText": "GUInot4", "centerTextHeight": 5.0, @@ -387,5 +387,5 @@ mograsim version: 0.1.3 "pinLabelHeight": 3.5, "pinLabelMargin": 0.5 }, - "outlineRendererSnippetID": "class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer" + "outlineRendererSnippetID": "default" } \ No newline at end of file diff --git a/net.mograsim.logic.model.editor/components/GUIor4.json b/net.mograsim.logic.model.editor/components/GUIor4.json index fca69d6f..5b09418b 100644 --- a/net.mograsim.logic.model.editor/components/GUIor4.json +++ b/net.mograsim.logic.model.editor/components/GUIor4.json @@ -539,7 +539,7 @@ mograsim version: 0.1.3 } ] }, - "symbolRendererSnippetID": "class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer", + "symbolRendererSnippetID": "simpleRectangularLike", "symbolRendererParams": { "centerText": "GUIor4", "centerTextHeight": 5.0, @@ -547,5 +547,5 @@ mograsim version: 0.1.3 "pinLabelHeight": 3.5, "pinLabelMargin": 0.5 }, - "outlineRendererSnippetID": "class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer" + "outlineRendererSnippetID": "default" } \ No newline at end of file diff --git a/net.mograsim.logic.model.editor/components/GUIor_4.json b/net.mograsim.logic.model.editor/components/GUIor_4.json index 07a3e1e3..ed484c98 100644 --- a/net.mograsim.logic.model.editor/components/GUIor_4.json +++ b/net.mograsim.logic.model.editor/components/GUIor_4.json @@ -871,7 +871,7 @@ mograsim version: 0.1.3 } ] }, - "symbolRendererSnippetID": "class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer", + "symbolRendererSnippetID": "simpleRectangularLike", "symbolRendererParams": { "centerText": "GUIor_4", "centerTextHeight": 5.0, @@ -879,5 +879,5 @@ mograsim version: 0.1.3 "pinLabelHeight": 3.5, "pinLabelMargin": 0.5 }, - "outlineRendererSnippetID": "class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer" + "outlineRendererSnippetID": "default" } \ No newline at end of file diff --git a/net.mograsim.logic.model.editor/components/GUIram2.json b/net.mograsim.logic.model.editor/components/GUIram2.json index 31a01fba..ea3eff93 100644 --- a/net.mograsim.logic.model.editor/components/GUIram2.json +++ b/net.mograsim.logic.model.editor/components/GUIram2.json @@ -2951,7 +2951,7 @@ mograsim version: 0.1.3 } ] }, - "symbolRendererSnippetID": "class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer", + "symbolRendererSnippetID": "simpleRectangularLike", "symbolRendererParams": { "centerText": "GUIram2", "centerTextHeight": 5.0, @@ -2959,30 +2959,30 @@ mograsim version: 0.1.3 "pinLabelHeight": 3.5, "pinLabelMargin": 0.5 }, - "outlineRendererSnippetID": "class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer", - "highLevelStateHandlerSnippetID": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.StandardHighLevelStateHandler", + "outlineRendererSnippetID": "default", + "highLevelStateHandlerSnippetID": "standard", "highLevelStateHandlerParams": { "subcomponentHighLevelStates": { "c00": { - "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler", + "id": "delegating", "params": { "delegateTarget": "GUIdlatch4#0" } }, "c11": { - "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler", + "id": "delegating", "params": { "delegateTarget": "GUIdlatch4#3" } }, "c10": { - "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler", + "id": "delegating", "params": { "delegateTarget": "GUIdlatch4#2" } }, "c01": { - "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler", + "id": "delegating", "params": { "delegateTarget": "GUIdlatch4#1" } @@ -2990,7 +2990,7 @@ mograsim version: 0.1.3 }, "atomicHighLevelStates": { "q": { - "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.BitVectorSplittingAtomicHighLevelStateHandler", + "id": "bitVectorSplitting", "params": { "vectorPartTargets": [ "c11.q", diff --git a/net.mograsim.logic.model.editor/components/GUIram4.json b/net.mograsim.logic.model.editor/components/GUIram4.json index 05bfe9da..e5e71cc1 100644 --- a/net.mograsim.logic.model.editor/components/GUIram4.json +++ b/net.mograsim.logic.model.editor/components/GUIram4.json @@ -3331,7 +3331,7 @@ mograsim version: 0.1.3 } ] }, - "symbolRendererSnippetID": "class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer", + "symbolRendererSnippetID": "simpleRectangularLike", "symbolRendererParams": { "centerText": "GUIram4", "centerTextHeight": 5.0, @@ -3339,141 +3339,141 @@ mograsim version: 0.1.3 "pinLabelHeight": 3.5, "pinLabelMargin": 0.5 }, - "outlineRendererSnippetID": "class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer", - "highLevelStateHandlerSnippetID": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.StandardHighLevelStateHandler", + "outlineRendererSnippetID": "default", + "highLevelStateHandlerSnippetID": "standard", "highLevelStateHandlerParams": { "subcomponentHighLevelStates": { "c00": { - "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler", + "id": "delegating", "params": { "delegateTarget": "GUIram2#0" } }, "c11": { - "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler", + "id": "delegating", "params": { "delegateTarget": "GUIram2#3" } }, "c10": { - "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler", + "id": "delegating", "params": { "delegateTarget": "GUIram2#2" } }, "c01": { - "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler", + "id": "delegating", "params": { "delegateTarget": "GUIram2#1" } }, "c1000": { - "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler", + "id": "delegating", "params": { "delegateTarget": "GUIram2#0", "prefix": "c10" } }, "c1011": { - "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler", + "id": "delegating", "params": { "delegateTarget": "GUIram2#3", "prefix": "c10" } }, "c1110": { - "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler", + "id": "delegating", "params": { "delegateTarget": "GUIram2#2", "prefix": "c11" } }, "c1001": { - "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler", + "id": "delegating", "params": { "delegateTarget": "GUIram2#1", "prefix": "c10" } }, "c1100": { - "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler", + "id": "delegating", "params": { "delegateTarget": "GUIram2#0", "prefix": "c11" } }, "c1111": { - "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler", + "id": "delegating", "params": { "delegateTarget": "GUIram2#3", "prefix": "c11" } }, "c0000": { - "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler", + "id": "delegating", "params": { "delegateTarget": "GUIram2#0", "prefix": "c00" } }, "c0011": { - "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler", + "id": "delegating", "params": { "delegateTarget": "GUIram2#3", "prefix": "c00" } }, "c0110": { - "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler", + "id": "delegating", "params": { "delegateTarget": "GUIram2#2", "prefix": "c01" } }, "c0010": { - "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler", + "id": "delegating", "params": { "delegateTarget": "GUIram2#2", "prefix": "c00" } }, "c1010": { - "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler", + "id": "delegating", "params": { "delegateTarget": "GUIram2#2", "prefix": "c10" } }, "c0101": { - "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler", + "id": "delegating", "params": { "delegateTarget": "GUIram2#1", "prefix": "c01" } }, "c0001": { - "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler", + "id": "delegating", "params": { "delegateTarget": "GUIram2#1", "prefix": "c00" } }, "c0100": { - "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler", + "id": "delegating", "params": { "delegateTarget": "GUIram2#0", "prefix": "c01" } }, "c0111": { - "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler", + "id": "delegating", "params": { "delegateTarget": "GUIram2#3", "prefix": "c01" } }, "c1101": { - "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler", + "id": "delegating", "params": { "delegateTarget": "GUIram2#1", "prefix": "c11" @@ -3482,7 +3482,7 @@ mograsim version: 0.1.3 }, "atomicHighLevelStates": { "q": { - "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.BitVectorSplittingAtomicHighLevelStateHandler", + "id": "bitVectorSplitting", "params": { "vectorPartTargets": [ "c11.q", diff --git a/net.mograsim.logic.model.editor/components/GUIsel2_4.json b/net.mograsim.logic.model.editor/components/GUIsel2_4.json index 1693ebfa..ef717486 100644 --- a/net.mograsim.logic.model.editor/components/GUIsel2_4.json +++ b/net.mograsim.logic.model.editor/components/GUIsel2_4.json @@ -835,7 +835,7 @@ mograsim version: 0.1.3 } ] }, - "symbolRendererSnippetID": "class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer", + "symbolRendererSnippetID": "simpleRectangularLike", "symbolRendererParams": { "centerText": "GUIsel2_4", "centerTextHeight": 5.0, @@ -843,5 +843,5 @@ mograsim version: 0.1.3 "pinLabelHeight": 3.5, "pinLabelMargin": 0.5 }, - "outlineRendererSnippetID": "class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer" + "outlineRendererSnippetID": "default" } \ No newline at end of file diff --git a/net.mograsim.logic.model.editor/components/GUIsel3_4.json b/net.mograsim.logic.model.editor/components/GUIsel3_4.json index cb7c3b4c..494332c3 100644 --- a/net.mograsim.logic.model.editor/components/GUIsel3_4.json +++ b/net.mograsim.logic.model.editor/components/GUIsel3_4.json @@ -904,7 +904,7 @@ mograsim version: 0.1.3 } ] }, - "symbolRendererSnippetID": "class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer", + "symbolRendererSnippetID": "simpleRectangularLike", "symbolRendererParams": { "centerText": "GUIsel3_4", "centerTextHeight": 5.0, @@ -912,5 +912,5 @@ mograsim version: 0.1.3 "pinLabelHeight": 3.5, "pinLabelMargin": 0.5 }, - "outlineRendererSnippetID": "class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer" + "outlineRendererSnippetID": "default" } \ No newline at end of file diff --git a/net.mograsim.logic.model.editor/components/GUIxor.json b/net.mograsim.logic.model.editor/components/GUIxor.json index a15e5df5..82b991e3 100644 --- a/net.mograsim.logic.model.editor/components/GUIxor.json +++ b/net.mograsim.logic.model.editor/components/GUIxor.json @@ -268,7 +268,7 @@ mograsim version: 0.1.3 } ] }, - "symbolRendererSnippetID": "class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer", + "symbolRendererSnippetID": "simpleRectangularLike", "symbolRendererParams": { "centerText": "GUIxor", "centerTextHeight": 5.0, @@ -276,5 +276,5 @@ mograsim version: 0.1.3 "pinLabelHeight": 3.5, "pinLabelMargin": 0.5 }, - "outlineRendererSnippetID": "class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer" + "outlineRendererSnippetID": "default" } \ No newline at end of file diff --git a/net.mograsim.logic.model.editor/components/am2901/GUIAm2901.json b/net.mograsim.logic.model.editor/components/am2901/GUIAm2901.json index 02f17617..81536b1f 100644 --- a/net.mograsim.logic.model.editor/components/am2901/GUIAm2901.json +++ b/net.mograsim.logic.model.editor/components/am2901/GUIAm2901.json @@ -3391,7 +3391,7 @@ mograsim version: 0.1.3 } ] }, - "symbolRendererSnippetID": "class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer", + "symbolRendererSnippetID": "simpleRectangularLike", "symbolRendererParams": { "centerText": "GUIAm2901", "centerTextHeight": 5.0, @@ -3399,18 +3399,18 @@ mograsim version: 0.1.3 "pinLabelHeight": 3.5, "pinLabelMargin": 0.5 }, - "outlineRendererSnippetID": "class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer", - "highLevelStateHandlerSnippetID": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.StandardHighLevelStateHandler", + "outlineRendererSnippetID": "default", + "highLevelStateHandlerSnippetID": "standard", "highLevelStateHandlerParams": { "subcomponentHighLevelStates": { "qreg": { - "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler", + "id": "delegating", "params": { "delegateTarget": "GUIdff4#0" } }, "regs": { - "id": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler", + "id": "delegating", "params": { "delegateTarget": "GUIram4#0" } diff --git a/net.mograsim.logic.model.editor/components/am2901/GUIAm2901ALUFuncDecode.json b/net.mograsim.logic.model.editor/components/am2901/GUIAm2901ALUFuncDecode.json index a575c5ce..006a46ff 100644 --- a/net.mograsim.logic.model.editor/components/am2901/GUIAm2901ALUFuncDecode.json +++ b/net.mograsim.logic.model.editor/components/am2901/GUIAm2901ALUFuncDecode.json @@ -702,7 +702,7 @@ mograsim version: 0.1.3 } ] }, - "symbolRendererSnippetID": "class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer", + "symbolRendererSnippetID": "simpleRectangularLike", "symbolRendererParams": { "centerText": "GUIAm2901ALUFuncDecode", "centerTextHeight": 5.0, @@ -710,5 +710,5 @@ mograsim version: 0.1.3 "pinLabelHeight": 3.5, "pinLabelMargin": 0.5 }, - "outlineRendererSnippetID": "class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer" + "outlineRendererSnippetID": "default" } \ No newline at end of file diff --git a/net.mograsim.logic.model.editor/components/am2901/GUIAm2901ALUInclDecode.json b/net.mograsim.logic.model.editor/components/am2901/GUIAm2901ALUInclDecode.json index c6f61c4f..0f8ee57c 100644 --- a/net.mograsim.logic.model.editor/components/am2901/GUIAm2901ALUInclDecode.json +++ b/net.mograsim.logic.model.editor/components/am2901/GUIAm2901ALUInclDecode.json @@ -1509,7 +1509,7 @@ mograsim version: 0.1.3 } ] }, - "symbolRendererSnippetID": "class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer", + "symbolRendererSnippetID": "simpleRectangularLike", "symbolRendererParams": { "centerText": "GUIAm2901ALUInclDecode", "centerTextHeight": 5.0, @@ -1517,5 +1517,5 @@ mograsim version: 0.1.3 "pinLabelHeight": 3.5, "pinLabelMargin": 0.5 }, - "outlineRendererSnippetID": "class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer" + "outlineRendererSnippetID": "default" } \ No newline at end of file diff --git a/net.mograsim.logic.model.editor/components/am2901/GUIAm2901ALUInclSourceDecodeInclFunctionDecode.json b/net.mograsim.logic.model.editor/components/am2901/GUIAm2901ALUInclSourceDecodeInclFunctionDecode.json index 12e28505..71d2d2d6 100644 --- a/net.mograsim.logic.model.editor/components/am2901/GUIAm2901ALUInclSourceDecodeInclFunctionDecode.json +++ b/net.mograsim.logic.model.editor/components/am2901/GUIAm2901ALUInclSourceDecodeInclFunctionDecode.json @@ -1352,7 +1352,7 @@ mograsim version: 0.1.3 } ] }, - "symbolRendererSnippetID": "class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer", + "symbolRendererSnippetID": "simpleRectangularLike", "symbolRendererParams": { "centerText": "GUIAm2901ALUInclSourceDecodeInclFunctionDecode", "centerTextHeight": 5.0, @@ -1360,5 +1360,5 @@ mograsim version: 0.1.3 "pinLabelHeight": 3.5, "pinLabelMargin": 0.5 }, - "outlineRendererSnippetID": "class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer" + "outlineRendererSnippetID": "default" } \ No newline at end of file diff --git a/net.mograsim.logic.model.editor/components/am2901/GUIAm2901ALUOneBit.json b/net.mograsim.logic.model.editor/components/am2901/GUIAm2901ALUOneBit.json index 5abfdb5b..b32a2b18 100644 --- a/net.mograsim.logic.model.editor/components/am2901/GUIAm2901ALUOneBit.json +++ b/net.mograsim.logic.model.editor/components/am2901/GUIAm2901ALUOneBit.json @@ -532,7 +532,7 @@ mograsim version: 0.1.3 } ] }, - "symbolRendererSnippetID": "class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer", + "symbolRendererSnippetID": "simpleRectangularLike", "symbolRendererParams": { "centerText": "GUIAm2901ALUOneBit", "centerTextHeight": 5.0, @@ -540,5 +540,5 @@ mograsim version: 0.1.3 "pinLabelHeight": 3.5, "pinLabelMargin": 0.5 }, - "outlineRendererSnippetID": "class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer" + "outlineRendererSnippetID": "default" } \ No newline at end of file diff --git a/net.mograsim.logic.model.editor/components/am2901/GUIAm2901DestDecode.json b/net.mograsim.logic.model.editor/components/am2901/GUIAm2901DestDecode.json index 150c0992..38f5fa63 100644 --- a/net.mograsim.logic.model.editor/components/am2901/GUIAm2901DestDecode.json +++ b/net.mograsim.logic.model.editor/components/am2901/GUIAm2901DestDecode.json @@ -1072,7 +1072,7 @@ mograsim version: 0.1.3 } ] }, - "symbolRendererSnippetID": "class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer", + "symbolRendererSnippetID": "simpleRectangularLike", "symbolRendererParams": { "centerText": "GUIAm2901DestDecode", "centerTextHeight": 5.0, @@ -1080,5 +1080,5 @@ mograsim version: 0.1.3 "pinLabelHeight": 3.5, "pinLabelMargin": 0.5 }, - "outlineRendererSnippetID": "class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer" + "outlineRendererSnippetID": "default" } \ No newline at end of file diff --git a/net.mograsim.logic.model.editor/components/am2901/GUIAm2901SourceDecode.json b/net.mograsim.logic.model.editor/components/am2901/GUIAm2901SourceDecode.json index 8c086bfe..cb28db67 100644 --- a/net.mograsim.logic.model.editor/components/am2901/GUIAm2901SourceDecode.json +++ b/net.mograsim.logic.model.editor/components/am2901/GUIAm2901SourceDecode.json @@ -1116,7 +1116,7 @@ mograsim version: 0.1.3 } ] }, - "symbolRendererSnippetID": "class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer", + "symbolRendererSnippetID": "simpleRectangularLike", "symbolRendererParams": { "centerText": "Am2901SourceDecode", "centerTextHeight": 5.0, @@ -1124,5 +1124,5 @@ mograsim version: 0.1.3 "pinLabelHeight": 3.5, "pinLabelMargin": 0.5 }, - "outlineRendererSnippetID": "class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer" + "outlineRendererSnippetID": "default" } \ No newline at end of file diff --git a/net.mograsim.logic.model.editor/components/am2904/GUIAm2904.json b/net.mograsim.logic.model.editor/components/am2904/GUIAm2904.json index a1959d98..d86ee056 100644 --- a/net.mograsim.logic.model.editor/components/am2904/GUIAm2904.json +++ b/net.mograsim.logic.model.editor/components/am2904/GUIAm2904.json @@ -232,7 +232,7 @@ mograsim version: 0.1.3 "innerScale": 0.2, "subComps": [ { - "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", + "id": "WireCrossPoint", "name": "WireCrossPoint#14", "pos": { "x": 520.0, @@ -241,7 +241,7 @@ mograsim version: 0.1.3 "params": 4 }, { - "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", + "id": "WireCrossPoint", "name": "WireCrossPoint#13", "pos": { "x": 330.0, @@ -250,7 +250,7 @@ mograsim version: 0.1.3 "params": 1 }, { - "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", + "id": "WireCrossPoint", "name": "WireCrossPoint#16", "pos": { "x": 255.0, @@ -259,7 +259,7 @@ mograsim version: 0.1.3 "params": 4 }, { - "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", + "id": "WireCrossPoint", "name": "WireCrossPoint#15", "pos": { "x": 255.0, @@ -277,7 +277,7 @@ mograsim version: 0.1.3 "params": 1 }, { - "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", + "id": "WireCrossPoint", "name": "WireCrossPoint#1", "pos": { "x": 180.0, @@ -286,7 +286,7 @@ mograsim version: 0.1.3 "params": 4 }, { - "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", + "id": "WireCrossPoint", "name": "WireCrossPoint#0", "pos": { "x": 165.0, @@ -295,7 +295,7 @@ mograsim version: 0.1.3 "params": 1 }, { - "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", + "id": "WireCrossPoint", "name": "WireCrossPoint#3", "pos": { "x": 335.0, @@ -304,7 +304,7 @@ mograsim version: 0.1.3 "params": 4 }, { - "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", + "id": "WireCrossPoint", "name": "WireCrossPoint#2", "pos": { "x": 295.0, @@ -313,7 +313,7 @@ mograsim version: 0.1.3 "params": 4 }, { - "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", + "id": "WireCrossPoint", "name": "WireCrossPoint#5", "pos": { "x": 530.0, @@ -322,7 +322,7 @@ mograsim version: 0.1.3 "params": 4 }, { - "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", + "id": "WireCrossPoint", "name": "WireCrossPoint#4", "pos": { "x": 150.0, @@ -331,7 +331,7 @@ mograsim version: 0.1.3 "params": 1 }, { - "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", + "id": "WireCrossPoint", "name": "WireCrossPoint#7", "pos": { "x": 215.0, @@ -340,7 +340,7 @@ mograsim version: 0.1.3 "params": 1 }, { - "id": "class:net.mograsim.logic.model.model.components.atomic.GUITriStateBuffer", + "id": "GUITriStateBuffer", "name": "GUITriStateBuffer#0", "pos": { "x": 530.0, @@ -352,7 +352,7 @@ mograsim version: 0.1.3 } }, { - "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", + "id": "WireCrossPoint", "name": "WireCrossPoint#6", "pos": { "x": 120.0, @@ -361,7 +361,7 @@ mograsim version: 0.1.3 "params": 1 }, { - "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", + "id": "WireCrossPoint", "name": "WireCrossPoint#9", "pos": { "x": 215.0, @@ -370,7 +370,7 @@ mograsim version: 0.1.3 "params": 1 }, { - "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", + "id": "WireCrossPoint", "name": "WireCrossPoint#8", "pos": { "x": 215.0, @@ -387,7 +387,7 @@ mograsim version: 0.1.3 } }, { - "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", + "id": "WireCrossPoint", "name": "WireCrossPoint#10", "pos": { "x": 195.0, @@ -404,7 +404,7 @@ mograsim version: 0.1.3 } }, { - "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", + "id": "WireCrossPoint", "name": "WireCrossPoint#12", "pos": { "x": 195.0, @@ -421,7 +421,7 @@ mograsim version: 0.1.3 } }, { - "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", + "id": "WireCrossPoint", "name": "WireCrossPoint#11", "pos": { "x": 195.0, @@ -454,7 +454,7 @@ mograsim version: 0.1.3 } }, { - "id": "class:net.mograsim.logic.model.model.components.atomic.GUIMerger", + "id": "GUIMerger", "name": "GUIMerger#4", "pos": { "x": 25.0, @@ -463,7 +463,7 @@ mograsim version: 0.1.3 "params": 2 }, { - "id": "class:net.mograsim.logic.model.model.components.atomic.GUIMerger", + "id": "GUIMerger", "name": "GUIMerger#3", "pos": { "x": 510.0, @@ -480,7 +480,7 @@ mograsim version: 0.1.3 } }, { - "id": "class:net.mograsim.logic.model.model.components.atomic.GUIMerger", + "id": "GUIMerger", "name": "GUIMerger#2", "pos": { "x": 15.0, @@ -497,7 +497,7 @@ mograsim version: 0.1.3 } }, { - "id": "class:net.mograsim.logic.model.model.components.atomic.GUIMerger", + "id": "GUIMerger", "name": "GUIMerger#1", "pos": { "x": 25.0, @@ -514,7 +514,7 @@ mograsim version: 0.1.3 } }, { - "id": "class:net.mograsim.logic.model.model.components.atomic.GUIMerger", + "id": "GUIMerger", "name": "GUIMerger#0", "pos": { "x": 25.0, @@ -571,7 +571,7 @@ mograsim version: 0.1.3 } }, { - "id": "class:net.mograsim.logic.model.model.components.atomic.GUINandGate", + "id": "GUINandGate", "name": "GUINandGate#10", "pos": { "x": 340.0, @@ -580,7 +580,7 @@ mograsim version: 0.1.3 "params": 1 }, { - "id": "class:net.mograsim.logic.model.model.components.atomic.GUINandGate", + "id": "GUINandGate", "name": "GUINandGate#9", "pos": { "x": 205.0, @@ -589,7 +589,7 @@ mograsim version: 0.1.3 "params": 1 }, { - "id": "class:net.mograsim.logic.model.model.components.atomic.GUINandGate", + "id": "GUINandGate", "name": "GUINandGate#8", "pos": { "x": 205.0, @@ -598,7 +598,7 @@ mograsim version: 0.1.3 "params": 1 }, { - "id": "class:net.mograsim.logic.model.model.components.atomic.GUINandGate", + "id": "GUINandGate", "name": "GUINandGate#5", "pos": { "x": 225.0, @@ -607,7 +607,7 @@ mograsim version: 0.1.3 "params": 1 }, { - "id": "class:net.mograsim.logic.model.model.components.atomic.GUINandGate", + "id": "GUINandGate", "name": "GUINandGate#4", "pos": { "x": 225.0, @@ -616,7 +616,7 @@ mograsim version: 0.1.3 "params": 1 }, { - "id": "class:net.mograsim.logic.model.model.components.atomic.GUINandGate", + "id": "GUINandGate", "name": "GUINandGate#7", "pos": { "x": 205.0, @@ -625,7 +625,7 @@ mograsim version: 0.1.3 "params": 1 }, { - "id": "class:net.mograsim.logic.model.model.components.atomic.GUINandGate", + "id": "GUINandGate", "name": "GUINandGate#6", "pos": { "x": 205.0, @@ -634,7 +634,7 @@ mograsim version: 0.1.3 "params": 1 }, { - "id": "class:net.mograsim.logic.model.model.components.atomic.GUINandGate", + "id": "GUINandGate", "name": "GUINandGate#1", "pos": { "x": 130.0, @@ -643,7 +643,7 @@ mograsim version: 0.1.3 "params": 1 }, { - "id": "class:net.mograsim.logic.model.model.components.atomic.GUINandGate", + "id": "GUINandGate", "name": "GUINandGate#0", "pos": { "x": 190.0, @@ -652,7 +652,7 @@ mograsim version: 0.1.3 "params": 1 }, { - "id": "class:net.mograsim.logic.model.model.components.atomic.GUINandGate", + "id": "GUINandGate", "name": "GUINandGate#3", "pos": { "x": 225.0, @@ -661,7 +661,7 @@ mograsim version: 0.1.3 "params": 1 }, { - "id": "class:net.mograsim.logic.model.model.components.atomic.GUINandGate", + "id": "GUINandGate", "name": "GUINandGate#2", "pos": { "x": 225.0, @@ -670,7 +670,7 @@ mograsim version: 0.1.3 "params": 1 }, { - "id": "class:net.mograsim.logic.model.model.components.atomic.GUISplitter", + "id": "GUISplitter", "name": "GUISplitter#9", "pos": { "x": 240.0, @@ -679,7 +679,7 @@ mograsim version: 0.1.3 "params": 4 }, { - "id": "class:net.mograsim.logic.model.model.components.atomic.GUISplitter", + "id": "GUISplitter", "name": "GUISplitter#4", "pos": { "x": 395.0, @@ -688,7 +688,7 @@ mograsim version: 0.1.3 "params": 4 }, { - "id": "class:net.mograsim.logic.model.model.components.atomic.GUISplitter", + "id": "GUISplitter", "name": "GUISplitter#3", "pos": { "x": 450.0, @@ -697,7 +697,7 @@ mograsim version: 0.1.3 "params": 4 }, { - "id": "class:net.mograsim.logic.model.model.components.atomic.GUISplitter", + "id": "GUISplitter", "name": "GUISplitter#2", "pos": { "x": 395.0, @@ -706,7 +706,7 @@ mograsim version: 0.1.3 "params": 2 }, { - "id": "class:net.mograsim.logic.model.model.components.atomic.GUISplitter", + "id": "GUISplitter", "name": "GUISplitter#1", "pos": { "x": 555.0, @@ -715,7 +715,7 @@ mograsim version: 0.1.3 "params": 4 }, { - "id": "class:net.mograsim.logic.model.model.components.atomic.GUISplitter", + "id": "GUISplitter", "name": "GUISplitter#8", "pos": { "x": 445.0, @@ -724,7 +724,7 @@ mograsim version: 0.1.3 "params": 4 }, { - "id": "class:net.mograsim.logic.model.model.components.atomic.GUISplitter", + "id": "GUISplitter", "name": "GUISplitter#7", "pos": { "x": 445.0, @@ -733,7 +733,7 @@ mograsim version: 0.1.3 "params": 4 }, { - "id": "class:net.mograsim.logic.model.model.components.atomic.GUISplitter", + "id": "GUISplitter", "name": "GUISplitter#6", "pos": { "x": 285.0, @@ -742,7 +742,7 @@ mograsim version: 0.1.3 "params": 3 }, { - "id": "class:net.mograsim.logic.model.model.components.atomic.GUISplitter", + "id": "GUISplitter", "name": "GUISplitter#5", "pos": { "x": 395.0, @@ -751,7 +751,7 @@ mograsim version: 0.1.3 "params": 4 }, { - "id": "class:net.mograsim.logic.model.model.components.atomic.GUISplitter", + "id": "GUISplitter", "name": "GUISplitter#0", "pos": { "x": 10.0, @@ -760,7 +760,7 @@ mograsim version: 0.1.3 "params": 13 }, { - "id": "class:net.mograsim.logic.model.am2900.components.am2904.GUIAm2904RegCTInstrDecode", + "id": "GUIAm2904RegCTInstrDecode", "name": "GUIAm2904RegCTInstrDecode#0", "pos": { "x": 50.0, @@ -768,7 +768,7 @@ mograsim version: 0.1.3 } }, { - "id": "class:net.mograsim.logic.model.model.components.atomic.GUISplitter", + "id": "GUISplitter", "name": "GUISplitter#10", "pos": { "x": 445.0, @@ -777,7 +777,7 @@ mograsim version: 0.1.3 "params": 4 }, { - "id": "class:net.mograsim.logic.model.am2900.components.am2904.GUIAm2904ShiftInstrDecode", + "id": "GUIAm2904ShiftInstrDecode", "name": "GUIAm2904ShiftInstrDecode#0", "pos": { "x": 50.0, @@ -2717,7 +2717,7 @@ mograsim version: 0.1.3 } ] }, - "symbolRendererSnippetID": "class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer", + "symbolRendererSnippetID": "simpleRectangularLike", "symbolRendererParams": { "centerText": "Am2904", "centerTextHeight": 5.0, @@ -2725,8 +2725,8 @@ mograsim version: 0.1.3 "pinLabelHeight": 3.5, "pinLabelMargin": 0.5 }, - "outlineRendererSnippetID": "class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer", - "highLevelStateHandlerSnippetID": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.StandardHighLevelStateHandler", + "outlineRendererSnippetID": "default", + "highLevelStateHandlerSnippetID": "standard", "highLevelStateHandlerParams": { "subcomponentHighLevelStates": {}, "atomicHighLevelStates": {} diff --git a/net.mograsim.logic.model.editor/components/am2904/GUIAm2904TestLogic.json b/net.mograsim.logic.model.editor/components/am2904/GUIAm2904TestLogic.json index 26928e50..5b35584f 100644 --- a/net.mograsim.logic.model.editor/components/am2904/GUIAm2904TestLogic.json +++ b/net.mograsim.logic.model.editor/components/am2904/GUIAm2904TestLogic.json @@ -80,7 +80,7 @@ mograsim version: 0.1.3 "innerScale": 0.4, "subComps": [ { - "id": "class:net.mograsim.logic.model.model.components.atomic.GUINandGate", + "id": "GUINandGate", "name": "GUINandGate#1", "pos": { "x": 45.0, @@ -89,7 +89,7 @@ mograsim version: 0.1.3 "params": 1 }, { - "id": "class:net.mograsim.logic.model.model.components.atomic.GUINandGate", + "id": "GUINandGate", "name": "GUINandGate#0", "pos": { "x": 85.0, @@ -98,7 +98,7 @@ mograsim version: 0.1.3 "params": 1 }, { - "id": "class:net.mograsim.logic.model.model.components.atomic.GUINandGate", + "id": "GUINandGate", "name": "GUINandGate#3", "pos": { "x": 45.0, @@ -107,7 +107,7 @@ mograsim version: 0.1.3 "params": 1 }, { - "id": "class:net.mograsim.logic.model.model.components.atomic.GUINandGate", + "id": "GUINandGate", "name": "GUINandGate#2", "pos": { "x": 120.0, @@ -116,7 +116,7 @@ mograsim version: 0.1.3 "params": 1 }, { - "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", + "id": "WireCrossPoint", "name": "WireCrossPoint#1", "pos": { "x": 34.0, @@ -125,7 +125,7 @@ mograsim version: 0.1.3 "params": 1 }, { - "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", + "id": "WireCrossPoint", "name": "WireCrossPoint#0", "pos": { "x": 29.0, @@ -134,7 +134,7 @@ mograsim version: 0.1.3 "params": 1 }, { - "id": "class:net.mograsim.logic.model.model.components.atomic.GUISplitter", + "id": "GUISplitter", "name": "GUISplitter#0", "pos": { "x": 5.0, @@ -143,7 +143,7 @@ mograsim version: 0.1.3 "params": 4 }, { - "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", + "id": "WireCrossPoint", "name": "WireCrossPoint#3", "pos": { "x": 79.0, @@ -152,7 +152,7 @@ mograsim version: 0.1.3 "params": 1 }, { - "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", + "id": "WireCrossPoint", "name": "WireCrossPoint#2", "pos": { "x": 79.0, @@ -161,7 +161,7 @@ mograsim version: 0.1.3 "params": 1 }, { - "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", + "id": "WireCrossPoint", "name": "WireCrossPoint#5", "pos": { "x": 24.0, @@ -170,7 +170,7 @@ mograsim version: 0.1.3 "params": 1 }, { - "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", + "id": "WireCrossPoint", "name": "WireCrossPoint#4", "pos": { "x": 19.0, @@ -179,7 +179,7 @@ mograsim version: 0.1.3 "params": 1 }, { - "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", + "id": "WireCrossPoint", "name": "WireCrossPoint#7", "pos": { "x": 74.0, @@ -188,7 +188,7 @@ mograsim version: 0.1.3 "params": 1 }, { - "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", + "id": "WireCrossPoint", "name": "WireCrossPoint#6", "pos": { "x": 39.0, @@ -197,7 +197,7 @@ mograsim version: 0.1.3 "params": 1 }, { - "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", + "id": "WireCrossPoint", "name": "WireCrossPoint#9", "pos": { "x": 24.0, @@ -206,7 +206,7 @@ mograsim version: 0.1.3 "params": 1 }, { - "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", + "id": "WireCrossPoint", "name": "WireCrossPoint#8", "pos": { "x": 74.0, @@ -215,7 +215,7 @@ mograsim version: 0.1.3 "params": 1 }, { - "id": "class:net.mograsim.logic.model.model.components.atomic.GUINandGate", + "id": "GUINandGate", "name": "GUINandGate#5", "pos": { "x": 80.0, @@ -224,7 +224,7 @@ mograsim version: 0.1.3 "params": 1 }, { - "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", + "id": "WireCrossPoint", "name": "WireCrossPoint#10", "pos": { "x": 39.0, @@ -241,7 +241,7 @@ mograsim version: 0.1.3 } }, { - "id": "class:net.mograsim.logic.model.model.components.atomic.GUINandGate", + "id": "GUINandGate", "name": "GUINandGate#4", "pos": { "x": 80.0, @@ -748,7 +748,7 @@ mograsim version: 0.1.3 } ] }, - "symbolRendererSnippetID": "class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer", + "symbolRendererSnippetID": "simpleRectangularLike", "symbolRendererParams": { "centerText": "Test\nlogic", "centerTextHeight": 5.0, @@ -756,8 +756,8 @@ mograsim version: 0.1.3 "pinLabelHeight": 3.5, "pinLabelMargin": 0.5 }, - "outlineRendererSnippetID": "class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer", - "highLevelStateHandlerSnippetID": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.StandardHighLevelStateHandler", + "outlineRendererSnippetID": "default", + "highLevelStateHandlerSnippetID": "standard", "highLevelStateHandlerParams": { "subcomponentHighLevelStates": {}, "atomicHighLevelStates": {} diff --git a/net.mograsim.logic.model.editor/components/am2910/GUIAm2910.json b/net.mograsim.logic.model.editor/components/am2910/GUIAm2910.json index 647afc30..e410f3b4 100644 --- a/net.mograsim.logic.model.editor/components/am2910/GUIAm2910.json +++ b/net.mograsim.logic.model.editor/components/am2910/GUIAm2910.json @@ -112,7 +112,7 @@ mograsim version: 0.1.3 "innerScale": 0.2, "subComps": [ { - "id": "class:net.mograsim.logic.model.model.components.atomic.GUINandGate", + "id": "GUINandGate", "name": "GUINandGate#1", "pos": { "x": 10.0, @@ -121,7 +121,7 @@ mograsim version: 0.1.3 "params": 1 }, { - "id": "class:net.mograsim.logic.model.am2900.components.GUIram5_12", + "id": "GUIram5_12", "name": "GUIram5_12#0", "pos": { "x": 305.0, @@ -129,7 +129,7 @@ mograsim version: 0.1.3 } }, { - "id": "class:net.mograsim.logic.model.model.components.atomic.GUINandGate", + "id": "GUINandGate", "name": "GUINandGate#0", "pos": { "x": 40.0, @@ -138,7 +138,7 @@ mograsim version: 0.1.3 "params": 1 }, { - "id": "class:net.mograsim.logic.model.am2900.components.GUIdff12", + "id": "GUIdff12", "name": "GUIdff12#0", "pos": { "x": 305.0, @@ -146,7 +146,7 @@ mograsim version: 0.1.3 } }, { - "id": "class:net.mograsim.logic.model.am2900.components.GUIinc12", + "id": "GUIinc12", "name": "GUIinc12#0", "pos": { "x": 305.0, @@ -154,7 +154,7 @@ mograsim version: 0.1.3 } }, { - "id": "class:net.mograsim.logic.model.model.components.atomic.GUIBitDisplay", + "id": "GUIBitDisplay", "name": "GUIBitDisplay#3", "pos": { "x": 265.0, @@ -163,7 +163,7 @@ mograsim version: 0.1.3 "params": 12 }, { - "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", + "id": "WireCrossPoint", "name": "WireCrossPoint#1", "pos": { "x": 294.0, @@ -172,7 +172,7 @@ mograsim version: 0.1.3 "params": 1 }, { - "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", + "id": "WireCrossPoint", "name": "WireCrossPoint#0", "pos": { "x": 324.0, @@ -181,7 +181,7 @@ mograsim version: 0.1.3 "params": 12 }, { - "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", + "id": "WireCrossPoint", "name": "WireCrossPoint#3", "pos": { "x": 179.0, @@ -190,7 +190,7 @@ mograsim version: 0.1.3 "params": 12 }, { - "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", + "id": "WireCrossPoint", "name": "WireCrossPoint#2", "pos": { "x": 189.0, @@ -199,7 +199,7 @@ mograsim version: 0.1.3 "params": 12 }, { - "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", + "id": "WireCrossPoint", "name": "WireCrossPoint#5", "pos": { "x": 4.0, @@ -208,7 +208,7 @@ mograsim version: 0.1.3 "params": 1 }, { - "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", + "id": "WireCrossPoint", "name": "WireCrossPoint#4", "pos": { "x": 179.0, @@ -217,7 +217,7 @@ mograsim version: 0.1.3 "params": 12 }, { - "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", + "id": "WireCrossPoint", "name": "WireCrossPoint#7", "pos": { "x": 299.0, @@ -226,7 +226,7 @@ mograsim version: 0.1.3 "params": 1 }, { - "id": "class:net.mograsim.logic.model.model.components.atomic.GUITriStateBuffer", + "id": "GUITriStateBuffer", "name": "GUITriStateBuffer#0", "pos": { "x": 180.0, @@ -238,7 +238,7 @@ mograsim version: 0.1.3 } }, { - "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", + "id": "WireCrossPoint", "name": "WireCrossPoint#6", "pos": { "x": 299.0, @@ -247,7 +247,7 @@ mograsim version: 0.1.3 "params": 1 }, { - "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", + "id": "WireCrossPoint", "name": "WireCrossPoint#9", "pos": { "x": 299.0, @@ -256,7 +256,7 @@ mograsim version: 0.1.3 "params": 1 }, { - "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", + "id": "WireCrossPoint", "name": "WireCrossPoint#8", "pos": { "x": 299.0, @@ -265,7 +265,7 @@ mograsim version: 0.1.3 "params": 1 }, { - "id": "class:net.mograsim.logic.model.am2900.components.GUInor12", + "id": "GUInor12", "name": "GUInor12#0", "pos": { "x": 190.0, @@ -273,7 +273,7 @@ mograsim version: 0.1.3 } }, { - "id": "class:net.mograsim.logic.model.model.components.atomic.GUIBitDisplay", + "id": "GUIBitDisplay", "name": "GUIBitDisplay#0", "pos": { "x": 160.0, @@ -282,7 +282,7 @@ mograsim version: 0.1.3 "params": 12 }, { - "id": "class:net.mograsim.logic.model.am2900.components.am2910.GUIAm2910InstrPLA", + "id": "GUIAm2910InstrPLA", "name": "GUIAm2910InstrPLA#0", "pos": { "x": 80.0, @@ -290,7 +290,7 @@ mograsim version: 0.1.3 } }, { - "id": "class:net.mograsim.logic.model.am2900.components.am2910.GUIAm2910SP", + "id": "GUIAm2910SP", "name": "GUIAm2910SP#0", "pos": { "x": 305.0, @@ -298,7 +298,7 @@ mograsim version: 0.1.3 } }, { - "id": "class:net.mograsim.logic.model.model.components.atomic.GUIBitDisplay", + "id": "GUIBitDisplay", "name": "GUIBitDisplay#1", "pos": { "x": 260.0, @@ -307,7 +307,7 @@ mograsim version: 0.1.3 "params": 12 }, { - "id": "class:net.mograsim.logic.model.model.components.atomic.GUIBitDisplay", + "id": "GUIBitDisplay", "name": "GUIBitDisplay#2", "pos": { "x": 345.0, @@ -316,7 +316,7 @@ mograsim version: 0.1.3 "params": 12 }, { - "id": "class:net.mograsim.logic.model.am2900.components.GUIsel4_12", + "id": "GUIsel4_12", "name": "GUIsel4_12#0", "pos": { "x": 150.0, @@ -324,7 +324,7 @@ mograsim version: 0.1.3 } }, { - "id": "class:net.mograsim.logic.model.am2900.components.am2910.GUIAm2910RegCntr", + "id": "GUIAm2910RegCntr", "name": "GUIAm2910RegCntr#0", "pos": { "x": 160.0, @@ -1121,7 +1121,7 @@ mograsim version: 0.1.3 } ] }, - "symbolRendererSnippetID": "class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer", + "symbolRendererSnippetID": "simpleRectangularLike", "symbolRendererParams": { "centerText": "Am2910", "centerTextHeight": 5.0, @@ -1129,8 +1129,8 @@ mograsim version: 0.1.3 "pinLabelHeight": 3.5, "pinLabelMargin": 0.5 }, - "outlineRendererSnippetID": "class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer", - "highLevelStateHandlerSnippetID": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.StandardHighLevelStateHandler", + "outlineRendererSnippetID": "default", + "highLevelStateHandlerSnippetID": "standard", "highLevelStateHandlerParams": { "subcomponentHighLevelStates": {}, "atomicHighLevelStates": {} diff --git a/net.mograsim.logic.model.editor/components/am2910/GUIAm2910_old.json b/net.mograsim.logic.model.editor/components/am2910/GUIAm2910_old.json index ae71c6d0..20f9ac0d 100644 --- a/net.mograsim.logic.model.editor/components/am2910/GUIAm2910_old.json +++ b/net.mograsim.logic.model.editor/components/am2910/GUIAm2910_old.json @@ -104,7 +104,7 @@ mograsim version: 0.1.3 "innerScale": 0.2, "subComps": [ { - "id": "class:net.mograsim.logic.model.model.components.atomic.GUINandGate", + "id": "GUINandGate", "name": "GUINandGate#1", "pos": { "x": 10.0, @@ -113,7 +113,7 @@ mograsim version: 0.1.3 "params": 1 }, { - "id": "class:net.mograsim.logic.model.am2900.components.GUIram5_12", + "id": "GUIram5_12", "name": "GUIram5_12#0", "pos": { "x": 305.0, @@ -121,7 +121,7 @@ mograsim version: 0.1.3 } }, { - "id": "class:net.mograsim.logic.model.model.components.atomic.GUINandGate", + "id": "GUINandGate", "name": "GUINandGate#0", "pos": { "x": 40.0, @@ -130,7 +130,7 @@ mograsim version: 0.1.3 "params": 1 }, { - "id": "class:net.mograsim.logic.model.am2900.components.GUIdff12", + "id": "GUIdff12", "name": "GUIdff12#0", "pos": { "x": 305.0, @@ -138,7 +138,7 @@ mograsim version: 0.1.3 } }, { - "id": "class:net.mograsim.logic.model.am2900.components.GUIinc12", + "id": "GUIinc12", "name": "GUIinc12#0", "pos": { "x": 305.0, @@ -146,7 +146,7 @@ mograsim version: 0.1.3 } }, { - "id": "class:net.mograsim.logic.model.model.components.atomic.GUIBitDisplay", + "id": "GUIBitDisplay", "name": "GUIBitDisplay#3", "pos": { "x": 265.0, @@ -155,7 +155,7 @@ mograsim version: 0.1.3 "params": 12 }, { - "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", + "id": "WireCrossPoint", "name": "WireCrossPoint#1", "pos": { "x": 294.0, @@ -164,7 +164,7 @@ mograsim version: 0.1.3 "params": 1 }, { - "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", + "id": "WireCrossPoint", "name": "WireCrossPoint#0", "pos": { "x": 324.0, @@ -173,7 +173,7 @@ mograsim version: 0.1.3 "params": 12 }, { - "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", + "id": "WireCrossPoint", "name": "WireCrossPoint#3", "pos": { "x": 179.0, @@ -182,7 +182,7 @@ mograsim version: 0.1.3 "params": 12 }, { - "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", + "id": "WireCrossPoint", "name": "WireCrossPoint#2", "pos": { "x": 189.0, @@ -191,7 +191,7 @@ mograsim version: 0.1.3 "params": 12 }, { - "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", + "id": "WireCrossPoint", "name": "WireCrossPoint#5", "pos": { "x": 4.0, @@ -200,7 +200,7 @@ mograsim version: 0.1.3 "params": 1 }, { - "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", + "id": "WireCrossPoint", "name": "WireCrossPoint#4", "pos": { "x": 179.0, @@ -209,7 +209,7 @@ mograsim version: 0.1.3 "params": 12 }, { - "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", + "id": "WireCrossPoint", "name": "WireCrossPoint#7", "pos": { "x": 299.0, @@ -218,7 +218,7 @@ mograsim version: 0.1.3 "params": 1 }, { - "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", + "id": "WireCrossPoint", "name": "WireCrossPoint#6", "pos": { "x": 299.0, @@ -227,7 +227,7 @@ mograsim version: 0.1.3 "params": 1 }, { - "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", + "id": "WireCrossPoint", "name": "WireCrossPoint#9", "pos": { "x": 299.0, @@ -236,7 +236,7 @@ mograsim version: 0.1.3 "params": 1 }, { - "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", + "id": "WireCrossPoint", "name": "WireCrossPoint#8", "pos": { "x": 299.0, @@ -245,7 +245,7 @@ mograsim version: 0.1.3 "params": 1 }, { - "id": "class:net.mograsim.logic.model.am2900.components.GUIsel4_12", + "id": "GUIsel4_12", "name": "GUIsel4_12#0", "pos": { "x": 150.0, @@ -253,7 +253,7 @@ mograsim version: 0.1.3 } }, { - "id": "class:net.mograsim.logic.model.am2900.components.GUInor12", + "id": "GUInor12", "name": "GUInor12#0", "pos": { "x": 190.0, @@ -261,7 +261,7 @@ mograsim version: 0.1.3 } }, { - "id": "class:net.mograsim.logic.model.model.components.atomic.GUIBitDisplay", + "id": "GUIBitDisplay", "name": "GUIBitDisplay#0", "pos": { "x": 160.0, @@ -270,7 +270,7 @@ mograsim version: 0.1.3 "params": 12 }, { - "id": "class:net.mograsim.logic.model.am2900.components.am2910.GUIAm2910InstrPLA", + "id": "GUIAm2910InstrPLA", "name": "GUIAm2910InstrPLA#0", "pos": { "x": 80.0, @@ -278,7 +278,7 @@ mograsim version: 0.1.3 } }, { - "id": "class:net.mograsim.logic.model.am2900.components.am2910.GUIAm2910SP", + "id": "GUIAm2910SP", "name": "GUIAm2910SP#0", "pos": { "x": 305.0, @@ -286,7 +286,7 @@ mograsim version: 0.1.3 } }, { - "id": "class:net.mograsim.logic.model.model.components.atomic.GUIBitDisplay", + "id": "GUIBitDisplay", "name": "GUIBitDisplay#1", "pos": { "x": 260.0, @@ -295,7 +295,7 @@ mograsim version: 0.1.3 "params": 12 }, { - "id": "class:net.mograsim.logic.model.model.components.atomic.GUIBitDisplay", + "id": "GUIBitDisplay", "name": "GUIBitDisplay#2", "pos": { "x": 345.0, @@ -304,7 +304,7 @@ mograsim version: 0.1.3 "params": 12 }, { - "id": "class:net.mograsim.logic.model.am2900.components.am2910.GUIAm2910RegCntr", + "id": "GUIAm2910RegCntr", "name": "GUIAm2910RegCntr#0", "pos": { "x": 160.0, @@ -1072,7 +1072,7 @@ mograsim version: 0.1.3 } ] }, - "symbolRendererSnippetID": "class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer", + "symbolRendererSnippetID": "simpleRectangularLike", "symbolRendererParams": { "centerText": "Am2910", "centerTextHeight": 5.0, @@ -1080,8 +1080,8 @@ mograsim version: 0.1.3 "pinLabelHeight": 3.5, "pinLabelMargin": 0.5 }, - "outlineRendererSnippetID": "class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer", - "highLevelStateHandlerSnippetID": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.StandardHighLevelStateHandler", + "outlineRendererSnippetID": "default", + "highLevelStateHandlerSnippetID": "standard", "highLevelStateHandlerParams": { "subcomponentHighLevelStates": {}, "atomicHighLevelStates": {} 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 e510661a..c0462d86 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 @@ -53,7 +53,7 @@ mograsim version: 0.1.3 "GUIsel1": "file:components/GUIsel1.json", "GUIsel2_4": "file:components/GUIsel2_4.json", "GUIsel3_4": "file:components/GUIsel3_4.json", - "GUIsel4_12": "class:net.mograsim.logic.model.am2900.components.GUImux4_12", + "GUIsel4_12": "class:net.mograsim.logic.model.am2900.components.GUIsel4_12", "GUISplitter": "class:net.mograsim.logic.model.model.components.atomic.GUISplitter", "GUIxor": "file:components/GUIxor.json", "WireCrossPoint": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/highlevelstatehandlers/standard/standardSnippetIDMapping.json b/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/highlevelstatehandlers/standard/standardSnippetIDMapping.json index d06f1c2a..627f5dc6 100644 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/highlevelstatehandlers/standard/standardSnippetIDMapping.json +++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/highlevelstatehandlers/standard/standardSnippetIDMapping.json @@ -5,6 +5,7 @@ mograsim version: 0.1.3 }, "standardAtomicHandlerSuppliers": { "delegating": "net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.DelegatingAtomicHighLevelStateHandler", + "wireForcing": "net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.WireForcingAtomicHighLevelStateHandler", "bitVectorSplitting": "net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.BitVectorSplittingAtomicHighLevelStateHandler" } } \ No newline at end of file -- 2.17.1