X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model.am2900%2Fcomponents%2Fam2904%2FGUIAm2904TestLogic.json;h=26928e504393a1f2e86f7290c3779f11a3007626;hb=f37f1f93f2c1ceb780f1c7ecab888bcb8f4f8b89;hp=ff3abac91e1234d7c103340775cada3f67deb0d4;hpb=611b5adfff8216fbe7fb3d81cdb1ecad443aa689;p=Mograsim.git diff --git a/net.mograsim.logic.model.am2900/components/am2904/GUIAm2904TestLogic.json b/net.mograsim.logic.model.am2900/components/am2904/GUIAm2904TestLogic.json index ff3abac9..26928e50 100644 --- a/net.mograsim.logic.model.am2900/components/am2904/GUIAm2904TestLogic.json +++ b/net.mograsim.logic.model.am2900/components/am2904/GUIAm2904TestLogic.json @@ -1,36 +1,36 @@ mograsim version: 0.1.3 { - "width": 29.0, - "height": 45.0, + "width": 60.0, + "height": 90.0, "interfacePins": [ { "location": { - "x": 29.0, - "y": 30.0 + "x": 60.0, + "y": 60.0 }, "name": "Y101", "logicWidth": 1 }, { "location": { - "x": 29.0, - "y": 10.0 + "x": 60.0, + "y": 20.0 }, "name": "Y001", "logicWidth": 1 }, { "location": { - "x": 29.0, - "y": 25.0 + "x": 60.0, + "y": 50.0 }, "name": "Y100", "logicWidth": 1 }, { "location": { - "x": 29.0, - "y": 40.0 + "x": 60.0, + "y": 80.0 }, "name": "Y111", "logicWidth": 1 @@ -38,139 +38,139 @@ mograsim version: 0.1.3 { "location": { "x": 0.0, - "y": 22.0 + "y": 50.0 }, "name": "I", "logicWidth": 4 }, { "location": { - "x": 29.0, - "y": 20.0 + "x": 60.0, + "y": 40.0 }, "name": "Y011", "logicWidth": 1 }, { "location": { - "x": 29.0, - "y": 5.0 + "x": 60.0, + "y": 10.0 }, "name": "Y000", "logicWidth": 1 }, { "location": { - "x": 29.0, - "y": 35.0 + "x": 60.0, + "y": 70.0 }, "name": "Y110", "logicWidth": 1 }, { "location": { - "x": 29.0, - "y": 15.0 + "x": 60.0, + "y": 30.0 }, "name": "Y010", "logicWidth": 1 } ], "submodel": { - "innerScale": 0.2, + "innerScale": 0.4, "subComps": [ { - "id": "GUINandGate", + "id": "class:net.mograsim.logic.model.model.components.atomic.GUINandGate", "name": "GUINandGate#1", "pos": { - "x": 40.0, + "x": 45.0, "y": 50.0 }, "params": 1 }, { - "id": "GUINandGate", + "id": "class:net.mograsim.logic.model.model.components.atomic.GUINandGate", "name": "GUINandGate#0", "pos": { - "x": 80.0, + "x": 85.0, "y": 20.0 }, "params": 1 }, { - "id": "GUINandGate", + "id": "class:net.mograsim.logic.model.model.components.atomic.GUINandGate", "name": "GUINandGate#3", "pos": { - "x": 40.0, + "x": 45.0, "y": 105.0 }, "params": 1 }, { - "id": "GUINandGate", + "id": "class:net.mograsim.logic.model.model.components.atomic.GUINandGate", "name": "GUINandGate#2", "pos": { - "x": 115.0, + "x": 120.0, "y": 15.0 }, "params": 1 }, { - "id": "WireCrossPoint", + "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", "name": "WireCrossPoint#1", "pos": { - "x": 29.0, + "x": 34.0, "y": 99.0 }, "params": 1 }, { - "id": "WireCrossPoint", + "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", "name": "WireCrossPoint#0", "pos": { - "x": 24.0, - "y": 114.0 + "x": 29.0, + "y": 129.0 }, "params": 1 }, { - "id": "GUISplitter", + "id": "class:net.mograsim.logic.model.model.components.atomic.GUISplitter", "name": "GUISplitter#0", "pos": { "x": 5.0, - "y": 95.0 + "y": 110.0 }, "params": 4 }, { - "id": "WireCrossPoint", + "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", "name": "WireCrossPoint#3", "pos": { - "x": 74.0, + "x": 79.0, "y": 24.0 }, "params": 1 }, { - "id": "WireCrossPoint", + "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", "name": "WireCrossPoint#2", "pos": { - "x": 74.0, + "x": 79.0, "y": 34.0 }, "params": 1 }, { - "id": "WireCrossPoint", + "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", "name": "WireCrossPoint#5", "pos": { - "x": 19.0, - "y": 109.0 + "x": 24.0, + "y": 119.0 }, "params": 1 }, { - "id": "WireCrossPoint", + "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", "name": "WireCrossPoint#4", "pos": { "x": 19.0, @@ -179,55 +179,55 @@ mograsim version: 0.1.3 "params": 1 }, { - "id": "WireCrossPoint", + "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", "name": "WireCrossPoint#7", "pos": { - "x": 69.0, + "x": 74.0, "y": 59.0 }, "params": 1 }, { - "id": "WireCrossPoint", + "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", "name": "WireCrossPoint#6", "pos": { - "x": 34.0, + "x": 39.0, "y": 64.0 }, "params": 1 }, { - "id": "WireCrossPoint", + "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", "name": "WireCrossPoint#9", "pos": { - "x": 19.0, + "x": 24.0, "y": 149.0 }, "params": 1 }, { - "id": "WireCrossPoint", + "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", "name": "WireCrossPoint#8", "pos": { - "x": 69.0, + "x": 74.0, "y": 119.0 }, "params": 1 }, { - "id": "GUINandGate", + "id": "class:net.mograsim.logic.model.model.components.atomic.GUINandGate", "name": "GUINandGate#5", "pos": { - "x": 75.0, + "x": 80.0, "y": 165.0 }, "params": 1 }, { - "id": "WireCrossPoint", + "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint", "name": "WireCrossPoint#10", "pos": { - "x": 34.0, + "x": 39.0, "y": 109.0 }, "params": 1 @@ -236,15 +236,15 @@ mograsim version: 0.1.3 "id": "GUIxor", "name": "DeserializedSubmodelComponent#0", "pos": { - "x": 35.0, + "x": 40.0, "y": 20.0 } }, { - "id": "GUINandGate", + "id": "class:net.mograsim.logic.model.model.components.atomic.GUINandGate", "name": "GUINandGate#4", "pos": { - "x": 75.0, + "x": 80.0, "y": 115.0 }, "params": 1 @@ -263,15 +263,11 @@ mograsim version: 0.1.3 "name": "unnamedWire#14", "path": [ { - "x": 70.0, - "y": 45.0 - }, - { - "x": 110.0, - "y": 45.0 + "x": 115.0, + "y": 60.0 }, { - "x": 110.0, + "x": 115.0, "y": 30.0 } ] @@ -312,7 +308,7 @@ mograsim version: 0.1.3 "name": "unnamedWire#15", "path": [ { - "x": 75.0, + "x": 80.0, "y": 50.0 } ] @@ -339,7 +335,12 @@ mograsim version: 0.1.3 "pinName": "" }, "name": "unnamedWire#17", - "path": [] + "path": [ + { + "x": 25.0, + "y": 110.0 + } + ] }, { "pin1": { @@ -351,12 +352,7 @@ mograsim version: 0.1.3 "pinName": "" }, "name": "unnamedWire#19", - "path": [ - { - "x": 20.0, - "y": 105.0 - } - ] + "path": [] }, { "pin1": { @@ -371,7 +367,7 @@ mograsim version: 0.1.3 "path": [ { "x": 20.0, - "y": 95.0 + "y": 110.0 } ] }, @@ -435,11 +431,11 @@ mograsim version: 0.1.3 "name": "unnamedWire#24", "path": [ { - "x": 65.0, + "x": 70.0, "y": 115.0 }, { - "x": 65.0, + "x": 70.0, "y": 130.0 } ] @@ -576,7 +572,7 @@ mograsim version: 0.1.3 "name": "unnamedWire#30", "path": [ { - "x": 70.0, + "x": 75.0, "y": 170.0 } ] @@ -593,11 +589,11 @@ mograsim version: 0.1.3 "name": "unnamedWire#10", "path": [ { - "x": 105.0, + "x": 110.0, "y": 20.0 }, { - "x": 105.0, + "x": 110.0, "y": 30.0 } ] @@ -626,7 +622,7 @@ mograsim version: 0.1.3 "name": "unnamedWire#32", "path": [ { - "x": 20.0, + "x": 25.0, "y": 180.0 } ] @@ -643,7 +639,7 @@ mograsim version: 0.1.3 "name": "unnamedWire#4", "path": [ { - "x": 30.0, + "x": 35.0, "y": 35.0 } ] @@ -660,7 +656,7 @@ mograsim version: 0.1.3 "name": "unnamedWire#31", "path": [ { - "x": 35.0, + "x": 40.0, "y": 120.0 } ] @@ -677,7 +673,7 @@ mograsim version: 0.1.3 "name": "unnamedWire#3", "path": [ { - "x": 25.0, + "x": 30.0, "y": 25.0 } ] @@ -694,7 +690,7 @@ mograsim version: 0.1.3 "name": "unnamedWire#12", "path": [ { - "x": 35.0, + "x": 40.0, "y": 55.0 } ] @@ -711,8 +707,8 @@ mograsim version: 0.1.3 "name": "unnamedWire#2", "path": [ { - "x": 30.0, - "y": 125.0 + "x": 35.0, + "y": 140.0 } ] }, @@ -745,7 +741,7 @@ mograsim version: 0.1.3 "name": "unnamedWire#33", "path": [ { - "x": 25.0, + "x": 30.0, "y": 200.0 } ]