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
/
GUImux1_4.json
diff --git
a/net.mograsim.logic.model.editor/components/GUImux1_4.json
b/net.mograsim.logic.model.editor/components/GUImux1_4.json
index
b9f6612
..
1caab2c
100644
(file)
--- a/
net.mograsim.logic.model.editor/components/GUImux1_4.json
+++ b/
net.mograsim.logic.model.editor/components/GUImux1_4.json
@@
-1,4
+1,3
@@
-mograsim version: 0.1.3
{
"width": 35.0,
"height": 90.0,
{
"width": 35.0,
"height": 90.0,
@@
-9,23
+8,17
@@
mograsim version: 0.1.3
"y": 15.0
},
"name": "I0_1",
"y": 15.0
},
"name": "I0_1",
- "logicWidth": 1
+ "logicWidth": 1,
+ "usage": "INPUT"
},
{
"location": {
},
{
"location": {
- "x": 35.0,
- "y": 5.0
- },
- "name": "Y1",
- "logicWidth": 1
- },
- {
- "location": {
- "x": 35.0,
- "y": 15.0
+ "x": 0.0,
+ "y": 25.0
},
},
- "name": "Y2",
- "logicWidth": 1
+ "name": "I0_2",
+ "logicWidth": 1,
+ "usage": "INPUT"
},
{
"location": {
},
{
"location": {
@@
-33,47
+26,44
@@
mograsim version: 0.1.3
"y": 35.0
},
"name": "I0_3",
"y": 35.0
},
"name": "I0_3",
- "logicWidth": 1
+ "logicWidth": 1,
+ "usage": "INPUT"
},
{
"location": {
"x": 0.0,
},
{
"location": {
"x": 0.0,
- "y": 65.0
- },
- "name": "I1_2",
- "logicWidth": 1
- },
- {
- "location": {
- "x": 35.0,
- "y": 25.0
+ "y": 45.0
},
},
- "name": "Y3",
- "logicWidth": 1
+ "name": "I0_4",
+ "logicWidth": 1,
+ "usage": "INPUT"
},
{
"location": {
"x": 0.0,
},
{
"location": {
"x": 0.0,
- "y":
2
5.0
+ "y":
5
5.0
},
},
- "name": "I0_2",
- "logicWidth": 1
+ "name": "I1_1",
+ "logicWidth": 1,
+ "usage": "INPUT"
},
{
"location": {
"x": 0.0,
},
{
"location": {
"x": 0.0,
- "y":
5
5.0
+ "y":
6
5.0
},
},
- "name": "I1_1",
- "logicWidth": 1
+ "name": "I1_2",
+ "logicWidth": 1,
+ "usage": "INPUT"
},
{
"location": {
},
{
"location": {
- "x":
35
.0,
- "y":
3
5.0
+ "x":
0
.0,
+ "y":
7
5.0
},
},
- "name": "Y4",
- "logicWidth": 1
+ "name": "I1_3",
+ "logicWidth": 1,
+ "usage": "INPUT"
},
{
"location": {
},
{
"location": {
@@
-81,7
+71,8
@@
mograsim version: 0.1.3
"y": 85.0
},
"name": "I1_4",
"y": 85.0
},
"name": "I1_4",
- "logicWidth": 1
+ "logicWidth": 1,
+ "usage": "INPUT"
},
{
"location": {
},
{
"location": {
@@
-89,28
+80,73
@@
mograsim version: 0.1.3
"y": 5.0
},
"name": "S0",
"y": 5.0
},
"name": "S0",
- "logicWidth": 1
+ "logicWidth": 1,
+ "usage": "INPUT"
},
{
"location": {
},
{
"location": {
- "x":
0
.0,
- "y":
4
5.0
+ "x":
35
.0,
+ "y": 5.0
},
},
- "name": "I0_4",
- "logicWidth": 1
+ "name": "Y1",
+ "logicWidth": 1,
+ "usage": "OUTPUT"
},
{
"location": {
},
{
"location": {
- "x":
0
.0,
- "y":
7
5.0
+ "x":
35
.0,
+ "y":
1
5.0
},
},
- "name": "I1_3",
- "logicWidth": 1
+ "name": "Y2",
+ "logicWidth": 1,
+ "usage": "OUTPUT"
+ },
+ {
+ "location": {
+ "x": 35.0,
+ "y": 25.0
+ },
+ "name": "Y3",
+ "logicWidth": 1,
+ "usage": "OUTPUT"
+ },
+ {
+ "location": {
+ "x": 35.0,
+ "y": 35.0
+ },
+ "name": "Y4",
+ "logicWidth": 1,
+ "usage": "OUTPUT"
}
],
}
],
+ "innerScale": 0.4,
"submodel": {
"submodel": {
- "innerScale": 0.4,
- "subComps": [
+ "components": [
+ {
+ "id": "GUImux1",
+ "name": "GUImux1#0",
+ "pos": {
+ "x": 30.0,
+ "y": 7.5
+ }
+ },
+ {
+ "id": "GUImux1",
+ "name": "GUImux1#1",
+ "pos": {
+ "x": 30.0,
+ "y": 42.5
+ }
+ },
+ {
+ "id": "GUImux1",
+ "name": "GUImux1#2",
+ "pos": {
+ "x": 30.0,
+ "y": 77.5
+ }
+ },
{
"id": "GUImux1",
"name": "GUImux1#3",
{
"id": "GUImux1",
"name": "GUImux1#3",
@@
-121,30
+157,22
@@
mograsim version: 0.1.3
},
{
"id": "WireCrossPoint",
},
{
"id": "WireCrossPoint",
- "name": "WireCrossPoint#
1
",
+ "name": "WireCrossPoint#
0
",
"pos": {
"x": 24.0,
"pos": {
"x": 24.0,
- "y":
46
.5
+ "y":
11
.5
},
"params": 1
},
{
"id": "WireCrossPoint",
},
"params": 1
},
{
"id": "WireCrossPoint",
- "name": "WireCrossPoint#
0
",
+ "name": "WireCrossPoint#
1
",
"pos": {
"x": 24.0,
"pos": {
"x": 24.0,
- "y":
11
.5
+ "y":
46
.5
},
"params": 1
},
},
"params": 1
},
- {
- "id": "GUImux1",
- "name": "GUImux1#0",
- "pos": {
- "x": 30.0,
- "y": 7.5
- }
- },
{
"id": "WireCrossPoint",
"name": "WireCrossPoint#2",
{
"id": "WireCrossPoint",
"name": "WireCrossPoint#2",
@@
-153,35
+181,77
@@
mograsim version: 0.1.3
"y": 81.5
},
"params": 1
"y": 81.5
},
"params": 1
+ }
+ ],
+ "wires": [
+ {
+ "pin1": {
+ "compName": "_submodelinterface",
+ "pinName": "S0"
+ },
+ "pin2": {
+ "compName": "WireCrossPoint#0",
+ "pinName": ""
+ },
+ "name": "unnamedWire#0",
+ "path": []
},
{
},
{
- "id": "GUImux1",
- "name": "GUImux1#2",
- "pos": {
- "x": 30.0,
- "y": 77.5
- }
+ "pin1": {
+ "compName": "WireCrossPoint#0",
+ "pinName": ""
+ },
+ "pin2": {
+ "compName": "GUImux1#0",
+ "pinName": "S0"
+ },
+ "name": "unnamedWire#1",
+ "path": []
},
{
},
{
- "id": "GUImux1",
- "name": "GUImux1#1",
- "pos": {
- "x": 30.0,
- "y": 42.5
- }
- }
- ],
- "innerWires": [
+ "pin1": {
+ "compName": "WireCrossPoint#1",
+ "pinName": ""
+ },
+ "pin2": {
+ "compName": "WireCrossPoint#2",
+ "pinName": ""
+ },
+ "name": "unnamedWire#10",
+ "path": []
+ },
{
"pin1": {
{
"pin1": {
- "compName": "
GUImux1
#2",
- "pinName": "
Y
"
+ "compName": "
WireCrossPoint
#2",
+ "pinName": ""
},
"pin2": {
},
"pin2": {
+ "compName": "GUImux1#2",
+ "pinName": "S0"
+ },
+ "name": "unnamedWire#11",
+ "path": []
+ },
+ {
+ "pin1": {
"compName": "_submodelinterface",
"compName": "_submodelinterface",
- "pinName": "
Y
3"
+ "pinName": "
I0_
3"
},
},
- "name": "unnamedWire#14"
+ "pin2": {
+ "compName": "GUImux1#2",
+ "pinName": "I0"
+ },
+ "name": "unnamedWire#12",
+ "path": [
+ {
+ "x": 5.0,
+ "y": 87.5
+ },
+ {
+ "x": 5.0,
+ "y": 92.5
+ }
+ ]
},
{
"pin1": {
},
{
"pin1": {
@@
-206,24
+276,14
@@
mograsim version: 0.1.3
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
_submodelinterface
",
- "pinName": "
I0_4
"
+ "compName": "
GUImux1#2
",
+ "pinName": "
Y
"
},
"pin2": {
},
"pin2": {
- "compName": "
GUImux1#3
",
- "pinName": "
I0
"
+ "compName": "
_submodelinterface
",
+ "pinName": "
Y3
"
},
},
- "name": "unnamedWire#16",
- "path": [
- {
- "x": 5.0,
- "y": 112.5
- },
- {
- "x": 5.0,
- "y": 127.5
- }
- ]
+ "name": "unnamedWire#14"
},
{
"pin1": {
},
{
"pin1": {
@@
-244,14
+304,24
@@
mograsim version: 0.1.3
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
GUImux1#3
",
- "pinName": "
Y
"
+ "compName": "
_submodelinterface
",
+ "pinName": "
I0_4
"
},
"pin2": {
},
"pin2": {
- "compName": "
_submodelinterface
",
- "pinName": "
Y4
"
+ "compName": "
GUImux1#3
",
+ "pinName": "
I0
"
},
},
- "name": "unnamedWire#18"
+ "name": "unnamedWire#16",
+ "path": [
+ {
+ "x": 5.0,
+ "y": 112.5
+ },
+ {
+ "x": 5.0,
+ "y": 127.5
+ }
+ ]
},
{
"pin1": {
},
{
"pin1": {
@@
-276,91
+346,67
@@
mograsim version: 0.1.3
},
{
"pin1": {
},
{
"pin1": {
- "compName": "GUImux1#
1
",
+ "compName": "GUImux1#
3
",
"pinName": "Y"
},
"pin2": {
"compName": "_submodelinterface",
"pinName": "Y"
},
"pin2": {
"compName": "_submodelinterface",
- "pinName": "Y
2
"
+ "pinName": "Y
4
"
},
},
- "name": "unnamedWire#
9
"
+ "name": "unnamedWire#
18
"
},
{
"pin1": {
"compName": "_submodelinterface",
},
{
"pin1": {
"compName": "_submodelinterface",
- "pinName": "I
1_2
"
+ "pinName": "I
0_1
"
},
"pin2": {
},
"pin2": {
- "compName": "GUImux1#
1
",
- "pinName": "I
1
"
+ "compName": "GUImux1#
0
",
+ "pinName": "I
0
"
},
},
- "name": "unnamedWire#
8
",
+ "name": "unnamedWire#
2
",
"path": [
{
"path": [
{
- "x":
1
5.0,
- "y":
162
.5
+ "x": 5.0,
+ "y":
37
.5
},
{
},
{
- "x":
1
5.0,
- "y":
67
.5
+ "x": 5.0,
+ "y":
22
.5
}
]
},
{
"pin1": {
"compName": "_submodelinterface",
}
]
},
{
"pin1": {
"compName": "_submodelinterface",
- "pinName": "I
0_2
"
+ "pinName": "I
1_1
"
},
"pin2": {
},
"pin2": {
- "compName": "GUImux1#
1
",
- "pinName": "I
0
"
+ "compName": "GUImux1#
0
",
+ "pinName": "I
1
"
},
},
- "name": "unnamedWire#
7
",
+ "name": "unnamedWire#
3
",
"path": [
{
"path": [
{
- "x":
5
.0,
- "y":
62
.5
+ "x":
10
.0,
+ "y":
137
.5
},
{
},
{
- "x":
5
.0,
- "y":
57
.5
+ "x":
10
.0,
+ "y":
32
.5
}
]
},
{
"pin1": {
}
]
},
{
"pin1": {
- "compName": "WireCrossPoint#1",
- "pinName": ""
- },
- "pin2": {
- "compName": "GUImux1#1",
- "pinName": "S0"
- },
- "name": "unnamedWire#6",
- "path": []
- },
- {
- "pin1": {
- "compName": "WireCrossPoint#0",
- "pinName": ""
- },
- "pin2": {
"compName": "GUImux1#0",
"compName": "GUImux1#0",
- "pinName": "S0"
- },
- "name": "unnamedWire#1",
- "path": []
- },
- {
- "pin1": {
- "compName": "_submodelinterface",
- "pinName": "S0"
+ "pinName": "Y"
},
"pin2": {
},
"pin2": {
- "compName": "
WireCrossPoint#0
",
- "pinName": ""
+ "compName": "
_submodelinterface
",
+ "pinName": "
Y1
"
},
},
- "name": "unnamedWire#
0
",
+ "name": "unnamedWire#
4
",
"path": []
},
{
"path": []
},
{
@@
-381,102
+427,69
@@
mograsim version: 0.1.3
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "compName": "WireCrossPoint#2",
- "pinName": ""
- },
- "name": "unnamedWire#10",
- "path": []
- },
- {
- "pin1": {
- "compName": "GUImux1#0",
- "pinName": "Y"
- },
- "pin2": {
- "compName": "_submodelinterface",
- "pinName": "Y1"
+ "compName": "GUImux1#1",
+ "pinName": "S0"
},
},
- "name": "unnamedWire#
4
",
+ "name": "unnamedWire#
6
",
"path": []
},
{
"pin1": {
"compName": "_submodelinterface",
"path": []
},
{
"pin1": {
"compName": "_submodelinterface",
- "pinName": "I1_1"
- },
- "pin2": {
- "compName": "GUImux1#0",
- "pinName": "I1"
- },
- "name": "unnamedWire#3",
- "path": [
- {
- "x": 10.0,
- "y": 137.5
- },
- {
- "x": 10.0,
- "y": 32.5
- }
- ]
- },
- {
- "pin1": {
- "compName": "_submodelinterface",
- "pinName": "I0_3"
+ "pinName": "I0_2"
},
"pin2": {
},
"pin2": {
- "compName": "GUImux1#
2
",
+ "compName": "GUImux1#
1
",
"pinName": "I0"
},
"pinName": "I0"
},
- "name": "unnamedWire#
12
",
+ "name": "unnamedWire#
7
",
"path": [
{
"x": 5.0,
"path": [
{
"x": 5.0,
- "y":
87
.5
+ "y":
62
.5
},
{
"x": 5.0,
},
{
"x": 5.0,
- "y":
92
.5
+ "y":
57
.5
}
]
},
{
"pin1": {
"compName": "_submodelinterface",
}
]
},
{
"pin1": {
"compName": "_submodelinterface",
- "pinName": "I
0_1
"
+ "pinName": "I
1_2
"
},
"pin2": {
},
"pin2": {
- "compName": "GUImux1#
0
",
- "pinName": "I
0
"
+ "compName": "GUImux1#
1
",
+ "pinName": "I
1
"
},
},
- "name": "unnamedWire#
2
",
+ "name": "unnamedWire#
8
",
"path": [
{
"path": [
{
- "x": 5.0,
- "y":
37
.5
+ "x":
1
5.0,
+ "y":
162
.5
},
{
},
{
- "x": 5.0,
- "y":
22
.5
+ "x":
1
5.0,
+ "y":
67
.5
}
]
},
{
"pin1": {
}
]
},
{
"pin1": {
- "compName": "
WireCrossPoint#2
",
- "pinName": ""
+ "compName": "
GUImux1#1
",
+ "pinName": "
Y
"
},
"pin2": {
},
"pin2": {
- "compName": "
GUImux1#2
",
- "pinName": "
S0
"
+ "compName": "
_submodelinterface
",
+ "pinName": "
Y2
"
},
},
- "name": "unnamedWire#11",
- "path": []
+ "name": "unnamedWire#9"
}
}
- ]
+ ],
+ "version": "0.1.1"
},
},
- "symbolRendererSnippetID": "
class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "GUImux1_4",
"centerTextHeight": 5.0,
"symbolRendererParams": {
"centerText": "GUImux1_4",
"centerTextHeight": 5.0,
@@
-484,5
+497,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