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
/
GUIsel1.json
diff --git
a/net.mograsim.logic.model.am2900/components/GUIsel1.json
b/net.mograsim.logic.model.am2900/components/GUIsel1.json
index
26a25cf
..
093657b
100644
(file)
--- a/
net.mograsim.logic.model.am2900/components/GUIsel1.json
+++ b/
net.mograsim.logic.model.am2900/components/GUIsel1.json
@@
-1,4
+1,3
@@
-mograsim version: 0.1.3
{
"width": 35.0,
"height": 40.0,
{
"width": 35.0,
"height": 40.0,
@@
-9,7
+8,8
@@
mograsim version: 0.1.3
"y": 25.0
},
"name": "I1",
"y": 25.0
},
"name": "I1",
- "logicWidth": 1
+ "logicWidth": 1,
+ "usage": "INPUT"
},
{
"location": {
},
{
"location": {
@@
-17,15
+17,8
@@
mograsim version: 0.1.3
"y": 35.0
},
"name": "I2",
"y": 35.0
},
"name": "I2",
- "logicWidth": 1
- },
- {
- "location": {
- "x": 35.0,
- "y": 5.0
- },
- "name": "Y",
- "logicWidth": 1
+ "logicWidth": 1,
+ "usage": "INPUT"
},
{
"location": {
},
{
"location": {
@@
-33,7
+26,8
@@
mograsim version: 0.1.3
"y": 5.0
},
"name": "S1",
"y": 5.0
},
"name": "S1",
- "logicWidth": 1
+ "logicWidth": 1,
+ "usage": "INPUT"
},
{
"location": {
},
{
"location": {
@@
-41,12
+35,22
@@
mograsim version: 0.1.3
"y": 15.0
},
"name": "S2",
"y": 15.0
},
"name": "S2",
- "logicWidth": 1
+ "logicWidth": 1,
+ "usage": "INPUT"
+ },
+ {
+ "location": {
+ "x": 35.0,
+ "y": 5.0
+ },
+ "name": "Y",
+ "logicWidth": 1,
+ "usage": "OUTPUT"
}
],
}
],
+ "innerScale": 0.4,
"submodel": {
"submodel": {
- "innerScale": 0.4,
- "subComps": [
+ "components": [
{
"id": "GUINandGate",
"name": "GUINandGate#1",
{
"id": "GUINandGate",
"name": "GUINandGate#1",
@@
-58,64
+62,42
@@
mograsim version: 0.1.3
},
{
"id": "GUINandGate",
},
{
"id": "GUINandGate",
- "name": "GUINandGate#
3
",
+ "name": "GUINandGate#
2
",
"pos": {
"pos": {
- "x":
60
.0,
- "y":
40
.0
+ "x":
35
.0,
+ "y":
55
.0
},
"params": 1
},
{
"id": "GUINandGate",
},
"params": 1
},
{
"id": "GUINandGate",
- "name": "GUINandGate#
2
",
+ "name": "GUINandGate#
3
",
"pos": {
"pos": {
- "x":
35
.0,
- "y":
55
.0
+ "x":
60
.0,
+ "y":
40
.0
},
"params": 1
}
],
},
"params": 1
}
],
- "
innerW
ires": [
+ "
w
ires": [
{
"pin1": {
{
"pin1": {
- "compName": "
GUINandGate#2
",
- "pinName": "
Y
"
+ "compName": "
_submodelinterface
",
+ "pinName": "
S1
"
},
"pin2": {
},
"pin2": {
- "compName": "GUINandGate#3",
- "pinName": "B"
- },
- "name": "unnamedWire#9"
- },
- {
- "pin1": {
"compName": "GUINandGate#1",
"compName": "GUINandGate#1",
- "pinName": "Y"
- },
- "pin2": {
- "compName": "GUINandGate#3",
"pinName": "A"
},
"pinName": "A"
},
- "name": "unnamedWire#8"
- },
- {
- "pin1": {
- "compName": "_submodelinterface",
- "pinName": "I2"
- },
- "pin2": {
- "compName": "GUINandGate#2",
- "pinName": "B"
- },
- "name": "unnamedWire#7",
+ "name": "unnamedWire#0",
"path": [
{
"path": [
{
- "x":
1
5.0,
- "y":
87
.5
+ "x":
2
5.0,
+ "y":
12
.5
},
{
},
{
- "x":
1
5.0,
- "y":
70
.0
+ "x":
2
5.0,
+ "y":
35
.0
}
]
},
}
]
},
@@
-142,58
+124,81
@@
mograsim version: 0.1.3
},
{
"pin1": {
},
{
"pin1": {
+ "compName": "GUINandGate#3",
+ "pinName": "Y"
+ },
+ "pin2": {
"compName": "_submodelinterface",
"compName": "_submodelinterface",
- "pinName": "S1"
+ "pinName": "Y"
+ },
+ "name": "unnamedWire#10"
+ },
+ {
+ "pin1": {
+ "compName": "_submodelinterface",
+ "pinName": "I1"
},
"pin2": {
"compName": "GUINandGate#1",
},
"pin2": {
"compName": "GUINandGate#1",
- "pinName": "
A
"
+ "pinName": "
B
"
},
},
- "name": "unnamedWire#
0
",
+ "name": "unnamedWire#
5
",
"path": [
{
"x": 25.0,
"path": [
{
"x": 25.0,
- "y":
1
2.5
+ "y":
6
2.5
},
{
"x": 25.0,
},
{
"x": 25.0,
- "y":
3
5.0
+ "y":
4
5.0
}
]
},
{
"pin1": {
"compName": "_submodelinterface",
}
]
},
{
"pin1": {
"compName": "_submodelinterface",
- "pinName": "I
1
"
+ "pinName": "I
2
"
},
"pin2": {
},
"pin2": {
- "compName": "GUINandGate#
1
",
+ "compName": "GUINandGate#
2
",
"pinName": "B"
},
"pinName": "B"
},
- "name": "unnamedWire#
5
",
+ "name": "unnamedWire#
7
",
"path": [
{
"path": [
{
- "x":
2
5.0,
- "y":
62
.5
+ "x":
1
5.0,
+ "y":
87
.5
},
{
},
{
- "x":
2
5.0,
- "y":
45
.0
+ "x":
1
5.0,
+ "y":
70
.0
}
]
},
{
"pin1": {
}
]
},
{
"pin1": {
- "compName": "GUINandGate#
3
",
+ "compName": "GUINandGate#
1
",
"pinName": "Y"
},
"pin2": {
"pinName": "Y"
},
"pin2": {
- "compName": "_submodelinterface",
+ "compName": "GUINandGate#3",
+ "pinName": "A"
+ },
+ "name": "unnamedWire#8"
+ },
+ {
+ "pin1": {
+ "compName": "GUINandGate#2",
"pinName": "Y"
},
"pinName": "Y"
},
- "name": "unnamedWire#10"
+ "pin2": {
+ "compName": "GUINandGate#3",
+ "pinName": "B"
+ },
+ "name": "unnamedWire#9"
}
}
- ]
+ ],
+ "version": "0.1.1"
},
"symbolRendererSnippetID": "simpleRectangularLike",
"symbolRendererParams": {
},
"symbolRendererSnippetID": "simpleRectangularLike",
"symbolRendererParams": {
@@
-204,5
+209,6
@@
mograsim version: 0.1.3
"pinLabelMargin": 0.5
},
"outlineRendererSnippetID": "default",
"pinLabelMargin": 0.5
},
"outlineRendererSnippetID": "default",
- "highLevelStateHandlerSnippetID": "default"
+ "highLevelStateHandlerSnippetID": "default",
+ "version": "0.1.5"
}
\ No newline at end of file
}
\ No newline at end of file