projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed package exports in net.mograsim.logic.ui's MANIFEST.MF
[Mograsim.git]
/
net.mograsim.logic.ui.am2900
/
components
/
GUIand41.json
diff --git
a/net.mograsim.logic.ui.am2900/components/GUIand41.json
b/net.mograsim.logic.ui.am2900/components/GUIand41.json
index
c3157e9
..
973a4c9
100644
(file)
--- a/
net.mograsim.logic.ui.am2900/components/GUIand41.json
+++ b/
net.mograsim.logic.ui.am2900/components/GUIand41.json
@@
-81,109
+81,116
@@
mograsim version: 0.1.3
"subComps": [
{
"pos": {
"subComps": [
{
"pos": {
- "x":
30
.0,
- "y": 7.5
+ "x":
24
.0,
+ "y": 7
1
.5
},
},
- "id": "GUIand"
+ "id": "WireCrossPoint",
+ "name": "WireCrossPoint#1",
+ "params": 1
},
{
"pos": {
},
{
"pos": {
- "x":
30
.0,
- "y":
32
.5
+ "x":
24
.0,
+ "y":
46
.5
},
},
- "id": "GUIand"
+ "id": "WireCrossPoint",
+ "name": "WireCrossPoint#0",
+ "params": 1
},
{
"pos": {
},
{
"pos": {
- "x":
30
.0,
- "y":
57
.5
+ "x":
24
.0,
+ "y":
96
.5
},
},
- "id": "GUIand"
+ "id": "WireCrossPoint",
+ "name": "WireCrossPoint#2",
+ "params": 1
},
{
"pos": {
"x": 30.0,
},
{
"pos": {
"x": 30.0,
- "y":
82
.5
+ "y":
7
.5
},
},
- "id": "GUIand"
+ "id": "GUIand",
+ "name": "GUIand#0"
},
{
"pos": {
},
{
"pos": {
- "x":
24
.0,
- "y":
46
.5
+ "x":
30
.0,
+ "y":
57
.5
},
},
- "id": "
WireCrossPoint
",
- "
params": 1
+ "id": "
GUIand
",
+ "
name": "GUIand#2"
},
{
"pos": {
},
{
"pos": {
- "x":
24
.0,
- "y":
71
.5
+ "x":
30
.0,
+ "y":
32
.5
},
},
- "id": "
WireCrossPoint
",
- "
params": 1
+ "id": "
GUIand
",
+ "
name": "GUIand#1"
},
{
"pos": {
},
{
"pos": {
- "x":
24
.0,
- "y":
96
.5
+ "x":
30
.0,
+ "y":
82
.5
},
},
- "id": "
WireCrossPoint
",
- "
params": 1
+ "id": "
GUIand
",
+ "
name": "GUIand#3"
}
],
"innerWires": [
{
"pin1": {
}
],
"innerWires": [
{
"pin1": {
- "comp
Id": 0
,
+ "comp
Name": "_submodelinterface"
,
"pinName": "A1"
},
"pin2": {
"pinName": "A1"
},
"pin2": {
- "comp
Id": 1
,
+ "comp
Name": "GUIand#0"
,
"pinName": "A"
},
"path": []
},
{
"pin1": {
"pinName": "A"
},
"path": []
},
{
"pin1": {
- "comp
Id": 0
,
+ "comp
Name": "_submodelinterface"
,
"pinName": "A2"
},
"pin2": {
"pinName": "A2"
},
"pin2": {
- "comp
Id": 2
,
+ "comp
Name": "GUIand#1"
,
"pinName": "A"
},
"path": []
},
{
"pin1": {
"pinName": "A"
},
"path": []
},
{
"pin1": {
- "comp
Id": 0
,
+ "comp
Name": "_submodelinterface"
,
"pinName": "A3"
},
"pin2": {
"pinName": "A3"
},
"pin2": {
- "comp
Id": 3
,
+ "comp
Name": "GUIand#2"
,
"pinName": "A"
},
"path": []
},
{
"pin1": {
"pinName": "A"
},
"path": []
},
{
"pin1": {
- "comp
Id": 0
,
+ "comp
Name": "_submodelinterface"
,
"pinName": "A4"
},
"pin2": {
"pinName": "A4"
},
"pin2": {
- "comp
Id": 4
,
+ "comp
Name": "GUIand#3"
,
"pinName": "A"
},
"path": []
},
{
"pin1": {
"pinName": "A"
},
"path": []
},
{
"pin1": {
- "comp
Id": 0
,
+ "comp
Name": "_submodelinterface"
,
"pinName": "B"
},
"pin2": {
"pinName": "B"
},
"pin2": {
- "comp
Id": 7
,
+ "comp
Name": "WireCrossPoint#2"
,
"pinName": ""
},
"path": [
"pinName": ""
},
"path": [
@@
-195,66
+202,66
@@
mograsim version: 0.1.3
},
{
"pin1": {
},
{
"pin1": {
- "comp
Id": 7
,
+ "comp
Name": "WireCrossPoint#2"
,
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "comp
Id": 4
,
+ "comp
Name": "GUIand#3"
,
"pinName": "B"
},
"path": []
},
{
"pin1": {
"pinName": "B"
},
"path": []
},
{
"pin1": {
- "comp
Id": 7
,
+ "comp
Name": "WireCrossPoint#2"
,
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "comp
Id": 6
,
+ "comp
Name": "WireCrossPoint#1"
,
"pinName": ""
},
"path": []
},
{
"pin1": {
"pinName": ""
},
"path": []
},
{
"pin1": {
- "comp
Id": 6
,
+ "comp
Name": "WireCrossPoint#1"
,
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "comp
Id": 3
,
+ "comp
Name": "GUIand#2"
,
"pinName": "B"
},
"path": []
},
{
"pin1": {
"pinName": "B"
},
"path": []
},
{
"pin1": {
- "comp
Id": 6
,
+ "comp
Name": "WireCrossPoint#1"
,
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "comp
Id": 5
,
+ "comp
Name": "WireCrossPoint#0"
,
"pinName": ""
},
"path": []
},
{
"pin1": {
"pinName": ""
},
"path": []
},
{
"pin1": {
- "comp
Id": 5
,
+ "comp
Name": "WireCrossPoint#0"
,
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "comp
Id": 2
,
+ "comp
Name": "GUIand#1"
,
"pinName": "B"
},
"path": []
},
{
"pin1": {
"pinName": "B"
},
"path": []
},
{
"pin1": {
- "comp
Id": 5
,
+ "comp
Name": "WireCrossPoint#0"
,
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "comp
Id": 1
,
+ "comp
Name": "GUIand#0"
,
"pinName": "B"
},
"path": [
"pinName": "B"
},
"path": [
@@
-266,44
+273,44
@@
mograsim version: 0.1.3
},
{
"pin1": {
},
{
"pin1": {
- "comp
Id": 1
,
+ "comp
Name": "GUIand#0"
,
"pinName": "Y"
},
"pin2": {
"pinName": "Y"
},
"pin2": {
- "comp
Id": 0
,
+ "comp
Name": "_submodelinterface"
,
"pinName": "Y1"
},
"path": []
},
{
"pin1": {
"pinName": "Y1"
},
"path": []
},
{
"pin1": {
- "comp
Id": 2
,
+ "comp
Name": "GUIand#1"
,
"pinName": "Y"
},
"pin2": {
"pinName": "Y"
},
"pin2": {
- "comp
Id": 0
,
+ "comp
Name": "_submodelinterface"
,
"pinName": "Y2"
},
"path": []
},
{
"pin1": {
"pinName": "Y2"
},
"path": []
},
{
"pin1": {
- "comp
Id": 3
,
+ "comp
Name": "GUIand#2"
,
"pinName": "Y"
},
"pin2": {
"pinName": "Y"
},
"pin2": {
- "comp
Id": 0
,
+ "comp
Name": "_submodelinterface"
,
"pinName": "Y3"
},
"path": []
},
{
"pin1": {
"pinName": "Y3"
},
"path": []
},
{
"pin1": {
- "comp
Id": 4
,
+ "comp
Name": "GUIand#3"
,
"pinName": "Y"
},
"pin2": {
"pinName": "Y"
},
"pin2": {
- "comp
Id": 0
,
+ "comp
Name": "_submodelinterface"
,
"pinName": "Y4"
},
"path": []
"pinName": "Y4"
},
"path": []