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
/
GUIor_4.json
diff --git
a/net.mograsim.logic.ui.am2900/components/GUIor_4.json
b/net.mograsim.logic.ui.am2900/components/GUIor_4.json
index
7db8660
..
86b4413
100644
(file)
--- a/
net.mograsim.logic.ui.am2900/components/GUIor_4.json
+++ b/
net.mograsim.logic.ui.am2900/components/GUIor_4.json
@@
-106,260
+106,280
@@
mograsim version: 0.1.3
{
"pos": {
"x": 15.0,
{
"pos": {
"x": 15.0,
- "y": 2.5
+ "y": 2
7
.5
},
"id": "GUINandGate",
},
"id": "GUINandGate",
+ "name": "GUINandGate#1",
"params": 1
},
{
"pos": {
"x": 15.0,
"params": 1
},
{
"pos": {
"x": 15.0,
- "y": 2
7
.5
+ "y": 2.5
},
"id": "GUINandGate",
},
"id": "GUINandGate",
+ "name": "GUINandGate#0",
"params": 1
},
{
"pos": {
"x": 15.0,
"params": 1
},
{
"pos": {
"x": 15.0,
- "y":
52
.5
+ "y":
77
.5
},
"id": "GUINandGate",
},
"id": "GUINandGate",
+ "name": "GUINandGate#3",
"params": 1
},
{
"pos": {
"x": 15.0,
"params": 1
},
{
"pos": {
"x": 15.0,
- "y":
77
.5
+ "y":
52
.5
},
"id": "GUINandGate",
},
"id": "GUINandGate",
+ "name": "GUINandGate#2",
"params": 1
},
{
"pos": {
"params": 1
},
{
"pos": {
- "x":
1
5.0,
- "y":
102
.5
+ "x":
6
5.0,
+ "y":
77
.5
},
"id": "GUINandGate",
},
"id": "GUINandGate",
+ "name": "GUINandGate#11",
"params": 1
},
{
"pos": {
"params": 1
},
{
"pos": {
- "x":
1
5.0,
- "y":
127
.5
+ "x":
6
5.0,
+ "y":
52
.5
},
"id": "GUINandGate",
},
"id": "GUINandGate",
+ "name": "GUINandGate#10",
"params": 1
},
{
"pos": {
"params": 1
},
{
"pos": {
- "x":
15.0
,
- "y":
152
.5
+ "x":
6.5
,
+ "y":
36
.5
},
},
- "id": "GUINandGate",
+ "id": "WireCrossPoint",
+ "name": "WireCrossPoint#1",
"params": 1
},
{
"pos": {
"params": 1
},
{
"pos": {
- "x":
15.0
,
- "y": 1
77
.5
+ "x":
6.5
,
+ "y": 1
1
.5
},
},
- "id": "GUINandGate",
+ "id": "WireCrossPoint",
+ "name": "WireCrossPoint#0",
"params": 1
},
{
"pos": {
"params": 1
},
{
"pos": {
- "x": 6
5.0
,
- "y":
2
.5
+ "x": 6
.5
,
+ "y":
86
.5
},
},
- "id": "GUINandGate",
+ "id": "WireCrossPoint",
+ "name": "WireCrossPoint#3",
"params": 1
},
{
"pos": {
"params": 1
},
{
"pos": {
- "x": 6
5.0
,
- "y":
27
.5
+ "x": 6
.5
,
+ "y":
61
.5
},
},
- "id": "GUINandGate",
+ "id": "WireCrossPoint",
+ "name": "WireCrossPoint#2",
"params": 1
},
{
"pos": {
"params": 1
},
{
"pos": {
- "x": 6
5.0
,
- "y":
52
.5
+ "x": 6
.5
,
+ "y":
136
.5
},
},
- "id": "GUINandGate",
+ "id": "WireCrossPoint",
+ "name": "WireCrossPoint#5",
"params": 1
},
{
"pos": {
"params": 1
},
{
"pos": {
- "x": 6
5.0
,
- "y":
77
.5
+ "x": 6
.5
,
+ "y":
111
.5
},
},
- "id": "GUINandGate",
+ "id": "WireCrossPoint",
+ "name": "WireCrossPoint#4",
"params": 1
},
{
"pos": {
"params": 1
},
{
"pos": {
- "x": 6
.5
,
- "y":
11
.5
+ "x": 6
5.0
,
+ "y":
27
.5
},
},
- "id": "WireCrossPoint",
+ "id": "GUINandGate",
+ "name": "GUINandGate#9",
"params": 1
},
{
"pos": {
"x": 6.5,
"params": 1
},
{
"pos": {
"x": 6.5,
- "y":
3
6.5
+ "y":
18
6.5
},
"id": "WireCrossPoint",
},
"id": "WireCrossPoint",
+ "name": "WireCrossPoint#7",
"params": 1
},
{
"pos": {
"params": 1
},
{
"pos": {
- "x": 6
.5
,
- "y":
61
.5
+ "x": 6
5.0
,
+ "y":
2
.5
},
},
- "id": "WireCrossPoint",
+ "id": "GUINandGate",
+ "name": "GUINandGate#8",
"params": 1
},
{
"pos": {
"x": 6.5,
"params": 1
},
{
"pos": {
"x": 6.5,
- "y":
86
.5
+ "y":
161
.5
},
"id": "WireCrossPoint",
},
"id": "WireCrossPoint",
+ "name": "WireCrossPoint#6",
"params": 1
},
{
"pos": {
"params": 1
},
{
"pos": {
- "x":
6.5
,
- "y": 1
11
.5
+ "x":
15.0
,
+ "y": 1
27
.5
},
},
- "id": "WireCrossPoint",
+ "id": "GUINandGate",
+ "name": "GUINandGate#5",
"params": 1
},
{
"pos": {
"params": 1
},
{
"pos": {
- "x":
6.5
,
- "y": 1
36
.5
+ "x":
15.0
,
+ "y": 1
02
.5
},
},
- "id": "WireCrossPoint",
+ "id": "GUINandGate",
+ "name": "GUINandGate#4",
"params": 1
},
{
"pos": {
"params": 1
},
{
"pos": {
- "x":
6.5
,
- "y": 1
61
.5
+ "x":
15.0
,
+ "y": 1
77
.5
},
},
- "id": "WireCrossPoint",
+ "id": "GUINandGate",
+ "name": "GUINandGate#7",
"params": 1
},
{
"pos": {
"params": 1
},
{
"pos": {
- "x":
6.5
,
- "y": 1
86
.5
+ "x":
15.0
,
+ "y": 1
52
.5
},
},
- "id": "WireCrossPoint",
+ "id": "GUINandGate",
+ "name": "GUINandGate#6",
"params": 1
}
],
"innerWires": [
{
"pin1": {
"params": 1
}
],
"innerWires": [
{
"pin1": {
- "comp
Id": 0
,
+ "comp
Name": "_submodelinterface"
,
"pinName": "A1"
},
"pin2": {
"pinName": "A1"
},
"pin2": {
- "comp
Id": 13
,
+ "comp
Name": "WireCrossPoint#0"
,
"pinName": ""
},
"path": []
},
{
"pin1": {
"pinName": ""
},
"path": []
},
{
"pin1": {
- "comp
Id": 0
,
+ "comp
Name": "_submodelinterface"
,
"pinName": "A2"
},
"pin2": {
"pinName": "A2"
},
"pin2": {
- "comp
Id": 14
,
+ "comp
Name": "WireCrossPoint#1"
,
"pinName": ""
},
"path": []
},
{
"pin1": {
"pinName": ""
},
"path": []
},
{
"pin1": {
- "comp
Id": 0
,
+ "comp
Name": "_submodelinterface"
,
"pinName": "A3"
},
"pin2": {
"pinName": "A3"
},
"pin2": {
- "comp
Id": 15
,
+ "comp
Name": "WireCrossPoint#2"
,
"pinName": ""
},
"path": []
},
{
"pin1": {
"pinName": ""
},
"path": []
},
{
"pin1": {
- "comp
Id": 0
,
+ "comp
Name": "_submodelinterface"
,
"pinName": "A4"
},
"pin2": {
"pinName": "A4"
},
"pin2": {
- "comp
Id": 16
,
+ "comp
Name": "WireCrossPoint#3"
,
"pinName": ""
},
"path": []
},
{
"pin1": {
"pinName": ""
},
"path": []
},
{
"pin1": {
- "comp
Id": 0
,
+ "comp
Name": "_submodelinterface"
,
"pinName": "B1"
},
"pin2": {
"pinName": "B1"
},
"pin2": {
- "comp
Id": 17
,
+ "comp
Name": "WireCrossPoint#4"
,
"pinName": ""
},
"path": []
},
{
"pin1": {
"pinName": ""
},
"path": []
},
{
"pin1": {
- "comp
Id": 0
,
+ "comp
Name": "_submodelinterface"
,
"pinName": "B2"
},
"pin2": {
"pinName": "B2"
},
"pin2": {
- "comp
Id": 18
,
+ "comp
Name": "WireCrossPoint#5"
,
"pinName": ""
},
"path": []
},
{
"pin1": {
"pinName": ""
},
"path": []
},
{
"pin1": {
- "comp
Id": 0
,
+ "comp
Name": "_submodelinterface"
,
"pinName": "B3"
},
"pin2": {
"pinName": "B3"
},
"pin2": {
- "comp
Id": 19
,
+ "comp
Name": "WireCrossPoint#6"
,
"pinName": ""
},
"path": []
},
{
"pin1": {
"pinName": ""
},
"path": []
},
{
"pin1": {
- "comp
Id": 0
,
+ "comp
Name": "_submodelinterface"
,
"pinName": "B4"
},
"pin2": {
"pinName": "B4"
},
"pin2": {
- "comp
Id": 20
,
+ "comp
Name": "WireCrossPoint#7"
,
"pinName": ""
},
"path": []
},
{
"pin1": {
"pinName": ""
},
"path": []
},
{
"pin1": {
- "comp
Id": 13
,
+ "comp
Name": "WireCrossPoint#0"
,
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "comp
Id": 1
,
+ "comp
Name": "GUINandGate#0"
,
"pinName": "A"
},
"path": [
"pinName": "A"
},
"path": [
@@
-371,11
+391,11
@@
mograsim version: 0.1.3
},
{
"pin1": {
},
{
"pin1": {
- "comp
Id": 13
,
+ "comp
Name": "WireCrossPoint#0"
,
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "comp
Id": 1
,
+ "comp
Name": "GUINandGate#0"
,
"pinName": "B"
},
"path": [
"pinName": "B"
},
"path": [
@@
-387,11
+407,11
@@
mograsim version: 0.1.3
},
{
"pin1": {
},
{
"pin1": {
- "comp
Id": 14
,
+ "comp
Name": "WireCrossPoint#1"
,
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "comp
Id": 2
,
+ "comp
Name": "GUINandGate#1"
,
"pinName": "A"
},
"path": [
"pinName": "A"
},
"path": [
@@
-403,11
+423,11
@@
mograsim version: 0.1.3
},
{
"pin1": {
},
{
"pin1": {
- "comp
Id": 14
,
+ "comp
Name": "WireCrossPoint#1"
,
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "comp
Id": 2
,
+ "comp
Name": "GUINandGate#1"
,
"pinName": "B"
},
"path": [
"pinName": "B"
},
"path": [
@@
-419,11
+439,11
@@
mograsim version: 0.1.3
},
{
"pin1": {
},
{
"pin1": {
- "comp
Id": 15
,
+ "comp
Name": "WireCrossPoint#2"
,
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "comp
Id": 3
,
+ "comp
Name": "GUINandGate#2"
,
"pinName": "A"
},
"path": [
"pinName": "A"
},
"path": [
@@
-435,11
+455,11
@@
mograsim version: 0.1.3
},
{
"pin1": {
},
{
"pin1": {
- "comp
Id": 15
,
+ "comp
Name": "WireCrossPoint#2"
,
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "comp
Id": 3
,
+ "comp
Name": "GUINandGate#2"
,
"pinName": "B"
},
"path": [
"pinName": "B"
},
"path": [
@@
-451,11
+471,11
@@
mograsim version: 0.1.3
},
{
"pin1": {
},
{
"pin1": {
- "comp
Id": 16
,
+ "comp
Name": "WireCrossPoint#3"
,
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "comp
Id": 4
,
+ "comp
Name": "GUINandGate#3"
,
"pinName": "A"
},
"path": [
"pinName": "A"
},
"path": [
@@
-467,11
+487,11
@@
mograsim version: 0.1.3
},
{
"pin1": {
},
{
"pin1": {
- "comp
Id": 16
,
+ "comp
Name": "WireCrossPoint#3"
,
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "comp
Id": 4
,
+ "comp
Name": "GUINandGate#3"
,
"pinName": "B"
},
"path": [
"pinName": "B"
},
"path": [
@@
-483,11
+503,11
@@
mograsim version: 0.1.3
},
{
"pin1": {
},
{
"pin1": {
- "comp
Id": 17
,
+ "comp
Name": "WireCrossPoint#4"
,
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "comp
Id": 5
,
+ "comp
Name": "GUINandGate#4"
,
"pinName": "A"
},
"path": [
"pinName": "A"
},
"path": [
@@
-499,11
+519,11
@@
mograsim version: 0.1.3
},
{
"pin1": {
},
{
"pin1": {
- "comp
Id": 17
,
+ "comp
Name": "WireCrossPoint#4"
,
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "comp
Id": 5
,
+ "comp
Name": "GUINandGate#4"
,
"pinName": "B"
},
"path": [
"pinName": "B"
},
"path": [
@@
-515,11
+535,11
@@
mograsim version: 0.1.3
},
{
"pin1": {
},
{
"pin1": {
- "comp
Id": 18
,
+ "comp
Name": "WireCrossPoint#5"
,
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "comp
Id": 6
,
+ "comp
Name": "GUINandGate#5"
,
"pinName": "A"
},
"path": [
"pinName": "A"
},
"path": [
@@
-531,11
+551,11
@@
mograsim version: 0.1.3
},
{
"pin1": {
},
{
"pin1": {
- "comp
Id": 18
,
+ "comp
Name": "WireCrossPoint#5"
,
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "comp
Id": 6
,
+ "comp
Name": "GUINandGate#5"
,
"pinName": "B"
},
"path": [
"pinName": "B"
},
"path": [
@@
-547,11
+567,11
@@
mograsim version: 0.1.3
},
{
"pin1": {
},
{
"pin1": {
- "comp
Id": 19
,
+ "comp
Name": "WireCrossPoint#6"
,
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "comp
Id": 7
,
+ "comp
Name": "GUINandGate#6"
,
"pinName": "A"
},
"path": [
"pinName": "A"
},
"path": [
@@
-563,11
+583,11
@@
mograsim version: 0.1.3
},
{
"pin1": {
},
{
"pin1": {
- "comp
Id": 19
,
+ "comp
Name": "WireCrossPoint#6"
,
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "comp
Id": 7
,
+ "comp
Name": "GUINandGate#6"
,
"pinName": "B"
},
"path": [
"pinName": "B"
},
"path": [
@@
-579,11
+599,11
@@
mograsim version: 0.1.3
},
{
"pin1": {
},
{
"pin1": {
- "comp
Id": 20
,
+ "comp
Name": "WireCrossPoint#7"
,
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "comp
Id": 8
,
+ "comp
Name": "GUINandGate#7"
,
"pinName": "A"
},
"path": [
"pinName": "A"
},
"path": [
@@
-595,11
+615,11
@@
mograsim version: 0.1.3
},
{
"pin1": {
},
{
"pin1": {
- "comp
Id": 20
,
+ "comp
Name": "WireCrossPoint#7"
,
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "comp
Id": 8
,
+ "comp
Name": "GUINandGate#7"
,
"pinName": "B"
},
"path": [
"pinName": "B"
},
"path": [
@@
-611,11
+631,11
@@
mograsim version: 0.1.3
},
{
"pin1": {
},
{
"pin1": {
- "comp
Id": 1
,
+ "comp
Name": "GUINandGate#0"
,
"pinName": "Y"
},
"pin2": {
"pinName": "Y"
},
"pin2": {
- "comp
Id": 9
,
+ "comp
Name": "GUINandGate#8"
,
"pinName": "A"
},
"path": [
"pinName": "A"
},
"path": [
@@
-631,11
+651,11
@@
mograsim version: 0.1.3
},
{
"pin1": {
},
{
"pin1": {
- "comp
Id": 5
,
+ "comp
Name": "GUINandGate#4"
,
"pinName": "Y"
},
"pin2": {
"pinName": "Y"
},
"pin2": {
- "comp
Id": 9
,
+ "comp
Name": "GUINandGate#8"
,
"pinName": "B"
},
"path": [
"pinName": "B"
},
"path": [
@@
-651,11
+671,11
@@
mograsim version: 0.1.3
},
{
"pin1": {
},
{
"pin1": {
- "comp
Id": 2
,
+ "comp
Name": "GUINandGate#1"
,
"pinName": "Y"
},
"pin2": {
"pinName": "Y"
},
"pin2": {
- "comp
Id": 10
,
+ "comp
Name": "GUINandGate#9"
,
"pinName": "A"
},
"path": [
"pinName": "A"
},
"path": [
@@
-671,11
+691,11
@@
mograsim version: 0.1.3
},
{
"pin1": {
},
{
"pin1": {
- "comp
Id": 6
,
+ "comp
Name": "GUINandGate#5"
,
"pinName": "Y"
},
"pin2": {
"pinName": "Y"
},
"pin2": {
- "comp
Id": 10
,
+ "comp
Name": "GUINandGate#9"
,
"pinName": "B"
},
"path": [
"pinName": "B"
},
"path": [
@@
-691,11
+711,11
@@
mograsim version: 0.1.3
},
{
"pin1": {
},
{
"pin1": {
- "comp
Id": 3
,
+ "comp
Name": "GUINandGate#2"
,
"pinName": "Y"
},
"pin2": {
"pinName": "Y"
},
"pin2": {
- "comp
Id": 11
,
+ "comp
Name": "GUINandGate#10"
,
"pinName": "A"
},
"path": [
"pinName": "A"
},
"path": [
@@
-711,11
+731,11
@@
mograsim version: 0.1.3
},
{
"pin1": {
},
{
"pin1": {
- "comp
Id": 7
,
+ "comp
Name": "GUINandGate#6"
,
"pinName": "Y"
},
"pin2": {
"pinName": "Y"
},
"pin2": {
- "comp
Id": 11
,
+ "comp
Name": "GUINandGate#10"
,
"pinName": "B"
},
"path": [
"pinName": "B"
},
"path": [
@@
-731,11
+751,11
@@
mograsim version: 0.1.3
},
{
"pin1": {
},
{
"pin1": {
- "comp
Id": 4
,
+ "comp
Name": "GUINandGate#3"
,
"pinName": "Y"
},
"pin2": {
"pinName": "Y"
},
"pin2": {
- "comp
Id": 12
,
+ "comp
Name": "GUINandGate#11"
,
"pinName": "A"
},
"path": [
"pinName": "A"
},
"path": [
@@
-751,11
+771,11
@@
mograsim version: 0.1.3
},
{
"pin1": {
},
{
"pin1": {
- "comp
Id": 8
,
+ "comp
Name": "GUINandGate#7"
,
"pinName": "Y"
},
"pin2": {
"pinName": "Y"
},
"pin2": {
- "comp
Id": 12
,
+ "comp
Name": "GUINandGate#11"
,
"pinName": "B"
},
"path": [
"pinName": "B"
},
"path": [
@@
-771,44
+791,44
@@
mograsim version: 0.1.3
},
{
"pin1": {
},
{
"pin1": {
- "comp
Id": 9
,
+ "comp
Name": "GUINandGate#8"
,
"pinName": "Y"
},
"pin2": {
"pinName": "Y"
},
"pin2": {
- "comp
Id": 0
,
+ "comp
Name": "_submodelinterface"
,
"pinName": "Y1"
},
"path": []
},
{
"pin1": {
"pinName": "Y1"
},
"path": []
},
{
"pin1": {
- "comp
Id": 10
,
+ "comp
Name": "GUINandGate#9"
,
"pinName": "Y"
},
"pin2": {
"pinName": "Y"
},
"pin2": {
- "comp
Id": 0
,
+ "comp
Name": "_submodelinterface"
,
"pinName": "Y2"
},
"path": []
},
{
"pin1": {
"pinName": "Y2"
},
"path": []
},
{
"pin1": {
- "comp
Id": 11
,
+ "comp
Name": "GUINandGate#10"
,
"pinName": "Y"
},
"pin2": {
"pinName": "Y"
},
"pin2": {
- "comp
Id": 0
,
+ "comp
Name": "_submodelinterface"
,
"pinName": "Y3"
},
"path": []
},
{
"pin1": {
"pinName": "Y3"
},
"path": []
},
{
"pin1": {
- "comp
Id": 12
,
+ "comp
Name": "GUINandGate#11"
,
"pinName": "Y"
},
"pin2": {
"pinName": "Y"
},
"pin2": {
- "comp
Id": 0
,
+ "comp
Name": "_submodelinterface"
,
"pinName": "Y4"
},
"path": []
"pinName": "Y4"
},
"path": []