projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Made GUIMerger/GUISplitter bit order more intuitive (MSB on top)
[Mograsim.git]
/
net.mograsim.logic.model.editor
/
components
/
GUIand.json
diff --git
a/net.mograsim.logic.model.editor/components/GUIand.json
b/net.mograsim.logic.model.editor/components/GUIand.json
index
c19d8f9
..
5e343e0
100644
(file)
--- a/
net.mograsim.logic.model.editor/components/GUIand.json
+++ b/
net.mograsim.logic.model.editor/components/GUIand.json
@@
-1,4
+1,3
@@
-mograsim version: 0.1.3
{
"width": 35.0,
"height": 20.0,
{
"width": 35.0,
"height": 20.0,
@@
-9,7
+8,8
@@
mograsim version: 0.1.3
"y": 5.0
},
"name": "A",
"y": 5.0
},
"name": "A",
- "logicWidth": 1
+ "logicWidth": 1,
+ "usage": "INPUT"
},
{
"location": {
},
{
"location": {
@@
-17,7
+17,8
@@
mograsim version: 0.1.3
"y": 15.0
},
"name": "B",
"y": 15.0
},
"name": "B",
- "logicWidth": 1
+ "logicWidth": 1,
+ "usage": "INPUT"
},
{
"location": {
},
{
"location": {
@@
-25,41
+26,42
@@
mograsim version: 0.1.3
"y": 5.0
},
"name": "Y",
"y": 5.0
},
"name": "Y",
- "logicWidth": 1
+ "logicWidth": 1,
+ "usage": "OUTPUT"
}
],
}
],
+ "innerScale": 0.4,
"submodel": {
"submodel": {
- "innerScale": 0.4,
- "subComps": [
+ "components": [
{
{
+ "id": "GUINandGate",
+ "name": "GUINandGate#0",
"pos": {
"pos": {
- "x":
5
0.0,
+ "x":
2
0.0,
"y": 15.0
},
"y": 15.0
},
- "id": "GUINandGate",
- "name": "GUINandGate#1",
"params": 1
},
{
"params": 1
},
{
+ "id": "GUINandGate",
+ "name": "GUINandGate#1",
"pos": {
"pos": {
- "x":
2
0.0,
+ "x":
5
0.0,
"y": 15.0
},
"y": 15.0
},
- "id": "GUINandGate",
- "name": "GUINandGate#0",
"params": 1
},
{
"params": 1
},
{
+ "id": "WireCrossPoint",
+ "name": "WireCrossPoint#0",
"pos": {
"x": 44.0,
"y": 24.0
},
"pos": {
"x": 44.0,
"y": 24.0
},
- "id": "WireCrossPoint",
- "name": "WireCrossPoint#0",
"params": 1
}
],
"params": 1
}
],
- "
innerW
ires": [
+ "
w
ires": [
{
"pin1": {
"compName": "_submodelinterface",
{
"pin1": {
"compName": "_submodelinterface",
@@
-68,7
+70,8
@@
mograsim version: 0.1.3
"pin2": {
"compName": "GUINandGate#0",
"pinName": "A"
"pin2": {
"compName": "GUINandGate#0",
"pinName": "A"
- }
+ },
+ "name": "unnamedWire#0"
},
{
"pin1": {
},
{
"pin1": {
@@
-78,7
+81,8
@@
mograsim version: 0.1.3
"pin2": {
"compName": "GUINandGate#0",
"pinName": "B"
"pin2": {
"compName": "GUINandGate#0",
"pinName": "B"
- }
+ },
+ "name": "unnamedWire#1"
},
{
"pin1": {
},
{
"pin1": {
@@
-89,6
+93,7
@@
mograsim version: 0.1.3
"compName": "WireCrossPoint#0",
"pinName": ""
},
"compName": "WireCrossPoint#0",
"pinName": ""
},
+ "name": "unnamedWire#2",
"path": []
},
{
"path": []
},
{
@@
-100,6
+105,7
@@
mograsim version: 0.1.3
"compName": "GUINandGate#1",
"pinName": "A"
},
"compName": "GUINandGate#1",
"pinName": "A"
},
+ "name": "unnamedWire#3",
"path": [
{
"x": 45.0,
"path": [
{
"x": 45.0,
@@
-116,6
+122,7
@@
mograsim version: 0.1.3
"compName": "GUINandGate#1",
"pinName": "B"
},
"compName": "GUINandGate#1",
"pinName": "B"
},
+ "name": "unnamedWire#4",
"path": [
{
"x": 45.0,
"path": [
{
"x": 45.0,
@@
-131,9
+138,11
@@
mograsim version: 0.1.3
"pin2": {
"compName": "_submodelinterface",
"pinName": "Y"
"pin2": {
"compName": "_submodelinterface",
"pinName": "Y"
- }
+ },
+ "name": "unnamedWire#5"
}
}
- ]
+ ],
+ "version": "0.1.1"
},
"symbolRendererSnippetID": "simpleRectangularLike",
"symbolRendererParams": {
},
"symbolRendererSnippetID": "simpleRectangularLike",
"symbolRendererParams": {
@@
-142,5
+151,8
@@
mograsim version: 0.1.3
"horizontalComponentCenter": 17.5,
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
"horizontalComponentCenter": 17.5,
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
- }
+ },
+ "outlineRendererSnippetID": "default",
+ "highLevelStateHandlerSnippetID": "default",
+ "version": "0.1.5"
}
\ No newline at end of file
}
\ No newline at end of file