projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changed GUIram2/4's cell order for high level state ID "q"
[Mograsim.git]
/
net.mograsim.logic.model.editor
/
components
/
GUIand41.json
diff --git
a/net.mograsim.logic.model.editor/components/GUIand41.json
b/net.mograsim.logic.model.editor/components/GUIand41.json
index
973a4c9
..
9577681
100644
(file)
--- a/
net.mograsim.logic.model.editor/components/GUIand41.json
+++ b/
net.mograsim.logic.model.editor/components/GUIand41.json
@@
-80,135
+80,124
@@
mograsim version: 0.1.3
"innerScale": 0.4,
"subComps": [
{
"innerScale": 0.4,
"subComps": [
{
+ "id": "WireCrossPoint",
+ "name": "WireCrossPoint#1",
"pos": {
"x": 24.0,
"y": 71.5
},
"pos": {
"x": 24.0,
"y": 71.5
},
- "id": "WireCrossPoint",
- "name": "WireCrossPoint#1",
"params": 1
},
{
"params": 1
},
{
+ "id": "WireCrossPoint",
+ "name": "WireCrossPoint#0",
"pos": {
"x": 24.0,
"y": 46.5
},
"pos": {
"x": 24.0,
"y": 46.5
},
- "id": "WireCrossPoint",
- "name": "WireCrossPoint#0",
"params": 1
},
{
"params": 1
},
{
+ "id": "WireCrossPoint",
+ "name": "WireCrossPoint#2",
"pos": {
"x": 24.0,
"y": 96.5
},
"pos": {
"x": 24.0,
"y": 96.5
},
- "id": "WireCrossPoint",
- "name": "WireCrossPoint#2",
"params": 1
},
{
"params": 1
},
{
+ "id": "GUIand",
+ "name": "GUIand#0",
"pos": {
"x": 30.0,
"y": 7.5
"pos": {
"x": 30.0,
"y": 7.5
- },
- "id": "GUIand",
- "name": "GUIand#0"
+ }
},
{
},
{
+ "id": "GUIand",
+ "name": "GUIand#2",
"pos": {
"x": 30.0,
"y": 57.5
"pos": {
"x": 30.0,
"y": 57.5
- },
- "id": "GUIand",
- "name": "GUIand#2"
+ }
},
{
},
{
+ "id": "GUIand",
+ "name": "GUIand#1",
"pos": {
"x": 30.0,
"y": 32.5
"pos": {
"x": 30.0,
"y": 32.5
- },
- "id": "GUIand",
- "name": "GUIand#1"
+ }
},
{
},
{
+ "id": "GUIand",
+ "name": "GUIand#3",
"pos": {
"x": 30.0,
"y": 82.5
"pos": {
"x": 30.0,
"y": 82.5
- },
- "id": "GUIand",
- "name": "GUIand#3"
+ }
}
],
"innerWires": [
{
"pin1": {
}
],
"innerWires": [
{
"pin1": {
- "compName": "
_submodelinterface
",
- "pinName": "
A1
"
+ "compName": "
GUIand#3
",
+ "pinName": "
Y
"
},
"pin2": {
},
"pin2": {
- "compName": "GUIand#0",
- "pinName": "A"
- },
- "path": []
- },
- {
- "pin1": {
"compName": "_submodelinterface",
"compName": "_submodelinterface",
- "pinName": "A2"
- },
- "pin2": {
- "compName": "GUIand#1",
- "pinName": "A"
+ "pinName": "Y4"
},
},
+ "name": "unnamedWire#14",
"path": []
},
{
"pin1": {
"path": []
},
{
"pin1": {
- "compName": "
_submodelinterface
",
- "pinName": "
A3
"
+ "compName": "
GUIand#2
",
+ "pinName": "
Y
"
},
"pin2": {
},
"pin2": {
- "compName": "
GUIand#2
",
- "pinName": "
A
"
+ "compName": "
_submodelinterface
",
+ "pinName": "
Y3
"
},
},
+ "name": "unnamedWire#13",
"path": []
},
{
"pin1": {
"path": []
},
{
"pin1": {
- "compName": "
_submodelinterface
",
- "pinName": "
A4
"
+ "compName": "
WireCrossPoint#0
",
+ "pinName": ""
},
"pin2": {
},
"pin2": {
- "compName": "GUIand#
3
",
- "pinName": "
A
"
+ "compName": "GUIand#
1
",
+ "pinName": "
B
"
},
},
+ "name": "unnamedWire#9",
"path": []
},
{
"pin1": {
"path": []
},
{
"pin1": {
- "compName": "
_submodelinterface
",
- "pinName": "
B
"
+ "compName": "
WireCrossPoint#1
",
+ "pinName": ""
},
"pin2": {
},
"pin2": {
- "compName": "WireCrossPoint#
2
",
+ "compName": "WireCrossPoint#
0
",
"pinName": ""
},
"pinName": ""
},
- "path": [
- {
- "x": 25.0,
- "y": 112.5
- }
- ]
+ "name": "unnamedWire#8",
+ "path": []
},
{
"pin1": {
},
{
"pin1": {
- "compName": "WireCrossPoint#
2
",
+ "compName": "WireCrossPoint#
1
",
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "compName": "GUIand#
3
",
+ "compName": "GUIand#
2
",
"pinName": "B"
},
"pinName": "B"
},
+ "name": "unnamedWire#7",
"path": []
},
{
"path": []
},
{
@@
-220,39
+209,43
@@
mograsim version: 0.1.3
"compName": "WireCrossPoint#1",
"pinName": ""
},
"compName": "WireCrossPoint#1",
"pinName": ""
},
+ "name": "unnamedWire#6",
"path": []
},
{
"pin1": {
"path": []
},
{
"pin1": {
- "compName": "
WireCrossPoint#1
",
- "pinName": ""
+ "compName": "
_submodelinterface
",
+ "pinName": "
A2
"
},
"pin2": {
},
"pin2": {
- "compName": "GUIand#
2
",
- "pinName": "
B
"
+ "compName": "GUIand#
1
",
+ "pinName": "
A
"
},
},
+ "name": "unnamedWire#1",
"path": []
},
{
"pin1": {
"path": []
},
{
"pin1": {
- "compName": "
WireCrossPoint#1
",
- "pinName": ""
+ "compName": "
_submodelinterface
",
+ "pinName": "
A1
"
},
"pin2": {
},
"pin2": {
- "compName": "
WireCrossPoint
#0",
- "pinName": ""
+ "compName": "
GUIand
#0",
+ "pinName": "
A
"
},
},
+ "name": "unnamedWire#0",
"path": []
},
{
"pin1": {
"path": []
},
{
"pin1": {
- "compName": "WireCrossPoint#
0
",
+ "compName": "WireCrossPoint#
2
",
"pinName": ""
},
"pin2": {
"pinName": ""
},
"pin2": {
- "compName": "GUIand#
1
",
+ "compName": "GUIand#
3
",
"pinName": "B"
},
"pinName": "B"
},
+ "name": "unnamedWire#5",
"path": []
},
{
"path": []
},
{
@@
-264,6
+257,7
@@
mograsim version: 0.1.3
"compName": "GUIand#0",
"pinName": "B"
},
"compName": "GUIand#0",
"pinName": "B"
},
+ "name": "unnamedWire#10",
"path": [
{
"x": 25.0,
"path": [
{
"x": 25.0,
@@
-273,13
+267,31
@@
mograsim version: 0.1.3
},
{
"pin1": {
},
{
"pin1": {
- "compName": "
GUIand#0
",
- "pinName": "
Y
"
+ "compName": "
_submodelinterface
",
+ "pinName": "
B
"
},
"pin2": {
},
"pin2": {
+ "compName": "WireCrossPoint#2",
+ "pinName": ""
+ },
+ "name": "unnamedWire#4",
+ "path": [
+ {
+ "x": 25.0,
+ "y": 112.5
+ }
+ ]
+ },
+ {
+ "pin1": {
"compName": "_submodelinterface",
"compName": "_submodelinterface",
- "pinName": "Y1"
+ "pinName": "A4"
+ },
+ "pin2": {
+ "compName": "GUIand#3",
+ "pinName": "A"
},
},
+ "name": "unnamedWire#3",
"path": []
},
{
"path": []
},
{
@@
-291,38
+303,42
@@
mograsim version: 0.1.3
"compName": "_submodelinterface",
"pinName": "Y2"
},
"compName": "_submodelinterface",
"pinName": "Y2"
},
+ "name": "unnamedWire#12",
"path": []
},
{
"pin1": {
"path": []
},
{
"pin1": {
- "compName": "
GUIand#2
",
- "pinName": "
Y
"
+ "compName": "
_submodelinterface
",
+ "pinName": "
A3
"
},
"pin2": {
},
"pin2": {
- "compName": "
_submodelinterface
",
- "pinName": "
Y3
"
+ "compName": "
GUIand#2
",
+ "pinName": "
A
"
},
},
+ "name": "unnamedWire#2",
"path": []
},
{
"pin1": {
"path": []
},
{
"pin1": {
- "compName": "GUIand#
3
",
+ "compName": "GUIand#
0
",
"pinName": "Y"
},
"pin2": {
"compName": "_submodelinterface",
"pinName": "Y"
},
"pin2": {
"compName": "_submodelinterface",
- "pinName": "Y
4
"
+ "pinName": "Y
1
"
},
},
+ "name": "unnamedWire#11",
"path": []
}
]
},
"path": []
}
]
},
- "symbolRendererSnippetID": "SimpleRectangularLikeSymbolRenderer",
+ "symbolRendererSnippetID": "
class:net.mograsim.logic.model.snippets.symbolrenderers.
SimpleRectangularLikeSymbolRenderer",
"symbolRendererParams": {
"centerText": "GUIand41",
"symbolRendererParams": {
"centerText": "GUIand41",
- "horizontalComponentCenter": 17.5,
"centerTextHeight": 5.0,
"centerTextHeight": 5.0,
+ "horizontalComponentCenter": 17.5,
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
- }
+ },
+ "outlineRendererSnippetID": "class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer"
}
\ No newline at end of file
}
\ No newline at end of file