projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Found a glitch / bug when fusing wires
[Mograsim.git]
/
net.mograsim.logic.model.editor
/
components
/
GUInot4.json
diff --git
a/net.mograsim.logic.model.editor/components/GUInot4.json
b/net.mograsim.logic.model.editor/components/GUInot4.json
index
0a3b703
..
b80166a
100644
(file)
--- a/
net.mograsim.logic.model.editor/components/GUInot4.json
+++ b/
net.mograsim.logic.model.editor/components/GUInot4.json
@@
-1,4
+1,3
@@
-mograsim version: 0.1.3
{
"width": 35.0,
"height": 40.0,
{
"width": 35.0,
"height": 40.0,
@@
-9,7
+8,8
@@
mograsim version: 0.1.3
"y": 5.0
},
"name": "A1",
"y": 5.0
},
"name": "A1",
- "logicWidth": 1
+ "logicWidth": 1,
+ "usage": "INPUT"
},
{
"location": {
},
{
"location": {
@@
-17,7
+17,8
@@
mograsim version: 0.1.3
"y": 15.0
},
"name": "A2",
"y": 15.0
},
"name": "A2",
- "logicWidth": 1
+ "logicWidth": 1,
+ "usage": "INPUT"
},
{
"location": {
},
{
"location": {
@@
-25,7
+26,8
@@
mograsim version: 0.1.3
"y": 25.0
},
"name": "A3",
"y": 25.0
},
"name": "A3",
- "logicWidth": 1
+ "logicWidth": 1,
+ "usage": "INPUT"
},
{
"location": {
},
{
"location": {
@@
-33,7
+35,8
@@
mograsim version: 0.1.3
"y": 35.0
},
"name": "A4",
"y": 35.0
},
"name": "A4",
- "logicWidth": 1
+ "logicWidth": 1,
+ "usage": "INPUT"
},
{
"location": {
},
{
"location": {
@@
-41,7
+44,8
@@
mograsim version: 0.1.3
"y": 5.0
},
"name": "Y1",
"y": 5.0
},
"name": "Y1",
- "logicWidth": 1
+ "logicWidth": 1,
+ "usage": "OUTPUT"
},
{
"location": {
},
{
"location": {
@@
-49,7
+53,8
@@
mograsim version: 0.1.3
"y": 15.0
},
"name": "Y2",
"y": 15.0
},
"name": "Y2",
- "logicWidth": 1
+ "logicWidth": 1,
+ "usage": "OUTPUT"
},
{
"location": {
},
{
"location": {
@@
-57,7
+62,8
@@
mograsim version: 0.1.3
"y": 25.0
},
"name": "Y3",
"y": 25.0
},
"name": "Y3",
- "logicWidth": 1
+ "logicWidth": 1,
+ "usage": "OUTPUT"
},
{
"location": {
},
{
"location": {
@@
-65,21
+71,13
@@
mograsim version: 0.1.3
"y": 35.0
},
"name": "Y4",
"y": 35.0
},
"name": "Y4",
- "logicWidth": 1
+ "logicWidth": 1,
+ "usage": "OUTPUT"
}
],
}
],
+ "innerScale": 0.4,
"submodel": {
"submodel": {
- "innerScale": 0.4,
- "subComps": [
- {
- "id": "GUINandGate",
- "name": "GUINandGate#1",
- "pos": {
- "x": 30.0,
- "y": 27.5
- },
- "params": 1
- },
+ "components": [
{
"id": "GUINandGate",
"name": "GUINandGate#0",
{
"id": "GUINandGate",
"name": "GUINandGate#0",
@@
-91,28
+89,28
@@
mograsim version: 0.1.3
},
{
"id": "GUINandGate",
},
{
"id": "GUINandGate",
- "name": "GUINandGate#
3
",
+ "name": "GUINandGate#
1
",
"pos": {
"x": 30.0,
"pos": {
"x": 30.0,
- "y":
7
7.5
+ "y":
2
7.5
},
"params": 1
},
{
},
"params": 1
},
{
- "id": "
WireCrossPoint
",
- "name": "
WireCrossPoint#1
",
+ "id": "
GUINandGate
",
+ "name": "
GUINandGate#2
",
"pos": {
"pos": {
- "x":
14
.0,
- "y":
36
.5
+ "x":
30
.0,
+ "y":
52
.5
},
"params": 1
},
{
"id": "GUINandGate",
},
"params": 1
},
{
"id": "GUINandGate",
- "name": "GUINandGate#
2
",
+ "name": "GUINandGate#
3
",
"pos": {
"x": 30.0,
"pos": {
"x": 30.0,
- "y":
52
.5
+ "y":
77
.5
},
"params": 1
},
},
"params": 1
},
@@
-127,10
+125,10
@@
mograsim version: 0.1.3
},
{
"id": "WireCrossPoint",
},
{
"id": "WireCrossPoint",
- "name": "WireCrossPoint#
3
",
+ "name": "WireCrossPoint#
1
",
"pos": {
"x": 14.0,
"pos": {
"x": 14.0,
- "y":
8
6.5
+ "y":
3
6.5
},
"params": 1
},
},
"params": 1
},
@@
-142,244
+140,254
@@
mograsim version: 0.1.3
"y": 61.5
},
"params": 1
"y": 61.5
},
"params": 1
+ },
+ {
+ "id": "WireCrossPoint",
+ "name": "WireCrossPoint#3",
+ "pos": {
+ "x": 14.0,
+ "y": 86.5
+ },
+ "params": 1
}
],
}
],
- "
innerW
ires": [
+ "
w
ires": [
{
"pin1": {
{
"pin1": {
- "compName": "GUINandGate#2",
- "pinName": "Y"
- },
- "pin2": {
"compName": "_submodelinterface",
"compName": "_submodelinterface",
- "pinName": "Y3"
- },
- "name": "unnamedWire#14",
- "path": []
- },
- {
- "pin1": {
- "compName": "GUINandGate#1",
- "pinName": "Y"
+ "pinName": "A1"
},
"pin2": {
},
"pin2": {
- "compName": "
_submodelinterface
",
- "pinName": "
Y2
"
+ "compName": "
WireCrossPoint#0
",
+ "pinName": ""
},
},
- "name": "unnamedWire#
13
",
+ "name": "unnamedWire#
0
",
"path": []
},
{
"pin1": {
"path": []
},
{
"pin1": {
- "compName": "
GUINandGate#3
",
- "pinName": "
Y
"
+ "compName": "
_submodelinterface
",
+ "pinName": "
A2
"
},
"pin2": {
},
"pin2": {
- "compName": "
_submodelinterface
",
- "pinName": "
Y4
"
+ "compName": "
WireCrossPoint#1
",
+ "pinName": ""
},
},
- "name": "unnamedWire#1
5
",
+ "name": "unnamedWire#1",
"path": []
},
{
"pin1": {
"path": []
},
{
"pin1": {
- "compName": "WireCrossPoint#
1
",
+ "compName": "WireCrossPoint#
2
",
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "compName": "GUINandGate#
1
",
+ "compName": "GUINandGate#
2
",
"pinName": "B"
},
"pinName": "B"
},
- "name": "unnamedWire#
9
",
+ "name": "unnamedWire#
10
",
"path": [
{
"x": 15.0,
"path": [
{
"x": 15.0,
- "y":
42
.5
+ "y":
67
.5
}
]
},
{
"pin1": {
}
]
},
{
"pin1": {
- "compName": "WireCrossPoint#
0
",
+ "compName": "WireCrossPoint#
3
",
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "compName": "GUINandGate#
0
",
+ "compName": "GUINandGate#
3
",
"pinName": "B"
},
"pinName": "B"
},
- "name": "unnamedWire#
8
",
+ "name": "unnamedWire#
11
",
"path": [
{
"x": 15.0,
"path": [
{
"x": 15.0,
- "y":
17
.5
+ "y":
92
.5
}
]
},
{
"pin1": {
}
]
},
{
"pin1": {
- "compName": "
WireCrossPoint#3
",
- "pinName": ""
+ "compName": "
GUINandGate#0
",
+ "pinName": "
Y
"
},
"pin2": {
},
"pin2": {
- "compName": "
GUINandGate#3
",
- "pinName": "
A
"
+ "compName": "
_submodelinterface
",
+ "pinName": "
Y1
"
},
},
- "name": "unnamedWire#7",
- "path": [
- {
- "x": 15.0,
- "y": 82.5
- }
- ]
+ "name": "unnamedWire#12",
+ "path": []
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
WireCrossPoint#2
",
- "pinName": ""
+ "compName": "
GUINandGate#1
",
+ "pinName": "
Y
"
},
"pin2": {
},
"pin2": {
+ "compName": "_submodelinterface",
+ "pinName": "Y2"
+ },
+ "name": "unnamedWire#13",
+ "path": []
+ },
+ {
+ "pin1": {
"compName": "GUINandGate#2",
"compName": "GUINandGate#2",
- "pinName": "
A
"
+ "pinName": "
Y
"
},
},
- "name": "unnamedWire#6",
- "path": [
- {
- "x": 15.0,
- "y": 57.5
- }
- ]
+ "pin2": {
+ "compName": "_submodelinterface",
+ "pinName": "Y3"
+ },
+ "name": "unnamedWire#14",
+ "path": []
},
{
"pin1": {
},
{
"pin1": {
+ "compName": "GUINandGate#3",
+ "pinName": "Y"
+ },
+ "pin2": {
"compName": "_submodelinterface",
"compName": "_submodelinterface",
- "pinName": "A2"
+ "pinName": "Y4"
+ },
+ "name": "unnamedWire#15",
+ "path": []
+ },
+ {
+ "pin1": {
+ "compName": "_submodelinterface",
+ "pinName": "A3"
},
"pin2": {
},
"pin2": {
- "compName": "WireCrossPoint#
1
",
+ "compName": "WireCrossPoint#
2
",
"pinName": ""
},
"pinName": ""
},
- "name": "unnamedWire#
1
",
+ "name": "unnamedWire#
2
",
"path": []
},
{
"pin1": {
"compName": "_submodelinterface",
"path": []
},
{
"pin1": {
"compName": "_submodelinterface",
- "pinName": "A
1
"
+ "pinName": "A
4
"
},
"pin2": {
},
"pin2": {
- "compName": "WireCrossPoint#
0
",
+ "compName": "WireCrossPoint#
3
",
"pinName": ""
},
"pinName": ""
},
- "name": "unnamedWire#
0
",
+ "name": "unnamedWire#
3
",
"path": []
},
{
"pin1": {
"path": []
},
{
"pin1": {
- "compName": "WireCrossPoint#
1
",
+ "compName": "WireCrossPoint#
0
",
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "compName": "GUINandGate#
1
",
+ "compName": "GUINandGate#
0
",
"pinName": "A"
},
"pinName": "A"
},
- "name": "unnamedWire#
5
",
+ "name": "unnamedWire#
4
",
"path": [
{
"x": 15.0,
"path": [
{
"x": 15.0,
- "y":
32
.5
+ "y":
7
.5
}
]
},
{
"pin1": {
}
]
},
{
"pin1": {
- "compName": "WireCrossPoint#
2
",
+ "compName": "WireCrossPoint#
1
",
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "compName": "GUINandGate#
2
",
- "pinName": "
B
"
+ "compName": "GUINandGate#
1
",
+ "pinName": "
A
"
},
},
- "name": "unnamedWire#
10
",
+ "name": "unnamedWire#
5
",
"path": [
{
"x": 15.0,
"path": [
{
"x": 15.0,
- "y":
67
.5
+ "y":
32
.5
}
]
},
{
"pin1": {
}
]
},
{
"pin1": {
- "compName": "WireCrossPoint#
0
",
+ "compName": "WireCrossPoint#
2
",
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "compName": "GUINandGate#
0
",
+ "compName": "GUINandGate#
2
",
"pinName": "A"
},
"pinName": "A"
},
- "name": "unnamedWire#
4
",
+ "name": "unnamedWire#
6
",
"path": [
{
"x": 15.0,
"path": [
{
"x": 15.0,
- "y": 7.5
+ "y":
5
7.5
}
]
},
{
"pin1": {
}
]
},
{
"pin1": {
- "compName": "_submodelinterface",
- "pinName": "A4"
- },
- "pin2": {
"compName": "WireCrossPoint#3",
"pinName": ""
},
"compName": "WireCrossPoint#3",
"pinName": ""
},
- "name": "unnamedWire#3",
- "path": []
- },
- {
- "pin1": {
- "compName": "GUINandGate#0",
- "pinName": "Y"
- },
"pin2": {
"pin2": {
- "compName": "
_submodelinterface
",
- "pinName": "
Y1
"
+ "compName": "
GUINandGate#3
",
+ "pinName": "
A
"
},
},
- "name": "unnamedWire#12",
- "path": []
+ "name": "unnamedWire#7",
+ "path": [
+ {
+ "x": 15.0,
+ "y": 82.5
+ }
+ ]
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
_submodelinterface
",
- "pinName": "
A3
"
+ "compName": "
WireCrossPoint#0
",
+ "pinName": ""
},
"pin2": {
},
"pin2": {
- "compName": "
WireCrossPoint#2
",
- "pinName": ""
+ "compName": "
GUINandGate#0
",
+ "pinName": "
B
"
},
},
- "name": "unnamedWire#2",
- "path": []
+ "name": "unnamedWire#8",
+ "path": [
+ {
+ "x": 15.0,
+ "y": 17.5
+ }
+ ]
},
{
"pin1": {
},
{
"pin1": {
- "compName": "WireCrossPoint#
3
",
+ "compName": "WireCrossPoint#
1
",
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "compName": "GUINandGate#
3
",
+ "compName": "GUINandGate#
1
",
"pinName": "B"
},
"pinName": "B"
},
- "name": "unnamedWire#
11
",
+ "name": "unnamedWire#
9
",
"path": [
{
"x": 15.0,
"path": [
{
"x": 15.0,
- "y":
9
2.5
+ "y":
4
2.5
}
]
}
}
]
}
- ]
+ ],
+ "version": "0.1.1"
},
},
- "symbolRendererSnippetID": "
class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "GUInot4",
"centerTextHeight": 5.0,
"symbolRendererParams": {
"centerText": "GUInot4",
"centerTextHeight": 5.0,
@@
-387,5
+395,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