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
/
GUIdlatch.json
diff --git
a/net.mograsim.logic.ui.am2900/components/GUIdlatch.json
b/net.mograsim.logic.ui.am2900/components/GUIdlatch.json
index
4b39347
..
69562ce
100644
(file)
--- a/
net.mograsim.logic.ui.am2900/components/GUIdlatch.json
+++ b/
net.mograsim.logic.ui.am2900/components/GUIdlatch.json
@@
-39,20
+39,13
@@
mograsim version: 0.1.3
"submodel": {
"innerScale": 0.4,
"subComps": [
"submodel": {
"innerScale": 0.4,
"subComps": [
- {
- "pos": {
- "x": 10.0,
- "y": 2.5
- },
- "id": "GUINandGate",
- "params": 1
- },
{
"pos": {
"x": 15.0,
"y": 27.5
},
"id": "GUINandGate",
{
"pos": {
"x": 15.0,
"y": 27.5
},
"id": "GUINandGate",
+ "name": "GUINandGate#1",
"params": 1
},
{
"params": 1
},
{
@@
-60,14
+53,16
@@
mograsim version: 0.1.3
"x": 45.0,
"y": 7.5
},
"x": 45.0,
"y": 7.5
},
- "id": "GUI_rsLatch"
+ "id": "GUI_rsLatch",
+ "name": "GUI_rsLatch#0"
},
{
"pos": {
},
{
"pos": {
- "x":
4
.0,
- "y":
36
.5
+ "x":
10
.0,
+ "y":
2
.5
},
},
- "id": "WireCrossPoint",
+ "id": "GUINandGate",
+ "name": "GUINandGate#0",
"params": 1
},
{
"params": 1
},
{
@@
-76,38
+71,48
@@
mograsim version: 0.1.3
"y": 11.5
},
"id": "WireCrossPoint",
"y": 11.5
},
"id": "WireCrossPoint",
+ "name": "WireCrossPoint#1",
+ "params": 1
+ },
+ {
+ "pos": {
+ "x": 4.0,
+ "y": 36.5
+ },
+ "id": "WireCrossPoint",
+ "name": "WireCrossPoint#0",
"params": 1
}
],
"innerWires": [
{
"pin1": {
"params": 1
}
],
"innerWires": [
{
"pin1": {
- "comp
Id": 0
,
+ "comp
Name": "_submodelinterface"
,
"pinName": "D"
},
"pin2": {
"pinName": "D"
},
"pin2": {
- "comp
Id": 1
,
+ "comp
Name": "GUINandGate#0"
,
"pinName": "A"
}
},
{
"pin1": {
"pinName": "A"
}
},
{
"pin1": {
- "comp
Id": 0
,
+ "comp
Name": "_submodelinterface"
,
"pinName": "E"
},
"pin2": {
"pinName": "E"
},
"pin2": {
- "comp
Id": 4
,
+ "comp
Name": "WireCrossPoint#0"
,
"pinName": ""
},
"path": []
},
{
"pin1": {
"pinName": ""
},
"path": []
},
{
"pin1": {
- "comp
Id": 4
,
+ "comp
Name": "WireCrossPoint#0"
,
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "comp
Id": 1
,
+ "comp
Name": "GUINandGate#0"
,
"pinName": "B"
},
"path": [
"pinName": "B"
},
"path": [
@@
-119,11
+124,11
@@
mograsim version: 0.1.3
},
{
"pin1": {
},
{
"pin1": {
- "comp
Id": 4
,
+ "comp
Name": "WireCrossPoint#0"
,
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "comp
Id": 2
,
+ "comp
Name": "GUINandGate#1"
,
"pinName": "B"
},
"path": [
"pinName": "B"
},
"path": [
@@
-135,22
+140,22
@@
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": "WireCrossPoint#1"
,
"pinName": ""
},
"path": []
},
{
"pin1": {
"pinName": ""
},
"path": []
},
{
"pin1": {
- "comp
Id": 5
,
+ "comp
Name": "WireCrossPoint#1"
,
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "comp
Id": 2
,
+ "comp
Name": "GUINandGate#1"
,
"pinName": "A"
},
"path": [
"pinName": "A"
},
"path": [
@@
-170,22
+175,22
@@
mograsim version: 0.1.3
},
{
"pin1": {
},
{
"pin1": {
- "comp
Id": 5
,
+ "comp
Name": "WireCrossPoint#1"
,
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "comp
Id": 3
,
+ "comp
Name": "GUI_rsLatch#0"
,
"pinName": "_S"
},
"path": []
},
{
"pin1": {
"pinName": "_S"
},
"path": []
},
{
"pin1": {
- "comp
Id": 2
,
+ "comp
Name": "GUINandGate#1"
,
"pinName": "Y"
},
"pin2": {
"pinName": "Y"
},
"pin2": {
- "comp
Id": 3
,
+ "comp
Name": "GUI_rsLatch#0"
,
"pinName": "_R"
},
"path": [
"pinName": "_R"
},
"path": [
@@
-201,22
+206,22
@@
mograsim version: 0.1.3
},
{
"pin1": {
},
{
"pin1": {
- "comp
Id": 3
,
+ "comp
Name": "GUI_rsLatch#0"
,
"pinName": "Q"
},
"pin2": {
"pinName": "Q"
},
"pin2": {
- "comp
Id": 0
,
+ "comp
Name": "_submodelinterface"
,
"pinName": "Q"
},
"path": []
},
{
"pin1": {
"pinName": "Q"
},
"path": []
},
{
"pin1": {
- "comp
Id": 3
,
+ "comp
Name": "GUI_rsLatch#0"
,
"pinName": "_Q"
},
"pin2": {
"pinName": "_Q"
},
"pin2": {
- "comp
Id": 0
,
+ "comp
Name": "_submodelinterface"
,
"pinName": "_Q"
}
}
"pinName": "_Q"
}
}