projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Switched to using IndirectGUIComponentCreator instead of new GUIAm2901()
[Mograsim.git]
/
net.mograsim.logic.model.editor
/
components
/
GUIhalfadder.json
diff --git
a/net.mograsim.logic.model.editor/components/GUIhalfadder.json
b/net.mograsim.logic.model.editor/components/GUIhalfadder.json
index
761d6ce
..
8ca9ccd
100644
(file)
--- a/
net.mograsim.logic.model.editor/components/GUIhalfadder.json
+++ b/
net.mograsim.logic.model.editor/components/GUIhalfadder.json
@@
-40,140
+40,166
@@
mograsim version: 0.1.3
"innerScale": 0.4,
"subComps": [
{
"innerScale": 0.4,
"subComps": [
{
+ "id": "GUINandGate",
+ "name": "GUINandGate#1",
"pos": {
"x": 40.0,
"y": 2.5
},
"pos": {
"x": 40.0,
"y": 2.5
},
- "id": "GUINandGate",
- "name": "GUINandGate#1",
"params": 1
},
{
"params": 1
},
{
+ "id": "GUINandGate",
+ "name": "GUINandGate#0",
"pos": {
"x": 10.0,
"y": 15.0
},
"pos": {
"x": 10.0,
"y": 15.0
},
- "id": "GUINandGate",
- "name": "GUINandGate#0",
"params": 1
},
{
"params": 1
},
{
+ "id": "GUINandGate",
+ "name": "GUINandGate#3",
"pos": {
"x": 65.0,
"y": 2.5
},
"pos": {
"x": 65.0,
"y": 2.5
},
- "id": "GUINandGate",
- "name": "GUINandGate#3",
"params": 1
},
{
"params": 1
},
{
+ "id": "WireCrossPoint",
+ "name": "WireCrossPoint#1",
"pos": {
"x": 4.0,
"y": 36.5
},
"pos": {
"x": 4.0,
"y": 36.5
},
- "id": "WireCrossPoint",
- "name": "WireCrossPoint#1",
"params": 1
},
{
"params": 1
},
{
+ "id": "GUINandGate",
+ "name": "GUINandGate#2",
"pos": {
"x": 40.0,
"y": 27.5
},
"pos": {
"x": 40.0,
"y": 27.5
},
- "id": "GUINandGate",
- "name": "GUINandGate#2",
"params": 1
},
{
"params": 1
},
{
+ "id": "WireCrossPoint",
+ "name": "WireCrossPoint#0",
"pos": {
"x": 4.0,
"y": 11.5
},
"pos": {
"x": 4.0,
"y": 11.5
},
- "id": "WireCrossPoint",
- "name": "WireCrossPoint#0",
"params": 1
},
{
"params": 1
},
{
+ "id": "WireCrossPoint",
+ "name": "WireCrossPoint#2",
"pos": {
"x": 34.0,
"y": 24.0
},
"pos": {
"x": 34.0,
"y": 24.0
},
- "id": "WireCrossPoint",
- "name": "WireCrossPoint#2",
"params": 1
}
],
"innerWires": [
{
"pin1": {
"params": 1
}
],
"innerWires": [
{
"pin1": {
- "compName": "
_submodelinterface
",
- "pinName": "
A
"
+ "compName": "
WireCrossPoint#2
",
+ "pinName": ""
},
"pin2": {
},
"pin2": {
- "compName": "
WireCrossPoint#0
",
- "pinName": ""
+ "compName": "
GUINandGate#2
",
+ "pinName": "
A
"
},
},
- "path": []
+ "name": "unnamedWire#9",
+ "path": [
+ {
+ "x": 35.0,
+ "y": 32.5
+ }
+ ]
},
{
"pin1": {
},
{
"pin1": {
- "compName": "WireCrossPoint#
0
",
+ "compName": "WireCrossPoint#
2
",
"pinName": ""
},
"pin2": {
"compName": "GUINandGate#1",
"pinName": ""
},
"pin2": {
"compName": "GUINandGate#1",
- "pinName": "
A
"
+ "pinName": "
B
"
},
},
+ "name": "unnamedWire#8",
"path": [
{
"path": [
{
- "x": 5.0,
- "y": 7.5
+ "x":
3
5.0,
+ "y":
1
7.5
}
]
},
{
"pin1": {
}
]
},
{
"pin1": {
- "compName": "WireCrossPoint#
0
",
+ "compName": "WireCrossPoint#
2
",
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "compName": "
GUINandGate#0
",
- "pinName": "
A
"
+ "compName": "
_submodelinterface
",
+ "pinName": "
_Z
"
},
},
+ "name": "unnamedWire#7",
"path": [
{
"path": [
{
- "x": 5.0,
- "y": 20.0
+ "x": 80.0,
+ "y": 25.0
+ },
+ {
+ "x": 80.0,
+ "y": 37.5
}
]
},
{
"pin1": {
}
]
},
{
"pin1": {
- "compName": "
_submodelinterface
",
- "pinName": "
B
"
+ "compName": "
GUINandGate#0
",
+ "pinName": "
Y
"
},
"pin2": {
},
"pin2": {
- "compName": "WireCrossPoint#
1
",
+ "compName": "WireCrossPoint#
2
",
"pinName": ""
},
"pinName": ""
},
+ "name": "unnamedWire#6",
"path": []
},
{
"pin1": {
"path": []
},
{
"pin1": {
- "compName": "WireCrossPoint#
1
",
+ "compName": "WireCrossPoint#
0
",
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "compName": "GUINandGate#
2
",
- "pinName": "
B
"
+ "compName": "GUINandGate#
1
",
+ "pinName": "
A
"
},
},
+ "name": "unnamedWire#1",
"path": [
{
"x": 5.0,
"path": [
{
"x": 5.0,
- "y":
42
.5
+ "y":
7
.5
}
]
},
}
]
},
+ {
+ "pin1": {
+ "compName": "_submodelinterface",
+ "pinName": "A"
+ },
+ "pin2": {
+ "compName": "WireCrossPoint#0",
+ "pinName": ""
+ },
+ "name": "unnamedWire#0",
+ "path": []
+ },
{
"pin1": {
"compName": "WireCrossPoint#1",
{
"pin1": {
"compName": "WireCrossPoint#1",
@@
-183,6
+209,7
@@
mograsim version: 0.1.3
"compName": "GUINandGate#0",
"pinName": "B"
},
"compName": "GUINandGate#0",
"pinName": "B"
},
+ "name": "unnamedWire#5",
"path": [
{
"x": 5.0,
"path": [
{
"x": 5.0,
@@
-192,84
+219,80
@@
mograsim version: 0.1.3
},
{
"pin1": {
},
{
"pin1": {
- "compName": "GUINandGate#
0
",
+ "compName": "GUINandGate#
1
",
"pinName": "Y"
},
"pin2": {
"pinName": "Y"
},
"pin2": {
- "compName": "WireCrossPoint#2",
- "pinName": ""
- },
- "path": []
- },
- {
- "pin1": {
- "compName": "WireCrossPoint#2",
- "pinName": ""
- },
- "pin2": {
- "compName": "_submodelinterface",
- "pinName": "_Z"
+ "compName": "GUINandGate#3",
+ "pinName": "A"
},
},
+ "name": "unnamedWire#10",
"path": [
{
"path": [
{
- "x":
80.0
,
- "y":
25.0
+ "x":
62.5
,
+ "y":
12.5
},
{
},
{
- "x":
80.0
,
- "y":
3
7.5
+ "x":
62.5
,
+ "y": 7.5
}
]
},
{
"pin1": {
}
]
},
{
"pin1": {
- "compName": "WireCrossPoint#
2
",
+ "compName": "WireCrossPoint#
1
",
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "compName": "GUINandGate#
1
",
+ "compName": "GUINandGate#
2
",
"pinName": "B"
},
"pinName": "B"
},
+ "name": "unnamedWire#4",
"path": [
{
"path": [
{
- "x":
3
5.0,
- "y":
17
.5
+ "x": 5.0,
+ "y":
42
.5
}
]
},
{
"pin1": {
}
]
},
{
"pin1": {
- "compName": "
WireCrossPoint#2
",
- "pinName": ""
+ "compName": "
_submodelinterface
",
+ "pinName": "
B
"
},
"pin2": {
},
"pin2": {
- "compName": "
GUINandGate#2
",
- "pinName": "
A
"
+ "compName": "
WireCrossPoint#1
",
+ "pinName": ""
},
},
- "path": [
- {
- "x": 35.0,
- "y": 32.5
- }
- ]
+ "name": "unnamedWire#3",
+ "path": []
},
{
"pin1": {
},
{
"pin1": {
- "compName": "GUINandGate#
1
",
+ "compName": "GUINandGate#
3
",
"pinName": "Y"
},
"pin2": {
"pinName": "Y"
},
"pin2": {
- "compName": "GUINandGate#3",
+ "compName": "_submodelinterface",
+ "pinName": "Y"
+ },
+ "name": "unnamedWire#12",
+ "path": []
+ },
+ {
+ "pin1": {
+ "compName": "WireCrossPoint#0",
+ "pinName": ""
+ },
+ "pin2": {
+ "compName": "GUINandGate#0",
"pinName": "A"
},
"pinName": "A"
},
+ "name": "unnamedWire#2",
"path": [
{
"path": [
{
- "x": 62.5,
- "y": 12.5
- },
- {
- "x": 62.5,
- "y": 7.5
+ "x": 5.0,
+ "y": 20.0
}
]
},
}
]
},
@@
-282,6
+305,7
@@
mograsim version: 0.1.3
"compName": "GUINandGate#3",
"pinName": "B"
},
"compName": "GUINandGate#3",
"pinName": "B"
},
+ "name": "unnamedWire#11",
"path": [
{
"x": 62.5,
"path": [
{
"x": 62.5,
@@
-292,26
+316,16
@@
mograsim version: 0.1.3
"y": 17.5
}
]
"y": 17.5
}
]
- },
- {
- "pin1": {
- "compName": "GUINandGate#3",
- "pinName": "Y"
- },
- "pin2": {
- "compName": "_submodelinterface",
- "pinName": "Y"
- },
- "path": []
}
]
},
}
]
},
- "symbolRendererSnippetID": "SimpleRectangularLikeSymbolRenderer",
+ "symbolRendererSnippetID": "
class:net.mograsim.logic.model.snippets.symbolrenderers.
SimpleRectangularLikeSymbolRenderer",
"symbolRendererParams": {
"centerText": "GUIhalfadder",
"symbolRendererParams": {
"centerText": "GUIhalfadder",
- "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