X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model.am2900%2Fcomponents%2FGUIandor414.json;h=bd61b9df79bf084f4a594255aa6d6212a0b175a2;hb=4398143ae40a2c41031bacabe9151f0e93d02d67;hp=3042690abc5542266e8d100324e77e6a58fe4851;hpb=c5c0d07286a29994a11ba8b01eaffb21964b6c1b;p=Mograsim.git diff --git a/net.mograsim.logic.model.am2900/components/GUIandor414.json b/net.mograsim.logic.model.am2900/components/GUIandor414.json index 3042690a..bd61b9df 100644 --- a/net.mograsim.logic.model.am2900/components/GUIandor414.json +++ b/net.mograsim.logic.model.am2900/components/GUIandor414.json @@ -112,133 +112,159 @@ mograsim version: 0.1.3 "innerScale": 0.4, "subComps": [ { + "id": "GUIor_4", + "name": "GUIor_4#0", "pos": { "x": 35.0, "y": 37.5 - }, - "id": "GUIor_4", - "name": "GUIor_4#0" + } }, { + "id": "GUIand41", + "name": "GUIand41#0", "pos": { "x": 15.0, "y": 137.5 - }, - "id": "GUIand41", - "name": "GUIand41#0" + } } ], "innerWires": [ { "pin1": { - "compName": "_submodelinterface", - "pinName": "A1" + "compName": "GUIor_4#0", + "pinName": "Y2" }, "pin2": { - "compName": "GUIand41#0", - "pinName": "A1" + "compName": "_submodelinterface", + "pinName": "Y2" }, + "name": "unnamedWire#14", "path": [ { - "x": 10.0, - "y": 112.5 + "x": 80.0, + "y": 52.5 }, { - "x": 10.0, - "y": 142.5 + "x": 80.0, + "y": 37.5 } ] }, { "pin1": { - "compName": "_submodelinterface", - "pinName": "A2" + "compName": "GUIor_4#0", + "pinName": "Y1" }, "pin2": { - "compName": "GUIand41#0", - "pinName": "A2" + "compName": "_submodelinterface", + "pinName": "Y1" }, + "name": "unnamedWire#13", "path": [ { - "x": 5.0, - "y": 137.5 + "x": 75.0, + "y": 42.5 }, { - "x": 5.0, - "y": 152.5 + "x": 75.0, + "y": 12.5 } ] }, { "pin1": { + "compName": "GUIor_4#0", + "pinName": "Y4" + }, + "pin2": { "compName": "_submodelinterface", - "pinName": "A3" + "pinName": "Y4" + }, + "name": "unnamedWire#16", + "path": [ + { + "x": 80.0, + "y": 72.5 + }, + { + "x": 80.0, + "y": 87.5 + } + ] + }, + { + "pin1": { + "compName": "GUIor_4#0", + "pinName": "Y3" }, "pin2": { - "compName": "GUIand41#0", - "pinName": "A3" + "compName": "_submodelinterface", + "pinName": "Y3" }, + "name": "unnamedWire#15", "path": [] }, { "pin1": { - "compName": "_submodelinterface", - "pinName": "A4" + "compName": "GUIand41#0", + "pinName": "Y1" }, "pin2": { - "compName": "GUIand41#0", - "pinName": "A4" + "compName": "GUIor_4#0", + "pinName": "B1" }, + "name": "unnamedWire#9", "path": [ { - "x": 5.0, - "y": 187.5 + "x": 70.0, + "y": 142.5 }, { - "x": 5.0, - "y": 172.5 + "x": 70.0, + "y": 120.0 + }, + { + "x": 30.0, + "y": 120.0 + }, + { + "x": 30.0, + "y": 82.5 } ] }, { "pin1": { "compName": "_submodelinterface", - "pinName": "B" + "pinName": "C4" }, "pin2": { - "compName": "GUIand41#0", - "pinName": "B" + "compName": "GUIor_4#0", + "pinName": "A4" }, + "name": "unnamedWire#8", "path": [ { - "x": 10.0, - "y": 212.5 + "x": 5.0, + "y": 87.5 }, { - "x": 10.0, - "y": 182.5 + "x": 5.0, + "y": 72.5 } ] }, { "pin1": { "compName": "_submodelinterface", - "pinName": "C1" + "pinName": "C3" }, "pin2": { "compName": "GUIor_4#0", - "pinName": "A1" + "pinName": "A3" }, - "path": [ - { - "x": 10.0, - "y": 12.5 - }, - { - "x": 10.0, - "y": 42.5 - } - ] + "name": "unnamedWire#7", + "path": [] }, { "pin1": { @@ -249,6 +275,7 @@ mograsim version: 0.1.3 "compName": "GUIor_4#0", "pinName": "A2" }, + "name": "unnamedWire#6", "path": [ { "x": 5.0, @@ -263,59 +290,63 @@ mograsim version: 0.1.3 { "pin1": { "compName": "_submodelinterface", - "pinName": "C3" + "pinName": "A2" }, "pin2": { - "compName": "GUIor_4#0", - "pinName": "A3" + "compName": "GUIand41#0", + "pinName": "A2" }, - "path": [] + "name": "unnamedWire#1", + "path": [ + { + "x": 5.0, + "y": 137.5 + }, + { + "x": 5.0, + "y": 152.5 + } + ] }, { "pin1": { "compName": "_submodelinterface", - "pinName": "C4" + "pinName": "A1" }, "pin2": { - "compName": "GUIor_4#0", - "pinName": "A4" + "compName": "GUIand41#0", + "pinName": "A1" }, + "name": "unnamedWire#0", "path": [ { - "x": 5.0, - "y": 87.5 + "x": 10.0, + "y": 112.5 }, { - "x": 5.0, - "y": 72.5 + "x": 10.0, + "y": 142.5 } ] }, { "pin1": { - "compName": "GUIand41#0", - "pinName": "Y1" + "compName": "_submodelinterface", + "pinName": "C1" }, "pin2": { "compName": "GUIor_4#0", - "pinName": "B1" + "pinName": "A1" }, + "name": "unnamedWire#5", "path": [ { - "x": 70.0, - "y": 142.5 - }, - { - "x": 70.0, - "y": 120.0 - }, - { - "x": 30.0, - "y": 120.0 + "x": 10.0, + "y": 12.5 }, { - "x": 30.0, - "y": 82.5 + "x": 10.0, + "y": 42.5 } ] }, @@ -328,6 +359,7 @@ mograsim version: 0.1.3 "compName": "GUIor_4#0", "pinName": "B2" }, + "name": "unnamedWire#10", "path": [ { "x": 65.0, @@ -349,29 +381,43 @@ mograsim version: 0.1.3 }, { "pin1": { - "compName": "GUIand41#0", - "pinName": "Y3" + "compName": "_submodelinterface", + "pinName": "B" }, "pin2": { - "compName": "GUIor_4#0", - "pinName": "B3" + "compName": "GUIand41#0", + "pinName": "B" }, + "name": "unnamedWire#4", "path": [ { - "x": 60.0, - "y": 162.5 + "x": 10.0, + "y": 212.5 }, { - "x": 60.0, - "y": 130.0 - }, + "x": 10.0, + "y": 182.5 + } + ] + }, + { + "pin1": { + "compName": "_submodelinterface", + "pinName": "A4" + }, + "pin2": { + "compName": "GUIand41#0", + "pinName": "A4" + }, + "name": "unnamedWire#3", + "path": [ { - "x": 20.0, - "y": 130.0 + "x": 5.0, + "y": 187.5 }, { - "x": 20.0, - "y": 102.5 + "x": 5.0, + "y": 172.5 } ] }, @@ -384,6 +430,7 @@ mograsim version: 0.1.3 "compName": "GUIor_4#0", "pinName": "B4" }, + "name": "unnamedWire#12", "path": [ { "x": 55.0, @@ -405,72 +452,42 @@ mograsim version: 0.1.3 }, { "pin1": { - "compName": "GUIor_4#0", - "pinName": "Y1" - }, - "pin2": { "compName": "_submodelinterface", - "pinName": "Y1" - }, - "path": [ - { - "x": 75.0, - "y": 42.5 - }, - { - "x": 75.0, - "y": 12.5 - } - ] - }, - { - "pin1": { - "compName": "GUIor_4#0", - "pinName": "Y2" + "pinName": "A3" }, "pin2": { - "compName": "_submodelinterface", - "pinName": "Y2" + "compName": "GUIand41#0", + "pinName": "A3" }, - "path": [ - { - "x": 80.0, - "y": 52.5 - }, - { - "x": 80.0, - "y": 37.5 - } - ] + "name": "unnamedWire#2", + "path": [] }, { "pin1": { - "compName": "GUIor_4#0", + "compName": "GUIand41#0", "pinName": "Y3" }, "pin2": { - "compName": "_submodelinterface", - "pinName": "Y3" - }, - "path": [] - }, - { - "pin1": { "compName": "GUIor_4#0", - "pinName": "Y4" - }, - "pin2": { - "compName": "_submodelinterface", - "pinName": "Y4" + "pinName": "B3" }, + "name": "unnamedWire#11", "path": [ { - "x": 80.0, - "y": 72.5 + "x": 60.0, + "y": 162.5 }, { - "x": 80.0, - "y": 87.5 + "x": 60.0, + "y": 130.0 + }, + { + "x": 20.0, + "y": 130.0 + }, + { + "x": 20.0, + "y": 102.5 } ] } @@ -483,5 +500,6 @@ mograsim version: 0.1.3 "horizontalComponentCenter": 17.5, "pinLabelHeight": 3.5, "pinLabelMargin": 0.5 - } + }, + "outlineRendererSnippetID": "default" } \ No newline at end of file