projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
TextComponent now only calculates its size once => speedup
[Mograsim.git]
/
net.mograsim.logic.model.am2900
/
components
/
GUImux1.json
diff --git
a/net.mograsim.logic.model.am2900/components/GUImux1.json
b/net.mograsim.logic.model.am2900/components/GUImux1.json
index
60b22cd
..
279f905
100644
(file)
--- a/
net.mograsim.logic.model.am2900/components/GUImux1.json
+++ b/
net.mograsim.logic.model.am2900/components/GUImux1.json
@@
-1,4
+1,3
@@
-mograsim version: 0.1.3
{
"width": 35.0,
"height": 30.0,
{
"width": 35.0,
"height": 30.0,
@@
-9,7
+8,8
@@
mograsim version: 0.1.3
"y": 15.0
},
"name": "I0",
"y": 15.0
},
"name": "I0",
- "logicWidth": 1
+ "logicWidth": 1,
+ "usage": "INPUT"
},
{
"location": {
},
{
"location": {
@@
-17,84
+17,87
@@
mograsim version: 0.1.3
"y": 25.0
},
"name": "I1",
"y": 25.0
},
"name": "I1",
- "logicWidth": 1
+ "logicWidth": 1,
+ "usage": "INPUT"
},
{
"location": {
},
{
"location": {
- "x":
35
.0,
+ "x":
0
.0,
"y": 5.0
},
"y": 5.0
},
- "name": "Y",
- "logicWidth": 1
+ "name": "S0",
+ "logicWidth": 1,
+ "usage": "INPUT"
},
{
"location": {
},
{
"location": {
- "x":
0
.0,
+ "x":
35
.0,
"y": 5.0
},
"y": 5.0
},
- "name": "S0",
- "logicWidth": 1
+ "name": "Y",
+ "logicWidth": 1,
+ "usage": "OUTPUT"
}
],
}
],
+ "innerScale": 0.4,
"submodel": {
"submodel": {
- "innerScale": 0.4,
- "subComps": [
+ "components": [
{
{
- "pos": {
- "x": 35.0,
- "y": 22.5
- },
"id": "GUINandGate",
"id": "GUINandGate",
- "name": "GUINandGate#1",
- "params": 1
- },
- {
+ "name": "GUINandGate#0",
"pos": {
"x": 10.0,
"y": 7.5
},
"pos": {
"x": 10.0,
"y": 7.5
},
- "id": "GUINandGate",
- "name": "GUINandGate#0",
"params": 1
},
{
"params": 1
},
{
+ "id": "GUINandGate",
+ "name": "GUINandGate#1",
"pos": {
"pos": {
- "x":
60
.0,
- "y":
30.0
+ "x":
35
.0,
+ "y":
22.5
},
},
- "id": "GUINandGate",
- "name": "GUINandGate#3",
"params": 1
},
{
"params": 1
},
{
+ "id": "GUINandGate",
+ "name": "GUINandGate#2",
"pos": {
"pos": {
- "x":
4
.0,
- "y":
21
.5
+ "x":
35
.0,
+ "y":
47
.5
},
},
- "id": "WireCrossPoint",
- "name": "WireCrossPoint#1",
"params": 1
},
{
"params": 1
},
{
+ "id": "GUINandGate",
+ "name": "GUINandGate#3",
"pos": {
"pos": {
- "x":
35
.0,
- "y":
47.5
+ "x":
60
.0,
+ "y":
30.0
},
},
- "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
},
+ "params": 1
+ },
+ {
"id": "WireCrossPoint",
"id": "WireCrossPoint",
- "name": "WireCrossPoint#0",
+ "name": "WireCrossPoint#1",
+ "pos": {
+ "x": 4.0,
+ "y": 21.5
+ },
"params": 1
}
],
"params": 1
}
],
- "
innerW
ires": [
+ "
w
ires": [
{
"pin1": {
"compName": "_submodelinterface",
{
"pin1": {
"compName": "_submodelinterface",
@@
-104,6
+107,7
@@
mograsim version: 0.1.3
"compName": "WireCrossPoint#0",
"pinName": ""
},
"compName": "WireCrossPoint#0",
"pinName": ""
},
+ "name": "unnamedWire#0",
"path": []
},
{
"path": []
},
{
@@
-115,8
+119,20
@@
mograsim version: 0.1.3
"compName": "GUINandGate#0",
"pinName": "A"
},
"compName": "GUINandGate#0",
"pinName": "A"
},
+ "name": "unnamedWire#1",
"path": []
},
"path": []
},
+ {
+ "pin1": {
+ "compName": "GUINandGate#3",
+ "pinName": "Y"
+ },
+ "pin2": {
+ "compName": "_submodelinterface",
+ "pinName": "Y"
+ },
+ "name": "unnamedWire#10"
+ },
{
"pin1": {
"compName": "WireCrossPoint#0",
{
"pin1": {
"compName": "WireCrossPoint#0",
@@
-126,6
+142,7
@@
mograsim version: 0.1.3
"compName": "WireCrossPoint#1",
"pinName": ""
},
"compName": "WireCrossPoint#1",
"pinName": ""
},
+ "name": "unnamedWire#2",
"path": []
},
{
"path": []
},
{
@@
-137,6
+154,7
@@
mograsim version: 0.1.3
"compName": "GUINandGate#0",
"pinName": "B"
},
"compName": "GUINandGate#0",
"pinName": "B"
},
+ "name": "unnamedWire#3",
"path": []
},
{
"path": []
},
{
@@
-147,7
+165,8
@@
mograsim version: 0.1.3
"pin2": {
"compName": "GUINandGate#1",
"pinName": "A"
"pin2": {
"compName": "GUINandGate#1",
"pinName": "A"
- }
+ },
+ "name": "unnamedWire#4"
},
{
"pin1": {
},
{
"pin1": {
@@
-158,6
+177,7
@@
mograsim version: 0.1.3
"compName": "GUINandGate#1",
"pinName": "B"
},
"compName": "GUINandGate#1",
"pinName": "B"
},
+ "name": "unnamedWire#5",
"path": []
},
{
"path": []
},
{
@@
-169,6
+189,7
@@
mograsim version: 0.1.3
"compName": "GUINandGate#2",
"pinName": "A"
},
"compName": "GUINandGate#2",
"pinName": "A"
},
+ "name": "unnamedWire#6",
"path": [
{
"x": 5.0,
"path": [
{
"x": 5.0,
@@
-185,6
+206,7
@@
mograsim version: 0.1.3
"compName": "GUINandGate#2",
"pinName": "B"
},
"compName": "GUINandGate#2",
"pinName": "B"
},
+ "name": "unnamedWire#7",
"path": []
},
{
"path": []
},
{
@@
-195,7
+217,8
@@
mograsim version: 0.1.3
"pin2": {
"compName": "GUINandGate#3",
"pinName": "A"
"pin2": {
"compName": "GUINandGate#3",
"pinName": "A"
- }
+ },
+ "name": "unnamedWire#8"
},
{
"pin1": {
},
{
"pin1": {
@@
-205,19
+228,11
@@
mograsim version: 0.1.3
"pin2": {
"compName": "GUINandGate#3",
"pinName": "B"
"pin2": {
"compName": "GUINandGate#3",
"pinName": "B"
- }
- },
- {
- "pin1": {
- "compName": "GUINandGate#3",
- "pinName": "Y"
},
},
- "pin2": {
- "compName": "_submodelinterface",
- "pinName": "Y"
- }
+ "name": "unnamedWire#9"
}
}
- ]
+ ],
+ "version": "0.1.1"
},
"symbolRendererSnippetID": "simpleRectangularLike",
"symbolRendererParams": {
},
"symbolRendererSnippetID": "simpleRectangularLike",
"symbolRendererParams": {
@@
-226,5
+241,8
@@
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",
+ "highLevelStateHandlerSnippetID": "default",
+ "version": "0.1.5"
}
\ No newline at end of file
}
\ No newline at end of file