projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Editor#getIdentifier(GUIComponent) improved
[Mograsim.git]
/
net.mograsim.logic.model.am2900
/
components
/
GUIdlatch4.json
diff --git
a/net.mograsim.logic.model.am2900/components/GUIdlatch4.json
b/net.mograsim.logic.model.am2900/components/GUIdlatch4.json
index
d798d7f
..
3bc4df7
100644
(file)
--- a/
net.mograsim.logic.model.am2900/components/GUIdlatch4.json
+++ b/
net.mograsim.logic.model.am2900/components/GUIdlatch4.json
@@
-1,4
+1,3
@@
-mograsim version: 0.1.3
{
"width": 35.0,
"height": 50.0,
{
"width": 35.0,
"height": 50.0,
@@
-6,105
+5,95
@@
mograsim version: 0.1.3
{
"location": {
"x": 0.0,
{
"location": {
"x": 0.0,
- "y":
3
5.0
+ "y":
4
5.0
},
},
- "name": "D4",
- "logicWidth": 1
+ "name": "C",
+ "logicWidth": 1,
+ "usage": "INPUT"
},
{
"location": {
},
{
"location": {
- "x":
35
.0,
+ "x":
0
.0,
"y": 5.0
},
"y": 5.0
},
- "name": "Q1",
- "logicWidth": 1
+ "name": "D1",
+ "logicWidth": 1,
+ "usage": "INPUT"
},
{
"location": {
},
{
"location": {
- "x":
35
.0,
+ "x":
0
.0,
"y": 15.0
},
"y": 15.0
},
- "name": "Q2",
- "logicWidth": 1
+ "name": "D2",
+ "logicWidth": 1,
+ "usage": "INPUT"
},
{
"location": {
},
{
"location": {
- "x":
35
.0,
+ "x":
0
.0,
"y": 25.0
},
"y": 25.0
},
- "name": "Q3",
- "logicWidth": 1
+ "name": "D3",
+ "logicWidth": 1,
+ "usage": "INPUT"
},
{
"location": {
"x": 0.0,
},
{
"location": {
"x": 0.0,
- "y":
4
5.0
+ "y":
3
5.0
},
},
- "name": "C",
- "logicWidth": 1
+ "name": "D4",
+ "logicWidth": 1,
+ "usage": "INPUT"
},
{
"location": {
"x": 35.0,
},
{
"location": {
"x": 35.0,
- "y":
3
5.0
+ "y": 5.0
},
},
- "name": "Q4",
- "logicWidth": 1
+ "name": "Q1",
+ "logicWidth": 1,
+ "usage": "OUTPUT"
},
{
"location": {
},
{
"location": {
- "x":
0
.0,
- "y": 5.0
+ "x":
35
.0,
+ "y":
1
5.0
},
},
- "name": "D1",
- "logicWidth": 1
+ "name": "Q2",
+ "logicWidth": 1,
+ "usage": "OUTPUT"
},
{
"location": {
},
{
"location": {
- "x":
0
.0,
- "y":
1
5.0
+ "x":
35
.0,
+ "y":
2
5.0
},
},
- "name": "D2",
- "logicWidth": 1
+ "name": "Q3",
+ "logicWidth": 1,
+ "usage": "OUTPUT"
},
{
"location": {
},
{
"location": {
- "x":
0
.0,
- "y":
2
5.0
+ "x":
35
.0,
+ "y":
3
5.0
},
},
- "name": "D3",
- "logicWidth": 1
+ "name": "Q4",
+ "logicWidth": 1,
+ "usage": "OUTPUT"
}
],
}
],
+ "innerScale": 0.4,
"submodel": {
"submodel": {
- "innerScale": 0.4,
- "subComps": [
- {
- "id": "WireCrossPoint",
- "name": "WireCrossPoint#1",
- "pos": {
- "x": 14.0,
- "y": 71.5
- },
- "params": 1
- },
+ "components": [
{
{
- "id": "WireCrossPoint",
- "name": "WireCrossPoint#0",
- "pos": {
- "x": 14.0,
- "y": 46.5
- },
- "params": 1
- },
- {
- "id": "WireCrossPoint",
- "name": "WireCrossPoint#2",
+ "id": "GUIdlatch",
+ "name": "GUIdlatch#0",
"pos": {
"pos": {
- "x": 14.0,
- "y": 96.5
- },
- "params": 1
+ "x": 30.0,
+ "y": 7.5
+ }
},
{
"id": "GUIdlatch",
},
{
"id": "GUIdlatch",
@@
-116,10
+105,10
@@
mograsim version: 0.1.3
},
{
"id": "GUIdlatch",
},
{
"id": "GUIdlatch",
- "name": "GUIdlatch#
0
",
+ "name": "GUIdlatch#
2
",
"pos": {
"x": 30.0,
"pos": {
"x": 30.0,
- "y": 7.5
+ "y":
5
7.5
}
},
{
}
},
{
@@
-131,206
+120,226
@@
mograsim version: 0.1.3
}
},
{
}
},
{
- "id": "
GUIdlatch
",
- "name": "
GUIdlatch#2
",
+ "id": "
WireCrossPoint
",
+ "name": "
WireCrossPoint#0
",
"pos": {
"pos": {
- "x": 30.0,
- "y": 57.5
- }
+ "x": 14.0,
+ "y": 46.5
+ },
+ "params": 1
+ },
+ {
+ "id": "WireCrossPoint",
+ "name": "WireCrossPoint#1",
+ "pos": {
+ "x": 14.0,
+ "y": 71.5
+ },
+ "params": 1
+ },
+ {
+ "id": "WireCrossPoint",
+ "name": "WireCrossPoint#2",
+ "pos": {
+ "x": 14.0,
+ "y": 96.5
+ },
+ "params": 1
}
],
}
],
- "
innerW
ires": [
+ "
w
ires": [
{
"pin1": {
{
"pin1": {
- "compName": "
GUIdlatch#3
",
- "pinName": "
Q
"
+ "compName": "
_submodelinterface
",
+ "pinName": "
C
"
},
"pin2": {
},
"pin2": {
- "compName": "
_submodelinterface
",
- "pinName": "
Q4
"
+ "compName": "
WireCrossPoint#2
",
+ "pinName": ""
},
},
- "name": "unnamedWire#14",
- "path": []
+ "name": "unnamedWire#0",
+ "path": [
+ {
+ "x": 15.0,
+ "y": 112.5
+ }
+ ]
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
GUIdlatch
#2",
- "pinName": "
Q
"
+ "compName": "
WireCrossPoint
#2",
+ "pinName": ""
},
"pin2": {
},
"pin2": {
- "compName": "
_submodelinterface
",
- "pinName": "
Q3
"
+ "compName": "
GUIdlatch#3
",
+ "pinName": "
E
"
},
},
- "name": "unnamedWire#1
3
",
+ "name": "unnamedWire#1",
"path": []
},
{
"pin1": {
"compName": "_submodelinterface",
"path": []
},
{
"pin1": {
"compName": "_submodelinterface",
- "pinName": "D
3
"
+ "pinName": "D
4
"
},
"pin2": {
},
"pin2": {
- "compName": "GUIdlatch#
2
",
+ "compName": "GUIdlatch#
3
",
"pinName": "D"
},
"pinName": "D"
},
- "name": "unnamedWire#
9
",
+ "name": "unnamedWire#
10
",
"path": []
},
{
"pin1": {
"path": []
},
{
"pin1": {
- "compName": "
_submodelinterface
",
- "pinName": "
D2
"
+ "compName": "
GUIdlatch#0
",
+ "pinName": "
Q
"
},
"pin2": {
},
"pin2": {
- "compName": "
GUIdlatch#1
",
- "pinName": "
D
"
+ "compName": "
_submodelinterface
",
+ "pinName": "
Q1
"
},
},
- "name": "unnamedWire#
8
",
+ "name": "unnamedWire#
11
",
"path": []
},
{
"pin1": {
"path": []
},
{
"pin1": {
- "compName": "
_submodelinterface
",
- "pinName": "
D1
"
+ "compName": "
GUIdlatch#1
",
+ "pinName": "
Q
"
},
"pin2": {
},
"pin2": {
- "compName": "
GUIdlatch#0
",
- "pinName": "
D
"
+ "compName": "
_submodelinterface
",
+ "pinName": "
Q2
"
},
},
- "name": "unnamedWire#
7
",
+ "name": "unnamedWire#
12
",
"path": []
},
{
"pin1": {
"path": []
},
{
"pin1": {
- "compName": "
WireCrossPoint#0
",
- "pinName": ""
+ "compName": "
GUIdlatch#2
",
+ "pinName": "
Q
"
},
"pin2": {
},
"pin2": {
- "compName": "
GUIdlatch#0
",
- "pinName": "
E
"
+ "compName": "
_submodelinterface
",
+ "pinName": "
Q3
"
},
},
- "name": "unnamedWire#6",
- "path": [
- {
- "x": 15.0,
- "y": 22.5
- }
- ]
+ "name": "unnamedWire#13",
+ "path": []
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
WireCrossPoint#2
",
- "pinName": ""
+ "compName": "
GUIdlatch#3
",
+ "pinName": "
Q
"
},
"pin2": {
},
"pin2": {
- "compName": "
GUIdlatch#3
",
- "pinName": "
E
"
+ "compName": "
_submodelinterface
",
+ "pinName": "
Q4
"
},
},
- "name": "unnamedWire#1",
+ "name": "unnamedWire#1
4
",
"path": []
},
{
"pin1": {
"path": []
},
{
"pin1": {
- "compName": "
_submodelinterface
",
- "pinName": "
C
"
+ "compName": "
WireCrossPoint#2
",
+ "pinName": ""
},
"pin2": {
},
"pin2": {
- "compName": "WireCrossPoint#
2
",
+ "compName": "WireCrossPoint#
1
",
"pinName": ""
},
"pinName": ""
},
- "name": "unnamedWire#0",
- "path": [
- {
- "x": 15.0,
- "y": 112.5
- }
- ]
+ "name": "unnamedWire#2",
+ "path": []
},
{
"pin1": {
},
{
"pin1": {
- "compName": "WireCrossPoint#
0
",
+ "compName": "WireCrossPoint#
1
",
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "compName": "GUIdlatch#
1
",
+ "compName": "GUIdlatch#
2
",
"pinName": "E"
},
"pinName": "E"
},
- "name": "unnamedWire#
5
",
+ "name": "unnamedWire#
3
",
"path": []
},
{
"pin1": {
"path": []
},
{
"pin1": {
- "compName": "
_submodelinterface
",
- "pinName": "
D4
"
+ "compName": "
WireCrossPoint#1
",
+ "pinName": ""
},
"pin2": {
},
"pin2": {
- "compName": "
GUIdlatch#3
",
- "pinName": "
D
"
+ "compName": "
WireCrossPoint#0
",
+ "pinName": ""
},
},
- "name": "unnamedWire#
10
",
+ "name": "unnamedWire#
4
",
"path": []
},
{
"pin1": {
"path": []
},
{
"pin1": {
- "compName": "WireCrossPoint#
1
",
+ "compName": "WireCrossPoint#
0
",
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "compName": "
WireCrossPoint#0
",
- "pinName": ""
+ "compName": "
GUIdlatch#1
",
+ "pinName": "
E
"
},
},
- "name": "unnamedWire#
4
",
+ "name": "unnamedWire#
5
",
"path": []
},
{
"pin1": {
"path": []
},
{
"pin1": {
- "compName": "WireCrossPoint#
1
",
+ "compName": "WireCrossPoint#
0
",
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "compName": "GUIdlatch#
2
",
+ "compName": "GUIdlatch#
0
",
"pinName": "E"
},
"pinName": "E"
},
- "name": "unnamedWire#3",
- "path": []
+ "name": "unnamedWire#6",
+ "path": [
+ {
+ "x": 15.0,
+ "y": 22.5
+ }
+ ]
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
GUIdlatch#1
",
- "pinName": "
Q
"
+ "compName": "
_submodelinterface
",
+ "pinName": "
D1
"
},
"pin2": {
},
"pin2": {
- "compName": "
_submodelinterface
",
- "pinName": "
Q2
"
+ "compName": "
GUIdlatch#0
",
+ "pinName": "
D
"
},
},
- "name": "unnamedWire#
12
",
+ "name": "unnamedWire#
7
",
"path": []
},
{
"pin1": {
"path": []
},
{
"pin1": {
- "compName": "
WireCrossPoint#2
",
- "pinName": ""
+ "compName": "
_submodelinterface
",
+ "pinName": "
D2
"
},
"pin2": {
},
"pin2": {
- "compName": "
WireCrossPoint
#1",
- "pinName": ""
+ "compName": "
GUIdlatch
#1",
+ "pinName": "
D
"
},
},
- "name": "unnamedWire#
2
",
+ "name": "unnamedWire#
8
",
"path": []
},
{
"pin1": {
"path": []
},
{
"pin1": {
- "compName": "
GUIdlatch#0
",
- "pinName": "
Q
"
+ "compName": "
_submodelinterface
",
+ "pinName": "
D3
"
},
"pin2": {
},
"pin2": {
- "compName": "
_submodelinterface
",
- "pinName": "
Q1
"
+ "compName": "
GUIdlatch#2
",
+ "pinName": "
D
"
},
},
- "name": "unnamedWire#
11
",
+ "name": "unnamedWire#
9
",
"path": []
}
"path": []
}
- ]
+ ],
+ "version": "0.1.1"
},
"symbolRendererSnippetID": "simpleRectangularLike",
"symbolRendererParams": {
},
"symbolRendererSnippetID": "simpleRectangularLike",
"symbolRendererParams": {
@@
-391,5
+400,6
@@
mograsim version: 0.1.3
}
}
}
}
}
}
- }
+ },
+ "version": "0.1.5"
}
\ No newline at end of file
}
\ No newline at end of file