projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
GUIComponents now have names
[Mograsim.git]
/
net.mograsim.logic.ui.am2900
/
components
/
GUIdemux2.json
diff --git
a/net.mograsim.logic.ui.am2900/components/GUIdemux2.json
b/net.mograsim.logic.ui.am2900/components/GUIdemux2.json
index
13ff969
..
5ded84b
100644
(file)
--- a/
net.mograsim.logic.ui.am2900/components/GUIdemux2.json
+++ b/
net.mograsim.logic.ui.am2900/components/GUIdemux2.json
@@
-58,17
+58,19
@@
mograsim version: 0.1.3
{
"pos": {
"x": 10.0,
{
"pos": {
"x": 10.0,
- "y": 2.5
+ "y": 2
7
.5
},
"id": "GUINandGate",
},
"id": "GUINandGate",
+ "name": "GUINandGate#1",
"params": 1
},
{
"pos": {
"x": 10.0,
"params": 1
},
{
"pos": {
"x": 10.0,
- "y": 2
7
.5
+ "y": 2.5
},
"id": "GUINandGate",
},
"id": "GUINandGate",
+ "name": "GUINandGate#0",
"params": 1
},
{
"params": 1
},
{
@@
-76,36
+78,32
@@
mograsim version: 0.1.3
"x": 40.0,
"y": 2.5
},
"x": 40.0,
"y": 2.5
},
- "id": "GUIand"
+ "id": "GUIand",
+ "name": "GUIand#0"
},
{
"pos": {
"x": 40.0,
},
{
"pos": {
"x": 40.0,
- "y":
27
.5
+ "y":
52
.5
},
},
- "id": "GUIand"
+ "id": "GUIand",
+ "name": "GUIand#2"
},
{
"pos": {
"x": 40.0,
},
{
"pos": {
"x": 40.0,
- "y":
52
.5
+ "y":
27
.5
},
},
- "id": "GUIand"
+ "id": "GUIand",
+ "name": "GUIand#1"
},
{
"pos": {
"x": 40.0,
"y": 77.5
},
},
{
"pos": {
"x": 40.0,
"y": 77.5
},
- "id": "GUIand"
- },
- {
- "pos": {
- "x": 6.5,
- "y": 11.5
- },
- "id": "WireCrossPoint",
- "params": 1
+ "id": "GUIand",
+ "name": "GUIand#3"
},
{
"pos": {
},
{
"pos": {
@@
-113,14
+111,16
@@
mograsim version: 0.1.3
"y": 16.5
},
"id": "WireCrossPoint",
"y": 16.5
},
"id": "WireCrossPoint",
+ "name": "WireCrossPoint#1",
"params": 1
},
{
"pos": {
"params": 1
},
{
"pos": {
- "x":
3
6.5,
- "y":
6
1.5
+ "x": 6.5,
+ "y":
1
1.5
},
"id": "WireCrossPoint",
},
"id": "WireCrossPoint",
+ "name": "WireCrossPoint#0",
"params": 1
},
{
"params": 1
},
{
@@
-129,14
+129,16
@@
mograsim version: 0.1.3
"y": 36.5
},
"id": "WireCrossPoint",
"y": 36.5
},
"id": "WireCrossPoint",
+ "name": "WireCrossPoint#3",
"params": 1
},
{
"pos": {
"params": 1
},
{
"pos": {
- "x":
4.0
,
- "y":
4
1.5
+ "x":
36.5
,
+ "y":
6
1.5
},
"id": "WireCrossPoint",
},
"id": "WireCrossPoint",
+ "name": "WireCrossPoint#2",
"params": 1
},
{
"params": 1
},
{
@@
-145,14
+147,16
@@
mograsim version: 0.1.3
"y": 66.5
},
"id": "WireCrossPoint",
"y": 66.5
},
"id": "WireCrossPoint",
+ "name": "WireCrossPoint#5",
"params": 1
},
{
"pos": {
"params": 1
},
{
"pos": {
- "x":
31.5
,
- "y":
1
1.5
+ "x":
4.0
,
+ "y":
4
1.5
},
"id": "WireCrossPoint",
},
"id": "WireCrossPoint",
+ "name": "WireCrossPoint#4",
"params": 1
},
{
"params": 1
},
{
@@
-161,39
+165,49
@@
mograsim version: 0.1.3
"y": 36.5
},
"id": "WireCrossPoint",
"y": 36.5
},
"id": "WireCrossPoint",
+ "name": "WireCrossPoint#7",
+ "params": 1
+ },
+ {
+ "pos": {
+ "x": 31.5,
+ "y": 11.5
+ },
+ "id": "WireCrossPoint",
+ "name": "WireCrossPoint#6",
"params": 1
}
],
"innerWires": [
{
"pin1": {
"params": 1
}
],
"innerWires": [
{
"pin1": {
- "comp
Id": 0
,
+ "comp
Name": "_submodelinterface"
,
"pinName": "S0"
},
"pin2": {
"pinName": "S0"
},
"pin2": {
- "comp
Id": 7
,
+ "comp
Name": "WireCrossPoint#0"
,
"pinName": ""
},
"path": []
},
{
"pin1": {
"pinName": ""
},
"path": []
},
{
"pin1": {
- "comp
Id": 0
,
+ "comp
Name": "_submodelinterface"
,
"pinName": "S1"
},
"pin2": {
"pinName": "S1"
},
"pin2": {
- "comp
Id": 10
,
+ "comp
Name": "WireCrossPoint#3"
,
"pinName": ""
},
"path": []
},
{
"pin1": {
"pinName": ""
},
"path": []
},
{
"pin1": {
- "comp
Id": 7
,
+ "comp
Name": "WireCrossPoint#0"
,
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "comp
Id": 1
,
+ "comp
Name": "GUINandGate#0"
,
"pinName": "A"
},
"path": [
"pinName": "A"
},
"path": [
@@
-205,11
+219,11
@@
mograsim version: 0.1.3
},
{
"pin1": {
},
{
"pin1": {
- "comp
Id": 10
,
+ "comp
Name": "WireCrossPoint#3"
,
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "comp
Id": 2
,
+ "comp
Name": "GUINandGate#1"
,
"pinName": "A"
},
"path": [
"pinName": "A"
},
"path": [
@@
-221,55
+235,55
@@
mograsim version: 0.1.3
},
{
"pin1": {
},
{
"pin1": {
- "comp
Id": 7
,
+ "comp
Name": "WireCrossPoint#0"
,
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "comp
Id": 8
,
+ "comp
Name": "WireCrossPoint#1"
,
"pinName": ""
},
"path": []
},
{
"pin1": {
"pinName": ""
},
"path": []
},
{
"pin1": {
- "comp
Id": 10
,
+ "comp
Name": "WireCrossPoint#3"
,
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "comp
Id": 11
,
+ "comp
Name": "WireCrossPoint#4"
,
"pinName": ""
},
"path": []
},
{
"pin1": {
"pinName": ""
},
"path": []
},
{
"pin1": {
- "comp
Id": 8
,
+ "comp
Name": "WireCrossPoint#1"
,
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "comp
Id": 1
,
+ "comp
Name": "GUINandGate#0"
,
"pinName": "B"
},
"path": []
},
{
"pin1": {
"pinName": "B"
},
"path": []
},
{
"pin1": {
- "comp
Id": 11
,
+ "comp
Name": "WireCrossPoint#4"
,
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "comp
Id": 2
,
+ "comp
Name": "GUINandGate#1"
,
"pinName": "B"
},
"path": []
},
{
"pin1": {
"pinName": "B"
},
"path": []
},
{
"pin1": {
- "comp
Id": 8
,
+ "comp
Name": "WireCrossPoint#1"
,
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "comp
Id": 9
,
+ "comp
Name": "WireCrossPoint#2"
,
"pinName": ""
},
"path": [
"pinName": ""
},
"path": [
@@
-281,11
+295,11
@@
mograsim version: 0.1.3
},
{
"pin1": {
},
{
"pin1": {
- "comp
Id": 11
,
+ "comp
Name": "WireCrossPoint#4"
,
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "comp
Id": 12
,
+ "comp
Name": "WireCrossPoint#5"
,
"pinName": ""
},
"path": [
"pinName": ""
},
"path": [
@@
-301,33
+315,33
@@
mograsim version: 0.1.3
},
{
"pin1": {
},
{
"pin1": {
- "comp
Id": 1
,
+ "comp
Name": "GUINandGate#0"
,
"pinName": "Y"
},
"pin2": {
"pinName": "Y"
},
"pin2": {
- "comp
Id": 13
,
+ "comp
Name": "WireCrossPoint#6"
,
"pinName": ""
},
"path": []
},
{
"pin1": {
"pinName": ""
},
"path": []
},
{
"pin1": {
- "comp
Id": 2
,
+ "comp
Name": "GUINandGate#1"
,
"pinName": "Y"
},
"pin2": {
"pinName": "Y"
},
"pin2": {
- "comp
Id": 14
,
+ "comp
Name": "WireCrossPoint#7"
,
"pinName": ""
},
"path": []
},
{
"pin1": {
"pinName": ""
},
"path": []
},
{
"pin1": {
- "comp
Id": 13
,
+ "comp
Name": "WireCrossPoint#6"
,
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "comp
Id": 3
,
+ "comp
Name": "GUIand#0"
,
"pinName": "A"
},
"path": [
"pinName": "A"
},
"path": [
@@
-339,11
+353,11
@@
mograsim version: 0.1.3
},
{
"pin1": {
},
{
"pin1": {
- "comp
Id": 14
,
+ "comp
Name": "WireCrossPoint#7"
,
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "comp
Id": 3
,
+ "comp
Name": "GUIand#0"
,
"pinName": "B"
},
"path": [
"pinName": "B"
},
"path": [
@@
-355,11
+369,11
@@
mograsim version: 0.1.3
},
{
"pin1": {
},
{
"pin1": {
- "comp
Id": 9
,
+ "comp
Name": "WireCrossPoint#2"
,
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "comp
Id": 4
,
+ "comp
Name": "GUIand#1"
,
"pinName": "A"
},
"path": [
"pinName": "A"
},
"path": [
@@
-371,11
+385,11
@@
mograsim version: 0.1.3
},
{
"pin1": {
},
{
"pin1": {
- "comp
Id": 14
,
+ "comp
Name": "WireCrossPoint#7"
,
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "comp
Id": 4
,
+ "comp
Name": "GUIand#1"
,
"pinName": "B"
},
"path": [
"pinName": "B"
},
"path": [
@@
-387,11
+401,11
@@
mograsim version: 0.1.3
},
{
"pin1": {
},
{
"pin1": {
- "comp
Id": 13
,
+ "comp
Name": "WireCrossPoint#6"
,
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "comp
Id": 5
,
+ "comp
Name": "GUIand#2"
,
"pinName": "A"
},
"path": [
"pinName": "A"
},
"path": [
@@
-403,22
+417,22
@@
mograsim version: 0.1.3
},
{
"pin1": {
},
{
"pin1": {
- "comp
Id": 12
,
+ "comp
Name": "WireCrossPoint#5"
,
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "comp
Id": 5
,
+ "comp
Name": "GUIand#2"
,
"pinName": "B"
},
"path": []
},
{
"pin1": {
"pinName": "B"
},
"path": []
},
{
"pin1": {
- "comp
Id": 9
,
+ "comp
Name": "WireCrossPoint#2"
,
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "comp
Id": 6
,
+ "comp
Name": "GUIand#3"
,
"pinName": "A"
},
"path": [
"pinName": "A"
},
"path": [
@@
-430,11
+444,11
@@
mograsim version: 0.1.3
},
{
"pin1": {
},
{
"pin1": {
- "comp
Id": 12
,
+ "comp
Name": "WireCrossPoint#5"
,
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "comp
Id": 6
,
+ "comp
Name": "GUIand#3"
,
"pinName": "B"
},
"path": [
"pinName": "B"
},
"path": [
@@
-446,41
+460,41
@@
mograsim version: 0.1.3
},
{
"pin1": {
},
{
"pin1": {
- "comp
Id": 3
,
+ "comp
Name": "GUIand#0"
,
"pinName": "Y"
},
"pin2": {
"pinName": "Y"
},
"pin2": {
- "comp
Id": 0
,
+ "comp
Name": "_submodelinterface"
,
"pinName": "Y00"
}
},
{
"pin1": {
"pinName": "Y00"
}
},
{
"pin1": {
- "comp
Id": 4
,
+ "comp
Name": "GUIand#1"
,
"pinName": "Y"
},
"pin2": {
"pinName": "Y"
},
"pin2": {
- "comp
Id": 0
,
+ "comp
Name": "_submodelinterface"
,
"pinName": "Y01"
}
},
{
"pin1": {
"pinName": "Y01"
}
},
{
"pin1": {
- "comp
Id": 5
,
+ "comp
Name": "GUIand#2"
,
"pinName": "Y"
},
"pin2": {
"pinName": "Y"
},
"pin2": {
- "comp
Id": 0
,
+ "comp
Name": "_submodelinterface"
,
"pinName": "Y10"
}
},
{
"pin1": {
"pinName": "Y10"
}
},
{
"pin1": {
- "comp
Id": 6
,
+ "comp
Name": "GUIand#3"
,
"pinName": "Y"
},
"pin2": {
"pinName": "Y"
},
"pin2": {
- "comp
Id": 0
,
+ "comp
Name": "_submodelinterface"
,
"pinName": "Y11"
}
}
"pinName": "Y11"
}
}