projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
GUIWires now have names
[Mograsim.git]
/
net.mograsim.logic.model.am2900
/
components
/
GUIdff.json
diff --git
a/net.mograsim.logic.model.am2900/components/GUIdff.json
b/net.mograsim.logic.model.am2900/components/GUIdff.json
index
80794ee
..
9d29afb
100644
(file)
--- a/
net.mograsim.logic.model.am2900/components/GUIdff.json
+++ b/
net.mograsim.logic.model.am2900/components/GUIdff.json
@@
-40,162
+40,145
@@
mograsim version: 0.1.3
"innerScale": 0.2,
"subComps": [
{
"innerScale": 0.2,
"subComps": [
{
+ "id": "GUI_rsLatch",
+ "name": "GUI_rsLatch#0",
"pos": {
"x": 40.0,
"y": 10.0
"pos": {
"x": 40.0,
"y": 10.0
- },
- "id": "GUI_rsLatch",
- "name": "GUI_rsLatch#0"
+ }
},
{
},
{
+ "id": "GUInand3",
+ "name": "GUInand3#0",
"pos": {
"x": 40.0,
"y": 40.0
"pos": {
"x": 40.0,
"y": 40.0
- },
- "id": "GUInand3",
- "name": "GUInand3#0"
+ }
},
{
},
{
+ "id": "GUINandGate",
+ "name": "GUINandGate#0",
"pos": {
"x": 120.0,
"y": 60.0
},
"pos": {
"x": 120.0,
"y": 60.0
},
- "id": "GUINandGate",
- "name": "GUINandGate#0",
"params": 1
},
{
"params": 1
},
{
+ "id": "GUI_rsLatch",
+ "name": "GUI_rsLatch#1",
"pos": {
"x": 120.0,
"y": 30.0
"pos": {
"x": 120.0,
"y": 30.0
- },
- "id": "GUI_rsLatch",
- "name": "GUI_rsLatch#1"
+ }
},
{
},
{
+ "id": "WireCrossPoint",
+ "name": "WireCrossPoint#1",
"pos": {
"x": 19.0,
"y": 64.0
},
"pos": {
"x": 19.0,
"y": 64.0
},
- "id": "WireCrossPoint",
- "name": "WireCrossPoint#1",
"params": 1
},
{
"params": 1
},
{
+ "id": "WireCrossPoint",
+ "name": "WireCrossPoint#0",
"pos": {
"x": 9.0,
"y": 24.0
},
"pos": {
"x": 9.0,
"y": 24.0
},
- "id": "WireCrossPoint",
- "name": "WireCrossPoint#0",
"params": 1
},
{
"params": 1
},
{
+ "id": "WireCrossPoint",
+ "name": "WireCrossPoint#3",
"pos": {
"x": 99.0,
"y": 44.0
},
"pos": {
"x": 99.0,
"y": 44.0
},
- "id": "WireCrossPoint",
- "name": "WireCrossPoint#3",
"params": 1
},
{
"params": 1
},
{
+ "id": "WireCrossPoint",
+ "name": "WireCrossPoint#2",
"pos": {
"x": 99.0,
"y": 34.0
},
"pos": {
"x": 99.0,
"y": 34.0
},
- "id": "WireCrossPoint",
- "name": "WireCrossPoint#2",
"params": 1
}
],
"innerWires": [
{
"pin1": {
"params": 1
}
],
"innerWires": [
{
"pin1": {
- "compName": "
_submodelinterface
",
- "pinName": "
C
"
+ "compName": "
GUI_rsLatch#1
",
+ "pinName": "
_Q
"
},
"pin2": {
},
"pin2": {
- "compName": "
WireCrossPoint#0
",
- "pinName": ""
+ "compName": "
_submodelinterface
",
+ "pinName": "
_Q
"
},
},
- "
path": []
+ "
name": "unnamedWire#14"
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
WireCrossPoint#0
",
- "pinName": ""
+ "compName": "
GUI_rsLatch#1
",
+ "pinName": "
Q
"
},
"pin2": {
},
"pin2": {
- "compName": "
GUI_rsLatch#0
",
- "pinName": "
_R
"
+ "compName": "
_submodelinterface
",
+ "pinName": "
Q
"
},
},
- "
path": []
+ "
name": "unnamedWire#13"
},
{
"pin1": {
},
{
"pin1": {
- "compName": "WireCrossPoint#
0
",
+ "compName": "WireCrossPoint#
2
",
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "compName": "GUInand3#0",
- "pinName": "B"
- },
- "path": [
- {
- "x": 10.0,
- "y": 55.0
- }
- ]
- },
- {
- "pin1": {
- "compName": "_submodelinterface",
- "pinName": "D"
- },
- "pin2": {
- "compName": "GUINandGate#0",
- "pinName": "B"
+ "compName": "GUI_rsLatch#1",
+ "pinName": "_S"
},
},
+ "name": "unnamedWire#9",
"path": []
},
{
"pin1": {
"path": []
},
{
"pin1": {
- "compName": "
GUINandGate#0
",
- "pinName": "
Y
"
+ "compName": "
WireCrossPoint#2
",
+ "pinName": ""
},
"pin2": {
},
"pin2": {
- "compName": "
WireCrossPoint#1
",
- "pinName": ""
+ "compName": "
GUInand3#0
",
+ "pinName": "
A
"
},
},
+ "name": "unnamedWire#8",
"path": [
{
"path": [
{
- "x": 145.0,
- "y": 70.0
- },
- {
- "x": 145.0,
- "y": 85.0
+ "x": 30.0,
+ "y": 35.0
},
{
},
{
- "x":
2
0.0,
- "y":
8
5.0
+ "x":
3
0.0,
+ "y":
4
5.0
}
]
},
{
"pin1": {
}
]
},
{
"pin1": {
- "compName": "
WireCrossPoint#1
",
- "pinName": ""
+ "compName": "
GUI_rsLatch#0
",
+ "pinName": "
_Q
"
},
"pin2": {
},
"pin2": {
- "compName": "
GUI_rsLatch#0
",
- "pinName": "
_S
"
+ "compName": "
WireCrossPoint#2
",
+ "pinName": ""
},
},
+ "name": "unnamedWire#7",
"path": [
{
"path": [
{
- "x":
2
0.0,
- "y":
1
5.0
+ "x":
10
0.0,
+ "y":
2
5.0
}
]
},
}
]
},
@@
-208,75
+191,97
@@
mograsim version: 0.1.3
"compName": "GUInand3#0",
"pinName": "C"
},
"compName": "GUInand3#0",
"pinName": "C"
},
+ "name": "unnamedWire#6",
"path": []
},
{
"pin1": {
"path": []
},
{
"pin1": {
+ "compName": "WireCrossPoint#0",
+ "pinName": ""
+ },
+ "pin2": {
"compName": "GUI_rsLatch#0",
"compName": "GUI_rsLatch#0",
- "pinName": "_Q"
+ "pinName": "_R"
+ },
+ "name": "unnamedWire#1",
+ "path": []
+ },
+ {
+ "pin1": {
+ "compName": "_submodelinterface",
+ "pinName": "C"
},
"pin2": {
},
"pin2": {
- "compName": "WireCrossPoint#
2
",
+ "compName": "WireCrossPoint#
0
",
"pinName": ""
},
"pinName": ""
},
- "path": [
- {
- "x": 100.0,
- "y": 25.0
- }
- ]
+ "name": "unnamedWire#0",
+ "path": []
},
{
"pin1": {
},
{
"pin1": {
- "compName": "WireCrossPoint#
2
",
+ "compName": "WireCrossPoint#
1
",
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "compName": "GUI
nand3
#0",
- "pinName": "
A
"
+ "compName": "GUI
_rsLatch
#0",
+ "pinName": "
_S
"
},
},
+ "name": "unnamedWire#5",
"path": [
{
"path": [
{
- "x": 30.0,
- "y": 35.0
- },
- {
- "x": 30.0,
- "y": 45.0
+ "x": 20.0,
+ "y": 15.0
}
]
},
{
"pin1": {
}
]
},
{
"pin1": {
- "compName": "
WireCrossPoint#2
",
- "pinName": ""
+ "compName": "
GUInand3#0
",
+ "pinName": "
Y
"
},
"pin2": {
},
"pin2": {
- "compName": "
GUI_rsLatch#1
",
- "pinName": "
_S
"
+ "compName": "
WireCrossPoint#3
",
+ "pinName": ""
},
},
+ "name": "unnamedWire#10",
"path": []
},
{
"pin1": {
"path": []
},
{
"pin1": {
- "compName": "GUI
nand3
#0",
+ "compName": "GUI
NandGate
#0",
"pinName": "Y"
},
"pin2": {
"pinName": "Y"
},
"pin2": {
- "compName": "WireCrossPoint#
3
",
+ "compName": "WireCrossPoint#
1
",
"pinName": ""
},
"pinName": ""
},
- "path": []
+ "name": "unnamedWire#4",
+ "path": [
+ {
+ "x": 145.0,
+ "y": 70.0
+ },
+ {
+ "x": 145.0,
+ "y": 85.0
+ },
+ {
+ "x": 20.0,
+ "y": 85.0
+ }
+ ]
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
WireCrossPoint#3
",
- "pinName": ""
+ "compName": "
_submodelinterface
",
+ "pinName": "
D
"
},
"pin2": {
},
"pin2": {
- "compName": "GUI
_rsLatch#1
",
- "pinName": "
_R
"
+ "compName": "GUI
NandGate#0
",
+ "pinName": "
B
"
},
},
+ "name": "unnamedWire#3",
"path": []
},
{
"path": []
},
{
@@
-288,6
+293,7
@@
mograsim version: 0.1.3
"compName": "GUINandGate#0",
"pinName": "A"
},
"compName": "GUINandGate#0",
"pinName": "A"
},
+ "name": "unnamedWire#12",
"path": [
{
"x": 100.0,
"path": [
{
"x": 100.0,
@@
-297,23
+303,32
@@
mograsim version: 0.1.3
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
GUI_rsLatch#1
",
- "pinName": "
Q
"
+ "compName": "
WireCrossPoint#0
",
+ "pinName": ""
},
"pin2": {
},
"pin2": {
- "compName": "_submodelinterface",
- "pinName": "Q"
- }
+ "compName": "GUInand3#0",
+ "pinName": "B"
+ },
+ "name": "unnamedWire#2",
+ "path": [
+ {
+ "x": 10.0,
+ "y": 55.0
+ }
+ ]
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
GUI_rsLatch#1
",
- "pinName": "
_Q
"
+ "compName": "
WireCrossPoint#3
",
+ "pinName": ""
},
"pin2": {
},
"pin2": {
- "compName": "_submodelinterface",
- "pinName": "_Q"
- }
+ "compName": "GUI_rsLatch#1",
+ "pinName": "_R"
+ },
+ "name": "unnamedWire#11",
+ "path": []
}
]
},
}
]
},