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
/
GUIhalfadder.json
diff --git
a/net.mograsim.logic.ui.am2900/components/GUIhalfadder.json
b/net.mograsim.logic.ui.am2900/components/GUIhalfadder.json
index
948192b
..
761d6ce
100644
(file)
--- a/
net.mograsim.logic.ui.am2900/components/GUIhalfadder.json
+++ b/
net.mograsim.logic.ui.am2900/components/GUIhalfadder.json
@@
-39,28
+39,22
@@
mograsim version: 0.1.3
"submodel": {
"innerScale": 0.4,
"subComps": [
"submodel": {
"innerScale": 0.4,
"subComps": [
- {
- "pos": {
- "x": 10.0,
- "y": 15.0
- },
- "id": "GUINandGate",
- "params": 1
- },
{
"pos": {
"x": 40.0,
"y": 2.5
},
"id": "GUINandGate",
{
"pos": {
"x": 40.0,
"y": 2.5
},
"id": "GUINandGate",
+ "name": "GUINandGate#1",
"params": 1
},
{
"pos": {
"params": 1
},
{
"pos": {
- "x":
4
0.0,
- "y":
27.5
+ "x":
1
0.0,
+ "y":
15.0
},
"id": "GUINandGate",
},
"id": "GUINandGate",
+ "name": "GUINandGate#0",
"params": 1
},
{
"params": 1
},
{
@@
-69,22
+63,34
@@
mograsim version: 0.1.3
"y": 2.5
},
"id": "GUINandGate",
"y": 2.5
},
"id": "GUINandGate",
+ "name": "GUINandGate#3",
"params": 1
},
{
"pos": {
"x": 4.0,
"params": 1
},
{
"pos": {
"x": 4.0,
- "y":
11
.5
+ "y":
36
.5
},
"id": "WireCrossPoint",
},
"id": "WireCrossPoint",
+ "name": "WireCrossPoint#1",
+ "params": 1
+ },
+ {
+ "pos": {
+ "x": 40.0,
+ "y": 27.5
+ },
+ "id": "GUINandGate",
+ "name": "GUINandGate#2",
"params": 1
},
{
"pos": {
"x": 4.0,
"params": 1
},
{
"pos": {
"x": 4.0,
- "y":
36
.5
+ "y":
11
.5
},
"id": "WireCrossPoint",
},
"id": "WireCrossPoint",
+ "name": "WireCrossPoint#0",
"params": 1
},
{
"params": 1
},
{
@@
-93,28
+99,29
@@
mograsim version: 0.1.3
"y": 24.0
},
"id": "WireCrossPoint",
"y": 24.0
},
"id": "WireCrossPoint",
+ "name": "WireCrossPoint#2",
"params": 1
}
],
"innerWires": [
{
"pin1": {
"params": 1
}
],
"innerWires": [
{
"pin1": {
- "comp
Id": 0
,
+ "comp
Name": "_submodelinterface"
,
"pinName": "A"
},
"pin2": {
"pinName": "A"
},
"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": "GUINandGate#1"
,
"pinName": "A"
},
"path": [
"pinName": "A"
},
"path": [
@@
-126,11
+133,11
@@
mograsim version: 0.1.3
},
{
"pin1": {
},
{
"pin1": {
- "comp
Id": 5
,
+ "comp
Name": "WireCrossPoint#0"
,
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "comp
Id": 1
,
+ "comp
Name": "GUINandGate#0"
,
"pinName": "A"
},
"path": [
"pinName": "A"
},
"path": [
@@
-142,22
+149,22
@@
mograsim version: 0.1.3
},
{
"pin1": {
},
{
"pin1": {
- "comp
Id": 0
,
+ "comp
Name": "_submodelinterface"
,
"pinName": "B"
},
"pin2": {
"pinName": "B"
},
"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": "GUINandGate#2"
,
"pinName": "B"
},
"path": [
"pinName": "B"
},
"path": [
@@
-169,11
+176,11
@@
mograsim version: 0.1.3
},
{
"pin1": {
},
{
"pin1": {
- "comp
Id": 6
,
+ "comp
Name": "WireCrossPoint#1"
,
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "comp
Id": 1
,
+ "comp
Name": "GUINandGate#0"
,
"pinName": "B"
},
"path": [
"pinName": "B"
},
"path": [
@@
-185,22
+192,22
@@
mograsim version: 0.1.3
},
{
"pin1": {
},
{
"pin1": {
- "comp
Id": 1
,
+ "comp
Name": "GUINandGate#0"
,
"pinName": "Y"
},
"pin2": {
"pinName": "Y"
},
"pin2": {
- "comp
Id": 7
,
+ "comp
Name": "WireCrossPoint#2"
,
"pinName": ""
},
"path": []
},
{
"pin1": {
"pinName": ""
},
"path": []
},
{
"pin1": {
- "comp
Id": 7
,
+ "comp
Name": "WireCrossPoint#2"
,
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "comp
Id": 0
,
+ "comp
Name": "_submodelinterface"
,
"pinName": "_Z"
},
"path": [
"pinName": "_Z"
},
"path": [
@@
-216,11
+223,11
@@
mograsim version: 0.1.3
},
{
"pin1": {
},
{
"pin1": {
- "comp
Id": 7
,
+ "comp
Name": "WireCrossPoint#2"
,
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "comp
Id": 2
,
+ "comp
Name": "GUINandGate#1"
,
"pinName": "B"
},
"path": [
"pinName": "B"
},
"path": [
@@
-232,11
+239,11
@@
mograsim version: 0.1.3
},
{
"pin1": {
},
{
"pin1": {
- "comp
Id": 7
,
+ "comp
Name": "WireCrossPoint#2"
,
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "comp
Id": 3
,
+ "comp
Name": "GUINandGate#2"
,
"pinName": "A"
},
"path": [
"pinName": "A"
},
"path": [
@@
-248,11
+255,11
@@
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#3"
,
"pinName": "A"
},
"path": [
"pinName": "A"
},
"path": [
@@
-268,11
+275,11
@@
mograsim version: 0.1.3
},
{
"pin1": {
},
{
"pin1": {
- "comp
Id": 3
,
+ "comp
Name": "GUINandGate#2"
,
"pinName": "Y"
},
"pin2": {
"pinName": "Y"
},
"pin2": {
- "comp
Id": 4
,
+ "comp
Name": "GUINandGate#3"
,
"pinName": "B"
},
"path": [
"pinName": "B"
},
"path": [
@@
-288,11
+295,11
@@
mograsim version: 0.1.3
},
{
"pin1": {
},
{
"pin1": {
- "comp
Id": 4
,
+ "comp
Name": "GUINandGate#3"
,
"pinName": "Y"
},
"pin2": {
"pinName": "Y"
},
"pin2": {
- "comp
Id": 0
,
+ "comp
Name": "_submodelinterface"
,
"pinName": "Y"
},
"path": []
"pinName": "Y"
},
"path": []