projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Implemented GUIAm2904's logic. Missing: layout; testing
[Mograsim.git]
/
net.mograsim.logic.model.editor
/
components
/
GUIand.json
diff --git
a/net.mograsim.logic.model.editor/components/GUIand.json
b/net.mograsim.logic.model.editor/components/GUIand.json
index
c19d8f9
..
ef57797
100644
(file)
--- a/
net.mograsim.logic.model.editor/components/GUIand.json
+++ b/
net.mograsim.logic.model.editor/components/GUIand.json
@@
-32,30
+32,30
@@
mograsim version: 0.1.3
"innerScale": 0.4,
"subComps": [
{
"innerScale": 0.4,
"subComps": [
{
+ "id": "GUINandGate",
+ "name": "GUINandGate#1",
"pos": {
"x": 50.0,
"y": 15.0
},
"pos": {
"x": 50.0,
"y": 15.0
},
- "id": "GUINandGate",
- "name": "GUINandGate#1",
"params": 1
},
{
"params": 1
},
{
+ "id": "GUINandGate",
+ "name": "GUINandGate#0",
"pos": {
"x": 20.0,
"y": 15.0
},
"pos": {
"x": 20.0,
"y": 15.0
},
- "id": "GUINandGate",
- "name": "GUINandGate#0",
"params": 1
},
{
"params": 1
},
{
+ "id": "WireCrossPoint",
+ "name": "WireCrossPoint#0",
"pos": {
"x": 44.0,
"y": 24.0
},
"pos": {
"x": 44.0,
"y": 24.0
},
- "id": "WireCrossPoint",
- "name": "WireCrossPoint#0",
"params": 1
}
],
"params": 1
}
],
@@
-63,33
+63,35
@@
mograsim version: 0.1.3
{
"pin1": {
"compName": "_submodelinterface",
{
"pin1": {
"compName": "_submodelinterface",
- "pinName": "
A
"
+ "pinName": "
B
"
},
"pin2": {
"compName": "GUINandGate#0",
},
"pin2": {
"compName": "GUINandGate#0",
- "pinName": "A"
- }
+ "pinName": "B"
+ },
+ "name": "unnamedWire#1"
},
{
"pin1": {
"compName": "_submodelinterface",
},
{
"pin1": {
"compName": "_submodelinterface",
- "pinName": "
B
"
+ "pinName": "
A
"
},
"pin2": {
"compName": "GUINandGate#0",
},
"pin2": {
"compName": "GUINandGate#0",
- "pinName": "B"
- }
+ "pinName": "A"
+ },
+ "name": "unnamedWire#0"
},
{
"pin1": {
},
{
"pin1": {
- "compName": "GUINandGate#
0
",
+ "compName": "GUINandGate#
1
",
"pinName": "Y"
},
"pin2": {
"pinName": "Y"
},
"pin2": {
- "compName": "
WireCrossPoint#0
",
- "pinName": ""
+ "compName": "
_submodelinterface
",
+ "pinName": "
Y
"
},
},
- "
path": []
+ "
name": "unnamedWire#5"
},
{
"pin1": {
},
{
"pin1": {
@@
-98,12
+100,13
@@
mograsim version: 0.1.3
},
"pin2": {
"compName": "GUINandGate#1",
},
"pin2": {
"compName": "GUINandGate#1",
- "pinName": "
A
"
+ "pinName": "
B
"
},
},
+ "name": "unnamedWire#4",
"path": [
{
"x": 45.0,
"path": [
{
"x": 45.0,
- "y":
2
0.0
+ "y":
3
0.0
}
]
},
}
]
},
@@
-114,24
+117,27
@@
mograsim version: 0.1.3
},
"pin2": {
"compName": "GUINandGate#1",
},
"pin2": {
"compName": "GUINandGate#1",
- "pinName": "
B
"
+ "pinName": "
A
"
},
},
+ "name": "unnamedWire#3",
"path": [
{
"x": 45.0,
"path": [
{
"x": 45.0,
- "y":
3
0.0
+ "y":
2
0.0
}
]
},
{
"pin1": {
}
]
},
{
"pin1": {
- "compName": "GUINandGate#
1
",
+ "compName": "GUINandGate#
0
",
"pinName": "Y"
},
"pin2": {
"pinName": "Y"
},
"pin2": {
- "compName": "_submodelinterface",
- "pinName": "Y"
- }
+ "compName": "WireCrossPoint#0",
+ "pinName": ""
+ },
+ "name": "unnamedWire#2",
+ "path": []
}
]
},
}
]
},
@@
-142,5
+148,6
@@
mograsim version: 0.1.3
"horizontalComponentCenter": 17.5,
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
"horizontalComponentCenter": 17.5,
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
- }
+ },
+ "outlineRendererSnippetID": "default"
}
\ No newline at end of file
}
\ No newline at end of file