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
/
GUIandor414.json
diff --git
a/net.mograsim.logic.model.am2900/components/GUIandor414.json
b/net.mograsim.logic.model.am2900/components/GUIandor414.json
index
c6dc821
..
5f6d292
100644
(file)
--- a/
net.mograsim.logic.model.am2900/components/GUIandor414.json
+++ b/
net.mograsim.logic.model.am2900/components/GUIandor414.json
@@
-1,4
+1,3
@@
-mograsim version: 0.1.3
{
"width": 35.0,
"height": 90.0,
{
"width": 35.0,
"height": 90.0,
@@
-6,74
+5,83
@@
mograsim version: 0.1.3
{
"location": {
"x": 0.0,
{
"location": {
"x": 0.0,
- "y":
8
5.0
+ "y":
4
5.0
},
},
- "name": "B",
- "logicWidth": 1
+ "name": "A1",
+ "logicWidth": 1,
+ "usage": "INPUT"
},
{
"location": {
"x": 0.0,
},
{
"location": {
"x": 0.0,
- "y": 5.0
+ "y": 5
5
.0
},
},
- "name": "C1",
- "logicWidth": 1
+ "name": "A2",
+ "logicWidth": 1,
+ "usage": "INPUT"
},
{
"location": {
"x": 0.0,
},
{
"location": {
"x": 0.0,
- "y":
1
5.0
+ "y":
6
5.0
},
},
- "name": "C2",
- "logicWidth": 1
+ "name": "A3",
+ "logicWidth": 1,
+ "usage": "INPUT"
},
{
"location": {
"x": 0.0,
},
{
"location": {
"x": 0.0,
- "y":
2
5.0
+ "y":
7
5.0
},
},
- "name": "C3",
- "logicWidth": 1
+ "name": "A4",
+ "logicWidth": 1,
+ "usage": "INPUT"
},
{
"location": {
"x": 0.0,
},
{
"location": {
"x": 0.0,
- "y":
4
5.0
+ "y":
8
5.0
},
},
- "name": "A1",
- "logicWidth": 1
+ "name": "B",
+ "logicWidth": 1,
+ "usage": "INPUT"
},
{
"location": {
"x": 0.0,
},
{
"location": {
"x": 0.0,
- "y":
3
5.0
+ "y": 5.0
},
},
- "name": "C4",
- "logicWidth": 1
+ "name": "C1",
+ "logicWidth": 1,
+ "usage": "INPUT"
},
{
"location": {
"x": 0.0,
},
{
"location": {
"x": 0.0,
- "y":
5
5.0
+ "y":
1
5.0
},
},
- "name": "A2",
- "logicWidth": 1
+ "name": "C2",
+ "logicWidth": 1,
+ "usage": "INPUT"
},
{
"location": {
"x": 0.0,
},
{
"location": {
"x": 0.0,
- "y":
6
5.0
+ "y":
2
5.0
},
},
- "name": "A3",
- "logicWidth": 1
+ "name": "C3",
+ "logicWidth": 1,
+ "usage": "INPUT"
},
{
"location": {
"x": 0.0,
},
{
"location": {
"x": 0.0,
- "y":
7
5.0
+ "y":
3
5.0
},
},
- "name": "A4",
- "logicWidth": 1
+ "name": "C4",
+ "logicWidth": 1,
+ "usage": "INPUT"
},
{
"location": {
},
{
"location": {
@@
-81,7
+89,8
@@
mograsim version: 0.1.3
"y": 5.0
},
"name": "Y1",
"y": 5.0
},
"name": "Y1",
- "logicWidth": 1
+ "logicWidth": 1,
+ "usage": "OUTPUT"
},
{
"location": {
},
{
"location": {
@@
-89,7
+98,8
@@
mograsim version: 0.1.3
"y": 15.0
},
"name": "Y2",
"y": 15.0
},
"name": "Y2",
- "logicWidth": 1
+ "logicWidth": 1,
+ "usage": "OUTPUT"
},
{
"location": {
},
{
"location": {
@@
-97,7
+107,8
@@
mograsim version: 0.1.3
"y": 25.0
},
"name": "Y3",
"y": 25.0
},
"name": "Y3",
- "logicWidth": 1
+ "logicWidth": 1,
+ "usage": "OUTPUT"
},
{
"location": {
},
{
"location": {
@@
-105,20
+116,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": "GUIor_4",
- "name": "GUIor_4#0",
- "pos": {
- "x": 35.0,
- "y": 37.5
- }
- },
+ "components": [
{
"id": "GUIand41",
"name": "GUIand41#0",
{
"id": "GUIand41",
"name": "GUIand41#0",
@@
-126,206
+130,272
@@
mograsim version: 0.1.3
"x": 15.0,
"y": 137.5
}
"x": 15.0,
"y": 137.5
}
+ },
+ {
+ "id": "GUIor_4",
+ "name": "GUIor_4#0",
+ "pos": {
+ "x": 35.0,
+ "y": 37.5
+ }
}
],
}
],
- "
innerW
ires": [
+ "
w
ires": [
{
"pin1": {
{
"pin1": {
- "compName": "
GUIor_4#0
",
- "pinName": "
Y2
"
+ "compName": "
_submodelinterface
",
+ "pinName": "
A1
"
},
"pin2": {
},
"pin2": {
- "compName": "
_submodelinterface
",
- "pinName": "
Y2
"
+ "compName": "
GUIand41#0
",
+ "pinName": "
A1
"
},
},
- "name": "unnamedWire#
14
",
+ "name": "unnamedWire#
0
",
"path": [
{
"path": [
{
- "x":
8
0.0,
- "y":
5
2.5
+ "x":
1
0.0,
+ "y":
11
2.5
},
{
},
{
- "x":
8
0.0,
- "y":
37
.5
+ "x":
1
0.0,
+ "y":
142
.5
}
]
},
{
"pin1": {
}
]
},
{
"pin1": {
- "compName": "
GUIor_4#0
",
- "pinName": "
Y1
"
+ "compName": "
_submodelinterface
",
+ "pinName": "
A2
"
},
"pin2": {
},
"pin2": {
- "compName": "
_submodelinterface
",
- "pinName": "
Y1
"
+ "compName": "
GUIand41#0
",
+ "pinName": "
A2
"
},
},
- "name": "unnamedWire#1
3
",
+ "name": "unnamedWire#1",
"path": [
{
"path": [
{
- "x":
7
5.0,
- "y":
42
.5
+ "x": 5.0,
+ "y":
137
.5
},
{
},
{
- "x":
7
5.0,
- "y": 12.5
+ "x": 5.0,
+ "y": 1
5
2.5
}
]
},
{
"pin1": {
}
]
},
{
"pin1": {
- "compName": "GUI
or_4
#0",
- "pinName": "Y
4
"
+ "compName": "GUI
and41
#0",
+ "pinName": "Y
2
"
},
"pin2": {
},
"pin2": {
- "compName": "
_submodelinterface
",
- "pinName": "
Y4
"
+ "compName": "
GUIor_4#0
",
+ "pinName": "
B2
"
},
},
- "name": "unnamedWire#1
6
",
+ "name": "unnamedWire#1
0
",
"path": [
{
"path": [
{
- "x":
80
.0,
- "y":
7
2.5
+ "x":
65
.0,
+ "y":
15
2.5
},
{
},
{
- "x": 80.0,
- "y": 87.5
+ "x": 65.0,
+ "y": 125.0
+ },
+ {
+ "x": 25.0,
+ "y": 125.0
+ },
+ {
+ "x": 25.0,
+ "y": 92.5
}
]
},
{
"pin1": {
}
]
},
{
"pin1": {
- "compName": "GUI
or_4
#0",
+ "compName": "GUI
and41
#0",
"pinName": "Y3"
},
"pin2": {
"pinName": "Y3"
},
"pin2": {
- "compName": "
_submodelinterface
",
- "pinName": "
Y
3"
+ "compName": "
GUIor_4#0
",
+ "pinName": "
B
3"
},
},
- "name": "unnamedWire#15",
- "path": []
+ "name": "unnamedWire#11",
+ "path": [
+ {
+ "x": 60.0,
+ "y": 162.5
+ },
+ {
+ "x": 60.0,
+ "y": 130.0
+ },
+ {
+ "x": 20.0,
+ "y": 130.0
+ },
+ {
+ "x": 20.0,
+ "y": 102.5
+ }
+ ]
},
{
"pin1": {
"compName": "GUIand41#0",
},
{
"pin1": {
"compName": "GUIand41#0",
- "pinName": "Y
1
"
+ "pinName": "Y
4
"
},
"pin2": {
"compName": "GUIor_4#0",
},
"pin2": {
"compName": "GUIor_4#0",
- "pinName": "B
1
"
+ "pinName": "B
4
"
},
},
- "name": "unnamedWire#
9
",
+ "name": "unnamedWire#
12
",
"path": [
{
"path": [
{
- "x":
70
.0,
- "y": 1
4
2.5
+ "x":
55
.0,
+ "y": 1
7
2.5
},
{
},
{
- "x":
70
.0,
- "y": 1
20
.0
+ "x":
55
.0,
+ "y": 1
35
.0
},
{
},
{
- "x":
30
.0,
- "y": 1
20
.0
+ "x":
15
.0,
+ "y": 1
35
.0
},
{
},
{
- "x":
30
.0,
- "y":
8
2.5
+ "x":
15
.0,
+ "y":
11
2.5
}
]
},
{
"pin1": {
}
]
},
{
"pin1": {
- "compName": "
_submodelinterface
",
- "pinName": "
C4
"
+ "compName": "
GUIor_4#0
",
+ "pinName": "
Y1
"
},
"pin2": {
},
"pin2": {
- "compName": "
GUIor_4#0
",
- "pinName": "
A4
"
+ "compName": "
_submodelinterface
",
+ "pinName": "
Y1
"
},
},
- "name": "unnamedWire#
8
",
+ "name": "unnamedWire#
13
",
"path": [
{
"path": [
{
- "x": 5.0,
- "y":
87
.5
+ "x":
7
5.0,
+ "y":
42
.5
},
{
},
{
- "x": 5.0,
- "y":
7
2.5
+ "x":
7
5.0,
+ "y":
1
2.5
}
]
},
{
"pin1": {
}
]
},
{
"pin1": {
- "compName": "
_submodelinterface
",
- "pinName": "
C3
"
+ "compName": "
GUIor_4#0
",
+ "pinName": "
Y2
"
},
"pin2": {
},
"pin2": {
+ "compName": "_submodelinterface",
+ "pinName": "Y2"
+ },
+ "name": "unnamedWire#14",
+ "path": [
+ {
+ "x": 80.0,
+ "y": 52.5
+ },
+ {
+ "x": 80.0,
+ "y": 37.5
+ }
+ ]
+ },
+ {
+ "pin1": {
"compName": "GUIor_4#0",
"compName": "GUIor_4#0",
- "pinName": "
A
3"
+ "pinName": "
Y
3"
},
},
- "name": "unnamedWire#7",
+ "pin2": {
+ "compName": "_submodelinterface",
+ "pinName": "Y3"
+ },
+ "name": "unnamedWire#15",
"path": []
},
{
"pin1": {
"path": []
},
{
"pin1": {
- "compName": "
_submodelinterface
",
- "pinName": "
C2
"
+ "compName": "
GUIor_4#0
",
+ "pinName": "
Y4
"
},
"pin2": {
},
"pin2": {
- "compName": "
GUIor_4#0
",
- "pinName": "
A2
"
+ "compName": "
_submodelinterface
",
+ "pinName": "
Y4
"
},
},
- "name": "unnamedWire#6",
+ "name": "unnamedWire#
1
6",
"path": [
{
"path": [
{
- "x":
5
.0,
- "y":
37
.5
+ "x":
80
.0,
+ "y":
72
.5
},
{
},
{
- "x":
5
.0,
- "y":
52
.5
+ "x":
80
.0,
+ "y":
87
.5
}
]
},
{
"pin1": {
"compName": "_submodelinterface",
}
]
},
{
"pin1": {
"compName": "_submodelinterface",
- "pinName": "A
2
"
+ "pinName": "A
3
"
},
"pin2": {
"compName": "GUIand41#0",
},
"pin2": {
"compName": "GUIand41#0",
- "pinName": "A
2
"
+ "pinName": "A
3
"
},
},
- "name": "unnamedWire#1",
+ "name": "unnamedWire#2",
+ "path": []
+ },
+ {
+ "pin1": {
+ "compName": "_submodelinterface",
+ "pinName": "A4"
+ },
+ "pin2": {
+ "compName": "GUIand41#0",
+ "pinName": "A4"
+ },
+ "name": "unnamedWire#3",
"path": [
{
"x": 5.0,
"path": [
{
"x": 5.0,
- "y": 1
3
7.5
+ "y": 1
8
7.5
},
{
"x": 5.0,
},
{
"x": 5.0,
- "y": 1
5
2.5
+ "y": 1
7
2.5
}
]
},
{
"pin1": {
"compName": "_submodelinterface",
}
]
},
{
"pin1": {
"compName": "_submodelinterface",
- "pinName": "
A1
"
+ "pinName": "
B
"
},
"pin2": {
"compName": "GUIand41#0",
},
"pin2": {
"compName": "GUIand41#0",
- "pinName": "
A1
"
+ "pinName": "
B
"
},
},
- "name": "unnamedWire#
0
",
+ "name": "unnamedWire#
4
",
"path": [
{
"x": 10.0,
"path": [
{
"x": 10.0,
- "y":
1
12.5
+ "y":
2
12.5
},
{
"x": 10.0,
},
{
"x": 10.0,
- "y": 1
4
2.5
+ "y": 1
8
2.5
}
]
},
}
]
},
@@
-352,148
+422,91
@@
mograsim version: 0.1.3
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
GUIand41#0
",
- "pinName": "
Y
2"
+ "compName": "
_submodelinterface
",
+ "pinName": "
C
2"
},
"pin2": {
"compName": "GUIor_4#0",
},
"pin2": {
"compName": "GUIor_4#0",
- "pinName": "
B
2"
+ "pinName": "
A
2"
},
},
- "name": "unnamedWire#
10
",
+ "name": "unnamedWire#
6
",
"path": [
{
"path": [
{
- "x": 65.0,
- "y": 152.5
- },
- {
- "x": 65.0,
- "y": 125.0
- },
- {
- "x": 25.0,
- "y": 125.0
+ "x": 5.0,
+ "y": 37.5
},
{
},
{
- "x":
2
5.0,
- "y":
9
2.5
+ "x": 5.0,
+ "y":
5
2.5
}
]
},
{
"pin1": {
"compName": "_submodelinterface",
}
]
},
{
"pin1": {
"compName": "_submodelinterface",
- "pinName": "
B
"
+ "pinName": "
C3
"
},
"pin2": {
},
"pin2": {
- "compName": "GUI
and41
#0",
- "pinName": "
B
"
+ "compName": "GUI
or_4
#0",
+ "pinName": "
A3
"
},
},
- "name": "unnamedWire#4",
- "path": [
- {
- "x": 10.0,
- "y": 212.5
- },
- {
- "x": 10.0,
- "y": 182.5
- }
- ]
+ "name": "unnamedWire#7",
+ "path": []
},
{
"pin1": {
"compName": "_submodelinterface",
},
{
"pin1": {
"compName": "_submodelinterface",
- "pinName": "
A
4"
+ "pinName": "
C
4"
},
"pin2": {
},
"pin2": {
- "compName": "GUI
and41
#0",
+ "compName": "GUI
or_4
#0",
"pinName": "A4"
},
"pinName": "A4"
},
- "name": "unnamedWire#
3
",
+ "name": "unnamedWire#
8
",
"path": [
{
"x": 5.0,
"path": [
{
"x": 5.0,
- "y":
1
87.5
+ "y": 87.5
},
{
"x": 5.0,
},
{
"x": 5.0,
- "y": 172.5
- }
- ]
- },
- {
- "pin1": {
- "compName": "GUIand41#0",
- "pinName": "Y4"
- },
- "pin2": {
- "compName": "GUIor_4#0",
- "pinName": "B4"
- },
- "name": "unnamedWire#12",
- "path": [
- {
- "x": 55.0,
- "y": 172.5
- },
- {
- "x": 55.0,
- "y": 135.0
- },
- {
- "x": 15.0,
- "y": 135.0
- },
- {
- "x": 15.0,
- "y": 112.5
+ "y": 72.5
}
]
},
}
]
},
- {
- "pin1": {
- "compName": "_submodelinterface",
- "pinName": "A3"
- },
- "pin2": {
- "compName": "GUIand41#0",
- "pinName": "A3"
- },
- "name": "unnamedWire#2",
- "path": []
- },
{
"pin1": {
"compName": "GUIand41#0",
{
"pin1": {
"compName": "GUIand41#0",
- "pinName": "Y
3
"
+ "pinName": "Y
1
"
},
"pin2": {
"compName": "GUIor_4#0",
},
"pin2": {
"compName": "GUIor_4#0",
- "pinName": "B
3
"
+ "pinName": "B
1
"
},
},
- "name": "unnamedWire#
11
",
+ "name": "unnamedWire#
9
",
"path": [
{
"path": [
{
- "x":
6
0.0,
- "y": 1
6
2.5
+ "x":
7
0.0,
+ "y": 1
4
2.5
},
{
},
{
- "x":
6
0.0,
- "y": 1
3
0.0
+ "x":
7
0.0,
+ "y": 1
2
0.0
},
{
},
{
- "x":
2
0.0,
- "y": 1
3
0.0
+ "x":
3
0.0,
+ "y": 1
2
0.0
},
{
},
{
- "x":
2
0.0,
- "y":
10
2.5
+ "x":
3
0.0,
+ "y":
8
2.5
}
]
}
}
]
}
- ]
+ ],
+ "version": "0.1.1"
},
},
- "symbolRendererSnippetID": "
class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "GUIandor414",
"centerTextHeight": 5.0,
"symbolRendererParams": {
"centerText": "GUIandor414",
"centerTextHeight": 5.0,
@@
-501,5
+514,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