projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Made wires with logicWidth!=1 thicker
[Mograsim.git]
/
net.mograsim.logic.model.am2900
/
components
/
GUIand.json
diff --git
a/net.mograsim.logic.model.am2900/components/GUIand.json
b/net.mograsim.logic.model.am2900/components/GUIand.json
index
6ec536a
..
5e343e0
100644
(file)
--- a/
net.mograsim.logic.model.am2900/components/GUIand.json
+++ b/
net.mograsim.logic.model.am2900/components/GUIand.json
@@
-1,4
+1,3
@@
-mograsim version: 0.1.3
{
"width": 35.0,
"height": 20.0,
{
"width": 35.0,
"height": 20.0,
@@
-9,7
+8,8
@@
mograsim version: 0.1.3
"y": 5.0
},
"name": "A",
"y": 5.0
},
"name": "A",
- "logicWidth": 1
+ "logicWidth": 1,
+ "usage": "INPUT"
},
{
"location": {
},
{
"location": {
@@
-17,7
+17,8
@@
mograsim version: 0.1.3
"y": 15.0
},
"name": "B",
"y": 15.0
},
"name": "B",
- "logicWidth": 1
+ "logicWidth": 1,
+ "usage": "INPUT"
},
{
"location": {
},
{
"location": {
@@
-25,26
+26,27
@@
mograsim version: 0.1.3
"y": 5.0
},
"name": "Y",
"y": 5.0
},
"name": "Y",
- "logicWidth": 1
+ "logicWidth": 1,
+ "usage": "OUTPUT"
}
],
}
],
+ "innerScale": 0.4,
"submodel": {
"submodel": {
- "innerScale": 0.4,
- "subComps": [
+ "components": [
{
"id": "GUINandGate",
{
"id": "GUINandGate",
- "name": "GUINandGate#
1
",
+ "name": "GUINandGate#
0
",
"pos": {
"pos": {
- "x":
5
0.0,
+ "x":
2
0.0,
"y": 15.0
},
"params": 1
},
{
"id": "GUINandGate",
"y": 15.0
},
"params": 1
},
{
"id": "GUINandGate",
- "name": "GUINandGate#
0
",
+ "name": "GUINandGate#
1
",
"pos": {
"pos": {
- "x":
2
0.0,
+ "x":
5
0.0,
"y": 15.0
},
"params": 1
"y": 15.0
},
"params": 1
@@
-59,39
+61,40
@@
mograsim version: 0.1.3
"params": 1
}
],
"params": 1
}
],
- "
innerW
ires": [
+ "
w
ires": [
{
"pin1": {
"compName": "_submodelinterface",
{
"pin1": {
"compName": "_submodelinterface",
- "pinName": "
B
"
+ "pinName": "
A
"
},
"pin2": {
"compName": "GUINandGate#0",
},
"pin2": {
"compName": "GUINandGate#0",
- "pinName": "
B
"
+ "pinName": "
A
"
},
},
- "name": "unnamedWire#
1
"
+ "name": "unnamedWire#
0
"
},
{
"pin1": {
"compName": "_submodelinterface",
},
{
"pin1": {
"compName": "_submodelinterface",
- "pinName": "
A
"
+ "pinName": "
B
"
},
"pin2": {
"compName": "GUINandGate#0",
},
"pin2": {
"compName": "GUINandGate#0",
- "pinName": "
A
"
+ "pinName": "
B
"
},
},
- "name": "unnamedWire#
0
"
+ "name": "unnamedWire#
1
"
},
{
"pin1": {
},
{
"pin1": {
- "compName": "GUINandGate#
1
",
+ "compName": "GUINandGate#
0
",
"pinName": "Y"
},
"pin2": {
"pinName": "Y"
},
"pin2": {
- "compName": "
_submodelinterface
",
- "pinName": "
Y
"
+ "compName": "
WireCrossPoint#0
",
+ "pinName": ""
},
},
- "name": "unnamedWire#5"
+ "name": "unnamedWire#2",
+ "path": []
},
{
"pin1": {
},
{
"pin1": {
@@
-100,13
+103,13
@@
mograsim version: 0.1.3
},
"pin2": {
"compName": "GUINandGate#1",
},
"pin2": {
"compName": "GUINandGate#1",
- "pinName": "
B
"
+ "pinName": "
A
"
},
},
- "name": "unnamedWire#
4
",
+ "name": "unnamedWire#
3
",
"path": [
{
"x": 45.0,
"path": [
{
"x": 45.0,
- "y":
3
0.0
+ "y":
2
0.0
}
]
},
}
]
},
@@
-117,31
+120,31
@@
mograsim version: 0.1.3
},
"pin2": {
"compName": "GUINandGate#1",
},
"pin2": {
"compName": "GUINandGate#1",
- "pinName": "
A
"
+ "pinName": "
B
"
},
},
- "name": "unnamedWire#
3
",
+ "name": "unnamedWire#
4
",
"path": [
{
"x": 45.0,
"path": [
{
"x": 45.0,
- "y":
2
0.0
+ "y":
3
0.0
}
]
},
{
"pin1": {
}
]
},
{
"pin1": {
- "compName": "GUINandGate#
0
",
+ "compName": "GUINandGate#
1
",
"pinName": "Y"
},
"pin2": {
"pinName": "Y"
},
"pin2": {
- "compName": "
WireCrossPoint#0
",
- "pinName": ""
+ "compName": "
_submodelinterface
",
+ "pinName": "
Y
"
},
},
- "name": "unnamedWire#2",
- "path": []
+ "name": "unnamedWire#5"
}
}
- ]
+ ],
+ "version": "0.1.1"
},
},
- "symbolRendererSnippetID": "
class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "GUIand",
"centerTextHeight": 5.0,
"symbolRendererParams": {
"centerText": "GUIand",
"centerTextHeight": 5.0,
@@
-149,5
+152,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