projects
/
Mograsim.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2d27647
)
Reexported mi.nandbased components to match new snippet IDs
author
Daniel Kirschten
<daniel.kirschten@gmx.de>
Mon, 15 Jul 2019 14:30:12 +0000
(16:30 +0200)
committer
Daniel Kirschten
<daniel.kirschten@gmx.de>
Mon, 15 Jul 2019 14:30:12 +0000
(16:30 +0200)
30 files changed:
net.mograsim.logic.model.am2900/components/GUI_rsLatch.json
patch
|
blob
|
history
net.mograsim.logic.model.am2900/components/GUIand.json
patch
|
blob
|
history
net.mograsim.logic.model.am2900/components/GUIand41.json
patch
|
blob
|
history
net.mograsim.logic.model.am2900/components/GUIandor414.json
patch
|
blob
|
history
net.mograsim.logic.model.am2900/components/GUIdemux2.json
patch
|
blob
|
history
net.mograsim.logic.model.am2900/components/GUIdff.json
patch
|
blob
|
history
net.mograsim.logic.model.am2900/components/GUIdlatch.json
patch
|
blob
|
history
net.mograsim.logic.model.am2900/components/GUIdlatch4.json
patch
|
blob
|
history
net.mograsim.logic.model.am2900/components/GUIfulladder.json
patch
|
blob
|
history
net.mograsim.logic.model.am2900/components/GUIhalfadder.json
patch
|
blob
|
history
net.mograsim.logic.model.am2900/components/GUImux1.json
patch
|
blob
|
history
net.mograsim.logic.model.am2900/components/GUImux1_4.json
patch
|
blob
|
history
net.mograsim.logic.model.am2900/components/GUInand3.json
patch
|
blob
|
history
net.mograsim.logic.model.am2900/components/GUInot4.json
patch
|
blob
|
history
net.mograsim.logic.model.am2900/components/GUIor4.json
patch
|
blob
|
history
net.mograsim.logic.model.am2900/components/GUIor_4.json
patch
|
blob
|
history
net.mograsim.logic.model.am2900/components/GUIram2.json
patch
|
blob
|
history
net.mograsim.logic.model.am2900/components/GUIram4.json
patch
|
blob
|
history
net.mograsim.logic.model.am2900/components/GUIsel2_4.json
patch
|
blob
|
history
net.mograsim.logic.model.am2900/components/GUIsel3_4.json
patch
|
blob
|
history
net.mograsim.logic.model.am2900/components/GUIxor.json
patch
|
blob
|
history
net.mograsim.logic.model.am2900/components/am2901/GUIAm2901.json
patch
|
blob
|
history
net.mograsim.logic.model.am2900/components/am2901/GUIAm2901ALUFuncDecode.json
patch
|
blob
|
history
net.mograsim.logic.model.am2900/components/am2901/GUIAm2901ALUInclDecode.json
patch
|
blob
|
history
net.mograsim.logic.model.am2900/components/am2901/GUIAm2901ALUInclSourceDecodeInclFunctionDecode.json
patch
|
blob
|
history
net.mograsim.logic.model.am2900/components/am2901/GUIAm2901ALUOneBit.json
patch
|
blob
|
history
net.mograsim.logic.model.am2900/components/am2901/GUIAm2901DestDecode.json
patch
|
blob
|
history
net.mograsim.logic.model.am2900/components/am2901/GUIAm2901QReg.json
patch
|
blob
|
history
net.mograsim.logic.model.am2900/components/am2901/GUIAm2901SourceDecode.json
patch
|
blob
|
history
net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/examples/ComponenetSerializer.java
patch
|
blob
|
history
diff --git
a/net.mograsim.logic.model.am2900/components/GUI_rsLatch.json
b/net.mograsim.logic.model.am2900/components/GUI_rsLatch.json
index
a91b815
..
1e846c4
100644
(file)
--- a/
net.mograsim.logic.model.am2900/components/GUI_rsLatch.json
+++ b/
net.mograsim.logic.model.am2900/components/GUI_rsLatch.json
@@
-211,11
+211,11
@@
mograsim version: 0.1.3
}
]
},
}
]
},
- "symbolRendererSnippetID": "
SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "_rsLatch",
"symbolRendererParams": {
"centerText": "_rsLatch",
- "horizontalComponentCenter": 17.5,
"centerTextHeight": 5.0,
"centerTextHeight": 5.0,
+ "horizontalComponentCenter": 17.5,
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
}
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
}
diff --git
a/net.mograsim.logic.model.am2900/components/GUIand.json
b/net.mograsim.logic.model.am2900/components/GUIand.json
index
5877291
..
c19d8f9
100644
(file)
--- a/
net.mograsim.logic.model.am2900/components/GUIand.json
+++ b/
net.mograsim.logic.model.am2900/components/GUIand.json
@@
-135,11
+135,11
@@
mograsim version: 0.1.3
}
]
},
}
]
},
- "symbolRendererSnippetID": "
SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "GUIand",
"symbolRendererParams": {
"centerText": "GUIand",
- "horizontalComponentCenter": 17.5,
"centerTextHeight": 5.0,
"centerTextHeight": 5.0,
+ "horizontalComponentCenter": 17.5,
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
}
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
}
diff --git
a/net.mograsim.logic.model.am2900/components/GUIand41.json
b/net.mograsim.logic.model.am2900/components/GUIand41.json
index
973a4c9
..
98ebfa1
100644
(file)
--- a/
net.mograsim.logic.model.am2900/components/GUIand41.json
+++ b/
net.mograsim.logic.model.am2900/components/GUIand41.json
@@
-317,11
+317,11
@@
mograsim version: 0.1.3
}
]
},
}
]
},
- "symbolRendererSnippetID": "
SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"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
}
diff --git
a/net.mograsim.logic.model.am2900/components/GUIandor414.json
b/net.mograsim.logic.model.am2900/components/GUIandor414.json
index
5cadf0f
..
3042690
100644
(file)
--- a/
net.mograsim.logic.model.am2900/components/GUIandor414.json
+++ b/
net.mograsim.logic.model.am2900/components/GUIandor414.json
@@
-476,11
+476,11
@@
mograsim version: 0.1.3
}
]
},
}
]
},
- "symbolRendererSnippetID": "
SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "GUIandor414",
"symbolRendererParams": {
"centerText": "GUIandor414",
- "horizontalComponentCenter": 17.5,
"centerTextHeight": 5.0,
"centerTextHeight": 5.0,
+ "horizontalComponentCenter": 17.5,
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
}
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
}
diff --git
a/net.mograsim.logic.model.am2900/components/GUIdemux2.json
b/net.mograsim.logic.model.am2900/components/GUIdemux2.json
index
5ded84b
..
29440a2
100644
(file)
--- a/
net.mograsim.logic.model.am2900/components/GUIdemux2.json
+++ b/
net.mograsim.logic.model.am2900/components/GUIdemux2.json
@@
-500,11
+500,11
@@
mograsim version: 0.1.3
}
]
},
}
]
},
- "symbolRendererSnippetID": "
SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "GUIdemux2",
"symbolRendererParams": {
"centerText": "GUIdemux2",
- "horizontalComponentCenter": 17.5,
"centerTextHeight": 5.0,
"centerTextHeight": 5.0,
+ "horizontalComponentCenter": 17.5,
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
}
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
}
diff --git
a/net.mograsim.logic.model.am2900/components/GUIdff.json
b/net.mograsim.logic.model.am2900/components/GUIdff.json
index
55151f8
..
80794ee
100644
(file)
--- a/
net.mograsim.logic.model.am2900/components/GUIdff.json
+++ b/
net.mograsim.logic.model.am2900/components/GUIdff.json
@@
-317,11
+317,11
@@
mograsim version: 0.1.3
}
]
},
}
]
},
- "symbolRendererSnippetID": "
SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "GUIdff",
"symbolRendererParams": {
"centerText": "GUIdff",
- "horizontalComponentCenter": 17.5,
"centerTextHeight": 5.0,
"centerTextHeight": 5.0,
+ "horizontalComponentCenter": 17.5,
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
}
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
}
diff --git
a/net.mograsim.logic.model.am2900/components/GUIdlatch.json
b/net.mograsim.logic.model.am2900/components/GUIdlatch.json
index
69562ce
..
d83cc99
100644
(file)
--- a/
net.mograsim.logic.model.am2900/components/GUIdlatch.json
+++ b/
net.mograsim.logic.model.am2900/components/GUIdlatch.json
@@
-227,11
+227,11
@@
mograsim version: 0.1.3
}
]
},
}
]
},
- "symbolRendererSnippetID": "
SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "GUIdlatch",
"symbolRendererParams": {
"centerText": "GUIdlatch",
- "horizontalComponentCenter": 17.5,
"centerTextHeight": 5.0,
"centerTextHeight": 5.0,
+ "horizontalComponentCenter": 17.5,
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
}
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
}
diff --git
a/net.mograsim.logic.model.am2900/components/GUIdlatch4.json
b/net.mograsim.logic.model.am2900/components/GUIdlatch4.json
index
29f4ac0
..
c42e6d0
100644
(file)
--- a/
net.mograsim.logic.model.am2900/components/GUIdlatch4.json
+++ b/
net.mograsim.logic.model.am2900/components/GUIdlatch4.json
@@
-317,11
+317,11
@@
mograsim version: 0.1.3
}
]
},
}
]
},
- "symbolRendererSnippetID": "
SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "GUIdlatch4",
"symbolRendererParams": {
"centerText": "GUIdlatch4",
- "horizontalComponentCenter": 17.5,
"centerTextHeight": 5.0,
"centerTextHeight": 5.0,
+ "horizontalComponentCenter": 17.5,
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
}
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
}
diff --git
a/net.mograsim.logic.model.am2900/components/GUIfulladder.json
b/net.mograsim.logic.model.am2900/components/GUIfulladder.json
index
dc4c616
..
c523394
100644
(file)
--- a/
net.mograsim.logic.model.am2900/components/GUIfulladder.json
+++ b/
net.mograsim.logic.model.am2900/components/GUIfulladder.json
@@
-177,11
+177,11
@@
mograsim version: 0.1.3
}
]
},
}
]
},
- "symbolRendererSnippetID": "
SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "GUIfulladder",
"symbolRendererParams": {
"centerText": "GUIfulladder",
- "horizontalComponentCenter": 17.5,
"centerTextHeight": 5.0,
"centerTextHeight": 5.0,
+ "horizontalComponentCenter": 17.5,
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
}
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
}
diff --git
a/net.mograsim.logic.model.am2900/components/GUIhalfadder.json
b/net.mograsim.logic.model.am2900/components/GUIhalfadder.json
index
761d6ce
..
dd070ea
100644
(file)
--- a/
net.mograsim.logic.model.am2900/components/GUIhalfadder.json
+++ b/
net.mograsim.logic.model.am2900/components/GUIhalfadder.json
@@
-306,11
+306,11
@@
mograsim version: 0.1.3
}
]
},
}
]
},
- "symbolRendererSnippetID": "
SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "GUIhalfadder",
"symbolRendererParams": {
"centerText": "GUIhalfadder",
- "horizontalComponentCenter": 17.5,
"centerTextHeight": 5.0,
"centerTextHeight": 5.0,
+ "horizontalComponentCenter": 17.5,
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
}
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
}
diff --git
a/net.mograsim.logic.model.am2900/components/GUImux1.json
b/net.mograsim.logic.model.am2900/components/GUImux1.json
index
7ce9002
..
60b22cd
100644
(file)
--- a/
net.mograsim.logic.model.am2900/components/GUImux1.json
+++ b/
net.mograsim.logic.model.am2900/components/GUImux1.json
@@
-219,11
+219,11
@@
mograsim version: 0.1.3
}
]
},
}
]
},
- "symbolRendererSnippetID": "
SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "GUImux1",
"symbolRendererParams": {
"centerText": "GUImux1",
- "horizontalComponentCenter": 17.5,
"centerTextHeight": 5.0,
"centerTextHeight": 5.0,
+ "horizontalComponentCenter": 17.5,
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
}
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
}
diff --git
a/net.mograsim.logic.model.am2900/components/GUImux1_4.json
b/net.mograsim.logic.model.am2900/components/GUImux1_4.json
index
21e2f21
..
7689ec7
100644
(file)
--- a/
net.mograsim.logic.model.am2900/components/GUImux1_4.json
+++ b/
net.mograsim.logic.model.am2900/components/GUImux1_4.json
@@
-457,11
+457,11
@@
mograsim version: 0.1.3
}
]
},
}
]
},
- "symbolRendererSnippetID": "
SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "GUImux1_4",
"symbolRendererParams": {
"centerText": "GUImux1_4",
- "horizontalComponentCenter": 17.5,
"centerTextHeight": 5.0,
"centerTextHeight": 5.0,
+ "horizontalComponentCenter": 17.5,
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
}
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
}
diff --git
a/net.mograsim.logic.model.am2900/components/GUInand3.json
b/net.mograsim.logic.model.am2900/components/GUInand3.json
index
b3a6300
..
f9fbb80
100644
(file)
--- a/
net.mograsim.logic.model.am2900/components/GUInand3.json
+++ b/
net.mograsim.logic.model.am2900/components/GUInand3.json
@@
-193,11
+193,11
@@
mograsim version: 0.1.3
}
]
},
}
]
},
- "symbolRendererSnippetID": "
SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "GUInand3",
"symbolRendererParams": {
"centerText": "GUInand3",
- "horizontalComponentCenter": 17.5,
"centerTextHeight": 5.0,
"centerTextHeight": 5.0,
+ "horizontalComponentCenter": 17.5,
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
}
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
}
diff --git
a/net.mograsim.logic.model.am2900/components/GUInot4.json
b/net.mograsim.logic.model.am2900/components/GUInot4.json
index
7d575c8
..
98f4cbe
100644
(file)
--- a/
net.mograsim.logic.model.am2900/components/GUInot4.json
+++ b/
net.mograsim.logic.model.am2900/components/GUInot4.json
@@
-363,11
+363,11
@@
mograsim version: 0.1.3
}
]
},
}
]
},
- "symbolRendererSnippetID": "
SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "GUInot4",
"symbolRendererParams": {
"centerText": "GUInot4",
- "horizontalComponentCenter": 17.5,
"centerTextHeight": 5.0,
"centerTextHeight": 5.0,
+ "horizontalComponentCenter": 17.5,
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
}
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
}
diff --git
a/net.mograsim.logic.model.am2900/components/GUIor4.json
b/net.mograsim.logic.model.am2900/components/GUIor4.json
index
d4bcd57
..
47755a3
100644
(file)
--- a/
net.mograsim.logic.model.am2900/components/GUIor4.json
+++ b/
net.mograsim.logic.model.am2900/components/GUIor4.json
@@
-514,11
+514,11
@@
mograsim version: 0.1.3
}
]
},
}
]
},
- "symbolRendererSnippetID": "
SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "GUIor4",
"symbolRendererParams": {
"centerText": "GUIor4",
- "horizontalComponentCenter": 17.5,
"centerTextHeight": 5.0,
"centerTextHeight": 5.0,
+ "horizontalComponentCenter": 17.5,
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
}
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
}
diff --git
a/net.mograsim.logic.model.am2900/components/GUIor_4.json
b/net.mograsim.logic.model.am2900/components/GUIor_4.json
index
86b4413
..
0e88690
100644
(file)
--- a/
net.mograsim.logic.model.am2900/components/GUIor_4.json
+++ b/
net.mograsim.logic.model.am2900/components/GUIor_4.json
@@
-835,11
+835,11
@@
mograsim version: 0.1.3
}
]
},
}
]
},
- "symbolRendererSnippetID": "
SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "GUIor_4",
"symbolRendererParams": {
"centerText": "GUIor_4",
- "horizontalComponentCenter": 17.5,
"centerTextHeight": 5.0,
"centerTextHeight": 5.0,
+ "horizontalComponentCenter": 17.5,
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
}
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
}
diff --git
a/net.mograsim.logic.model.am2900/components/GUIram2.json
b/net.mograsim.logic.model.am2900/components/GUIram2.json
index
3cb8583
..
a3e9e76
100644
(file)
--- a/
net.mograsim.logic.model.am2900/components/GUIram2.json
+++ b/
net.mograsim.logic.model.am2900/components/GUIram2.json
@@
-2818,11
+2818,11
@@
mograsim version: 0.1.3
}
]
},
}
]
},
- "symbolRendererSnippetID": "
SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "GUIram2",
"symbolRendererParams": {
"centerText": "GUIram2",
- "horizontalComponentCenter": 17.5,
"centerTextHeight": 5.0,
"centerTextHeight": 5.0,
+ "horizontalComponentCenter": 17.5,
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
}
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
}
diff --git
a/net.mograsim.logic.model.am2900/components/GUIram4.json
b/net.mograsim.logic.model.am2900/components/GUIram4.json
index
99f606d
..
d6d7ea8
100644
(file)
--- a/
net.mograsim.logic.model.am2900/components/GUIram4.json
+++ b/
net.mograsim.logic.model.am2900/components/GUIram4.json
@@
-3186,11
+3186,11
@@
mograsim version: 0.1.3
}
]
},
}
]
},
- "symbolRendererSnippetID": "
SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "GUIram4",
"symbolRendererParams": {
"centerText": "GUIram4",
- "horizontalComponentCenter": 17.5,
"centerTextHeight": 5.0,
"centerTextHeight": 5.0,
+ "horizontalComponentCenter": 17.5,
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
}
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
}
diff --git
a/net.mograsim.logic.model.am2900/components/GUIsel2_4.json
b/net.mograsim.logic.model.am2900/components/GUIsel2_4.json
index
219e1b9
..
099fb5f
100644
(file)
--- a/
net.mograsim.logic.model.am2900/components/GUIsel2_4.json
+++ b/
net.mograsim.logic.model.am2900/components/GUIsel2_4.json
@@
-801,11
+801,11
@@
mograsim version: 0.1.3
}
]
},
}
]
},
- "symbolRendererSnippetID": "
SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "GUIsel2_4",
"symbolRendererParams": {
"centerText": "GUIsel2_4",
- "horizontalComponentCenter": 17.5,
"centerTextHeight": 5.0,
"centerTextHeight": 5.0,
+ "horizontalComponentCenter": 17.5,
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
}
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
}
diff --git
a/net.mograsim.logic.model.am2900/components/GUIsel3_4.json
b/net.mograsim.logic.model.am2900/components/GUIsel3_4.json
index
1cae789
..
c85cf05
100644
(file)
--- a/
net.mograsim.logic.model.am2900/components/GUIsel3_4.json
+++ b/
net.mograsim.logic.model.am2900/components/GUIsel3_4.json
@@
-867,11
+867,11
@@
mograsim version: 0.1.3
}
]
},
}
]
},
- "symbolRendererSnippetID": "
SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "GUIsel3_4",
"symbolRendererParams": {
"centerText": "GUIsel3_4",
- "horizontalComponentCenter": 17.5,
"centerTextHeight": 5.0,
"centerTextHeight": 5.0,
+ "horizontalComponentCenter": 17.5,
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
}
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
}
diff --git
a/net.mograsim.logic.model.am2900/components/GUIxor.json
b/net.mograsim.logic.model.am2900/components/GUIxor.json
index
9e3ec59
..
d4e28ed
100644
(file)
--- a/
net.mograsim.logic.model.am2900/components/GUIxor.json
+++ b/
net.mograsim.logic.model.am2900/components/GUIxor.json
@@
-256,11
+256,11
@@
mograsim version: 0.1.3
}
]
},
}
]
},
- "symbolRendererSnippetID": "
SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "GUIxor",
"symbolRendererParams": {
"centerText": "GUIxor",
- "horizontalComponentCenter": 17.5,
"centerTextHeight": 5.0,
"centerTextHeight": 5.0,
+ "horizontalComponentCenter": 17.5,
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
}
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
}
diff --git
a/net.mograsim.logic.model.am2900/components/am2901/GUIAm2901.json
b/net.mograsim.logic.model.am2900/components/am2901/GUIAm2901.json
index
7563d83
..
b40848d
100644
(file)
--- a/
net.mograsim.logic.model.am2900/components/am2901/GUIAm2901.json
+++ b/
net.mograsim.logic.model.am2900/components/am2901/GUIAm2901.json
@@
-3234,11
+3234,11
@@
mograsim version: 0.1.3
}
]
},
}
]
},
- "symbolRendererSnippetID": "
SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "GUIAm2901",
"symbolRendererParams": {
"centerText": "GUIAm2901",
- "horizontalComponentCenter": 17.5,
"centerTextHeight": 5.0,
"centerTextHeight": 5.0,
+ "horizontalComponentCenter": 17.5,
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
}
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
}
diff --git
a/net.mograsim.logic.model.am2900/components/am2901/GUIAm2901ALUFuncDecode.json
b/net.mograsim.logic.model.am2900/components/am2901/GUIAm2901ALUFuncDecode.json
index
a24476b
..
b9c4492
100644
(file)
--- a/
net.mograsim.logic.model.am2900/components/am2901/GUIAm2901ALUFuncDecode.json
+++ b/
net.mograsim.logic.model.am2900/components/am2901/GUIAm2901ALUFuncDecode.json
@@
-670,11
+670,11
@@
mograsim version: 0.1.3
}
]
},
}
]
},
- "symbolRendererSnippetID": "
SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "GUIAm2901ALUFuncDecode",
"symbolRendererParams": {
"centerText": "GUIAm2901ALUFuncDecode",
- "horizontalComponentCenter": 17.5,
"centerTextHeight": 5.0,
"centerTextHeight": 5.0,
+ "horizontalComponentCenter": 17.5,
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
}
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
}
diff --git
a/net.mograsim.logic.model.am2900/components/am2901/GUIAm2901ALUInclDecode.json
b/net.mograsim.logic.model.am2900/components/am2901/GUIAm2901ALUInclDecode.json
index
62d78f1
..
ee540ec
100644
(file)
--- a/
net.mograsim.logic.model.am2900/components/am2901/GUIAm2901ALUInclDecode.json
+++ b/
net.mograsim.logic.model.am2900/components/am2901/GUIAm2901ALUInclDecode.json
@@
-1442,11
+1442,11
@@
mograsim version: 0.1.3
}
]
},
}
]
},
- "symbolRendererSnippetID": "
SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "GUIAm2901ALUInclDecode",
"symbolRendererParams": {
"centerText": "GUIAm2901ALUInclDecode",
- "horizontalComponentCenter": 17.5,
"centerTextHeight": 5.0,
"centerTextHeight": 5.0,
+ "horizontalComponentCenter": 17.5,
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
}
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
}
diff --git
a/net.mograsim.logic.model.am2900/components/am2901/GUIAm2901ALUInclSourceDecodeInclFunctionDecode.json
b/net.mograsim.logic.model.am2900/components/am2901/GUIAm2901ALUInclSourceDecodeInclFunctionDecode.json
index
75c63dd
..
5e9bea0
100644
(file)
--- a/
net.mograsim.logic.model.am2900/components/am2901/GUIAm2901ALUInclSourceDecodeInclFunctionDecode.json
+++ b/
net.mograsim.logic.model.am2900/components/am2901/GUIAm2901ALUInclSourceDecodeInclFunctionDecode.json
@@
-1302,11
+1302,11
@@
mograsim version: 0.1.3
}
]
},
}
]
},
- "symbolRendererSnippetID": "
SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "GUIAm2901ALUInclSourceDecodeInclFunctionDecode",
"symbolRendererParams": {
"centerText": "GUIAm2901ALUInclSourceDecodeInclFunctionDecode",
- "horizontalComponentCenter": 17.5,
"centerTextHeight": 5.0,
"centerTextHeight": 5.0,
+ "horizontalComponentCenter": 17.5,
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
}
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
}
diff --git
a/net.mograsim.logic.model.am2900/components/am2901/GUIAm2901ALUOneBit.json
b/net.mograsim.logic.model.am2900/components/am2901/GUIAm2901ALUOneBit.json
index
b6b05e1
..
1dffc50
100644
(file)
--- a/
net.mograsim.logic.model.am2900/components/am2901/GUIAm2901ALUOneBit.json
+++ b/
net.mograsim.logic.model.am2900/components/am2901/GUIAm2901ALUOneBit.json
@@
-510,11
+510,11
@@
mograsim version: 0.1.3
}
]
},
}
]
},
- "symbolRendererSnippetID": "
SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "GUIAm2901ALUOneBit",
"symbolRendererParams": {
"centerText": "GUIAm2901ALUOneBit",
- "horizontalComponentCenter": 17.5,
"centerTextHeight": 5.0,
"centerTextHeight": 5.0,
+ "horizontalComponentCenter": 17.5,
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
}
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
}
diff --git
a/net.mograsim.logic.model.am2900/components/am2901/GUIAm2901DestDecode.json
b/net.mograsim.logic.model.am2900/components/am2901/GUIAm2901DestDecode.json
index
d80d080
..
3a75574
100644
(file)
--- a/
net.mograsim.logic.model.am2900/components/am2901/GUIAm2901DestDecode.json
+++ b/
net.mograsim.logic.model.am2900/components/am2901/GUIAm2901DestDecode.json
@@
-1024,11
+1024,11
@@
mograsim version: 0.1.3
}
]
},
}
]
},
- "symbolRendererSnippetID": "
SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "GUIAm2901DestDecode",
"symbolRendererParams": {
"centerText": "GUIAm2901DestDecode",
- "horizontalComponentCenter": 17.5,
"centerTextHeight": 5.0,
"centerTextHeight": 5.0,
+ "horizontalComponentCenter": 17.5,
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
}
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
}
diff --git
a/net.mograsim.logic.model.am2900/components/am2901/GUIAm2901QReg.json
b/net.mograsim.logic.model.am2900/components/am2901/GUIAm2901QReg.json
index
6af804d
..
ec0983e
100644
(file)
--- a/
net.mograsim.logic.model.am2900/components/am2901/GUIAm2901QReg.json
+++ b/
net.mograsim.logic.model.am2900/components/am2901/GUIAm2901QReg.json
@@
-397,11
+397,11
@@
mograsim version: 0.1.3
}
]
},
}
]
},
- "symbolRendererSnippetID": "
SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "GUIAm2901QReg",
"symbolRendererParams": {
"centerText": "GUIAm2901QReg",
- "horizontalComponentCenter": 17.5,
"centerTextHeight": 5.0,
"centerTextHeight": 5.0,
+ "horizontalComponentCenter": 17.5,
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
}
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
}
diff --git
a/net.mograsim.logic.model.am2900/components/am2901/GUIAm2901SourceDecode.json
b/net.mograsim.logic.model.am2900/components/am2901/GUIAm2901SourceDecode.json
index
e36193d
..
a995649
100644
(file)
--- a/
net.mograsim.logic.model.am2900/components/am2901/GUIAm2901SourceDecode.json
+++ b/
net.mograsim.logic.model.am2900/components/am2901/GUIAm2901SourceDecode.json
@@
-1065,11
+1065,11
@@
mograsim version: 0.1.3
}
]
},
}
]
},
- "symbolRendererSnippetID": "
SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "Am2901SourceDecode",
"symbolRendererParams": {
"centerText": "Am2901SourceDecode",
- "horizontalComponentCenter": 17.5,
"centerTextHeight": 5.0,
"centerTextHeight": 5.0,
+ "horizontalComponentCenter": 17.5,
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
}
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
}
diff --git
a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/examples/ComponenetSerializer.java
b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/examples/ComponenetSerializer.java
index
00478d4
..
ea629a6
100644
(file)
--- a/
net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/examples/ComponenetSerializer.java
+++ b/
net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/examples/ComponenetSerializer.java
@@
-58,9
+58,12
@@
public class ComponenetSerializer
for (SubmodelComponent comp : components)
{
SubmodelComponentParams params = SubmodelComponentSerializer.serialize(comp, getIdentifier);
for (SubmodelComponent comp : components)
{
SubmodelComponentParams params = SubmodelComponentSerializer.serialize(comp, getIdentifier);
- JsonHandler.writeJson(params, "components/"
- + comp.getClass().getName().substring("net.mograsim.logic.ui.model.components.mi.nandbased.".length()).replace('.', '/')
- + ".json");
+ JsonHandler
+ .writeJson(params,
+ "components/"
+ + comp.getClass().getName()
+ .substring("net.mograsim.logic.model.model.components.mi.nandbased.".length()).replace('.', '/')
+ + ".json");
}
}
}
\ No newline at end of file
}
}
}
\ No newline at end of file