X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model.editor%2Fcomponents%2FGUIdff4.json;h=a717818852181495c24f663e0efdf2d0d7a56695;hb=148a58630b38b30d4d24a21e3f55c357f5b4d0bc;hp=4064f93e11b2b6c53775750c4d52da2633ff3f24;hpb=61621670ab3ea56eea6571cc9bba5e015c9f0861;p=Mograsim.git diff --git a/net.mograsim.logic.model.editor/components/GUIdff4.json b/net.mograsim.logic.model.editor/components/GUIdff4.json index 4064f93e..a7178188 100644 --- a/net.mograsim.logic.model.editor/components/GUIdff4.json +++ b/net.mograsim.logic.model.editor/components/GUIdff4.json @@ -1,4 +1,3 @@ -mograsim version: 0.1.3 { "width": 35.0, "height": 60.0, @@ -6,87 +5,113 @@ mograsim version: 0.1.3 { "location": { "x": 0.0, - "y": 55.0 + "y": 5.0 }, - "name": "D4", - "logicWidth": 1 + "name": "C", + "logicWidth": 1, + "usage": "INPUT" }, { "location": { - "x": 35.0, - "y": 5.0 + "x": 0.0, + "y": 25.0 }, - "name": "Q1", - "logicWidth": 1 + "name": "D1", + "logicWidth": 1, + "usage": "INPUT" }, { "location": { - "x": 35.0, - "y": 15.0 + "x": 0.0, + "y": 35.0 }, - "name": "Q2", - "logicWidth": 1 + "name": "D2", + "logicWidth": 1, + "usage": "INPUT" }, { "location": { - "x": 35.0, - "y": 25.0 + "x": 0.0, + "y": 45.0 }, - "name": "Q3", - "logicWidth": 1 + "name": "D3", + "logicWidth": 1, + "usage": "INPUT" }, { "location": { "x": 0.0, - "y": 5.0 + "y": 55.0 }, - "name": "C", - "logicWidth": 1 + "name": "D4", + "logicWidth": 1, + "usage": "INPUT" }, { "location": { "x": 35.0, - "y": 35.0 + "y": 5.0 }, - "name": "Q4", - "logicWidth": 1 + "name": "Q1", + "logicWidth": 1, + "usage": "OUTPUT" }, { "location": { - "x": 0.0, - "y": 25.0 + "x": 35.0, + "y": 15.0 }, - "name": "D1", - "logicWidth": 1 + "name": "Q2", + "logicWidth": 1, + "usage": "OUTPUT" }, { "location": { - "x": 0.0, - "y": 15.0 + "x": 35.0, + "y": 25.0 }, - "name": "WE", - "logicWidth": 1 + "name": "Q3", + "logicWidth": 1, + "usage": "OUTPUT" }, { "location": { - "x": 0.0, + "x": 35.0, "y": 35.0 }, - "name": "D2", - "logicWidth": 1 + "name": "Q4", + "logicWidth": 1, + "usage": "OUTPUT" }, { "location": { "x": 0.0, - "y": 45.0 + "y": 15.0 }, - "name": "D3", - "logicWidth": 1 + "name": "WE", + "logicWidth": 1, + "usage": "INPUT" } ], + "innerScale": 0.2, "submodel": { - "innerScale": 0.2, - "subComps": [ + "components": [ + { + "id": "GUImux1_4", + "name": "DeserializedSubmodelComponent#0", + "pos": { + "x": 55.0, + "y": 70.0 + } + }, + { + "id": "GUIdff", + "name": "GUIdff#0", + "pos": { + "x": 115.0, + "y": 20.0 + } + }, { "id": "GUIdff", "name": "GUIdff#1", @@ -97,20 +122,19 @@ mograsim version: 0.1.3 }, { "id": "GUIdff", - "name": "GUIdff#0", + "name": "GUIdff#2", "pos": { "x": 115.0, - "y": 20.0 + "y": 120.0 } }, { - "id": "WireCrossPoint", - "name": "WireCrossPoint#1", + "id": "GUIdff", + "name": "GUIdff#3", "pos": { - "x": 104.0, - "y": 74.0 - }, - "params": 1 + "x": 115.0, + "y": 170.0 + } }, { "id": "WireCrossPoint", @@ -123,10 +147,10 @@ mograsim version: 0.1.3 }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#3", + "name": "WireCrossPoint#1", "pos": { - "x": 169.0, - "y": 24.0 + "x": 104.0, + "y": 74.0 }, "params": 1 }, @@ -141,10 +165,10 @@ mograsim version: 0.1.3 }, { "id": "WireCrossPoint", - "name": "WireCrossPoint#5", + "name": "WireCrossPoint#3", "pos": { - "x": 159.0, - "y": 124.0 + "x": 169.0, + "y": 24.0 }, "params": 1 }, @@ -157,6 +181,15 @@ mograsim version: 0.1.3 }, "params": 1 }, + { + "id": "WireCrossPoint", + "name": "WireCrossPoint#5", + "pos": { + "x": 159.0, + "y": 124.0 + }, + "params": 1 + }, { "id": "WireCrossPoint", "name": "WireCrossPoint#6", @@ -165,44 +198,95 @@ mograsim version: 0.1.3 "y": 174.0 }, "params": 1 - }, + } + ], + "wires": [ { - "id": "GUImux1_4", - "name": "DeserializedSubmodelComponent#0", - "pos": { - "x": 55.0, - "y": 70.0 - } + "pin1": { + "compName": "_submodelinterface", + "pinName": "C" + }, + "pin2": { + "compName": "WireCrossPoint#0", + "pinName": "" + }, + "name": "unnamedWire#0", + "path": [] }, { - "id": "GUIdff", - "name": "GUIdff#3", - "pos": { - "x": 115.0, - "y": 170.0 - } + "pin1": { + "compName": "DeserializedSubmodelComponent#0", + "pinName": "Y1" + }, + "pin2": { + "compName": "GUIdff#0", + "pinName": "D" + }, + "name": "unnamedWire#1", + "path": [ + { + "x": 100.0, + "y": 75.0 + }, + { + "x": 100.0, + "y": 35.0 + } + ] }, { - "id": "GUIdff", - "name": "GUIdff#2", - "pos": { - "x": 115.0, - "y": 120.0 - } - } - ], - "innerWires": [ + "pin1": { + "compName": "_submodelinterface", + "pinName": "D1" + }, + "pin2": { + "compName": "DeserializedSubmodelComponent#0", + "pinName": "I1_1" + }, + "name": "unnamedWire#10", + "path": [] + }, { "pin1": { - "compName": "WireCrossPoint#3", - "pinName": "" + "compName": "_submodelinterface", + "pinName": "D2" }, "pin2": { + "compName": "DeserializedSubmodelComponent#0", + "pinName": "I1_2" + }, + "name": "unnamedWire#11", + "path": [ + { + "x": 5.0, + "y": 175.0 + }, + { + "x": 5.0, + "y": 135.0 + } + ] + }, + { + "pin1": { "compName": "_submodelinterface", - "pinName": "Q1" + "pinName": "D3" }, - "name": "unnamedWire#14", - "path": [] + "pin2": { + "compName": "DeserializedSubmodelComponent#0", + "pinName": "I1_3" + }, + "name": "unnamedWire#12", + "path": [ + { + "x": 10.0, + "y": 225.0 + }, + { + "x": 10.0, + "y": 145.0 + } + ] }, { "pin1": { @@ -218,14 +302,14 @@ mograsim version: 0.1.3 }, { "pin1": { - "compName": "WireCrossPoint#4", + "compName": "WireCrossPoint#3", "pinName": "" }, "pin2": { - "compName": "GUIdff#1", - "pinName": "Q" + "compName": "_submodelinterface", + "pinName": "Q1" }, - "name": "unnamedWire#16", + "name": "unnamedWire#14", "path": [] }, { @@ -242,14 +326,14 @@ mograsim version: 0.1.3 }, { "pin1": { - "compName": "GUIdff#2", - "pinName": "Q" + "compName": "WireCrossPoint#4", + "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#5", - "pinName": "" + "compName": "GUIdff#1", + "pinName": "Q" }, - "name": "unnamedWire#18", + "name": "unnamedWire#16", "path": [] }, { @@ -273,6 +357,18 @@ mograsim version: 0.1.3 } ] }, + { + "pin1": { + "compName": "GUIdff#2", + "pinName": "Q" + }, + "pin2": { + "compName": "WireCrossPoint#5", + "pinName": "" + }, + "name": "unnamedWire#18", + "path": [] + }, { "pin1": { "compName": "WireCrossPoint#5", @@ -287,14 +383,14 @@ mograsim version: 0.1.3 }, { "pin1": { - "compName": "WireCrossPoint#6", - "pinName": "" + "compName": "DeserializedSubmodelComponent#0", + "pinName": "Y2" }, "pin2": { - "compName": "GUIdff#3", - "pinName": "Q" + "compName": "GUIdff#1", + "pinName": "D" }, - "name": "unnamedWire#21", + "name": "unnamedWire#2", "path": [] }, { @@ -311,24 +407,15 @@ mograsim version: 0.1.3 }, { "pin1": { - "compName": "DeserializedSubmodelComponent#0", - "pinName": "Y4" + "compName": "WireCrossPoint#6", + "pinName": "" }, "pin2": { "compName": "GUIdff#3", - "pinName": "D" + "pinName": "Q" }, - "name": "unnamedWire#23", - "path": [ - { - "x": 95.0, - "y": 105.0 - }, - { - "x": 95.0, - "y": 185.0 - } - ] + "name": "unnamedWire#21", + "path": [] }, { "pin1": { @@ -353,26 +440,22 @@ mograsim version: 0.1.3 }, { "pin1": { - "compName": "WireCrossPoint#4", - "pinName": "" + "compName": "DeserializedSubmodelComponent#0", + "pinName": "Y4" }, "pin2": { - "compName": "DeserializedSubmodelComponent#0", - "pinName": "I0_2" + "compName": "GUIdff#3", + "pinName": "D" }, - "name": "unnamedWire#25", + "name": "unnamedWire#23", "path": [ { - "x": 165.0, - "y": 200.0 - }, - { - "x": 45.0, - "y": 200.0 + "x": 95.0, + "y": 105.0 }, { - "x": 45.0, - "y": 95.0 + "x": 95.0, + "y": 185.0 } ] }, @@ -403,15 +486,28 @@ mograsim version: 0.1.3 }, { "pin1": { - "compName": "WireCrossPoint#6", + "compName": "WireCrossPoint#4", "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#6", - "pinName": "" + "compName": "DeserializedSubmodelComponent#0", + "pinName": "I0_2" }, - "name": "unnamedWire#27", - "path": [] + "name": "unnamedWire#25", + "path": [ + { + "x": 165.0, + "y": 200.0 + }, + { + "x": 45.0, + "y": 200.0 + }, + { + "x": 45.0, + "y": 95.0 + } + ] }, { "pin1": { @@ -438,6 +534,18 @@ mograsim version: 0.1.3 } ] }, + { + "pin1": { + "compName": "WireCrossPoint#6", + "pinName": "" + }, + "pin2": { + "compName": "WireCrossPoint#6", + "pinName": "" + }, + "name": "unnamedWire#27", + "path": [] + }, { "pin1": { "compName": "WireCrossPoint#6", @@ -465,88 +573,26 @@ mograsim version: 0.1.3 }, { "pin1": { - "compName": "_submodelinterface", - "pinName": "WE" - }, - "pin2": { - "compName": "DeserializedSubmodelComponent#0", - "pinName": "S0" - }, - "name": "unnamedWire#9", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#2", - "pinName": "" - }, - "pin2": { - "compName": "GUIdff#3", - "pinName": "C" - }, - "name": "unnamedWire#8", - "path": [ - { - "x": 105.0, - "y": 175.0 - } - ] - }, - { - "pin1": { - "compName": "WireCrossPoint#2", + "compName": "WireCrossPoint#0", "pinName": "" }, "pin2": { - "compName": "GUIdff#2", + "compName": "GUIdff#0", "pinName": "C" }, - "name": "unnamedWire#7", + "name": "unnamedWire#3", "path": [] }, { "pin1": { - "compName": "WireCrossPoint#1", - "pinName": "" - }, - "pin2": { - "compName": "WireCrossPoint#2", + "compName": "WireCrossPoint#0", "pinName": "" }, - "name": "unnamedWire#6", - "path": [] - }, - { - "pin1": { - "compName": "DeserializedSubmodelComponent#0", - "pinName": "Y1" - }, - "pin2": { - "compName": "GUIdff#0", - "pinName": "D" - }, - "name": "unnamedWire#1", - "path": [ - { - "x": 100.0, - "y": 75.0 - }, - { - "x": 100.0, - "y": 35.0 - } - ] - }, - { - "pin1": { - "compName": "_submodelinterface", - "pinName": "C" - }, "pin2": { - "compName": "WireCrossPoint#0", + "compName": "WireCrossPoint#1", "pinName": "" }, - "name": "unnamedWire#0", + "name": "unnamedWire#4", "path": [] }, { @@ -563,97 +609,61 @@ mograsim version: 0.1.3 }, { "pin1": { - "compName": "_submodelinterface", - "pinName": "D1" - }, - "pin2": { - "compName": "DeserializedSubmodelComponent#0", - "pinName": "I1_1" - }, - "name": "unnamedWire#10", - "path": [] - }, - { - "pin1": { - "compName": "WireCrossPoint#0", + "compName": "WireCrossPoint#1", "pinName": "" }, "pin2": { - "compName": "WireCrossPoint#1", + "compName": "WireCrossPoint#2", "pinName": "" }, - "name": "unnamedWire#4", + "name": "unnamedWire#6", "path": [] }, { "pin1": { - "compName": "WireCrossPoint#0", + "compName": "WireCrossPoint#2", "pinName": "" }, "pin2": { - "compName": "GUIdff#0", + "compName": "GUIdff#2", "pinName": "C" }, - "name": "unnamedWire#3", + "name": "unnamedWire#7", "path": [] }, { "pin1": { - "compName": "_submodelinterface", - "pinName": "D3" + "compName": "WireCrossPoint#2", + "pinName": "" }, "pin2": { - "compName": "DeserializedSubmodelComponent#0", - "pinName": "I1_3" + "compName": "GUIdff#3", + "pinName": "C" }, - "name": "unnamedWire#12", + "name": "unnamedWire#8", "path": [ { - "x": 10.0, - "y": 225.0 - }, - { - "x": 10.0, - "y": 145.0 + "x": 105.0, + "y": 175.0 } ] }, { "pin1": { "compName": "_submodelinterface", - "pinName": "D2" + "pinName": "WE" }, "pin2": { "compName": "DeserializedSubmodelComponent#0", - "pinName": "I1_2" - }, - "name": "unnamedWire#11", - "path": [ - { - "x": 5.0, - "y": 175.0 - }, - { - "x": 5.0, - "y": 135.0 - } - ] - }, - { - "pin1": { - "compName": "DeserializedSubmodelComponent#0", - "pinName": "Y2" - }, - "pin2": { - "compName": "GUIdff#1", - "pinName": "D" + "pinName": "S0" }, - "name": "unnamedWire#2", + "name": "unnamedWire#9", "path": [] } - ] + ], + "version": "0.1.1" }, - "symbolRendererSnippetID": "class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer", + "symbolRendererSnippetID": "simpleRectangularLike", "symbolRendererParams": { "centerText": "D flip flop\n4 bit", "centerTextHeight": 5.0, @@ -661,27 +671,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,19 +708,20 @@ 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" } } } - } + }, + "version": "0.1.5" } \ No newline at end of file