projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Made wires with logicWidth!=1 thicker
[Mograsim.git]
/
net.mograsim.logic.model.am2900
/
components
/
GUIxor.json
diff --git
a/net.mograsim.logic.model.am2900/components/GUIxor.json
b/net.mograsim.logic.model.am2900/components/GUIxor.json
index
a15e5df
..
48c22e5
100644
(file)
--- a/
net.mograsim.logic.model.am2900/components/GUIxor.json
+++ b/
net.mograsim.logic.model.am2900/components/GUIxor.json
@@
-1,4
+1,3
@@
-mograsim version: 0.1.3
{
"width": 35.0,
"height": 20.0,
{
"width": 35.0,
"height": 20.0,
@@
-9,7
+8,8
@@
mograsim version: 0.1.3
"y": 5.0
},
"name": "A",
"y": 5.0
},
"name": "A",
- "logicWidth": 1
+ "logicWidth": 1,
+ "usage": "INPUT"
},
{
"location": {
},
{
"location": {
@@
-17,7
+17,8
@@
mograsim version: 0.1.3
"y": 15.0
},
"name": "B",
"y": 15.0
},
"name": "B",
- "logicWidth": 1
+ "logicWidth": 1,
+ "usage": "INPUT"
},
{
"location": {
},
{
"location": {
@@
-25,12
+26,22
@@
mograsim version: 0.1.3
"y": 5.0
},
"name": "Y",
"y": 5.0
},
"name": "Y",
- "logicWidth": 1
+ "logicWidth": 1,
+ "usage": "OUTPUT"
}
],
}
],
+ "innerScale": 0.4,
"submodel": {
"submodel": {
- "innerScale": 0.4,
- "subComps": [
+ "components": [
+ {
+ "id": "GUINandGate",
+ "name": "GUINandGate#0",
+ "pos": {
+ "x": 7.5,
+ "y": 15.0
+ },
+ "params": 1
+ },
{
"id": "GUINandGate",
"name": "GUINandGate#1",
{
"id": "GUINandGate",
"name": "GUINandGate#1",
@@
-42,10
+53,10
@@
mograsim version: 0.1.3
},
{
"id": "GUINandGate",
},
{
"id": "GUINandGate",
- "name": "GUINandGate#
0
",
+ "name": "GUINandGate#
2
",
"pos": {
"pos": {
- "x":
7.5
,
- "y":
15.0
+ "x":
35.0
,
+ "y":
27.5
},
"params": 1
},
},
"params": 1
},
@@
-60,28
+71,19
@@
mograsim version: 0.1.3
},
{
"id": "WireCrossPoint",
},
{
"id": "WireCrossPoint",
- "name": "WireCrossPoint#
1
",
+ "name": "WireCrossPoint#
0
",
"pos": {
"x": 4.0,
"pos": {
"x": 4.0,
- "y": 36.5
- },
- "params": 1
- },
- {
- "id": "GUINandGate",
- "name": "GUINandGate#2",
- "pos": {
- "x": 35.0,
- "y": 27.5
+ "y": 11.5
},
"params": 1
},
{
"id": "WireCrossPoint",
},
"params": 1
},
{
"id": "WireCrossPoint",
- "name": "WireCrossPoint#
0
",
+ "name": "WireCrossPoint#
1
",
"pos": {
"x": 4.0,
"pos": {
"x": 4.0,
- "y":
11
.5
+ "y":
36
.5
},
"params": 1
},
},
"params": 1
},
@@
-95,34
+97,52
@@
mograsim version: 0.1.3
"params": 1
}
],
"params": 1
}
],
- "
innerW
ires": [
+ "
w
ires": [
{
"pin1": {
{
"pin1": {
- "compName": "
GUINandGate#1
",
- "pinName": "
Y
"
+ "compName": "
_submodelinterface
",
+ "pinName": "
A
"
},
"pin2": {
},
"pin2": {
- "compName": "
GUINandGate#3
",
- "pinName": "
A
"
+ "compName": "
WireCrossPoint#0
",
+ "pinName": ""
},
},
- "name": "unnamedWire#9"
+ "name": "unnamedWire#0",
+ "path": []
},
{
"pin1": {
},
{
"pin1": {
+ "compName": "_submodelinterface",
+ "pinName": "B"
+ },
+ "pin2": {
"compName": "WireCrossPoint#1",
"pinName": ""
},
"compName": "WireCrossPoint#1",
"pinName": ""
},
- "pin2": {
+ "name": "unnamedWire#1",
+ "path": []
+ },
+ {
+ "pin1": {
"compName": "GUINandGate#2",
"compName": "GUINandGate#2",
+ "pinName": "Y"
+ },
+ "pin2": {
+ "compName": "GUINandGate#3",
"pinName": "B"
},
"pinName": "B"
},
- "name": "unnamedWire#8",
- "path": [
- {
- "x": 5.0,
- "y": 42.5
- }
- ]
+ "name": "unnamedWire#10"
+ },
+ {
+ "pin1": {
+ "compName": "GUINandGate#3",
+ "pinName": "Y"
+ },
+ "pin2": {
+ "compName": "_submodelinterface",
+ "pinName": "Y"
+ },
+ "name": "unnamedWire#11"
},
{
"pin1": {
},
{
"pin1": {
@@
-130,57
+150,44
@@
mograsim version: 0.1.3
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "compName": "GUINandGate#
1
",
+ "compName": "GUINandGate#
0
",
"pinName": "A"
},
"pinName": "A"
},
- "name": "unnamedWire#
7
",
+ "name": "unnamedWire#
2
",
"path": [
{
"x": 5.0,
"path": [
{
"x": 5.0,
- "y":
7.5
+ "y":
20.0
}
]
},
{
"pin1": {
}
]
},
{
"pin1": {
- "compName": "WireCrossPoint#
2
",
+ "compName": "WireCrossPoint#
1
",
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "compName": "GUINandGate#
2
",
- "pinName": "
A
"
+ "compName": "GUINandGate#
0
",
+ "pinName": "
B
"
},
},
- "name": "unnamedWire#
6
",
+ "name": "unnamedWire#
3
",
"path": [
{
"path": [
{
- "x":
30
.0,
- "y": 3
2.5
+ "x":
5
.0,
+ "y": 3
0.0
}
]
},
{
"pin1": {
}
]
},
{
"pin1": {
- "compName": "_submodelinterface",
- "pinName": "B"
- },
- "pin2": {
- "compName": "WireCrossPoint#1",
- "pinName": ""
- },
- "name": "unnamedWire#1",
- "path": []
- },
- {
- "pin1": {
- "compName": "_submodelinterface",
- "pinName": "A"
+ "compName": "GUINandGate#0",
+ "pinName": "Y"
},
"pin2": {
},
"pin2": {
- "compName": "WireCrossPoint#
0
",
+ "compName": "WireCrossPoint#
2
",
"pinName": ""
},
"pinName": ""
},
- "name": "unnamedWire#0",
- "path": []
+ "name": "unnamedWire#4"
},
{
"pin1": {
},
{
"pin1": {
@@
-201,74
+208,70
@@
mograsim version: 0.1.3
},
{
"pin1": {
},
{
"pin1": {
- "compName": "GUINandGate#2",
- "pinName": "Y"
- },
- "pin2": {
- "compName": "GUINandGate#3",
- "pinName": "B"
- },
- "name": "unnamedWire#10"
- },
- {
- "pin1": {
- "compName": "GUINandGate#0",
- "pinName": "Y"
- },
- "pin2": {
"compName": "WireCrossPoint#2",
"pinName": ""
},
"compName": "WireCrossPoint#2",
"pinName": ""
},
- "name": "unnamedWire#4"
+ "pin2": {
+ "compName": "GUINandGate#2",
+ "pinName": "A"
+ },
+ "name": "unnamedWire#6",
+ "path": [
+ {
+ "x": 30.0,
+ "y": 32.5
+ }
+ ]
},
{
"pin1": {
},
{
"pin1": {
- "compName": "WireCrossPoint#
1
",
+ "compName": "WireCrossPoint#
0
",
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "compName": "GUINandGate#
0
",
- "pinName": "
B
"
+ "compName": "GUINandGate#
1
",
+ "pinName": "
A
"
},
},
- "name": "unnamedWire#
3
",
+ "name": "unnamedWire#
7
",
"path": [
{
"x": 5.0,
"path": [
{
"x": 5.0,
- "y":
30.0
+ "y":
7.5
}
]
},
{
"pin1": {
}
]
},
{
"pin1": {
- "compName": "WireCrossPoint#
0
",
+ "compName": "WireCrossPoint#
1
",
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "compName": "GUINandGate#
0
",
- "pinName": "
A
"
+ "compName": "GUINandGate#
2
",
+ "pinName": "
B
"
},
},
- "name": "unnamedWire#
2
",
+ "name": "unnamedWire#
8
",
"path": [
{
"x": 5.0,
"path": [
{
"x": 5.0,
- "y":
20.0
+ "y":
42.5
}
]
},
{
"pin1": {
}
]
},
{
"pin1": {
- "compName": "GUINandGate#
3
",
+ "compName": "GUINandGate#
1
",
"pinName": "Y"
},
"pin2": {
"pinName": "Y"
},
"pin2": {
- "compName": "
_submodelinterface
",
- "pinName": "
Y
"
+ "compName": "
GUINandGate#3
",
+ "pinName": "
A
"
},
},
- "name": "unnamedWire#
11
"
+ "name": "unnamedWire#
9
"
}
}
- ]
+ ],
+ "version": "0.1.1"
},
},
- "symbolRendererSnippetID": "
class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "GUIxor",
"centerTextHeight": 5.0,
"symbolRendererParams": {
"centerText": "GUIxor",
"centerTextHeight": 5.0,
@@
-276,5
+279,7
@@
mograsim version: 0.1.3
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
- "outlineRendererSnippetID": "class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer"
+ "outlineRendererSnippetID": "default",
+ "highLevelStateHandlerSnippetID": "default",
+ "version": "0.1.5"
}
\ No newline at end of file
}
\ No newline at end of file