projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Made submodel / symbol rendering transition faster in SubmodelComponent
[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
5cadf0f
..
c6dc821
100644
(file)
--- a/
net.mograsim.logic.model.am2900/components/GUIandor414.json
+++ b/
net.mograsim.logic.model.am2900/components/GUIandor414.json
@@
-112,133
+112,159
@@
mograsim version: 0.1.3
"innerScale": 0.4,
"subComps": [
{
"innerScale": 0.4,
"subComps": [
{
+ "id": "GUIor_4",
+ "name": "GUIor_4#0",
"pos": {
"x": 35.0,
"y": 37.5
"pos": {
"x": 35.0,
"y": 37.5
- },
- "id": "GUIor_4",
- "name": "GUIor_4#0"
+ }
},
{
},
{
+ "id": "GUIand41",
+ "name": "GUIand41#0",
"pos": {
"x": 15.0,
"y": 137.5
"pos": {
"x": 15.0,
"y": 137.5
- },
- "id": "GUIand41",
- "name": "GUIand41#0"
+ }
}
],
"innerWires": [
{
"pin1": {
}
],
"innerWires": [
{
"pin1": {
- "compName": "
_submodelinterface
",
- "pinName": "
A1
"
+ "compName": "
GUIor_4#0
",
+ "pinName": "
Y2
"
},
"pin2": {
},
"pin2": {
- "compName": "
GUIand41#0
",
- "pinName": "
A1
"
+ "compName": "
_submodelinterface
",
+ "pinName": "
Y2
"
},
},
+ "name": "unnamedWire#14",
"path": [
{
"path": [
{
- "x":
1
0.0,
- "y":
11
2.5
+ "x":
8
0.0,
+ "y":
5
2.5
},
{
},
{
- "x":
1
0.0,
- "y":
142
.5
+ "x":
8
0.0,
+ "y":
37
.5
}
]
},
{
"pin1": {
}
]
},
{
"pin1": {
- "compName": "
_submodelinterface
",
- "pinName": "
A2
"
+ "compName": "
GUIor_4#0
",
+ "pinName": "
Y1
"
},
"pin2": {
},
"pin2": {
- "compName": "
GUIand41#0
",
- "pinName": "
A2
"
+ "compName": "
_submodelinterface
",
+ "pinName": "
Y1
"
},
},
+ "name": "unnamedWire#13",
"path": [
{
"path": [
{
- "x": 5.0,
- "y":
137
.5
+ "x":
7
5.0,
+ "y":
42
.5
},
{
},
{
- "x": 5.0,
- "y": 1
5
2.5
+ "x":
7
5.0,
+ "y": 12.5
}
]
},
{
"pin1": {
}
]
},
{
"pin1": {
+ "compName": "GUIor_4#0",
+ "pinName": "Y4"
+ },
+ "pin2": {
"compName": "_submodelinterface",
"compName": "_submodelinterface",
- "pinName": "A3"
+ "pinName": "Y4"
+ },
+ "name": "unnamedWire#16",
+ "path": [
+ {
+ "x": 80.0,
+ "y": 72.5
+ },
+ {
+ "x": 80.0,
+ "y": 87.5
+ }
+ ]
+ },
+ {
+ "pin1": {
+ "compName": "GUIor_4#0",
+ "pinName": "Y3"
},
"pin2": {
},
"pin2": {
- "compName": "
GUIand41#0
",
- "pinName": "
A
3"
+ "compName": "
_submodelinterface
",
+ "pinName": "
Y
3"
},
},
+ "name": "unnamedWire#15",
"path": []
},
{
"pin1": {
"path": []
},
{
"pin1": {
- "compName": "
_submodelinterface
",
- "pinName": "
A4
"
+ "compName": "
GUIand41#0
",
+ "pinName": "
Y1
"
},
"pin2": {
},
"pin2": {
- "compName": "GUI
and41
#0",
- "pinName": "
A4
"
+ "compName": "GUI
or_4
#0",
+ "pinName": "
B1
"
},
},
+ "name": "unnamedWire#9",
"path": [
{
"path": [
{
- "x":
5
.0,
- "y": 1
87
.5
+ "x":
70
.0,
+ "y": 1
42
.5
},
{
},
{
- "x": 5.0,
- "y": 172.5
+ "x": 70.0,
+ "y": 120.0
+ },
+ {
+ "x": 30.0,
+ "y": 120.0
+ },
+ {
+ "x": 30.0,
+ "y": 82.5
}
]
},
{
"pin1": {
"compName": "_submodelinterface",
}
]
},
{
"pin1": {
"compName": "_submodelinterface",
- "pinName": "
B
"
+ "pinName": "
C4
"
},
"pin2": {
},
"pin2": {
- "compName": "GUI
and41
#0",
- "pinName": "
B
"
+ "compName": "GUI
or_4
#0",
+ "pinName": "
A4
"
},
},
+ "name": "unnamedWire#8",
"path": [
{
"path": [
{
- "x":
10
.0,
- "y":
212
.5
+ "x":
5
.0,
+ "y":
87
.5
},
{
},
{
- "x":
10
.0,
- "y":
18
2.5
+ "x":
5
.0,
+ "y":
7
2.5
}
]
},
{
"pin1": {
"compName": "_submodelinterface",
}
]
},
{
"pin1": {
"compName": "_submodelinterface",
- "pinName": "C
1
"
+ "pinName": "C
3
"
},
"pin2": {
"compName": "GUIor_4#0",
},
"pin2": {
"compName": "GUIor_4#0",
- "pinName": "A
1
"
+ "pinName": "A
3
"
},
},
- "path": [
- {
- "x": 10.0,
- "y": 12.5
- },
- {
- "x": 10.0,
- "y": 42.5
- }
- ]
+ "name": "unnamedWire#7",
+ "path": []
},
{
"pin1": {
},
{
"pin1": {
@@
-249,6
+275,7
@@
mograsim version: 0.1.3
"compName": "GUIor_4#0",
"pinName": "A2"
},
"compName": "GUIor_4#0",
"pinName": "A2"
},
+ "name": "unnamedWire#6",
"path": [
{
"x": 5.0,
"path": [
{
"x": 5.0,
@@
-263,59
+290,63
@@
mograsim version: 0.1.3
{
"pin1": {
"compName": "_submodelinterface",
{
"pin1": {
"compName": "_submodelinterface",
- "pinName": "
C3
"
+ "pinName": "
A2
"
},
"pin2": {
},
"pin2": {
- "compName": "GUI
or_4
#0",
- "pinName": "A
3
"
+ "compName": "GUI
and41
#0",
+ "pinName": "A
2
"
},
},
- "path": []
+ "name": "unnamedWire#1",
+ "path": [
+ {
+ "x": 5.0,
+ "y": 137.5
+ },
+ {
+ "x": 5.0,
+ "y": 152.5
+ }
+ ]
},
{
"pin1": {
"compName": "_submodelinterface",
},
{
"pin1": {
"compName": "_submodelinterface",
- "pinName": "
C4
"
+ "pinName": "
A1
"
},
"pin2": {
},
"pin2": {
- "compName": "GUI
or_4
#0",
- "pinName": "A
4
"
+ "compName": "GUI
and41
#0",
+ "pinName": "A
1
"
},
},
+ "name": "unnamedWire#0",
"path": [
{
"path": [
{
- "x":
5
.0,
- "y":
87
.5
+ "x":
10
.0,
+ "y":
112
.5
},
{
},
{
- "x":
5
.0,
- "y":
7
2.5
+ "x":
10
.0,
+ "y":
14
2.5
}
]
},
{
"pin1": {
}
]
},
{
"pin1": {
- "compName": "
GUIand41#0
",
- "pinName": "
Y
1"
+ "compName": "
_submodelinterface
",
+ "pinName": "
C
1"
},
"pin2": {
"compName": "GUIor_4#0",
},
"pin2": {
"compName": "GUIor_4#0",
- "pinName": "
B
1"
+ "pinName": "
A
1"
},
},
+ "name": "unnamedWire#5",
"path": [
{
"path": [
{
- "x": 70.0,
- "y": 142.5
- },
- {
- "x": 70.0,
- "y": 120.0
- },
- {
- "x": 30.0,
- "y": 120.0
+ "x": 10.0,
+ "y": 12.5
},
{
},
{
- "x":
3
0.0,
- "y":
8
2.5
+ "x":
1
0.0,
+ "y":
4
2.5
}
]
},
}
]
},
@@
-328,6
+359,7
@@
mograsim version: 0.1.3
"compName": "GUIor_4#0",
"pinName": "B2"
},
"compName": "GUIor_4#0",
"pinName": "B2"
},
+ "name": "unnamedWire#10",
"path": [
{
"x": 65.0,
"path": [
{
"x": 65.0,
@@
-349,29
+381,43
@@
mograsim version: 0.1.3
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
GUIand41#0
",
- "pinName": "
Y3
"
+ "compName": "
_submodelinterface
",
+ "pinName": "
B
"
},
"pin2": {
},
"pin2": {
- "compName": "GUI
or_4
#0",
- "pinName": "B
3
"
+ "compName": "GUI
and41
#0",
+ "pinName": "B"
},
},
+ "name": "unnamedWire#4",
"path": [
{
"path": [
{
- "x":
6
0.0,
- "y":
16
2.5
+ "x":
1
0.0,
+ "y":
21
2.5
},
{
},
{
- "x": 60.0,
- "y": 130.0
- },
+ "x": 10.0,
+ "y": 182.5
+ }
+ ]
+ },
+ {
+ "pin1": {
+ "compName": "_submodelinterface",
+ "pinName": "A4"
+ },
+ "pin2": {
+ "compName": "GUIand41#0",
+ "pinName": "A4"
+ },
+ "name": "unnamedWire#3",
+ "path": [
{
{
- "x":
20
.0,
- "y": 1
30.0
+ "x":
5
.0,
+ "y": 1
87.5
},
{
},
{
- "x":
20
.0,
- "y": 1
0
2.5
+ "x":
5
.0,
+ "y": 1
7
2.5
}
]
},
}
]
},
@@
-384,6
+430,7
@@
mograsim version: 0.1.3
"compName": "GUIor_4#0",
"pinName": "B4"
},
"compName": "GUIor_4#0",
"pinName": "B4"
},
+ "name": "unnamedWire#12",
"path": [
{
"x": 55.0,
"path": [
{
"x": 55.0,
@@
-405,83
+452,54
@@
mograsim version: 0.1.3
},
{
"pin1": {
},
{
"pin1": {
- "compName": "GUIor_4#0",
- "pinName": "Y1"
- },
- "pin2": {
"compName": "_submodelinterface",
"compName": "_submodelinterface",
- "pinName": "Y1"
- },
- "path": [
- {
- "x": 75.0,
- "y": 42.5
- },
- {
- "x": 75.0,
- "y": 12.5
- }
- ]
- },
- {
- "pin1": {
- "compName": "GUIor_4#0",
- "pinName": "Y2"
+ "pinName": "A3"
},
"pin2": {
},
"pin2": {
- "compName": "
_submodelinterface
",
- "pinName": "
Y2
"
+ "compName": "
GUIand41#0
",
+ "pinName": "
A3
"
},
},
- "path": [
- {
- "x": 80.0,
- "y": 52.5
- },
- {
- "x": 80.0,
- "y": 37.5
- }
- ]
+ "name": "unnamedWire#2",
+ "path": []
},
{
"pin1": {
},
{
"pin1": {
- "compName": "GUI
or_4
#0",
+ "compName": "GUI
and41
#0",
"pinName": "Y3"
},
"pin2": {
"pinName": "Y3"
},
"pin2": {
- "compName": "_submodelinterface",
- "pinName": "Y3"
- },
- "path": []
- },
- {
- "pin1": {
"compName": "GUIor_4#0",
"compName": "GUIor_4#0",
- "pinName": "Y4"
- },
- "pin2": {
- "compName": "_submodelinterface",
- "pinName": "Y4"
+ "pinName": "B3"
},
},
+ "name": "unnamedWire#11",
"path": [
{
"path": [
{
- "x":
8
0.0,
- "y":
7
2.5
+ "x":
6
0.0,
+ "y":
16
2.5
},
{
},
{
- "x": 80.0,
- "y": 87.5
+ "x": 60.0,
+ "y": 130.0
+ },
+ {
+ "x": 20.0,
+ "y": 130.0
+ },
+ {
+ "x": 20.0,
+ "y": 102.5
}
]
}
]
},
}
]
}
]
},
- "symbolRendererSnippetID": "SimpleRectangularLikeSymbolRenderer",
+ "symbolRendererSnippetID": "
class:net.mograsim.logic.model.snippets.symbolrenderers.
SimpleRectangularLikeSymbolRenderer",
"symbolRendererParams": {
"centerText": "GUIandor414",
"symbolRendererParams": {
"centerText": "GUIandor414",
- "horizontalComponentCenter": 17.5,
"centerTextHeight": 5.0,
"centerTextHeight": 5.0,
+ "horizontalComponentCenter": 17.5,
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
- }
+ },
+ "outlineRendererSnippetID": "class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer"
}
\ No newline at end of file
}
\ No newline at end of file