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
/
am2901
/
GUIAm2901ALUFuncDecode.json
diff --git
a/net.mograsim.logic.ui.am2900/components/am2901/GUIAm2901ALUFuncDecode.json
b/net.mograsim.logic.ui.am2900/components/am2901/GUIAm2901ALUFuncDecode.json
index
dfa954a
..
a24476b
100644
(file)
--- a/
net.mograsim.logic.ui.am2900/components/am2901/GUIAm2901ALUFuncDecode.json
+++ b/
net.mograsim.logic.ui.am2900/components/am2901/GUIAm2901ALUFuncDecode.json
@@
-79,20
+79,13
@@
mograsim version: 0.1.3
"submodel": {
"innerScale": 0.25,
"subComps": [
"submodel": {
"innerScale": 0.25,
"subComps": [
- {
- "pos": {
- "x": 15.0,
- "y": 10.0
- },
- "id": "GUINandGate",
- "params": 1
- },
{
"pos": {
"x": 15.0,
"y": 50.0
},
"id": "GUINandGate",
{
"pos": {
"x": 15.0,
"y": 50.0
},
"id": "GUINandGate",
+ "name": "GUINandGate#1",
"params": 1
},
{
"params": 1
},
{
@@
-100,14
+93,16
@@
mograsim version: 0.1.3
"x": 55.0,
"y": 10.0
},
"x": 55.0,
"y": 10.0
},
- "id": "GUInand3"
+ "id": "GUInand3",
+ "name": "GUInand3#0"
},
{
"pos": {
},
{
"pos": {
- "x":
5
5.0,
- "y":
45
.0
+ "x":
1
5.0,
+ "y":
10
.0
},
"id": "GUINandGate",
},
"id": "GUINandGate",
+ "name": "GUINandGate#0",
"params": 1
},
{
"params": 1
},
{
@@
-116,14
+111,16
@@
mograsim version: 0.1.3
"y": 70.0
},
"id": "GUINandGate",
"y": 70.0
},
"id": "GUINandGate",
+ "name": "GUINandGate#3",
"params": 1
},
{
"pos": {
"params": 1
},
{
"pos": {
- "x":
100
.0,
- "y":
50
.0
+ "x":
55
.0,
+ "y":
45
.0
},
"id": "GUINandGate",
},
"id": "GUINandGate",
+ "name": "GUINandGate#2",
"params": 1
},
{
"params": 1
},
{
@@
-131,22
+128,34
@@
mograsim version: 0.1.3
"x": 100.0,
"y": 135.0
},
"x": 100.0,
"y": 135.0
},
- "id": "GUIand"
+ "id": "GUIand",
+ "name": "GUIand#0"
},
{
"pos": {
"x": 4.0,
},
{
"pos": {
"x": 4.0,
- "y":
19
.0
+ "y":
24
.0
},
"id": "WireCrossPoint",
},
"id": "WireCrossPoint",
+ "name": "WireCrossPoint#1",
"params": 1
},
{
"pos": {
"x": 4.0,
"params": 1
},
{
"pos": {
"x": 4.0,
- "y": 24.0
+ "y": 19.0
+ },
+ "id": "WireCrossPoint",
+ "name": "WireCrossPoint#0",
+ "params": 1
+ },
+ {
+ "pos": {
+ "x": 9.0,
+ "y": 59.0
},
"id": "WireCrossPoint",
},
"id": "WireCrossPoint",
+ "name": "WireCrossPoint#3",
"params": 1
},
{
"params": 1
},
{
@@
-155,14
+164,16
@@
mograsim version: 0.1.3
"y": 44.0
},
"id": "WireCrossPoint",
"y": 44.0
},
"id": "WireCrossPoint",
+ "name": "WireCrossPoint#2",
"params": 1
},
{
"pos": {
"x": 9.0,
"params": 1
},
{
"pos": {
"x": 9.0,
- "y":
59
.0
+ "y":
64
.0
},
"id": "WireCrossPoint",
},
"id": "WireCrossPoint",
+ "name": "WireCrossPoint#5",
"params": 1
},
{
"params": 1
},
{
@@
-171,14
+182,16
@@
mograsim version: 0.1.3
"y": 54.0
},
"id": "WireCrossPoint",
"y": 54.0
},
"id": "WireCrossPoint",
+ "name": "WireCrossPoint#4",
"params": 1
},
{
"pos": {
"params": 1
},
{
"pos": {
- "x": 9.0,
- "y":
64
.0
+ "x":
4
9.0,
+ "y":
99
.0
},
"id": "WireCrossPoint",
},
"id": "WireCrossPoint",
+ "name": "WireCrossPoint#7",
"params": 1
},
{
"params": 1
},
{
@@
-187,14
+200,16
@@
mograsim version: 0.1.3
"y": 84.0
},
"id": "WireCrossPoint",
"y": 84.0
},
"id": "WireCrossPoint",
+ "name": "WireCrossPoint#6",
"params": 1
},
{
"pos": {
"params": 1
},
{
"pos": {
- "x":
4
9.0,
- "y":
9
9.0
+ "x":
3
9.0,
+ "y":
1
9.0
},
"id": "WireCrossPoint",
},
"id": "WireCrossPoint",
+ "name": "WireCrossPoint#9",
"params": 1
},
{
"params": 1
},
{
@@
-203,44
+218,47
@@
mograsim version: 0.1.3
"y": 74.0
},
"id": "WireCrossPoint",
"y": 74.0
},
"id": "WireCrossPoint",
+ "name": "WireCrossPoint#8",
"params": 1
},
{
"pos": {
"x": 39.0,
"params": 1
},
{
"pos": {
"x": 39.0,
- "y":
19
.0
+ "y":
34
.0
},
"id": "WireCrossPoint",
},
"id": "WireCrossPoint",
+ "name": "WireCrossPoint#10",
"params": 1
},
{
"pos": {
"params": 1
},
{
"pos": {
- "x":
39
.0,
- "y":
34
.0
+ "x":
100
.0,
+ "y":
50
.0
},
},
- "id": "WireCrossPoint",
+ "id": "GUINandGate",
+ "name": "GUINandGate#4",
"params": 1
}
],
"innerWires": [
{
"pin1": {
"params": 1
}
],
"innerWires": [
{
"pin1": {
- "comp
Id": 0
,
+ "comp
Name": "_submodelinterface"
,
"pinName": "I5"
},
"pin2": {
"pinName": "I5"
},
"pin2": {
- "comp
Id": 8
,
+ "comp
Name": "WireCrossPoint#0"
,
"pinName": ""
},
"path": []
},
{
"pin1": {
"pinName": ""
},
"path": []
},
{
"pin1": {
- "comp
Id": 8
,
+ "comp
Name": "WireCrossPoint#0"
,
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "comp
Id": 1
,
+ "comp
Name": "GUINandGate#0"
,
"pinName": "A"
},
"path": [
"pinName": "A"
},
"path": [
@@
-252,44
+270,44
@@
mograsim version: 0.1.3
},
{
"pin1": {
},
{
"pin1": {
- "comp
Id": 8
,
+ "comp
Name": "WireCrossPoint#0"
,
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "comp
Id": 9
,
+ "comp
Name": "WireCrossPoint#1"
,
"pinName": ""
},
"path": []
},
{
"pin1": {
"pinName": ""
},
"path": []
},
{
"pin1": {
- "comp
Id": 9
,
+ "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": 9
,
+ "comp
Name": "WireCrossPoint#1"
,
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "comp
Id": 10
,
+ "comp
Name": "WireCrossPoint#2"
,
"pinName": ""
},
"path": []
},
{
"pin1": {
"pinName": ""
},
"path": []
},
{
"pin1": {
- "comp
Id": 10
,
+ "comp
Name": "WireCrossPoint#2"
,
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "comp
Id": 4
,
+ "comp
Name": "GUINandGate#2"
,
"pinName": "A"
},
"path": [
"pinName": "A"
},
"path": [
@@
-305,11
+323,11
@@
mograsim version: 0.1.3
},
{
"pin1": {
},
{
"pin1": {
- "comp
Id": 10
,
+ "comp
Name": "WireCrossPoint#2"
,
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "comp
Id": 0
,
+ "comp
Name": "_submodelinterface"
,
"pinName": "FN"
},
"path": [
"pinName": "FN"
},
"path": [
@@
-321,33
+339,33
@@
mograsim version: 0.1.3
},
{
"pin1": {
},
{
"pin1": {
- "comp
Id": 0
,
+ "comp
Name": "_submodelinterface"
,
"pinName": "I4"
},
"pin2": {
"pinName": "I4"
},
"pin2": {
- "comp
Id": 11
,
+ "comp
Name": "WireCrossPoint#3"
,
"pinName": ""
},
"path": []
},
{
"pin1": {
"pinName": ""
},
"path": []
},
{
"pin1": {
- "comp
Id": 11
,
+ "comp
Name": "WireCrossPoint#3"
,
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "comp
Id": 12
,
+ "comp
Name": "WireCrossPoint#4"
,
"pinName": ""
},
"path": []
},
{
"pin1": {
"pinName": ""
},
"path": []
},
{
"pin1": {
- "comp
Id": 12
,
+ "comp
Name": "WireCrossPoint#4"
,
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "comp
Id": 3
,
+ "comp
Name": "GUInand3#0"
,
"pinName": "A"
},
"path": [
"pinName": "A"
},
"path": [
@@
-367,66
+385,66
@@
mograsim version: 0.1.3
},
{
"pin1": {
},
{
"pin1": {
- "comp
Id": 12
,
+ "comp
Name": "WireCrossPoint#4"
,
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "comp
Id": 2
,
+ "comp
Name": "GUINandGate#1"
,
"pinName": "A"
},
"path": []
},
{
"pin1": {
"pinName": "A"
},
"path": []
},
{
"pin1": {
- "comp
Id": 11
,
+ "comp
Name": "WireCrossPoint#3"
,
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "comp
Id": 13
,
+ "comp
Name": "WireCrossPoint#5"
,
"pinName": ""
},
"path": []
},
{
"pin1": {
"pinName": ""
},
"path": []
},
{
"pin1": {
- "comp
Id": 13
,
+ "comp
Name": "WireCrossPoint#5"
,
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "comp
Id": 2
,
+ "comp
Name": "GUINandGate#1"
,
"pinName": "B"
},
"path": []
},
{
"pin1": {
"pinName": "B"
},
"path": []
},
{
"pin1": {
- "comp
Id": 13
,
+ "comp
Name": "WireCrossPoint#5"
,
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "comp
Id": 14
,
+ "comp
Name": "WireCrossPoint#6"
,
"pinName": ""
},
"path": []
},
{
"pin1": {
"pinName": ""
},
"path": []
},
{
"pin1": {
- "comp
Id": 14
,
+ "comp
Name": "WireCrossPoint#6"
,
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "comp
Id": 5
,
+ "comp
Name": "GUINandGate#3"
,
"pinName": "B"
},
"path": []
},
{
"pin1": {
"pinName": "B"
},
"path": []
},
{
"pin1": {
- "comp
Id": 14
,
+ "comp
Name": "WireCrossPoint#6"
,
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "comp
Id": 0
,
+ "comp
Name": "_submodelinterface"
,
"pinName": "SN"
},
"path": [
"pinName": "SN"
},
"path": [
@@
-446,11
+464,11
@@
mograsim version: 0.1.3
},
{
"pin1": {
},
{
"pin1": {
- "comp
Id": 0
,
+ "comp
Name": "_submodelinterface"
,
"pinName": "I3"
},
"pin2": {
"pinName": "I3"
},
"pin2": {
- "comp
Id": 15
,
+ "comp
Name": "WireCrossPoint#7"
,
"pinName": ""
},
"path": [
"pinName": ""
},
"path": [
@@
-462,11
+480,11
@@
mograsim version: 0.1.3
},
{
"pin1": {
},
{
"pin1": {
- "comp
Id": 15
,
+ "comp
Name": "WireCrossPoint#7"
,
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "comp
Id": 0
,
+ "comp
Name": "_submodelinterface"
,
"pinName": "RN"
},
"path": [
"pinName": "RN"
},
"path": [
@@
-478,22
+496,22
@@
mograsim version: 0.1.3
},
{
"pin1": {
},
{
"pin1": {
- "comp
Id": 15
,
+ "comp
Name": "WireCrossPoint#7"
,
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "comp
Id": 16
,
+ "comp
Name": "WireCrossPoint#8"
,
"pinName": ""
},
"path": []
},
{
"pin1": {
"pinName": ""
},
"path": []
},
{
"pin1": {
- "comp
Id": 16
,
+ "comp
Name": "WireCrossPoint#8"
,
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "comp
Id": 3
,
+ "comp
Name": "GUInand3#0"
,
"pinName": "B"
},
"path": [
"pinName": "B"
},
"path": [
@@
-505,33
+523,33
@@
mograsim version: 0.1.3
},
{
"pin1": {
},
{
"pin1": {
- "comp
Id": 16
,
+ "comp
Name": "WireCrossPoint#8"
,
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "comp
Id": 5
,
+ "comp
Name": "GUINandGate#3"
,
"pinName": "A"
},
"path": []
},
{
"pin1": {
"pinName": "A"
},
"path": []
},
{
"pin1": {
- "comp
Id": 1
,
+ "comp
Name": "GUINandGate#0"
,
"pinName": "Y"
},
"pin2": {
"pinName": "Y"
},
"pin2": {
- "comp
Id": 17
,
+ "comp
Name": "WireCrossPoint#9"
,
"pinName": ""
},
"path": []
},
{
"pin1": {
"pinName": ""
},
"path": []
},
{
"pin1": {
- "comp
Id": 17
,
+ "comp
Name": "WireCrossPoint#9"
,
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "comp
Id": 0
,
+ "comp
Name": "_submodelinterface"
,
"pinName": "CinE"
},
"path": [
"pinName": "CinE"
},
"path": [
@@
-551,33
+569,33
@@
mograsim version: 0.1.3
},
{
"pin1": {
},
{
"pin1": {
- "comp
Id": 17
,
+ "comp
Name": "WireCrossPoint#9"
,
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "comp
Id": 18
,
+ "comp
Name": "WireCrossPoint#10"
,
"pinName": ""
},
"path": []
},
{
"pin1": {
"pinName": ""
},
"path": []
},
{
"pin1": {
- "comp
Id": 18
,
+ "comp
Name": "WireCrossPoint#10"
,
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "comp
Id": 3
,
+ "comp
Name": "GUInand3#0"
,
"pinName": "C"
},
"path": []
},
{
"pin1": {
"pinName": "C"
},
"path": []
},
{
"pin1": {
- "comp
Id": 18
,
+ "comp
Name": "WireCrossPoint#10"
,
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "comp
Id": 7
,
+ "comp
Name": "GUIand#0"
,
"pinName": "B"
},
"path": [
"pinName": "B"
},
"path": [
@@
-589,63
+607,63
@@
mograsim version: 0.1.3
},
{
"pin1": {
},
{
"pin1": {
- "comp
Id": 2
,
+ "comp
Name": "GUINandGate#1"
,
"pinName": "Y"
},
"pin2": {
"pinName": "Y"
},
"pin2": {
- "comp
Id": 4
,
+ "comp
Name": "GUINandGate#2"
,
"pinName": "B"
},
"path": []
},
{
"pin1": {
"pinName": "B"
},
"path": []
},
{
"pin1": {
- "comp
Id": 3
,
+ "comp
Name": "GUInand3#0"
,
"pinName": "Y"
},
"pin2": {
"pinName": "Y"
},
"pin2": {
- "comp
Id": 6
,
+ "comp
Name": "GUINandGate#4"
,
"pinName": "A"
}
},
{
"pin1": {
"pinName": "A"
}
},
{
"pin1": {
- "comp
Id": 4
,
+ "comp
Name": "GUINandGate#2"
,
"pinName": "Y"
},
"pin2": {
"pinName": "Y"
},
"pin2": {
- "comp
Id": 6
,
+ "comp
Name": "GUINandGate#4"
,
"pinName": "B"
}
},
{
"pin1": {
"pinName": "B"
}
},
{
"pin1": {
- "comp
Id": 5
,
+ "comp
Name": "GUINandGate#3"
,
"pinName": "Y"
},
"pin2": {
"pinName": "Y"
},
"pin2": {
- "comp
Id": 7
,
+ "comp
Name": "GUIand#0"
,
"pinName": "A"
}
},
{
"pin1": {
"pinName": "A"
}
},
{
"pin1": {
- "comp
Id": 6
,
+ "comp
Name": "GUINandGate#4"
,
"pinName": "Y"
},
"pin2": {
"pinName": "Y"
},
"pin2": {
- "comp
Id": 0
,
+ "comp
Name": "_submodelinterface"
,
"pinName": "L"
},
"path": []
},
{
"pin1": {
"pinName": "L"
},
"path": []
},
{
"pin1": {
- "comp
Id": 7
,
+ "comp
Name": "GUIand#0"
,
"pinName": "Y"
},
"pin2": {
"pinName": "Y"
},
"pin2": {
- "comp
Id": 0
,
+ "comp
Name": "_submodelinterface"
,
"pinName": "SBE"
},
"path": []
"pinName": "SBE"
},
"path": []