projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Small cleanup
[Mograsim.git]
/
net.mograsim.logic.model.am2900
/
components
/
GUImux2.json
diff --git
a/net.mograsim.logic.model.am2900/components/GUImux2.json
b/net.mograsim.logic.model.am2900/components/GUImux2.json
index
2542ce0
..
a0b8dd3
100644
(file)
--- a/
net.mograsim.logic.model.am2900/components/GUImux2.json
+++ b/
net.mograsim.logic.model.am2900/components/GUImux2.json
@@
-1,4
+1,3
@@
-mograsim version: 0.1.3
{
"width": 70.0,
"height": 70.0,
{
"width": 70.0,
"height": 70.0,
@@
-9,15
+8,17
@@
mograsim version: 0.1.3
"y": 30.0
},
"name": "I00",
"y": 30.0
},
"name": "I00",
- "logicWidth": 1
+ "logicWidth": 1,
+ "usage": "INPUT"
},
{
"location": {
"x": 0.0,
},
{
"location": {
"x": 0.0,
- "y":
6
0.0
+ "y":
4
0.0
},
},
- "name": "I11",
- "logicWidth": 1
+ "name": "I01",
+ "logicWidth": 1,
+ "usage": "INPUT"
},
{
"location": {
},
{
"location": {
@@
-25,23
+26,17
@@
mograsim version: 0.1.3
"y": 50.0
},
"name": "I10",
"y": 50.0
},
"name": "I10",
- "logicWidth": 1
- },
- {
- "location": {
- "x": 70.0,
- "y": 10.0
- },
- "name": "Y",
- "logicWidth": 1
+ "logicWidth": 1,
+ "usage": "INPUT"
},
{
"location": {
"x": 0.0,
},
{
"location": {
"x": 0.0,
- "y":
4
0.0
+ "y":
6
0.0
},
},
- "name": "I01",
- "logicWidth": 1
+ "name": "I11",
+ "logicWidth": 1,
+ "usage": "INPUT"
},
{
"location": {
},
{
"location": {
@@
-49,7
+44,8
@@
mograsim version: 0.1.3
"y": 10.0
},
"name": "S0",
"y": 10.0
},
"name": "S0",
- "logicWidth": 1
+ "logicWidth": 1,
+ "usage": "INPUT"
},
{
"location": {
},
{
"location": {
@@
-57,14
+53,48
@@
mograsim version: 0.1.3
"y": 20.0
},
"name": "S1",
"y": 20.0
},
"name": "S1",
- "logicWidth": 1
+ "logicWidth": 1,
+ "usage": "INPUT"
+ },
+ {
+ "location": {
+ "x": 70.0,
+ "y": 10.0
+ },
+ "name": "Y",
+ "logicWidth": 1,
+ "usage": "OUTPUT"
}
],
}
],
+ "innerScale": 0.4,
"submodel": {
"submodel": {
- "innerScale": 0.4,
- "subComps": [
+ "components": [
+ {
+ "id": "GUIsel1",
+ "name": "DeserializedSubmodelComponent#0",
+ "pos": {
+ "x": 60.0,
+ "y": 35.0
+ }
+ },
+ {
+ "id": "GUIsel1",
+ "name": "DeserializedSubmodelComponent#1",
+ "pos": {
+ "x": 60.0,
+ "y": 100.0
+ }
+ },
+ {
+ "id": "GUImux1",
+ "name": "DeserializedSubmodelComponent#2",
+ "pos": {
+ "x": 115.0,
+ "y": 20.0
+ }
+ },
{
{
- "id": "GUINandGate",
+ "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
"name": "GUINandGate#0",
"pos": {
"x": 30.0,
"name": "GUINandGate#0",
"pos": {
"x": 30.0,
@@
-73,7
+103,16
@@
mograsim version: 0.1.3
"params": 1
},
{
"params": 1
},
{
- "id": "WireCrossPoint",
+ "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint",
+ "name": "WireCrossPoint#0",
+ "pos": {
+ "x": 24.0,
+ "y": 24.0
+ },
+ "params": 1
+ },
+ {
+ "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint",
"name": "WireCrossPoint#1",
"pos": {
"x": 24.0,
"name": "WireCrossPoint#1",
"pos": {
"x": 24.0,
@@
-82,68
+121,88
@@
mograsim version: 0.1.3
"params": 1
},
{
"params": 1
},
{
- "id": "WireCrossPoint",
- "name": "WireCrossPoint#
0
",
+ "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "name": "WireCrossPoint#
2
",
"pos": {
"x": 24.0,
"pos": {
"x": 24.0,
- "y":
24
.0
+ "y":
49
.0
},
"params": 1
},
{
},
"params": 1
},
{
- "id": "WireCrossPoint",
+ "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
"name": "WireCrossPoint#3",
"pos": {
"x": 54.0,
"y": 39.0
},
"params": 1
"name": "WireCrossPoint#3",
"pos": {
"x": 54.0,
"y": 39.0
},
"params": 1
- },
+ }
+ ],
+ "wires": [
{
{
- "id": "WireCrossPoint",
- "name": "WireCrossPoint#2",
- "pos": {
- "x": 24.0,
- "y": 49.0
+ "pin1": {
+ "compName": "GUINandGate#0",
+ "pinName": "A"
},
},
- "params": 1
+ "pin2": {
+ "compName": "WireCrossPoint#0",
+ "pinName": ""
+ },
+ "name": "unnamedWire#0",
+ "path": [
+ {
+ "x": 25.0,
+ "y": 20.0
+ }
+ ]
},
{
},
{
- "id": "GUIsel1",
- "name": "DeserializedSubmodelComponent#1",
- "pos": {
- "x": 60.0,
- "y": 100.0
- }
+ "pin1": {
+ "compName": "WireCrossPoint#1",
+ "pinName": ""
+ },
+ "pin2": {
+ "compName": "GUINandGate#0",
+ "pinName": "B"
+ },
+ "name": "unnamedWire#1",
+ "path": []
},
{
},
{
- "id": "GUIsel1",
- "name": "DeserializedSubmodelComponent#0",
- "pos": {
- "x": 60.0,
- "y": 35.0
- }
+ "pin1": {
+ "compName": "WireCrossPoint#1",
+ "pinName": ""
+ },
+ "pin2": {
+ "compName": "WireCrossPoint#0",
+ "pinName": ""
+ },
+ "name": "unnamedWire#10",
+ "path": []
},
},
- {
- "id": "GUImux1",
- "name": "DeserializedSubmodelComponent#2",
- "pos": {
- "x": 115.0,
- "y": 20.0
- }
- }
- ],
- "innerWires": [
{
"pin1": {
{
"pin1": {
+ "compName": "WireCrossPoint#2",
+ "pinName": ""
+ },
+ "pin2": {
"compName": "DeserializedSubmodelComponent#0",
"compName": "DeserializedSubmodelComponent#0",
- "pinName": "S1"
+ "pinName": "S2"
+ },
+ "name": "unnamedWire#11",
+ "path": []
+ },
+ {
+ "pin1": {
+ "compName": "WireCrossPoint#2",
+ "pinName": ""
},
"pin2": {
},
"pin2": {
- "compName": "WireCrossPoint#
3
",
+ "compName": "WireCrossPoint#
1
",
"pinName": ""
},
"pinName": ""
},
- "name": "unnamedWire#1
4
",
+ "name": "unnamedWire#1
2
",
"path": []
},
{
"path": []
},
{
@@
-160,20
+219,15
@@
mograsim version: 0.1.3
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
WireCrossPoint#2
",
- "pinName": ""
+ "compName": "
DeserializedSubmodelComponent#0
",
+ "pinName": "
S1
"
},
"pin2": {
},
"pin2": {
- "compName": "
DeserializedSubmodelComponent#1
",
- "pinName": "
S2
"
+ "compName": "
WireCrossPoint#3
",
+ "pinName": ""
},
},
- "name": "unnamedWire#16",
- "path": [
- {
- "x": 25.0,
- "y": 115.0
- }
- ]
+ "name": "unnamedWire#14",
+ "path": []
},
{
"pin1": {
},
{
"pin1": {
@@
-194,133
+248,92
@@
mograsim version: 0.1.3
},
{
"pin1": {
},
{
"pin1": {
- "compName": "WireCrossPoint#
3
",
+ "compName": "WireCrossPoint#
2
",
"pinName": ""
},
"pin2": {
"compName": "DeserializedSubmodelComponent#1",
"pinName": ""
},
"pin2": {
"compName": "DeserializedSubmodelComponent#1",
- "pinName": "S
1
"
+ "pinName": "S
2
"
},
},
- "name": "unnamedWire#1
7
",
+ "name": "unnamedWire#1
6
",
"path": [
{
"path": [
{
- "x":
5
5.0,
- "y": 1
0
5.0
+ "x":
2
5.0,
+ "y": 1
1
5.0
}
]
},
{
"pin1": {
}
]
},
{
"pin1": {
- "compName": "
_submodelinterface
",
- "pinName": "
S1
"
+ "compName": "
WireCrossPoint#3
",
+ "pinName": ""
},
"pin2": {
},
"pin2": {
- "compName": "DeserializedSubmodelComponent#
2
",
- "pinName": "S
0
"
+ "compName": "DeserializedSubmodelComponent#
1
",
+ "pinName": "S
1
"
},
},
- "name": "unnamedWire#
9
",
+ "name": "unnamedWire#
17
",
"path": [
{
"path": [
{
- "x": 15.0,
- "y": 50.0
- },
- {
- "x": 15.0,
- "y": 10.0
- },
- {
- "x": 85.0,
- "y": 10.0
- },
- {
- "x": 85.0,
- "y": 25.0
+ "x": 55.0,
+ "y": 105.0
}
]
},
{
"pin1": {
}
]
},
{
"pin1": {
- "compName": "
DeserializedSubmodelComponent#1
",
- "pinName": "
Y
"
+ "compName": "
_submodelinterface
",
+ "pinName": "
I00
"
},
"pin2": {
},
"pin2": {
- "compName": "DeserializedSubmodelComponent#
2
",
+ "compName": "DeserializedSubmodelComponent#
0
",
"pinName": "I1"
},
"pinName": "I1"
},
- "name": "unnamedWire#
8
",
+ "name": "unnamedWire#
2
",
"path": [
{
"path": [
{
- "x":
10
5.0,
- "y":
10
5.0
+ "x":
3
5.0,
+ "y":
7
5.0
},
{
},
{
- "x":
10
5.0,
- "y":
45
.0
+ "x":
3
5.0,
+ "y":
60
.0
}
]
},
{
"pin1": {
}
]
},
{
"pin1": {
- "compName": "
DeserializedSubmodelComponent#0
",
- "pinName": "
Y
"
+ "compName": "
_submodelinterface
",
+ "pinName": "
I01
"
},
"pin2": {
},
"pin2": {
- "compName": "DeserializedSubmodelComponent#
2
",
- "pinName": "I
0
"
+ "compName": "DeserializedSubmodelComponent#
0
",
+ "pinName": "I
2
"
},
},
- "name": "unnamedWire#
7
",
+ "name": "unnamedWire#
3
",
"path": [
{
"path": [
{
- "x":
105
.0,
- "y":
4
0.0
+ "x":
40
.0,
+ "y":
10
0.0
},
{
},
{
- "x":
105
.0,
- "y":
35
.0
+ "x":
40
.0,
+ "y":
70
.0
}
]
},
{
"pin1": {
}
]
},
{
"pin1": {
- "compName": "DeserializedSubmodelComponent#2",
- "pinName": "Y"
- },
- "pin2": {
"compName": "_submodelinterface",
"compName": "_submodelinterface",
- "pinName": "Y"
- },
- "name": "unnamedWire#6",
- "path": []
- },
- {
- "pin1": {
- "compName": "WireCrossPoint#1",
- "pinName": ""
+ "pinName": "I10"
},
"pin2": {
},
"pin2": {
- "compName": "
GUINandGate#0
",
- "pinName": "
B
"
+ "compName": "
DeserializedSubmodelComponent#1
",
+ "pinName": "
I1
"
},
},
- "name": "unnamedWire#
1
",
+ "name": "unnamedWire#
4
",
"path": []
},
"path": []
},
- {
- "pin1": {
- "compName": "GUINandGate#0",
- "pinName": "A"
- },
- "pin2": {
- "compName": "WireCrossPoint#0",
- "pinName": ""
- },
- "name": "unnamedWire#0",
- "path": [
- {
- "x": 25.0,
- "y": 20.0
- }
- ]
- },
{
"pin1": {
"compName": "_submodelinterface",
{
"pin1": {
"compName": "_submodelinterface",
@@
-344,97
+357,91
@@
mograsim version: 0.1.3
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
WireCrossPoint#1
",
- "pinName": ""
+ "compName": "
DeserializedSubmodelComponent#2
",
+ "pinName": "
Y
"
},
"pin2": {
},
"pin2": {
- "compName": "WireCrossPoint#0",
- "pinName": ""
- },
- "name": "unnamedWire#10",
- "path": []
- },
- {
- "pin1": {
"compName": "_submodelinterface",
"compName": "_submodelinterface",
- "pinName": "I10"
- },
- "pin2": {
- "compName": "DeserializedSubmodelComponent#1",
- "pinName": "I1"
+ "pinName": "Y"
},
},
- "name": "unnamedWire#
4
",
+ "name": "unnamedWire#
6
",
"path": []
},
{
"pin1": {
"path": []
},
{
"pin1": {
- "compName": "
_submodelinterface
",
- "pinName": "
I01
"
+ "compName": "
DeserializedSubmodelComponent#0
",
+ "pinName": "
Y
"
},
"pin2": {
},
"pin2": {
- "compName": "DeserializedSubmodelComponent#
0
",
- "pinName": "I
2
"
+ "compName": "DeserializedSubmodelComponent#
2
",
+ "pinName": "I
0
"
},
},
- "name": "unnamedWire#
3
",
+ "name": "unnamedWire#
7
",
"path": [
{
"path": [
{
- "x":
40
.0,
- "y":
10
0.0
+ "x":
105
.0,
+ "y":
4
0.0
},
{
},
{
- "x":
40
.0,
- "y":
70
.0
+ "x":
105
.0,
+ "y":
35
.0
}
]
},
{
"pin1": {
}
]
},
{
"pin1": {
- "compName": "WireCrossPoint#2",
- "pinName": ""
- },
- "pin2": {
- "compName": "WireCrossPoint#1",
- "pinName": ""
- },
- "name": "unnamedWire#12",
- "path": []
- },
- {
- "pin1": {
- "compName": "_submodelinterface",
- "pinName": "I00"
+ "compName": "DeserializedSubmodelComponent#1",
+ "pinName": "Y"
},
"pin2": {
},
"pin2": {
- "compName": "DeserializedSubmodelComponent#
0
",
+ "compName": "DeserializedSubmodelComponent#
2
",
"pinName": "I1"
},
"pinName": "I1"
},
- "name": "unnamedWire#
2
",
+ "name": "unnamedWire#
8
",
"path": [
{
"path": [
{
- "x":
3
5.0,
- "y":
7
5.0
+ "x":
10
5.0,
+ "y":
10
5.0
},
{
},
{
- "x":
3
5.0,
- "y":
60
.0
+ "x":
10
5.0,
+ "y":
45
.0
}
]
},
{
"pin1": {
}
]
},
{
"pin1": {
- "compName": "
WireCrossPoint#2
",
- "pinName": ""
+ "compName": "
_submodelinterface
",
+ "pinName": "
S1
"
},
"pin2": {
},
"pin2": {
- "compName": "DeserializedSubmodelComponent#
0
",
- "pinName": "S
2
"
+ "compName": "DeserializedSubmodelComponent#
2
",
+ "pinName": "S
0
"
},
},
- "name": "unnamedWire#11",
- "path": []
+ "name": "unnamedWire#9",
+ "path": [
+ {
+ "x": 15.0,
+ "y": 50.0
+ },
+ {
+ "x": 15.0,
+ "y": 10.0
+ },
+ {
+ "x": 85.0,
+ "y": 10.0
+ },
+ {
+ "x": 85.0,
+ "y": 25.0
+ }
+ ]
}
}
- ]
+ ],
+ "version": "0.1.1"
},
},
- "symbolRendererSnippetID": "
simpleRectangularLike
",
+ "symbolRendererSnippetID": "
class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer
",
"symbolRendererParams": {
"centerText": "GUImux2",
"centerTextHeight": 5.0,
"symbolRendererParams": {
"centerText": "GUImux2",
"centerTextHeight": 5.0,
@@
-442,6
+449,7
@@
mograsim version: 0.1.3
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
- "outlineRendererSnippetID": "default",
- "highLevelStateHandlerSnippetID": "default"
+ "outlineRendererSnippetID": "class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer",
+ "highLevelStateHandlerSnippetID": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.DefaultHighLevelStateHandler",
+ "version": "0.1.5"
}
\ No newline at end of file
}
\ No newline at end of file