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
/
GUIor4.json
diff --git
a/net.mograsim.logic.ui.am2900/components/GUIor4.json
b/net.mograsim.logic.ui.am2900/components/GUIor4.json
index
54933c4
..
d4bcd57
100644
(file)
--- a/
net.mograsim.logic.ui.am2900/components/GUIor4.json
+++ b/
net.mograsim.logic.ui.am2900/components/GUIor4.json
@@
-50,176
+50,191
@@
mograsim version: 0.1.3
{
"pos": {
"x": 20.0,
{
"pos": {
"x": 20.0,
- "y":
1
5.0
+ "y":
6
5.0
},
"id": "GUINandGate",
},
"id": "GUINandGate",
+ "name": "GUINandGate#1",
"params": 1
},
{
"pos": {
"x": 20.0,
"params": 1
},
{
"pos": {
"x": 20.0,
- "y":
6
5.0
+ "y":
1
5.0
},
"id": "GUINandGate",
},
"id": "GUINandGate",
+ "name": "GUINandGate#0",
"params": 1
},
{
"pos": {
"x": 20.0,
"params": 1
},
{
"pos": {
"x": 20.0,
- "y": 1
1
5.0
+ "y": 1
6
5.0
},
"id": "GUINandGate",
},
"id": "GUINandGate",
+ "name": "GUINandGate#3",
"params": 1
},
{
"pos": {
"x": 20.0,
"params": 1
},
{
"pos": {
"x": 20.0,
- "y": 1
6
5.0
+ "y": 1
1
5.0
},
"id": "GUINandGate",
},
"id": "GUINandGate",
+ "name": "GUINandGate#2",
"params": 1
},
{
"pos": {
"params": 1
},
{
"pos": {
- "x":
50
.0,
- "y":
40
.0
+ "x":
14
.0,
+ "y":
74
.0
},
},
- "id": "GUINandGate",
+ "id": "WireCrossPoint",
+ "name": "WireCrossPoint#1",
"params": 1
},
{
"pos": {
"params": 1
},
{
"pos": {
- "x":
50
.0,
- "y":
140
.0
+ "x":
14
.0,
+ "y":
24
.0
},
},
- "id": "GUINandGate",
+ "id": "WireCrossPoint",
+ "name": "WireCrossPoint#0",
"params": 1
},
{
"pos": {
"params": 1
},
{
"pos": {
- "x": 1
10
.0,
- "y":
40
.0
+ "x": 1
4
.0,
+ "y":
174
.0
},
},
- "id": "GUINandGate",
+ "id": "WireCrossPoint",
+ "name": "WireCrossPoint#3",
"params": 1
},
{
"pos": {
"params": 1
},
{
"pos": {
- "x": 1
10
.0,
- "y": 1
40
.0
+ "x": 1
4
.0,
+ "y": 1
24
.0
},
},
- "id": "GUINandGate",
+ "id": "WireCrossPoint",
+ "name": "WireCrossPoint#2",
"params": 1
},
{
"pos": {
"params": 1
},
{
"pos": {
- "x": 1
40
.0,
- "y":
90
.0
+ "x": 1
04
.0,
+ "y":
149
.0
},
},
- "id": "GUINandGate",
+ "id": "WireCrossPoint",
+ "name": "WireCrossPoint#5",
"params": 1
},
{
"pos": {
"params": 1
},
{
"pos": {
- "x": 14.0,
- "y":
24
.0
+ "x": 1
0
4.0,
+ "y":
49
.0
},
"id": "WireCrossPoint",
},
"id": "WireCrossPoint",
+ "name": "WireCrossPoint#4",
"params": 1
},
{
"pos": {
"params": 1
},
{
"pos": {
- "x": 14.0,
- "y":
74
.0
+ "x": 14
0
.0,
+ "y":
90
.0
},
},
- "id": "WireCrossPoint",
+ "id": "GUINandGate",
+ "name": "GUINandGate#8",
"params": 1
},
{
"pos": {
"params": 1
},
{
"pos": {
- "x":
14
.0,
- "y": 1
24
.0
+ "x":
50
.0,
+ "y": 1
40
.0
},
},
- "id": "WireCrossPoint",
+ "id": "GUINandGate",
+ "name": "GUINandGate#5",
"params": 1
},
{
"pos": {
"params": 1
},
{
"pos": {
- "x":
14
.0,
- "y":
174
.0
+ "x":
50
.0,
+ "y":
40
.0
},
},
- "id": "WireCrossPoint",
+ "id": "GUINandGate",
+ "name": "GUINandGate#4",
"params": 1
},
{
"pos": {
"params": 1
},
{
"pos": {
- "x": 1
04
.0,
- "y":
49
.0
+ "x": 1
10
.0,
+ "y":
140
.0
},
},
- "id": "WireCrossPoint",
+ "id": "GUINandGate",
+ "name": "GUINandGate#7",
"params": 1
},
{
"pos": {
"params": 1
},
{
"pos": {
- "x": 1
04
.0,
- "y":
149
.0
+ "x": 1
10
.0,
+ "y":
40
.0
},
},
- "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": 10
,
+ "comp
Name": "WireCrossPoint#0"
,
"pinName": ""
},
"path": []
},
{
"pin1": {
"pinName": ""
},
"path": []
},
{
"pin1": {
- "comp
Id": 0
,
+ "comp
Name": "_submodelinterface"
,
"pinName": "A2"
},
"pin2": {
"pinName": "A2"
},
"pin2": {
- "comp
Id": 11
,
+ "comp
Name": "WireCrossPoint#1"
,
"pinName": ""
},
"path": []
},
{
"pin1": {
"pinName": ""
},
"path": []
},
{
"pin1": {
- "comp
Id": 0
,
+ "comp
Name": "_submodelinterface"
,
"pinName": "A3"
},
"pin2": {
"pinName": "A3"
},
"pin2": {
- "comp
Id": 12
,
+ "comp
Name": "WireCrossPoint#2"
,
"pinName": ""
},
"path": []
},
{
"pin1": {
"pinName": ""
},
"path": []
},
{
"pin1": {
- "comp
Id": 0
,
+ "comp
Name": "_submodelinterface"
,
"pinName": "A4"
},
"pin2": {
"pinName": "A4"
},
"pin2": {
- "comp
Id": 13
,
+ "comp
Name": "WireCrossPoint#3"
,
"pinName": ""
},
"path": []
},
{
"pin1": {
"pinName": ""
},
"path": []
},
{
"pin1": {
- "comp
Id": 10
,
+ "comp
Name": "WireCrossPoint#0"
,
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "comp
Id": 1
,
+ "comp
Name": "GUINandGate#0"
,
"pinName": "A"
},
"path": [
"pinName": "A"
},
"path": [
@@
-231,11
+246,11
@@
mograsim version: 0.1.3
},
{
"pin1": {
},
{
"pin1": {
- "comp
Id": 11
,
+ "comp
Name": "WireCrossPoint#1"
,
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "comp
Id": 2
,
+ "comp
Name": "GUINandGate#1"
,
"pinName": "A"
},
"path": [
"pinName": "A"
},
"path": [
@@
-247,11
+262,11
@@
mograsim version: 0.1.3
},
{
"pin1": {
},
{
"pin1": {
- "comp
Id": 12
,
+ "comp
Name": "WireCrossPoint#2"
,
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "comp
Id": 3
,
+ "comp
Name": "GUINandGate#2"
,
"pinName": "A"
},
"path": [
"pinName": "A"
},
"path": [
@@
-263,11
+278,11
@@
mograsim version: 0.1.3
},
{
"pin1": {
},
{
"pin1": {
- "comp
Id": 13
,
+ "comp
Name": "WireCrossPoint#3"
,
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "comp
Id": 4
,
+ "comp
Name": "GUINandGate#3"
,
"pinName": "A"
},
"path": [
"pinName": "A"
},
"path": [
@@
-279,11
+294,11
@@
mograsim version: 0.1.3
},
{
"pin1": {
},
{
"pin1": {
- "comp
Id": 10
,
+ "comp
Name": "WireCrossPoint#0"
,
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "comp
Id": 1
,
+ "comp
Name": "GUINandGate#0"
,
"pinName": "B"
},
"path": [
"pinName": "B"
},
"path": [
@@
-295,11
+310,11
@@
mograsim version: 0.1.3
},
{
"pin1": {
},
{
"pin1": {
- "comp
Id": 11
,
+ "comp
Name": "WireCrossPoint#1"
,
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "comp
Id": 2
,
+ "comp
Name": "GUINandGate#1"
,
"pinName": "B"
},
"path": [
"pinName": "B"
},
"path": [
@@
-311,11
+326,11
@@
mograsim version: 0.1.3
},
{
"pin1": {
},
{
"pin1": {
- "comp
Id": 12
,
+ "comp
Name": "WireCrossPoint#2"
,
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "comp
Id": 3
,
+ "comp
Name": "GUINandGate#2"
,
"pinName": "B"
},
"path": [
"pinName": "B"
},
"path": [
@@
-327,11
+342,11
@@
mograsim version: 0.1.3
},
{
"pin1": {
},
{
"pin1": {
- "comp
Id": 13
,
+ "comp
Name": "WireCrossPoint#3"
,
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "comp
Id": 4
,
+ "comp
Name": "GUINandGate#3"
,
"pinName": "B"
},
"path": [
"pinName": "B"
},
"path": [
@@
-343,73
+358,73
@@
mograsim version: 0.1.3
},
{
"pin1": {
},
{
"pin1": {
- "comp
Id": 1
,
+ "comp
Name": "GUINandGate#0"
,
"pinName": "Y"
},
"pin2": {
"pinName": "Y"
},
"pin2": {
- "comp
Id": 5
,
+ "comp
Name": "GUINandGate#4"
,
"pinName": "A"
}
},
{
"pin1": {
"pinName": "A"
}
},
{
"pin1": {
- "comp
Id": 2
,
+ "comp
Name": "GUINandGate#1"
,
"pinName": "Y"
},
"pin2": {
"pinName": "Y"
},
"pin2": {
- "comp
Id": 5
,
+ "comp
Name": "GUINandGate#4"
,
"pinName": "B"
}
},
{
"pin1": {
"pinName": "B"
}
},
{
"pin1": {
- "comp
Id": 3
,
+ "comp
Name": "GUINandGate#2"
,
"pinName": "Y"
},
"pin2": {
"pinName": "Y"
},
"pin2": {
- "comp
Id": 6
,
+ "comp
Name": "GUINandGate#5"
,
"pinName": "A"
}
},
{
"pin1": {
"pinName": "A"
}
},
{
"pin1": {
- "comp
Id": 4
,
+ "comp
Name": "GUINandGate#3"
,
"pinName": "Y"
},
"pin2": {
"pinName": "Y"
},
"pin2": {
- "comp
Id": 6
,
+ "comp
Name": "GUINandGate#5"
,
"pinName": "B"
}
},
{
"pin1": {
"pinName": "B"
}
},
{
"pin1": {
- "comp
Id": 5
,
+ "comp
Name": "GUINandGate#4"
,
"pinName": "Y"
},
"pin2": {
"pinName": "Y"
},
"pin2": {
- "comp
Id": 14
,
+ "comp
Name": "WireCrossPoint#4"
,
"pinName": ""
},
"path": []
},
{
"pin1": {
"pinName": ""
},
"path": []
},
{
"pin1": {
- "comp
Id": 6
,
+ "comp
Name": "GUINandGate#5"
,
"pinName": "Y"
},
"pin2": {
"pinName": "Y"
},
"pin2": {
- "comp
Id": 15
,
+ "comp
Name": "WireCrossPoint#5"
,
"pinName": ""
},
"path": []
},
{
"pin1": {
"pinName": ""
},
"path": []
},
{
"pin1": {
- "comp
Id": 14
,
+ "comp
Name": "WireCrossPoint#4"
,
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "comp
Id": 7
,
+ "comp
Name": "GUINandGate#6"
,
"pinName": "A"
},
"path": [
"pinName": "A"
},
"path": [
@@
-421,11
+436,11
@@
mograsim version: 0.1.3
},
{
"pin1": {
},
{
"pin1": {
- "comp
Id": 14
,
+ "comp
Name": "WireCrossPoint#4"
,
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "comp
Id": 7
,
+ "comp
Name": "GUINandGate#6"
,
"pinName": "B"
},
"path": [
"pinName": "B"
},
"path": [
@@
-437,11
+452,11
@@
mograsim version: 0.1.3
},
{
"pin1": {
},
{
"pin1": {
- "comp
Id": 15
,
+ "comp
Name": "WireCrossPoint#5"
,
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "comp
Id": 8
,
+ "comp
Name": "GUINandGate#7"
,
"pinName": "A"
},
"path": [
"pinName": "A"
},
"path": [
@@
-453,11
+468,11
@@
mograsim version: 0.1.3
},
{
"pin1": {
},
{
"pin1": {
- "comp
Id": 15
,
+ "comp
Name": "WireCrossPoint#5"
,
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "comp
Id": 8
,
+ "comp
Name": "GUINandGate#7"
,
"pinName": "B"
},
"path": [
"pinName": "B"
},
"path": [
@@
-469,31
+484,31
@@
mograsim version: 0.1.3
},
{
"pin1": {
},
{
"pin1": {
- "comp
Id": 7
,
+ "comp
Name": "GUINandGate#6"
,
"pinName": "Y"
},
"pin2": {
"pinName": "Y"
},
"pin2": {
- "comp
Id": 9
,
+ "comp
Name": "GUINandGate#8"
,
"pinName": "A"
}
},
{
"pin1": {
"pinName": "A"
}
},
{
"pin1": {
- "comp
Id": 8
,
+ "comp
Name": "GUINandGate#7"
,
"pinName": "Y"
},
"pin2": {
"pinName": "Y"
},
"pin2": {
- "comp
Id": 9
,
+ "comp
Name": "GUINandGate#8"
,
"pinName": "B"
}
},
{
"pin1": {
"pinName": "B"
}
},
{
"pin1": {
- "comp
Id": 9
,
+ "comp
Name": "GUINandGate#8"
,
"pinName": "Y"
},
"pin2": {
"pinName": "Y"
},
"pin2": {
- "comp
Id": 0
,
+ "comp
Name": "_submodelinterface"
,
"pinName": "Y"
}
}
"pinName": "Y"
}
}