projects
/
Mograsim.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
0cb5e7f
)
Reserialized all components with new ID improvement
author
Daniel Kirschten
<daniel.kirschten@gmx.de>
Sun, 1 Sep 2019 11:14:09 +0000
(13:14 +0200)
committer
Daniel Kirschten
<daniel.kirschten@gmx.de>
Sun, 1 Sep 2019 11:14:09 +0000
(13:14 +0200)
77 files changed:
net.mograsim.logic.model.am2900/GUIAm2904Testbench.json
patch
|
blob
|
history
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/GUIdff4.json
patch
|
blob
|
history
net.mograsim.logic.model.am2900/components/GUIdff4_invwe.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/GUImux2.json
patch
|
blob
|
history
net.mograsim.logic.model.am2900/components/GUImux2_4.json
patch
|
blob
|
history
net.mograsim.logic.model.am2900/components/GUImux3.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/GUIsel1.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/GUIAm2901SourceDecode.json
patch
|
blob
|
history
net.mograsim.logic.model.am2900/components/am2904/GUIAm2904.json
patch
|
blob
|
history
net.mograsim.logic.model.am2900/components/am2904/GUIAm2904MSR.json
patch
|
blob
|
history
net.mograsim.logic.model.am2900/components/am2904/GUIAm2904TestLogic.json
patch
|
blob
|
history
net.mograsim.logic.model.am2900/components/am2904/GUIAm2904muSR.json
patch
|
blob
|
history
net.mograsim.logic.model.editor/components/GUI_rsLatch.json
patch
|
blob
|
history
net.mograsim.logic.model.editor/components/GUIand.json
patch
|
blob
|
history
net.mograsim.logic.model.editor/components/GUIand41.json
patch
|
blob
|
history
net.mograsim.logic.model.editor/components/GUIandor414.json
patch
|
blob
|
history
net.mograsim.logic.model.editor/components/GUIdemux2.json
patch
|
blob
|
history
net.mograsim.logic.model.editor/components/GUIdff.json
patch
|
blob
|
history
net.mograsim.logic.model.editor/components/GUIdff4.json
patch
|
blob
|
history
net.mograsim.logic.model.editor/components/GUIdff4_invwe.json
patch
|
blob
|
history
net.mograsim.logic.model.editor/components/GUIdlatch.json
patch
|
blob
|
history
net.mograsim.logic.model.editor/components/GUIdlatch4.json
patch
|
blob
|
history
net.mograsim.logic.model.editor/components/GUIfulladder.json
patch
|
blob
|
history
net.mograsim.logic.model.editor/components/GUIhalfadder.json
patch
|
blob
|
history
net.mograsim.logic.model.editor/components/GUImux1.json
patch
|
blob
|
history
net.mograsim.logic.model.editor/components/GUImux1_4.json
patch
|
blob
|
history
net.mograsim.logic.model.editor/components/GUImux2.json
patch
|
blob
|
history
net.mograsim.logic.model.editor/components/GUImux2_4.json
patch
|
blob
|
history
net.mograsim.logic.model.editor/components/GUImux3.json
patch
|
blob
|
history
net.mograsim.logic.model.editor/components/GUInand3.json
patch
|
blob
|
history
net.mograsim.logic.model.editor/components/GUInot4.json
patch
|
blob
|
history
net.mograsim.logic.model.editor/components/GUIor4.json
patch
|
blob
|
history
net.mograsim.logic.model.editor/components/GUIor_4.json
patch
|
blob
|
history
net.mograsim.logic.model.editor/components/GUIram2.json
patch
|
blob
|
history
net.mograsim.logic.model.editor/components/GUIram4.json
patch
|
blob
|
history
net.mograsim.logic.model.editor/components/GUIsel1.json
patch
|
blob
|
history
net.mograsim.logic.model.editor/components/GUIsel2_4.json
patch
|
blob
|
history
net.mograsim.logic.model.editor/components/GUIsel3_4.json
patch
|
blob
|
history
net.mograsim.logic.model.editor/components/GUIxor.json
patch
|
blob
|
history
net.mograsim.logic.model.editor/components/am2901/GUIAm2901.json
patch
|
blob
|
history
net.mograsim.logic.model.editor/components/am2901/GUIAm2901ALUFuncDecode.json
patch
|
blob
|
history
net.mograsim.logic.model.editor/components/am2901/GUIAm2901ALUInclDecode.json
patch
|
blob
|
history
net.mograsim.logic.model.editor/components/am2901/GUIAm2901ALUInclSourceDecodeInclFunctionDecode.json
patch
|
blob
|
history
net.mograsim.logic.model.editor/components/am2901/GUIAm2901ALUOneBit.json
patch
|
blob
|
history
net.mograsim.logic.model.editor/components/am2901/GUIAm2901DestDecode.json
patch
|
blob
|
history
net.mograsim.logic.model.editor/components/am2901/GUIAm2901SourceDecode.json
patch
|
blob
|
history
net.mograsim.logic.model.editor/components/am2904/GUIAm2904.json
patch
|
blob
|
history
net.mograsim.logic.model.editor/components/am2904/GUIAm2904MSR.json
patch
|
blob
|
history
net.mograsim.logic.model.editor/components/am2904/GUIAm2904TestLogic.json
patch
|
blob
|
history
net.mograsim.logic.model.editor/components/am2904/GUIAm2904muSR.json
patch
|
blob
|
history
diff --git
a/net.mograsim.logic.model.am2900/GUIAm2904Testbench.json
b/net.mograsim.logic.model.am2900/GUIAm2904Testbench.json
index
568ee04
..
a36c8e0
100644
(file)
--- a/
net.mograsim.logic.model.am2900/GUIAm2904Testbench.json
+++ b/
net.mograsim.logic.model.am2900/GUIAm2904Testbench.json
@@
-14,7
+14,7
@@
}
},
{
}
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUIBitDisplay",
+ "id": "GUIBitDisplay",
"name": "GUIBitDisplay#0",
"pos": {
"x": 391.0,
"name": "GUIBitDisplay#0",
"pos": {
"x": 391.0,
@@
-23,7
+23,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUIBitDisplay",
+ "id": "GUIBitDisplay",
"name": "GUIBitDisplay#1",
"pos": {
"x": 391.0,
"name": "GUIBitDisplay#1",
"pos": {
"x": 391.0,
@@
-32,7
+32,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUIBitDisplay",
+ "id": "GUIBitDisplay",
"name": "GUIBitDisplay#2",
"pos": {
"x": 391.0,
"name": "GUIBitDisplay#2",
"pos": {
"x": 391.0,
@@
-41,7
+41,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUIBitDisplay",
+ "id": "GUIBitDisplay",
"name": "GUIBitDisplay#3",
"pos": {
"x": 391.0,
"name": "GUIBitDisplay#3",
"pos": {
"x": 391.0,
@@
-50,7
+50,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUIBitDisplay",
+ "id": "GUIBitDisplay",
"name": "GUIBitDisplay#4",
"pos": {
"x": 365.0,
"name": "GUIBitDisplay#4",
"pos": {
"x": 365.0,
@@
-59,7
+59,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUIBitDisplay",
+ "id": "GUIBitDisplay",
"name": "GUIBitDisplay#5",
"pos": {
"x": 365.0,
"name": "GUIBitDisplay#5",
"pos": {
"x": 365.0,
@@
-68,7
+68,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUIBitDisplay",
+ "id": "GUIBitDisplay",
"name": "GUIBitDisplay#6",
"pos": {
"x": 365.0,
"name": "GUIBitDisplay#6",
"pos": {
"x": 365.0,
@@
-77,7
+77,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUIBitDisplay",
+ "id": "GUIBitDisplay",
"name": "GUIBitDisplay#7",
"pos": {
"x": 365.0,
"name": "GUIBitDisplay#7",
"pos": {
"x": 365.0,
@@
-86,7
+86,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUIBitDisplay",
+ "id": "GUIBitDisplay",
"name": "GUIBitDisplay#8",
"pos": {
"x": 365.0,
"name": "GUIBitDisplay#8",
"pos": {
"x": 365.0,
@@
-95,7
+95,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUIBitDisplay",
+ "id": "GUIBitDisplay",
"name": "GUIBitDisplay#9",
"pos": {
"x": 365.0,
"name": "GUIBitDisplay#9",
"pos": {
"x": 365.0,
@@
-104,7
+104,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUIManualSwitch",
+ "id": "GUIManualSwitch",
"name": "GUIManualSwitch#0",
"pos": {
"x": 255.0,
"name": "GUIManualSwitch#0",
"pos": {
"x": 255.0,
@@
-113,7
+113,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUIManualSwitch",
+ "id": "GUIManualSwitch",
"name": "GUIManualSwitch#1",
"pos": {
"x": 170.0,
"name": "GUIManualSwitch#1",
"pos": {
"x": 170.0,
@@
-122,7
+122,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUIManualSwitch",
+ "id": "GUIManualSwitch",
"name": "GUIManualSwitch#10",
"pos": {
"x": 160.0,
"name": "GUIManualSwitch#10",
"pos": {
"x": 160.0,
@@
-131,7
+131,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUIManualSwitch",
+ "id": "GUIManualSwitch",
"name": "GUIManualSwitch#11",
"pos": {
"x": 160.0,
"name": "GUIManualSwitch#11",
"pos": {
"x": 160.0,
@@
-140,7
+140,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUIManualSwitch",
+ "id": "GUIManualSwitch",
"name": "GUIManualSwitch#12",
"pos": {
"x": 160.0,
"name": "GUIManualSwitch#12",
"pos": {
"x": 160.0,
@@
-149,7
+149,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUIManualSwitch",
+ "id": "GUIManualSwitch",
"name": "GUIManualSwitch#13",
"pos": {
"x": 60.0,
"name": "GUIManualSwitch#13",
"pos": {
"x": 60.0,
@@
-158,7
+158,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUIManualSwitch",
+ "id": "GUIManualSwitch",
"name": "GUIManualSwitch#14",
"pos": {
"x": 165.0,
"name": "GUIManualSwitch#14",
"pos": {
"x": 165.0,
@@
-167,7
+167,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUIManualSwitch",
+ "id": "GUIManualSwitch",
"name": "GUIManualSwitch#15",
"pos": {
"x": 140.0,
"name": "GUIManualSwitch#15",
"pos": {
"x": 140.0,
@@
-176,7
+176,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUIManualSwitch",
+ "id": "GUIManualSwitch",
"name": "GUIManualSwitch#16",
"pos": {
"x": 140.0,
"name": "GUIManualSwitch#16",
"pos": {
"x": 140.0,
@@
-185,7
+185,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUIManualSwitch",
+ "id": "GUIManualSwitch",
"name": "GUIManualSwitch#17",
"pos": {
"x": 140.0,
"name": "GUIManualSwitch#17",
"pos": {
"x": 140.0,
@@
-194,7
+194,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUIManualSwitch",
+ "id": "GUIManualSwitch",
"name": "GUIManualSwitch#18",
"pos": {
"x": 140.0,
"name": "GUIManualSwitch#18",
"pos": {
"x": 140.0,
@@
-203,7
+203,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUIManualSwitch",
+ "id": "GUIManualSwitch",
"name": "GUIManualSwitch#19",
"pos": {
"x": 140.0,
"name": "GUIManualSwitch#19",
"pos": {
"x": 140.0,
@@
-212,7
+212,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUIManualSwitch",
+ "id": "GUIManualSwitch",
"name": "GUIManualSwitch#2",
"pos": {
"x": 170.0,
"name": "GUIManualSwitch#2",
"pos": {
"x": 170.0,
@@
-221,7
+221,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUIManualSwitch",
+ "id": "GUIManualSwitch",
"name": "GUIManualSwitch#20",
"pos": {
"x": 140.0,
"name": "GUIManualSwitch#20",
"pos": {
"x": 140.0,
@@
-230,7
+230,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUIManualSwitch",
+ "id": "GUIManualSwitch",
"name": "GUIManualSwitch#21",
"pos": {
"x": 55.0,
"name": "GUIManualSwitch#21",
"pos": {
"x": 55.0,
@@
-239,7
+239,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUIManualSwitch",
+ "id": "GUIManualSwitch",
"name": "GUIManualSwitch#22",
"pos": {
"x": 60.0,
"name": "GUIManualSwitch#22",
"pos": {
"x": 60.0,
@@
-248,7
+248,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUIManualSwitch",
+ "id": "GUIManualSwitch",
"name": "GUIManualSwitch#23",
"pos": {
"x": 60.0,
"name": "GUIManualSwitch#23",
"pos": {
"x": 60.0,
@@
-257,7
+257,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUIManualSwitch",
+ "id": "GUIManualSwitch",
"name": "GUIManualSwitch#24",
"pos": {
"x": 55.0,
"name": "GUIManualSwitch#24",
"pos": {
"x": 55.0,
@@
-266,7
+266,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUIManualSwitch",
+ "id": "GUIManualSwitch",
"name": "GUIManualSwitch#25",
"pos": {
"x": 55.0,
"name": "GUIManualSwitch#25",
"pos": {
"x": 55.0,
@@
-275,7
+275,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUIManualSwitch",
+ "id": "GUIManualSwitch",
"name": "GUIManualSwitch#26",
"pos": {
"x": 60.0,
"name": "GUIManualSwitch#26",
"pos": {
"x": 60.0,
@@
-284,7
+284,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUIManualSwitch",
+ "id": "GUIManualSwitch",
"name": "GUIManualSwitch#27",
"pos": {
"x": 60.0,
"name": "GUIManualSwitch#27",
"pos": {
"x": 60.0,
@@
-293,7
+293,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUIManualSwitch",
+ "id": "GUIManualSwitch",
"name": "GUIManualSwitch#28",
"pos": {
"x": 55.0,
"name": "GUIManualSwitch#28",
"pos": {
"x": 55.0,
@@
-302,7
+302,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUIManualSwitch",
+ "id": "GUIManualSwitch",
"name": "GUIManualSwitch#29",
"pos": {
"x": 55.0,
"name": "GUIManualSwitch#29",
"pos": {
"x": 55.0,
@@
-311,7
+311,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUIManualSwitch",
+ "id": "GUIManualSwitch",
"name": "GUIManualSwitch#3",
"pos": {
"x": 55.0,
"name": "GUIManualSwitch#3",
"pos": {
"x": 55.0,
@@
-320,7
+320,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUIManualSwitch",
+ "id": "GUIManualSwitch",
"name": "GUIManualSwitch#30",
"pos": {
"x": 60.0,
"name": "GUIManualSwitch#30",
"pos": {
"x": 60.0,
@@
-329,7
+329,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUIManualSwitch",
+ "id": "GUIManualSwitch",
"name": "GUIManualSwitch#31",
"pos": {
"x": 55.0,
"name": "GUIManualSwitch#31",
"pos": {
"x": 55.0,
@@
-338,7
+338,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUIManualSwitch",
+ "id": "GUIManualSwitch",
"name": "GUIManualSwitch#32",
"pos": {
"x": 300.0,
"name": "GUIManualSwitch#32",
"pos": {
"x": 300.0,
@@
-347,7
+347,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUIManualSwitch",
+ "id": "GUIManualSwitch",
"name": "GUIManualSwitch#33",
"pos": {
"x": 300.0,
"name": "GUIManualSwitch#33",
"pos": {
"x": 300.0,
@@
-356,7
+356,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUIManualSwitch",
+ "id": "GUIManualSwitch",
"name": "GUIManualSwitch#34",
"pos": {
"x": 300.0,
"name": "GUIManualSwitch#34",
"pos": {
"x": 300.0,
@@
-365,7
+365,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUIManualSwitch",
+ "id": "GUIManualSwitch",
"name": "GUIManualSwitch#35",
"pos": {
"x": 300.0,
"name": "GUIManualSwitch#35",
"pos": {
"x": 300.0,
@@
-374,7
+374,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUIManualSwitch",
+ "id": "GUIManualSwitch",
"name": "GUIManualSwitch#36",
"pos": {
"x": 300.0,
"name": "GUIManualSwitch#36",
"pos": {
"x": 300.0,
@@
-383,7
+383,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUIManualSwitch",
+ "id": "GUIManualSwitch",
"name": "GUIManualSwitch#37",
"pos": {
"x": 165.0,
"name": "GUIManualSwitch#37",
"pos": {
"x": 165.0,
@@
-392,7
+392,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUIManualSwitch",
+ "id": "GUIManualSwitch",
"name": "GUIManualSwitch#38",
"pos": {
"x": 385.0,
"name": "GUIManualSwitch#38",
"pos": {
"x": 385.0,
@@
-401,7
+401,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUIManualSwitch",
+ "id": "GUIManualSwitch",
"name": "GUIManualSwitch#4",
"pos": {
"x": 170.0,
"name": "GUIManualSwitch#4",
"pos": {
"x": 170.0,
@@
-410,7
+410,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUIManualSwitch",
+ "id": "GUIManualSwitch",
"name": "GUIManualSwitch#5",
"pos": {
"x": 170.0,
"name": "GUIManualSwitch#5",
"pos": {
"x": 170.0,
@@
-419,7
+419,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUIManualSwitch",
+ "id": "GUIManualSwitch",
"name": "GUIManualSwitch#6",
"pos": {
"x": 170.0,
"name": "GUIManualSwitch#6",
"pos": {
"x": 170.0,
@@
-428,7
+428,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUIManualSwitch",
+ "id": "GUIManualSwitch",
"name": "GUIManualSwitch#7",
"pos": {
"x": 155.0,
"name": "GUIManualSwitch#7",
"pos": {
"x": 155.0,
@@
-437,7
+437,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUIManualSwitch",
+ "id": "GUIManualSwitch",
"name": "GUIManualSwitch#8",
"pos": {
"x": 155.0,
"name": "GUIManualSwitch#8",
"pos": {
"x": 155.0,
@@
-446,7
+446,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUIManualSwitch",
+ "id": "GUIManualSwitch",
"name": "GUIManualSwitch#9",
"pos": {
"x": 160.0,
"name": "GUIManualSwitch#9",
"pos": {
"x": 160.0,
@@
-455,7
+455,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUIMerger",
+ "id": "GUIMerger",
"name": "GUIMerger#0",
"pos": {
"x": 85.0,
"name": "GUIMerger#0",
"pos": {
"x": 85.0,
@@
-464,7
+464,7
@@
"params": 13
},
{
"params": 13
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUITriStateBuffer",
+ "id": "GUITriStateBuffer",
"name": "GUITriStateBuffer#0",
"pos": {
"x": 175.0,
"name": "GUITriStateBuffer#0",
"pos": {
"x": 175.0,
@@
-476,7
+476,7
@@
}
},
{
}
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUITriStateBuffer",
+ "id": "GUITriStateBuffer",
"name": "GUITriStateBuffer#1",
"pos": {
"x": 175.0,
"name": "GUITriStateBuffer#1",
"pos": {
"x": 175.0,
@@
-488,7
+488,7
@@
}
},
{
}
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUITriStateBuffer",
+ "id": "GUITriStateBuffer",
"name": "GUITriStateBuffer#2",
"pos": {
"x": 175.0,
"name": "GUITriStateBuffer#2",
"pos": {
"x": 175.0,
@@
-500,7
+500,7
@@
}
},
{
}
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUITriStateBuffer",
+ "id": "GUITriStateBuffer",
"name": "GUITriStateBuffer#3",
"pos": {
"x": 175.0,
"name": "GUITriStateBuffer#3",
"pos": {
"x": 175.0,
@@
-512,7
+512,7
@@
}
},
{
}
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUITriStateBuffer",
+ "id": "GUITriStateBuffer",
"name": "GUITriStateBuffer#4",
"pos": {
"x": 335.0,
"name": "GUITriStateBuffer#4",
"pos": {
"x": 335.0,
@@
-524,7
+524,7
@@
}
},
{
}
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUITriStateBuffer",
+ "id": "GUITriStateBuffer",
"name": "GUITriStateBuffer#5",
"pos": {
"x": 335.0,
"name": "GUITriStateBuffer#5",
"pos": {
"x": 335.0,
@@
-536,7
+536,7
@@
}
},
{
}
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUITriStateBuffer",
+ "id": "GUITriStateBuffer",
"name": "GUITriStateBuffer#6",
"pos": {
"x": 335.0,
"name": "GUITriStateBuffer#6",
"pos": {
"x": 335.0,
@@
-548,7
+548,7
@@
}
},
{
}
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUITriStateBuffer",
+ "id": "GUITriStateBuffer",
"name": "GUITriStateBuffer#7",
"pos": {
"x": 335.0,
"name": "GUITriStateBuffer#7",
"pos": {
"x": 335.0,
@@
-560,7
+560,7
@@
}
},
{
}
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
TextComponent",
+ "id": "TextComponent",
"name": "TextComponent#0",
"pos": {
"x": 140.0,
"name": "TextComponent#0",
"pos": {
"x": 140.0,
@@
-569,7
+569,7
@@
"params": "IZ"
},
{
"params": "IZ"
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
TextComponent",
+ "id": "TextComponent",
"name": "TextComponent#1",
"pos": {
"x": 140.0,
"name": "TextComponent#1",
"pos": {
"x": 140.0,
@@
-578,7
+578,7
@@
"params": "IC"
},
{
"params": "IC"
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
TextComponent",
+ "id": "TextComponent",
"name": "TextComponent#10",
"pos": {
"x": 35.0,
"name": "TextComponent#10",
"pos": {
"x": 35.0,
@@
-587,7
+587,7
@@
"params": "I0"
},
{
"params": "I0"
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
TextComponent",
+ "id": "TextComponent",
"name": "TextComponent#11",
"pos": {
"x": 35.0,
"name": "TextComponent#11",
"pos": {
"x": 35.0,
@@
-596,7
+596,7
@@
"params": "I12"
},
{
"params": "I12"
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
TextComponent",
+ "id": "TextComponent",
"name": "TextComponent#12",
"pos": {
"x": 35.0,
"name": "TextComponent#12",
"pos": {
"x": 35.0,
@@
-605,7
+605,7
@@
"params": "I2"
},
{
"params": "I2"
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
TextComponent",
+ "id": "TextComponent",
"name": "TextComponent#13",
"pos": {
"x": 40.0,
"name": "TextComponent#13",
"pos": {
"x": 40.0,
@@
-614,7
+614,7
@@
"params": "I5"
},
{
"params": "I5"
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
TextComponent",
+ "id": "TextComponent",
"name": "TextComponent#14",
"pos": {
"x": 40.0,
"name": "TextComponent#14",
"pos": {
"x": 40.0,
@@
-623,7
+623,7
@@
"params": "I1"
},
{
"params": "I1"
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
TextComponent",
+ "id": "TextComponent",
"name": "TextComponent#15",
"pos": {
"x": 40.0,
"name": "TextComponent#15",
"pos": {
"x": 40.0,
@@
-632,7
+632,7
@@
"params": "I3"
},
{
"params": "I3"
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
TextComponent",
+ "id": "TextComponent",
"name": "TextComponent#16",
"pos": {
"x": 35.0,
"name": "TextComponent#16",
"pos": {
"x": 35.0,
@@
-641,7
+641,7
@@
"params": "I4"
},
{
"params": "I4"
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
TextComponent",
+ "id": "TextComponent",
"name": "TextComponent#17",
"pos": {
"x": 35.0,
"name": "TextComponent#17",
"pos": {
"x": 35.0,
@@
-650,7
+650,7
@@
"params": "I6"
},
{
"params": "I6"
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
TextComponent",
+ "id": "TextComponent",
"name": "TextComponent#18",
"pos": {
"x": 40.0,
"name": "TextComponent#18",
"pos": {
"x": 40.0,
@@
-659,7
+659,7
@@
"params": "I7"
},
{
"params": "I7"
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
TextComponent",
+ "id": "TextComponent",
"name": "TextComponent#19",
"pos": {
"x": 35.0,
"name": "TextComponent#19",
"pos": {
"x": 35.0,
@@
-668,7
+668,7
@@
"params": "I8"
},
{
"params": "I8"
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
TextComponent",
+ "id": "TextComponent",
"name": "TextComponent#2",
"pos": {
"x": 140.0,
"name": "TextComponent#2",
"pos": {
"x": 140.0,
@@
-677,7
+677,7
@@
"params": "IN"
},
{
"params": "IN"
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
TextComponent",
+ "id": "TextComponent",
"name": "TextComponent#20",
"pos": {
"x": 40.0,
"name": "TextComponent#20",
"pos": {
"x": 40.0,
@@
-686,7
+686,7
@@
"params": "I9"
},
{
"params": "I9"
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
TextComponent",
+ "id": "TextComponent",
"name": "TextComponent#21",
"pos": {
"x": 35.0,
"name": "TextComponent#21",
"pos": {
"x": 35.0,
@@
-695,7
+695,7
@@
"params": "I10"
},
{
"params": "I10"
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
TextComponent",
+ "id": "TextComponent",
"name": "TextComponent#22",
"pos": {
"x": 40.0,
"name": "TextComponent#22",
"pos": {
"x": 40.0,
@@
-704,7
+704,7
@@
"params": "I11"
},
{
"params": "I11"
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
TextComponent",
+ "id": "TextComponent",
"name": "TextComponent#23",
"pos": {
"x": 145.0,
"name": "TextComponent#23",
"pos": {
"x": 145.0,
@@
-713,7
+713,7
@@
"params": "CX"
},
{
"params": "CX"
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
TextComponent",
+ "id": "TextComponent",
"name": "TextComponent#24",
"pos": {
"x": 150.0,
"name": "TextComponent#24",
"pos": {
"x": 150.0,
@@
-722,7
+722,7
@@
"params": "C"
},
{
"params": "C"
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
TextComponent",
+ "id": "TextComponent",
"name": "TextComponent#25",
"pos": {
"x": 225.0,
"name": "TextComponent#25",
"pos": {
"x": 225.0,
@@
-731,7
+731,7
@@
"params": "_OEY"
},
{
"params": "_OEY"
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
TextComponent",
+ "id": "TextComponent",
"name": "TextComponent#26",
"pos": {
"x": 416.0,
"name": "TextComponent#26",
"pos": {
"x": 416.0,
@@
-740,7
+740,7
@@
"params": "YZ"
},
{
"params": "YZ"
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
TextComponent",
+ "id": "TextComponent",
"name": "TextComponent#27",
"pos": {
"x": 416.0,
"name": "TextComponent#27",
"pos": {
"x": 416.0,
@@
-749,7
+749,7
@@
"params": "YC"
},
{
"params": "YC"
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
TextComponent",
+ "id": "TextComponent",
"name": "TextComponent#28",
"pos": {
"x": 416.0,
"name": "TextComponent#28",
"pos": {
"x": 416.0,
@@
-758,7
+758,7
@@
"params": "YN"
},
{
"params": "YN"
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
TextComponent",
+ "id": "TextComponent",
"name": "TextComponent#29",
"pos": {
"x": 416.0,
"name": "TextComponent#29",
"pos": {
"x": 416.0,
@@
-767,7
+767,7
@@
"params": "YOVR"
},
{
"params": "YOVR"
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
TextComponent",
+ "id": "TextComponent",
"name": "TextComponent#3",
"pos": {
"x": 140.0,
"name": "TextComponent#3",
"pos": {
"x": 140.0,
@@
-776,7
+776,7
@@
"params": "IOVR"
},
{
"params": "IOVR"
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
TextComponent",
+ "id": "TextComponent",
"name": "TextComponent#30",
"pos": {
"x": 390.0,
"name": "TextComponent#30",
"pos": {
"x": 390.0,
@@
-785,7
+785,7
@@
"params": "CT"
},
{
"params": "CT"
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
TextComponent",
+ "id": "TextComponent",
"name": "TextComponent#31",
"pos": {
"x": 390.0,
"name": "TextComponent#31",
"pos": {
"x": 390.0,
@@
-794,7
+794,7
@@
"params": "C0"
},
{
"params": "C0"
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
TextComponent",
+ "id": "TextComponent",
"name": "TextComponent#32",
"pos": {
"x": 390.0,
"name": "TextComponent#32",
"pos": {
"x": 390.0,
@@
-803,7
+803,7
@@
"params": "SIOn"
},
{
"params": "SIOn"
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
TextComponent",
+ "id": "TextComponent",
"name": "TextComponent#33",
"pos": {
"x": 390.0,
"name": "TextComponent#33",
"pos": {
"x": 390.0,
@@
-812,7
+812,7
@@
"params": "QIOn"
},
{
"params": "QIOn"
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
TextComponent",
+ "id": "TextComponent",
"name": "TextComponent#34",
"pos": {
"x": 390.0,
"name": "TextComponent#34",
"pos": {
"x": 390.0,
@@
-821,7
+821,7
@@
"params": "SIO0"
},
{
"params": "SIO0"
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
TextComponent",
+ "id": "TextComponent",
"name": "TextComponent#35",
"pos": {
"x": 390.0,
"name": "TextComponent#35",
"pos": {
"x": 390.0,
@@
-830,7
+830,7
@@
"params": "QIO0"
},
{
"params": "QIO0"
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
TextComponent",
+ "id": "TextComponent",
"name": "TextComponent#36",
"pos": {
"x": 30.0,
"name": "TextComponent#36",
"pos": {
"x": 30.0,
@@
-839,7
+839,7
@@
"params": "enable S/QIOn input"
},
{
"params": "enable S/QIOn input"
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
TextComponent",
+ "id": "TextComponent",
"name": "TextComponent#37",
"pos": {
"x": 30.0,
"name": "TextComponent#37",
"pos": {
"x": 30.0,
@@
-848,7
+848,7
@@
"params": "enable S/QIO0 input"
},
{
"params": "enable S/QIO0 input"
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
TextComponent",
+ "id": "TextComponent",
"name": "TextComponent#38",
"pos": {
"x": 110.0,
"name": "TextComponent#38",
"pos": {
"x": 110.0,
@@
-857,7
+857,7
@@
"params": "QIO0"
},
{
"params": "QIO0"
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
TextComponent",
+ "id": "TextComponent",
"name": "TextComponent#39",
"pos": {
"x": 110.0,
"name": "TextComponent#39",
"pos": {
"x": 110.0,
@@
-866,7
+866,7
@@
"params": "SIO0"
},
{
"params": "SIO0"
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
TextComponent",
+ "id": "TextComponent",
"name": "TextComponent#4",
"pos": {
"x": 115.0,
"name": "TextComponent#4",
"pos": {
"x": 115.0,
@@
-875,7
+875,7
@@
"params": "_CEM"
},
{
"params": "_CEM"
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
TextComponent",
+ "id": "TextComponent",
"name": "TextComponent#40",
"pos": {
"x": 110.0,
"name": "TextComponent#40",
"pos": {
"x": 110.0,
@@
-884,7
+884,7
@@
"params": "SIOn"
},
{
"params": "SIOn"
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
TextComponent",
+ "id": "TextComponent",
"name": "TextComponent#41",
"pos": {
"x": 110.0,
"name": "TextComponent#41",
"pos": {
"x": 110.0,
@@
-893,7
+893,7
@@
"params": "QIOn"
},
{
"params": "QIOn"
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
TextComponent",
+ "id": "TextComponent",
"name": "TextComponent#42",
"pos": {
"x": 270.0,
"name": "TextComponent#42",
"pos": {
"x": 270.0,
@@
-902,7
+902,7
@@
"params": "YOVR"
},
{
"params": "YOVR"
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
TextComponent",
+ "id": "TextComponent",
"name": "TextComponent#43",
"pos": {
"x": 270.0,
"name": "TextComponent#43",
"pos": {
"x": 270.0,
@@
-911,7
+911,7
@@
"params": "YN"
},
{
"params": "YN"
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
TextComponent",
+ "id": "TextComponent",
"name": "TextComponent#44",
"pos": {
"x": 270.0,
"name": "TextComponent#44",
"pos": {
"x": 270.0,
@@
-920,7
+920,7
@@
"params": "YZ"
},
{
"params": "YZ"
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
TextComponent",
+ "id": "TextComponent",
"name": "TextComponent#45",
"pos": {
"x": 270.0,
"name": "TextComponent#45",
"pos": {
"x": 270.0,
@@
-929,7
+929,7
@@
"params": "YC"
},
{
"params": "YC"
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
TextComponent",
+ "id": "TextComponent",
"name": "TextComponent#46",
"pos": {
"x": 220.0,
"name": "TextComponent#46",
"pos": {
"x": 220.0,
@@
-938,7
+938,7
@@
"params": "enable Y input"
},
{
"params": "enable Y input"
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
TextComponent",
+ "id": "TextComponent",
"name": "TextComponent#47",
"pos": {
"x": 145.0,
"name": "TextComponent#47",
"pos": {
"x": 145.0,
@@
-947,7
+947,7
@@
"params": "_SE"
},
{
"params": "_SE"
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
TextComponent",
+ "id": "TextComponent",
"name": "TextComponent#48",
"pos": {
"x": 350.0,
"name": "TextComponent#48",
"pos": {
"x": 350.0,
@@
-956,7
+956,7
@@
"params": "_OECT"
},
{
"params": "_OECT"
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
TextComponent",
+ "id": "TextComponent",
"name": "TextComponent#5",
"pos": {
"x": 115.0,
"name": "TextComponent#5",
"pos": {
"x": 115.0,
@@
-965,7
+965,7
@@
"params": "_CEmu"
},
{
"params": "_CEmu"
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
TextComponent",
+ "id": "TextComponent",
"name": "TextComponent#6",
"pos": {
"x": 125.0,
"name": "TextComponent#6",
"pos": {
"x": 125.0,
@@
-974,7
+974,7
@@
"params": "_EZ"
},
{
"params": "_EZ"
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
TextComponent",
+ "id": "TextComponent",
"name": "TextComponent#7",
"pos": {
"x": 125.0,
"name": "TextComponent#7",
"pos": {
"x": 125.0,
@@
-983,7
+983,7
@@
"params": "_EC"
},
{
"params": "_EC"
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
TextComponent",
+ "id": "TextComponent",
"name": "TextComponent#8",
"pos": {
"x": 125.0,
"name": "TextComponent#8",
"pos": {
"x": 125.0,
@@
-992,7
+992,7
@@
"params": "_EN"
},
{
"params": "_EN"
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
TextComponent",
+ "id": "TextComponent",
"name": "TextComponent#9",
"pos": {
"x": 125.0,
"name": "TextComponent#9",
"pos": {
"x": 125.0,
@@
-1001,7
+1001,7
@@
"params": "_EOVR"
},
{
"params": "_EOVR"
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#0",
"pos": {
"x": 185.0,
"name": "WireCrossPoint#0",
"pos": {
"x": 185.0,
@@
-1010,7
+1010,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#1",
"pos": {
"x": 185.0,
"name": "WireCrossPoint#1",
"pos": {
"x": 185.0,
@@
-1019,7
+1019,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#10",
"pos": {
"x": 370.0,
"name": "WireCrossPoint#10",
"pos": {
"x": 370.0,
@@
-1028,7
+1028,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#11",
"pos": {
"x": 375.0,
"name": "WireCrossPoint#11",
"pos": {
"x": 375.0,
@@
-1037,7
+1037,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#12",
"pos": {
"x": 380.0,
"name": "WireCrossPoint#12",
"pos": {
"x": 380.0,
@@
-1046,7
+1046,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#2",
"pos": {
"x": 210.0,
"name": "WireCrossPoint#2",
"pos": {
"x": 210.0,
@@
-1055,7
+1055,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#3",
"pos": {
"x": 215.0,
"name": "WireCrossPoint#3",
"pos": {
"x": 215.0,
@@
-1064,7
+1064,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#4",
"pos": {
"x": 355.0,
"name": "WireCrossPoint#4",
"pos": {
"x": 355.0,
@@
-1073,7
+1073,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#5",
"pos": {
"x": 360.0,
"name": "WireCrossPoint#5",
"pos": {
"x": 360.0,
@@
-1082,7
+1082,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#6",
"pos": {
"x": 345.0,
"name": "WireCrossPoint#6",
"pos": {
"x": 345.0,
@@
-1091,7
+1091,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#7",
"pos": {
"x": 360.0,
"name": "WireCrossPoint#7",
"pos": {
"x": 360.0,
@@
-1100,7
+1100,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#8",
"pos": {
"x": 360.0,
"name": "WireCrossPoint#8",
"pos": {
"x": 360.0,
@@
-1109,7
+1109,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#9",
"pos": {
"x": 365.0,
"name": "WireCrossPoint#9",
"pos": {
"x": 365.0,
@@
-2331,8
+2331,8
@@
],
"version": "0.1.1"
},
],
"version": "0.1.1"
},
- "symbolRendererSnippetID": "
class:net.mograsim.logic.model.snippets.symbolrenderers.DefaultSymbolRenderer
",
- "outlineRendererSnippetID": "
class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer
",
- "highLevelStateHandlerSnippetID": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.DefaultHighLevelStateHandler
",
+ "symbolRendererSnippetID": "
default
",
+ "outlineRendererSnippetID": "
default
",
+ "highLevelStateHandlerSnippetID": "
default
",
"version": "0.1.5"
}
\ No newline at end of file
"version": "0.1.5"
}
\ No newline at end of file
diff --git
a/net.mograsim.logic.model.am2900/components/GUI_rsLatch.json
b/net.mograsim.logic.model.am2900/components/GUI_rsLatch.json
index
4dd03a9
..
89eab0a
100644
(file)
--- a/
net.mograsim.logic.model.am2900/components/GUI_rsLatch.json
+++ b/
net.mograsim.logic.model.am2900/components/GUI_rsLatch.json
@@
-43,7
+43,7
@@
"submodel": {
"components": [
{
"submodel": {
"components": [
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#0",
"pos": {
"x": 10.0,
"name": "GUINandGate#0",
"pos": {
"x": 10.0,
@@
-52,7
+52,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#1",
"pos": {
"x": 40.0,
"name": "GUINandGate#1",
"pos": {
"x": 40.0,
@@
-61,7
+61,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#0",
"pos": {
"x": 34.0,
"name": "WireCrossPoint#0",
"pos": {
"x": 34.0,
@@
-70,7
+70,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#1",
"pos": {
"x": 64.0,
"name": "WireCrossPoint#1",
"pos": {
"x": 64.0,
@@
-223,7
+223,7
@@
],
"version": "0.1.1"
},
],
"version": "0.1.1"
},
- "symbolRendererSnippetID": "
class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "_rsLatch",
"centerTextHeight": 5.0,
"symbolRendererParams": {
"centerText": "_rsLatch",
"centerTextHeight": 5.0,
@@
-231,13
+231,13
@@
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
- "outlineRendererSnippetID": "
class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer
",
- "highLevelStateHandlerSnippetID": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.StandardHighLevelStateHandler
",
+ "outlineRendererSnippetID": "
default
",
+ "highLevelStateHandlerSnippetID": "
standard
",
"highLevelStateHandlerParams": {
"subcomponentHighLevelStates": {},
"atomicHighLevelStates": {
"q": {
"highLevelStateHandlerParams": {
"subcomponentHighLevelStates": {},
"atomicHighLevelStates": {
"q": {
- "id": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.WireForcingAtomicHighLevelStateHandler
",
+ "id": "
wireForcing
",
"params": {
"wiresToForce": [
"q"
"params": {
"wiresToForce": [
"q"
diff --git
a/net.mograsim.logic.model.am2900/components/GUIand.json
b/net.mograsim.logic.model.am2900/components/GUIand.json
index
beeec77
..
5e343e0
100644
(file)
--- a/
net.mograsim.logic.model.am2900/components/GUIand.json
+++ b/
net.mograsim.logic.model.am2900/components/GUIand.json
@@
-34,7
+34,7
@@
"submodel": {
"components": [
{
"submodel": {
"components": [
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#0",
"pos": {
"x": 20.0,
"name": "GUINandGate#0",
"pos": {
"x": 20.0,
@@
-43,7
+43,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#1",
"pos": {
"x": 50.0,
"name": "GUINandGate#1",
"pos": {
"x": 50.0,
@@
-52,7
+52,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#0",
"pos": {
"x": 44.0,
"name": "WireCrossPoint#0",
"pos": {
"x": 44.0,
@@
-144,7
+144,7
@@
],
"version": "0.1.1"
},
],
"version": "0.1.1"
},
- "symbolRendererSnippetID": "
class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "GUIand",
"centerTextHeight": 5.0,
"symbolRendererParams": {
"centerText": "GUIand",
"centerTextHeight": 5.0,
@@
-152,7
+152,7
@@
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
- "outlineRendererSnippetID": "
class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer
",
- "highLevelStateHandlerSnippetID": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.DefaultHighLevelStateHandler
",
+ "outlineRendererSnippetID": "
default
",
+ "highLevelStateHandlerSnippetID": "
default
",
"version": "0.1.5"
}
\ No newline at end of file
"version": "0.1.5"
}
\ No newline at end of file
diff --git
a/net.mograsim.logic.model.am2900/components/GUIand41.json
b/net.mograsim.logic.model.am2900/components/GUIand41.json
index
acebe97
..
c7ae05e
100644
(file)
--- a/
net.mograsim.logic.model.am2900/components/GUIand41.json
+++ b/
net.mograsim.logic.model.am2900/components/GUIand41.json
@@
-120,7
+120,7
@@
}
},
{
}
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#0",
"pos": {
"x": 24.0,
"name": "WireCrossPoint#0",
"pos": {
"x": 24.0,
@@
-129,7
+129,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#1",
"pos": {
"x": 24.0,
"name": "WireCrossPoint#1",
"pos": {
"x": 24.0,
@@
-138,7
+138,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#2",
"pos": {
"x": 24.0,
"name": "WireCrossPoint#2",
"pos": {
"x": 24.0,
@@
-341,7
+341,7
@@
],
"version": "0.1.1"
},
],
"version": "0.1.1"
},
- "symbolRendererSnippetID": "
class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "GUIand41",
"centerTextHeight": 5.0,
"symbolRendererParams": {
"centerText": "GUIand41",
"centerTextHeight": 5.0,
@@
-349,7
+349,7
@@
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
- "outlineRendererSnippetID": "
class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer
",
- "highLevelStateHandlerSnippetID": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.DefaultHighLevelStateHandler
",
+ "outlineRendererSnippetID": "
default
",
+ "highLevelStateHandlerSnippetID": "
default
",
"version": "0.1.5"
}
\ No newline at end of file
"version": "0.1.5"
}
\ No newline at end of file
diff --git
a/net.mograsim.logic.model.am2900/components/GUIandor414.json
b/net.mograsim.logic.model.am2900/components/GUIandor414.json
index
8e97325
..
5f6d292
100644
(file)
--- a/
net.mograsim.logic.model.am2900/components/GUIandor414.json
+++ b/
net.mograsim.logic.model.am2900/components/GUIandor414.json
@@
-506,7
+506,7
@@
],
"version": "0.1.1"
},
],
"version": "0.1.1"
},
- "symbolRendererSnippetID": "
class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "GUIandor414",
"centerTextHeight": 5.0,
"symbolRendererParams": {
"centerText": "GUIandor414",
"centerTextHeight": 5.0,
@@
-514,7
+514,7
@@
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
- "outlineRendererSnippetID": "
class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer
",
- "highLevelStateHandlerSnippetID": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.DefaultHighLevelStateHandler
",
+ "outlineRendererSnippetID": "
default
",
+ "highLevelStateHandlerSnippetID": "
default
",
"version": "0.1.5"
}
\ No newline at end of file
"version": "0.1.5"
}
\ No newline at end of file
diff --git
a/net.mograsim.logic.model.am2900/components/GUIdemux2.json
b/net.mograsim.logic.model.am2900/components/GUIdemux2.json
index
9b2ea44
..
7e28bfd
100644
(file)
--- a/
net.mograsim.logic.model.am2900/components/GUIdemux2.json
+++ b/
net.mograsim.logic.model.am2900/components/GUIdemux2.json
@@
-61,7
+61,7
@@
"submodel": {
"components": [
{
"submodel": {
"components": [
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#0",
"pos": {
"x": 10.0,
"name": "GUINandGate#0",
"pos": {
"x": 10.0,
@@
-70,7
+70,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#1",
"pos": {
"x": 10.0,
"name": "GUINandGate#1",
"pos": {
"x": 10.0,
@@
-111,7
+111,7
@@
}
},
{
}
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#0",
"pos": {
"x": 6.5,
"name": "WireCrossPoint#0",
"pos": {
"x": 6.5,
@@
-120,7
+120,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#1",
"pos": {
"x": 6.5,
"name": "WireCrossPoint#1",
"pos": {
"x": 6.5,
@@
-129,7
+129,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#2",
"pos": {
"x": 36.5,
"name": "WireCrossPoint#2",
"pos": {
"x": 36.5,
@@
-138,7
+138,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#3",
"pos": {
"x": 4.0,
"name": "WireCrossPoint#3",
"pos": {
"x": 4.0,
@@
-147,7
+147,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#4",
"pos": {
"x": 4.0,
"name": "WireCrossPoint#4",
"pos": {
"x": 4.0,
@@
-156,7
+156,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#5",
"pos": {
"x": 31.5,
"name": "WireCrossPoint#5",
"pos": {
"x": 31.5,
@@
-165,7
+165,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#6",
"pos": {
"x": 31.5,
"name": "WireCrossPoint#6",
"pos": {
"x": 31.5,
@@
-174,7
+174,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#7",
"pos": {
"x": 34.0,
"name": "WireCrossPoint#7",
"pos": {
"x": 34.0,
@@
-530,7
+530,7
@@
],
"version": "0.1.1"
},
],
"version": "0.1.1"
},
- "symbolRendererSnippetID": "
class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "GUIdemux2",
"centerTextHeight": 5.0,
"symbolRendererParams": {
"centerText": "GUIdemux2",
"centerTextHeight": 5.0,
@@
-538,7
+538,7
@@
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
- "outlineRendererSnippetID": "
class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer
",
- "highLevelStateHandlerSnippetID": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.DefaultHighLevelStateHandler
",
+ "outlineRendererSnippetID": "
default
",
+ "highLevelStateHandlerSnippetID": "
default
",
"version": "0.1.5"
}
\ No newline at end of file
"version": "0.1.5"
}
\ No newline at end of file
diff --git
a/net.mograsim.logic.model.am2900/components/GUIdff.json
b/net.mograsim.logic.model.am2900/components/GUIdff.json
index
35eba16
..
30c17e6
100644
(file)
--- a/
net.mograsim.logic.model.am2900/components/GUIdff.json
+++ b/
net.mograsim.logic.model.am2900/components/GUIdff.json
@@
-43,7
+43,7
@@
"submodel": {
"components": [
{
"submodel": {
"components": [
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#0",
"pos": {
"x": 120.0,
"name": "GUINandGate#0",
"pos": {
"x": 120.0,
@@
-76,7
+76,7
@@
}
},
{
}
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#0",
"pos": {
"x": 9.0,
"name": "WireCrossPoint#0",
"pos": {
"x": 9.0,
@@
-85,7
+85,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#1",
"pos": {
"x": 19.0,
"name": "WireCrossPoint#1",
"pos": {
"x": 19.0,
@@
-94,7
+94,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#2",
"pos": {
"x": 99.0,
"name": "WireCrossPoint#2",
"pos": {
"x": 99.0,
@@
-103,7
+103,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#3",
"pos": {
"x": 99.0,
"name": "WireCrossPoint#3",
"pos": {
"x": 99.0,
@@
-336,7
+336,7
@@
],
"version": "0.1.1"
},
],
"version": "0.1.1"
},
- "symbolRendererSnippetID": "
class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "GUIdff",
"centerTextHeight": 5.0,
"symbolRendererParams": {
"centerText": "GUIdff",
"centerTextHeight": 5.0,
@@
-344,13
+344,13
@@
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
- "outlineRendererSnippetID": "
class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer
",
- "highLevelStateHandlerSnippetID": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.StandardHighLevelStateHandler
",
+ "outlineRendererSnippetID": "
default
",
+ "highLevelStateHandlerSnippetID": "
standard
",
"highLevelStateHandlerParams": {
"subcomponentHighLevelStates": {},
"atomicHighLevelStates": {
"q": {
"highLevelStateHandlerParams": {
"subcomponentHighLevelStates": {},
"atomicHighLevelStates": {
"q": {
- "id": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.DelegatingAtomicHighLevelStateHandler
",
+ "id": "
delegating
",
"params": {
"delegateTarget": "GUI_rsLatch#1",
"subStateID": "q"
"params": {
"delegateTarget": "GUI_rsLatch#1",
"subStateID": "q"
diff --git
a/net.mograsim.logic.model.am2900/components/GUIdff4.json
b/net.mograsim.logic.model.am2900/components/GUIdff4.json
index
23edb9a
..
a717818
100644
(file)
--- a/
net.mograsim.logic.model.am2900/components/GUIdff4.json
+++ b/
net.mograsim.logic.model.am2900/components/GUIdff4.json
@@
-137,7
+137,7
@@
}
},
{
}
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#0",
"pos": {
"x": 104.0,
"name": "WireCrossPoint#0",
"pos": {
"x": 104.0,
@@
-146,7
+146,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#1",
"pos": {
"x": 104.0,
"name": "WireCrossPoint#1",
"pos": {
"x": 104.0,
@@
-155,7
+155,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#2",
"pos": {
"x": 104.0,
"name": "WireCrossPoint#2",
"pos": {
"x": 104.0,
@@
-164,7
+164,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#3",
"pos": {
"x": 169.0,
"name": "WireCrossPoint#3",
"pos": {
"x": 169.0,
@@
-173,7
+173,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#4",
"pos": {
"x": 164.0,
"name": "WireCrossPoint#4",
"pos": {
"x": 164.0,
@@
-182,7
+182,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#5",
"pos": {
"x": 159.0,
"name": "WireCrossPoint#5",
"pos": {
"x": 159.0,
@@
-191,7
+191,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#6",
"pos": {
"x": 154.0,
"name": "WireCrossPoint#6",
"pos": {
"x": 154.0,
@@
-663,7
+663,7
@@
],
"version": "0.1.1"
},
],
"version": "0.1.1"
},
- "symbolRendererSnippetID": "
class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "D flip flop\n4 bit",
"centerTextHeight": 5.0,
"symbolRendererParams": {
"centerText": "D flip flop\n4 bit",
"centerTextHeight": 5.0,
@@
-671,27
+671,27
@@
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
- "outlineRendererSnippetID": "
class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer
",
- "highLevelStateHandlerSnippetID": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.StandardHighLevelStateHandler
",
+ "outlineRendererSnippetID": "
default
",
+ "highLevelStateHandlerSnippetID": "
standard
",
"highLevelStateHandlerParams": {
"subcomponentHighLevelStates": {},
"atomicHighLevelStates": {
"q1": {
"highLevelStateHandlerParams": {
"subcomponentHighLevelStates": {},
"atomicHighLevelStates": {
"q1": {
- "id": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.DelegatingAtomicHighLevelStateHandler
",
+ "id": "
delegating
",
"params": {
"delegateTarget": "GUIdff#0",
"subStateID": "q"
}
},
"q2": {
"params": {
"delegateTarget": "GUIdff#0",
"subStateID": "q"
}
},
"q2": {
- "id": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.DelegatingAtomicHighLevelStateHandler
",
+ "id": "
delegating
",
"params": {
"delegateTarget": "GUIdff#1",
"subStateID": "q"
}
},
"q": {
"params": {
"delegateTarget": "GUIdff#1",
"subStateID": "q"
}
},
"q": {
- "id": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.BitVectorSplittingAtomicHighLevelStateHandler
",
+ "id": "
bitVectorSplitting
",
"params": {
"vectorPartTargets": [
"q1",
"params": {
"vectorPartTargets": [
"q1",
@@
-708,14
+708,14
@@
}
},
"q3": {
}
},
"q3": {
- "id": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.DelegatingAtomicHighLevelStateHandler
",
+ "id": "
delegating
",
"params": {
"delegateTarget": "GUIdff#2",
"subStateID": "q"
}
},
"q4": {
"params": {
"delegateTarget": "GUIdff#2",
"subStateID": "q"
}
},
"q4": {
- "id": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.DelegatingAtomicHighLevelStateHandler
",
+ "id": "
delegating
",
"params": {
"delegateTarget": "GUIdff#3",
"subStateID": "q"
"params": {
"delegateTarget": "GUIdff#3",
"subStateID": "q"
diff --git
a/net.mograsim.logic.model.am2900/components/GUIdff4_invwe.json
b/net.mograsim.logic.model.am2900/components/GUIdff4_invwe.json
index
89d09fb
..
c34cb35
100644
(file)
--- a/
net.mograsim.logic.model.am2900/components/GUIdff4_invwe.json
+++ b/
net.mograsim.logic.model.am2900/components/GUIdff4_invwe.json
@@
-137,7
+137,7
@@
}
},
{
}
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#0",
"pos": {
"x": 104.0,
"name": "WireCrossPoint#0",
"pos": {
"x": 104.0,
@@
-146,7
+146,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#1",
"pos": {
"x": 104.0,
"name": "WireCrossPoint#1",
"pos": {
"x": 104.0,
@@
-155,7
+155,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#2",
"pos": {
"x": 104.0,
"name": "WireCrossPoint#2",
"pos": {
"x": 104.0,
@@
-164,7
+164,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#3",
"pos": {
"x": 169.0,
"name": "WireCrossPoint#3",
"pos": {
"x": 169.0,
@@
-173,7
+173,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#4",
"pos": {
"x": 164.0,
"name": "WireCrossPoint#4",
"pos": {
"x": 164.0,
@@
-182,7
+182,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#5",
"pos": {
"x": 159.0,
"name": "WireCrossPoint#5",
"pos": {
"x": 159.0,
@@
-191,7
+191,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#6",
"pos": {
"x": 154.0,
"name": "WireCrossPoint#6",
"pos": {
"x": 154.0,
@@
-672,7
+672,7
@@
],
"version": "0.1.1"
},
],
"version": "0.1.1"
},
- "symbolRendererSnippetID": "
class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "D flip flop\n4 bit",
"centerTextHeight": 5.0,
"symbolRendererParams": {
"centerText": "D flip flop\n4 bit",
"centerTextHeight": 5.0,
@@
-680,27
+680,27
@@
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
- "outlineRendererSnippetID": "
class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer
",
- "highLevelStateHandlerSnippetID": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.StandardHighLevelStateHandler
",
+ "outlineRendererSnippetID": "
default
",
+ "highLevelStateHandlerSnippetID": "
standard
",
"highLevelStateHandlerParams": {
"subcomponentHighLevelStates": {},
"atomicHighLevelStates": {
"q1": {
"highLevelStateHandlerParams": {
"subcomponentHighLevelStates": {},
"atomicHighLevelStates": {
"q1": {
- "id": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.DelegatingAtomicHighLevelStateHandler
",
+ "id": "
delegating
",
"params": {
"delegateTarget": "GUIdff#0",
"subStateID": "q"
}
},
"q2": {
"params": {
"delegateTarget": "GUIdff#0",
"subStateID": "q"
}
},
"q2": {
- "id": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.DelegatingAtomicHighLevelStateHandler
",
+ "id": "
delegating
",
"params": {
"delegateTarget": "GUIdff#1",
"subStateID": "q"
}
},
"q": {
"params": {
"delegateTarget": "GUIdff#1",
"subStateID": "q"
}
},
"q": {
- "id": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.BitVectorSplittingAtomicHighLevelStateHandler
",
+ "id": "
bitVectorSplitting
",
"params": {
"vectorPartTargets": [
"q1",
"params": {
"vectorPartTargets": [
"q1",
@@
-717,14
+717,14
@@
}
},
"q3": {
}
},
"q3": {
- "id": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.DelegatingAtomicHighLevelStateHandler
",
+ "id": "
delegating
",
"params": {
"delegateTarget": "GUIdff#2",
"subStateID": "q"
}
},
"q4": {
"params": {
"delegateTarget": "GUIdff#2",
"subStateID": "q"
}
},
"q4": {
- "id": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.DelegatingAtomicHighLevelStateHandler
",
+ "id": "
delegating
",
"params": {
"delegateTarget": "GUIdff#3",
"subStateID": "q"
"params": {
"delegateTarget": "GUIdff#3",
"subStateID": "q"
diff --git
a/net.mograsim.logic.model.am2900/components/GUIdlatch.json
b/net.mograsim.logic.model.am2900/components/GUIdlatch.json
index
9e01a2c
..
b09c439
100644
(file)
--- a/
net.mograsim.logic.model.am2900/components/GUIdlatch.json
+++ b/
net.mograsim.logic.model.am2900/components/GUIdlatch.json
@@
-43,7
+43,7
@@
"submodel": {
"components": [
{
"submodel": {
"components": [
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#0",
"pos": {
"x": 10.0,
"name": "GUINandGate#0",
"pos": {
"x": 10.0,
@@
-52,7
+52,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#1",
"pos": {
"x": 15.0,
"name": "GUINandGate#1",
"pos": {
"x": 15.0,
@@
-69,7
+69,7
@@
}
},
{
}
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#0",
"pos": {
"x": 4.0,
"name": "WireCrossPoint#0",
"pos": {
"x": 4.0,
@@
-78,7
+78,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#1",
"pos": {
"x": 34.0,
"name": "WireCrossPoint#1",
"pos": {
"x": 34.0,
@@
-241,7
+241,7
@@
],
"version": "0.1.1"
},
],
"version": "0.1.1"
},
- "symbolRendererSnippetID": "
class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "GUIdlatch",
"centerTextHeight": 5.0,
"symbolRendererParams": {
"centerText": "GUIdlatch",
"centerTextHeight": 5.0,
@@
-249,13
+249,13
@@
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
- "outlineRendererSnippetID": "
class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer
",
- "highLevelStateHandlerSnippetID": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.StandardHighLevelStateHandler
",
+ "outlineRendererSnippetID": "
default
",
+ "highLevelStateHandlerSnippetID": "
standard
",
"highLevelStateHandlerParams": {
"subcomponentHighLevelStates": {},
"atomicHighLevelStates": {
"q": {
"highLevelStateHandlerParams": {
"subcomponentHighLevelStates": {},
"atomicHighLevelStates": {
"q": {
- "id": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.DelegatingAtomicHighLevelStateHandler
",
+ "id": "
delegating
",
"params": {
"delegateTarget": "GUI_rsLatch#0",
"subStateID": "q"
"params": {
"delegateTarget": "GUI_rsLatch#0",
"subStateID": "q"
diff --git
a/net.mograsim.logic.model.am2900/components/GUIdlatch4.json
b/net.mograsim.logic.model.am2900/components/GUIdlatch4.json
index
7b72993
..
3bc4df7
100644
(file)
--- a/
net.mograsim.logic.model.am2900/components/GUIdlatch4.json
+++ b/
net.mograsim.logic.model.am2900/components/GUIdlatch4.json
@@
-120,7
+120,7
@@
}
},
{
}
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#0",
"pos": {
"x": 14.0,
"name": "WireCrossPoint#0",
"pos": {
"x": 14.0,
@@
-129,7
+129,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#1",
"pos": {
"x": 14.0,
"name": "WireCrossPoint#1",
"pos": {
"x": 14.0,
@@
-138,7
+138,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#2",
"pos": {
"x": 14.0,
"name": "WireCrossPoint#2",
"pos": {
"x": 14.0,
@@
-341,7
+341,7
@@
],
"version": "0.1.1"
},
],
"version": "0.1.1"
},
- "symbolRendererSnippetID": "
class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "GUIdlatch4",
"centerTextHeight": 5.0,
"symbolRendererParams": {
"centerText": "GUIdlatch4",
"centerTextHeight": 5.0,
@@
-349,27
+349,27
@@
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
- "outlineRendererSnippetID": "
class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer
",
- "highLevelStateHandlerSnippetID": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.StandardHighLevelStateHandler
",
+ "outlineRendererSnippetID": "
default
",
+ "highLevelStateHandlerSnippetID": "
standard
",
"highLevelStateHandlerParams": {
"subcomponentHighLevelStates": {},
"atomicHighLevelStates": {
"q1": {
"highLevelStateHandlerParams": {
"subcomponentHighLevelStates": {},
"atomicHighLevelStates": {
"q1": {
- "id": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.DelegatingAtomicHighLevelStateHandler
",
+ "id": "
delegating
",
"params": {
"delegateTarget": "GUIdlatch#0",
"subStateID": "q"
}
},
"q2": {
"params": {
"delegateTarget": "GUIdlatch#0",
"subStateID": "q"
}
},
"q2": {
- "id": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.DelegatingAtomicHighLevelStateHandler
",
+ "id": "
delegating
",
"params": {
"delegateTarget": "GUIdlatch#1",
"subStateID": "q"
}
},
"q": {
"params": {
"delegateTarget": "GUIdlatch#1",
"subStateID": "q"
}
},
"q": {
- "id": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.BitVectorSplittingAtomicHighLevelStateHandler
",
+ "id": "
bitVectorSplitting
",
"params": {
"vectorPartTargets": [
"q1",
"params": {
"vectorPartTargets": [
"q1",
@@
-386,14
+386,14
@@
}
},
"q3": {
}
},
"q3": {
- "id": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.DelegatingAtomicHighLevelStateHandler
",
+ "id": "
delegating
",
"params": {
"delegateTarget": "GUIdlatch#2",
"subStateID": "q"
}
},
"q4": {
"params": {
"delegateTarget": "GUIdlatch#2",
"subStateID": "q"
}
},
"q4": {
- "id": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.DelegatingAtomicHighLevelStateHandler
",
+ "id": "
delegating
",
"params": {
"delegateTarget": "GUIdlatch#3",
"subStateID": "q"
"params": {
"delegateTarget": "GUIdlatch#3",
"subStateID": "q"
diff --git
a/net.mograsim.logic.model.am2900/components/GUIfulladder.json
b/net.mograsim.logic.model.am2900/components/GUIfulladder.json
index
c91f9be
..
8b41bd3
100644
(file)
--- a/
net.mograsim.logic.model.am2900/components/GUIfulladder.json
+++ b/
net.mograsim.logic.model.am2900/components/GUIfulladder.json
@@
-52,7
+52,7
@@
"submodel": {
"components": [
{
"submodel": {
"components": [
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#0",
"pos": {
"x": 57.5,
"name": "GUINandGate#0",
"pos": {
"x": 57.5,
@@
-190,7
+190,7
@@
],
"version": "0.1.1"
},
],
"version": "0.1.1"
},
- "symbolRendererSnippetID": "
class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "GUIfulladder",
"centerTextHeight": 5.0,
"symbolRendererParams": {
"centerText": "GUIfulladder",
"centerTextHeight": 5.0,
@@
-198,7
+198,7
@@
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
- "outlineRendererSnippetID": "
class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer
",
- "highLevelStateHandlerSnippetID": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.DefaultHighLevelStateHandler
",
+ "outlineRendererSnippetID": "
default
",
+ "highLevelStateHandlerSnippetID": "
default
",
"version": "0.1.5"
}
\ No newline at end of file
"version": "0.1.5"
}
\ No newline at end of file
diff --git
a/net.mograsim.logic.model.am2900/components/GUIhalfadder.json
b/net.mograsim.logic.model.am2900/components/GUIhalfadder.json
index
5475ded
..
92720a8
100644
(file)
--- a/
net.mograsim.logic.model.am2900/components/GUIhalfadder.json
+++ b/
net.mograsim.logic.model.am2900/components/GUIhalfadder.json
@@
-43,7
+43,7
@@
"submodel": {
"components": [
{
"submodel": {
"components": [
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#0",
"pos": {
"x": 10.0,
"name": "GUINandGate#0",
"pos": {
"x": 10.0,
@@
-52,7
+52,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#1",
"pos": {
"x": 40.0,
"name": "GUINandGate#1",
"pos": {
"x": 40.0,
@@
-61,7
+61,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#2",
"pos": {
"x": 40.0,
"name": "GUINandGate#2",
"pos": {
"x": 40.0,
@@
-70,7
+70,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#3",
"pos": {
"x": 65.0,
"name": "GUINandGate#3",
"pos": {
"x": 65.0,
@@
-79,7
+79,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#0",
"pos": {
"x": 4.0,
"name": "WireCrossPoint#0",
"pos": {
"x": 4.0,
@@
-88,7
+88,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#1",
"pos": {
"x": 4.0,
"name": "WireCrossPoint#1",
"pos": {
"x": 4.0,
@@
-97,7
+97,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#2",
"pos": {
"x": 34.0,
"name": "WireCrossPoint#2",
"pos": {
"x": 34.0,
@@
-323,7
+323,7
@@
],
"version": "0.1.1"
},
],
"version": "0.1.1"
},
- "symbolRendererSnippetID": "
class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "GUIhalfadder",
"centerTextHeight": 5.0,
"symbolRendererParams": {
"centerText": "GUIhalfadder",
"centerTextHeight": 5.0,
@@
-331,7
+331,7
@@
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
- "outlineRendererSnippetID": "
class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer
",
- "highLevelStateHandlerSnippetID": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.DefaultHighLevelStateHandler
",
+ "outlineRendererSnippetID": "
default
",
+ "highLevelStateHandlerSnippetID": "
default
",
"version": "0.1.5"
}
\ No newline at end of file
"version": "0.1.5"
}
\ No newline at end of file
diff --git
a/net.mograsim.logic.model.am2900/components/GUImux1.json
b/net.mograsim.logic.model.am2900/components/GUImux1.json
index
978801d
..
279f905
100644
(file)
--- a/
net.mograsim.logic.model.am2900/components/GUImux1.json
+++ b/
net.mograsim.logic.model.am2900/components/GUImux1.json
@@
-43,7
+43,7
@@
"submodel": {
"components": [
{
"submodel": {
"components": [
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#0",
"pos": {
"x": 10.0,
"name": "GUINandGate#0",
"pos": {
"x": 10.0,
@@
-52,7
+52,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#1",
"pos": {
"x": 35.0,
"name": "GUINandGate#1",
"pos": {
"x": 35.0,
@@
-61,7
+61,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#2",
"pos": {
"x": 35.0,
"name": "GUINandGate#2",
"pos": {
"x": 35.0,
@@
-70,7
+70,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#3",
"pos": {
"x": 60.0,
"name": "GUINandGate#3",
"pos": {
"x": 60.0,
@@
-79,7
+79,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#0",
"pos": {
"x": 4.0,
"name": "WireCrossPoint#0",
"pos": {
"x": 4.0,
@@
-88,7
+88,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#1",
"pos": {
"x": 4.0,
"name": "WireCrossPoint#1",
"pos": {
"x": 4.0,
@@
-234,7
+234,7
@@
],
"version": "0.1.1"
},
],
"version": "0.1.1"
},
- "symbolRendererSnippetID": "
class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "GUImux1",
"centerTextHeight": 5.0,
"symbolRendererParams": {
"centerText": "GUImux1",
"centerTextHeight": 5.0,
@@
-242,7
+242,7
@@
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
- "outlineRendererSnippetID": "
class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer
",
- "highLevelStateHandlerSnippetID": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.DefaultHighLevelStateHandler
",
+ "outlineRendererSnippetID": "
default
",
+ "highLevelStateHandlerSnippetID": "
default
",
"version": "0.1.5"
}
\ No newline at end of file
"version": "0.1.5"
}
\ No newline at end of file
diff --git
a/net.mograsim.logic.model.am2900/components/GUImux1_4.json
b/net.mograsim.logic.model.am2900/components/GUImux1_4.json
index
11216b0
..
1caab2c
100644
(file)
--- a/
net.mograsim.logic.model.am2900/components/GUImux1_4.json
+++ b/
net.mograsim.logic.model.am2900/components/GUImux1_4.json
@@
-156,7
+156,7
@@
}
},
{
}
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#0",
"pos": {
"x": 24.0,
"name": "WireCrossPoint#0",
"pos": {
"x": 24.0,
@@
-165,7
+165,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#1",
"pos": {
"x": 24.0,
"name": "WireCrossPoint#1",
"pos": {
"x": 24.0,
@@
-174,7
+174,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#2",
"pos": {
"x": 24.0,
"name": "WireCrossPoint#2",
"pos": {
"x": 24.0,
@@
-489,7
+489,7
@@
],
"version": "0.1.1"
},
],
"version": "0.1.1"
},
- "symbolRendererSnippetID": "
class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "GUImux1_4",
"centerTextHeight": 5.0,
"symbolRendererParams": {
"centerText": "GUImux1_4",
"centerTextHeight": 5.0,
@@
-497,7
+497,7
@@
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
- "outlineRendererSnippetID": "
class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer
",
- "highLevelStateHandlerSnippetID": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.DefaultHighLevelStateHandler
",
+ "outlineRendererSnippetID": "
default
",
+ "highLevelStateHandlerSnippetID": "
default
",
"version": "0.1.5"
}
\ No newline at end of file
"version": "0.1.5"
}
\ No newline at end of file
diff --git
a/net.mograsim.logic.model.am2900/components/GUImux2.json
b/net.mograsim.logic.model.am2900/components/GUImux2.json
index
a0b8dd3
..
b1cf3a6
100644
(file)
--- a/
net.mograsim.logic.model.am2900/components/GUImux2.json
+++ b/
net.mograsim.logic.model.am2900/components/GUImux2.json
@@
-94,7
+94,7
@@
}
},
{
}
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#0",
"pos": {
"x": 30.0,
"name": "GUINandGate#0",
"pos": {
"x": 30.0,
@@
-103,7
+103,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#0",
"pos": {
"x": 24.0,
"name": "WireCrossPoint#0",
"pos": {
"x": 24.0,
@@
-112,7
+112,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#1",
"pos": {
"x": 24.0,
"name": "WireCrossPoint#1",
"pos": {
"x": 24.0,
@@
-121,7
+121,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#2",
"pos": {
"x": 24.0,
"name": "WireCrossPoint#2",
"pos": {
"x": 24.0,
@@
-130,7
+130,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#3",
"pos": {
"x": 54.0,
"name": "WireCrossPoint#3",
"pos": {
"x": 54.0,
@@
-441,7
+441,7
@@
],
"version": "0.1.1"
},
],
"version": "0.1.1"
},
- "symbolRendererSnippetID": "
class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "GUImux2",
"centerTextHeight": 5.0,
"symbolRendererParams": {
"centerText": "GUImux2",
"centerTextHeight": 5.0,
@@
-449,7
+449,7
@@
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
- "outlineRendererSnippetID": "
class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer
",
- "highLevelStateHandlerSnippetID": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.DefaultHighLevelStateHandler
",
+ "outlineRendererSnippetID": "
default
",
+ "highLevelStateHandlerSnippetID": "
default
",
"version": "0.1.5"
}
\ No newline at end of file
"version": "0.1.5"
}
\ No newline at end of file
diff --git
a/net.mograsim.logic.model.am2900/components/GUImux2_4.json
b/net.mograsim.logic.model.am2900/components/GUImux2_4.json
index
e5d6932
..
7d1342a
100644
(file)
--- a/
net.mograsim.logic.model.am2900/components/GUImux2_4.json
+++ b/
net.mograsim.logic.model.am2900/components/GUImux2_4.json
@@
-94,7
+94,7
@@
}
},
{
}
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUIMerger",
+ "id": "GUIMerger",
"name": "GUIMerger#0",
"pos": {
"x": 140.0,
"name": "GUIMerger#0",
"pos": {
"x": 140.0,
@@
-103,7
+103,7
@@
"params": 4
},
{
"params": 4
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUISplitter",
+ "id": "GUISplitter",
"name": "GUISplitter#0",
"pos": {
"x": 25.0,
"name": "GUISplitter#0",
"pos": {
"x": 25.0,
@@
-112,7
+112,7
@@
"params": 4
},
{
"params": 4
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUISplitter",
+ "id": "GUISplitter",
"name": "GUISplitter#1",
"pos": {
"x": 25.0,
"name": "GUISplitter#1",
"pos": {
"x": 25.0,
@@
-121,7
+121,7
@@
"params": 4
},
{
"params": 4
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUISplitter",
+ "id": "GUISplitter",
"name": "GUISplitter#2",
"pos": {
"x": 25.0,
"name": "GUISplitter#2",
"pos": {
"x": 25.0,
@@
-130,7
+130,7
@@
"params": 4
},
{
"params": 4
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUISplitter",
+ "id": "GUISplitter",
"name": "GUISplitter#3",
"pos": {
"x": 25.0,
"name": "GUISplitter#3",
"pos": {
"x": 25.0,
@@
-139,7
+139,7
@@
"params": 4
},
{
"params": 4
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#0",
"pos": {
"x": 19.0,
"name": "WireCrossPoint#0",
"pos": {
"x": 19.0,
@@
-686,7
+686,7
@@
],
"version": "0.1.1"
},
],
"version": "0.1.1"
},
- "symbolRendererSnippetID": "
class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "GUImux1_4",
"centerTextHeight": 5.0,
"symbolRendererParams": {
"centerText": "GUImux1_4",
"centerTextHeight": 5.0,
@@
-694,7
+694,7
@@
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
- "outlineRendererSnippetID": "
class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer
",
- "highLevelStateHandlerSnippetID": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.DefaultHighLevelStateHandler
",
+ "outlineRendererSnippetID": "
default
",
+ "highLevelStateHandlerSnippetID": "
default
",
"version": "0.1.5"
}
\ No newline at end of file
"version": "0.1.5"
}
\ No newline at end of file
diff --git
a/net.mograsim.logic.model.am2900/components/GUImux3.json
b/net.mograsim.logic.model.am2900/components/GUImux3.json
index
3058d7a
..
a27f5ca
100644
(file)
--- a/
net.mograsim.logic.model.am2900/components/GUImux3.json
+++ b/
net.mograsim.logic.model.am2900/components/GUImux3.json
@@
-139,7
+139,7
@@
}
},
{
}
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#0",
"pos": {
"x": 19.0,
"name": "WireCrossPoint#0",
"pos": {
"x": 19.0,
@@
-148,7
+148,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#1",
"pos": {
"x": 24.0,
"name": "WireCrossPoint#1",
"pos": {
"x": 24.0,
@@
-478,7
+478,7
@@
],
"version": "0.1.1"
},
],
"version": "0.1.1"
},
- "symbolRendererSnippetID": "
class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "GUImux3",
"centerTextHeight": 5.0,
"symbolRendererParams": {
"centerText": "GUImux3",
"centerTextHeight": 5.0,
@@
-486,7
+486,7
@@
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
- "outlineRendererSnippetID": "
class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer
",
- "highLevelStateHandlerSnippetID": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.DefaultHighLevelStateHandler
",
+ "outlineRendererSnippetID": "
default
",
+ "highLevelStateHandlerSnippetID": "
default
",
"version": "0.1.5"
}
\ No newline at end of file
"version": "0.1.5"
}
\ No newline at end of file
diff --git
a/net.mograsim.logic.model.am2900/components/GUInand3.json
b/net.mograsim.logic.model.am2900/components/GUInand3.json
index
d88e3e8
..
28b9a60
100644
(file)
--- a/
net.mograsim.logic.model.am2900/components/GUInand3.json
+++ b/
net.mograsim.logic.model.am2900/components/GUInand3.json
@@
-43,7
+43,7
@@
"submodel": {
"components": [
{
"submodel": {
"components": [
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#0",
"pos": {
"x": 10.0,
"name": "GUINandGate#0",
"pos": {
"x": 10.0,
@@
-52,7
+52,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#1",
"pos": {
"x": 35.0,
"name": "GUINandGate#1",
"pos": {
"x": 35.0,
@@
-61,7
+61,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#2",
"pos": {
"x": 62.5,
"name": "GUINandGate#2",
"pos": {
"x": 62.5,
@@
-70,7
+70,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#0",
"pos": {
"x": 31.5,
"name": "WireCrossPoint#0",
"pos": {
"x": 31.5,
@@
-205,7
+205,7
@@
],
"version": "0.1.1"
},
],
"version": "0.1.1"
},
- "symbolRendererSnippetID": "
class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "GUInand3",
"centerTextHeight": 5.0,
"symbolRendererParams": {
"centerText": "GUInand3",
"centerTextHeight": 5.0,
@@
-213,7
+213,7
@@
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
- "outlineRendererSnippetID": "
class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer
",
- "highLevelStateHandlerSnippetID": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.DefaultHighLevelStateHandler
",
+ "outlineRendererSnippetID": "
default
",
+ "highLevelStateHandlerSnippetID": "
default
",
"version": "0.1.5"
}
\ No newline at end of file
"version": "0.1.5"
}
\ No newline at end of file
diff --git
a/net.mograsim.logic.model.am2900/components/GUInot4.json
b/net.mograsim.logic.model.am2900/components/GUInot4.json
index
536a38d
..
b80166a
100644
(file)
--- a/
net.mograsim.logic.model.am2900/components/GUInot4.json
+++ b/
net.mograsim.logic.model.am2900/components/GUInot4.json
@@
-79,7
+79,7
@@
"submodel": {
"components": [
{
"submodel": {
"components": [
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#0",
"pos": {
"x": 30.0,
"name": "GUINandGate#0",
"pos": {
"x": 30.0,
@@
-88,7
+88,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#1",
"pos": {
"x": 30.0,
"name": "GUINandGate#1",
"pos": {
"x": 30.0,
@@
-97,7
+97,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#2",
"pos": {
"x": 30.0,
"name": "GUINandGate#2",
"pos": {
"x": 30.0,
@@
-106,7
+106,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#3",
"pos": {
"x": 30.0,
"name": "GUINandGate#3",
"pos": {
"x": 30.0,
@@
-115,7
+115,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#0",
"pos": {
"x": 14.0,
"name": "WireCrossPoint#0",
"pos": {
"x": 14.0,
@@
-124,7
+124,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#1",
"pos": {
"x": 14.0,
"name": "WireCrossPoint#1",
"pos": {
"x": 14.0,
@@
-133,7
+133,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#2",
"pos": {
"x": 14.0,
"name": "WireCrossPoint#2",
"pos": {
"x": 14.0,
@@
-142,7
+142,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#3",
"pos": {
"x": 14.0,
"name": "WireCrossPoint#3",
"pos": {
"x": 14.0,
@@
-387,7
+387,7
@@
],
"version": "0.1.1"
},
],
"version": "0.1.1"
},
- "symbolRendererSnippetID": "
class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "GUInot4",
"centerTextHeight": 5.0,
"symbolRendererParams": {
"centerText": "GUInot4",
"centerTextHeight": 5.0,
@@
-395,7
+395,7
@@
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
- "outlineRendererSnippetID": "
class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer
",
- "highLevelStateHandlerSnippetID": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.DefaultHighLevelStateHandler
",
+ "outlineRendererSnippetID": "
default
",
+ "highLevelStateHandlerSnippetID": "
default
",
"version": "0.1.5"
}
\ No newline at end of file
"version": "0.1.5"
}
\ No newline at end of file
diff --git
a/net.mograsim.logic.model.am2900/components/GUIor4.json
b/net.mograsim.logic.model.am2900/components/GUIor4.json
index
59ce75b
..
9b6e1bf
100644
(file)
--- a/
net.mograsim.logic.model.am2900/components/GUIor4.json
+++ b/
net.mograsim.logic.model.am2900/components/GUIor4.json
@@
-52,7
+52,7
@@
"submodel": {
"components": [
{
"submodel": {
"components": [
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#0",
"pos": {
"x": 20.0,
"name": "GUINandGate#0",
"pos": {
"x": 20.0,
@@
-61,7
+61,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#1",
"pos": {
"x": 20.0,
"name": "GUINandGate#1",
"pos": {
"x": 20.0,
@@
-70,7
+70,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#2",
"pos": {
"x": 20.0,
"name": "GUINandGate#2",
"pos": {
"x": 20.0,
@@
-79,7
+79,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#3",
"pos": {
"x": 20.0,
"name": "GUINandGate#3",
"pos": {
"x": 20.0,
@@
-88,7
+88,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#4",
"pos": {
"x": 50.0,
"name": "GUINandGate#4",
"pos": {
"x": 50.0,
@@
-97,7
+97,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#5",
"pos": {
"x": 50.0,
"name": "GUINandGate#5",
"pos": {
"x": 50.0,
@@
-106,7
+106,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#6",
"pos": {
"x": 110.0,
"name": "GUINandGate#6",
"pos": {
"x": 110.0,
@@
-115,7
+115,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#7",
"pos": {
"x": 110.0,
"name": "GUINandGate#7",
"pos": {
"x": 110.0,
@@
-124,7
+124,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#8",
"pos": {
"x": 140.0,
"name": "GUINandGate#8",
"pos": {
"x": 140.0,
@@
-133,7
+133,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#0",
"pos": {
"x": 14.0,
"name": "WireCrossPoint#0",
"pos": {
"x": 14.0,
@@
-142,7
+142,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#1",
"pos": {
"x": 14.0,
"name": "WireCrossPoint#1",
"pos": {
"x": 14.0,
@@
-151,7
+151,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#2",
"pos": {
"x": 14.0,
"name": "WireCrossPoint#2",
"pos": {
"x": 14.0,
@@
-160,7
+160,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#3",
"pos": {
"x": 14.0,
"name": "WireCrossPoint#3",
"pos": {
"x": 14.0,
@@
-169,7
+169,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#4",
"pos": {
"x": 104.0,
"name": "WireCrossPoint#4",
"pos": {
"x": 104.0,
@@
-178,7
+178,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#5",
"pos": {
"x": 104.0,
"name": "WireCrossPoint#5",
"pos": {
"x": 104.0,
@@
-544,7
+544,7
@@
],
"version": "0.1.1"
},
],
"version": "0.1.1"
},
- "symbolRendererSnippetID": "
class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "GUIor4",
"centerTextHeight": 5.0,
"symbolRendererParams": {
"centerText": "GUIor4",
"centerTextHeight": 5.0,
@@
-552,7
+552,7
@@
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
- "outlineRendererSnippetID": "
class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer
",
- "highLevelStateHandlerSnippetID": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.DefaultHighLevelStateHandler
",
+ "outlineRendererSnippetID": "
default
",
+ "highLevelStateHandlerSnippetID": "
default
",
"version": "0.1.5"
}
\ No newline at end of file
"version": "0.1.5"
}
\ No newline at end of file
diff --git
a/net.mograsim.logic.model.am2900/components/GUIor_4.json
b/net.mograsim.logic.model.am2900/components/GUIor_4.json
index
6701045
..
232a77f
100644
(file)
--- a/
net.mograsim.logic.model.am2900/components/GUIor_4.json
+++ b/
net.mograsim.logic.model.am2900/components/GUIor_4.json
@@
-115,7
+115,7
@@
"submodel": {
"components": [
{
"submodel": {
"components": [
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#0",
"pos": {
"x": 15.0,
"name": "GUINandGate#0",
"pos": {
"x": 15.0,
@@
-124,7
+124,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#1",
"pos": {
"x": 15.0,
"name": "GUINandGate#1",
"pos": {
"x": 15.0,
@@
-133,7
+133,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#10",
"pos": {
"x": 65.0,
"name": "GUINandGate#10",
"pos": {
"x": 65.0,
@@
-142,7
+142,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#11",
"pos": {
"x": 65.0,
"name": "GUINandGate#11",
"pos": {
"x": 65.0,
@@
-151,7
+151,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#2",
"pos": {
"x": 15.0,
"name": "GUINandGate#2",
"pos": {
"x": 15.0,
@@
-160,7
+160,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#3",
"pos": {
"x": 15.0,
"name": "GUINandGate#3",
"pos": {
"x": 15.0,
@@
-169,7
+169,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#4",
"pos": {
"x": 15.0,
"name": "GUINandGate#4",
"pos": {
"x": 15.0,
@@
-178,7
+178,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#5",
"pos": {
"x": 15.0,
"name": "GUINandGate#5",
"pos": {
"x": 15.0,
@@
-187,7
+187,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#6",
"pos": {
"x": 15.0,
"name": "GUINandGate#6",
"pos": {
"x": 15.0,
@@
-196,7
+196,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#7",
"pos": {
"x": 15.0,
"name": "GUINandGate#7",
"pos": {
"x": 15.0,
@@
-205,7
+205,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#8",
"pos": {
"x": 65.0,
"name": "GUINandGate#8",
"pos": {
"x": 65.0,
@@
-214,7
+214,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#9",
"pos": {
"x": 65.0,
"name": "GUINandGate#9",
"pos": {
"x": 65.0,
@@
-223,7
+223,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#0",
"pos": {
"x": 6.5,
"name": "WireCrossPoint#0",
"pos": {
"x": 6.5,
@@
-232,7
+232,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#1",
"pos": {
"x": 6.5,
"name": "WireCrossPoint#1",
"pos": {
"x": 6.5,
@@
-241,7
+241,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#2",
"pos": {
"x": 6.5,
"name": "WireCrossPoint#2",
"pos": {
"x": 6.5,
@@
-250,7
+250,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#3",
"pos": {
"x": 6.5,
"name": "WireCrossPoint#3",
"pos": {
"x": 6.5,
@@
-259,7
+259,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#4",
"pos": {
"x": 6.5,
"name": "WireCrossPoint#4",
"pos": {
"x": 6.5,
@@
-268,7
+268,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#5",
"pos": {
"x": 6.5,
"name": "WireCrossPoint#5",
"pos": {
"x": 6.5,
@@
-277,7
+277,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#6",
"pos": {
"x": 6.5,
"name": "WireCrossPoint#6",
"pos": {
"x": 6.5,
@@
-286,7
+286,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#7",
"pos": {
"x": 6.5,
"name": "WireCrossPoint#7",
"pos": {
"x": 6.5,
@@
-883,7
+883,7
@@
],
"version": "0.1.1"
},
],
"version": "0.1.1"
},
- "symbolRendererSnippetID": "
class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "GUIor_4",
"centerTextHeight": 5.0,
"symbolRendererParams": {
"centerText": "GUIor_4",
"centerTextHeight": 5.0,
@@
-891,7
+891,7
@@
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
- "outlineRendererSnippetID": "
class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer
",
- "highLevelStateHandlerSnippetID": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.DefaultHighLevelStateHandler
",
+ "outlineRendererSnippetID": "
default
",
+ "highLevelStateHandlerSnippetID": "
default
",
"version": "0.1.5"
}
\ No newline at end of file
"version": "0.1.5"
}
\ No newline at end of file
diff --git
a/net.mograsim.logic.model.am2900/components/GUIram2.json
b/net.mograsim.logic.model.am2900/components/GUIram2.json
index
a5637f1
..
6322110
100644
(file)
--- a/
net.mograsim.logic.model.am2900/components/GUIram2.json
+++ b/
net.mograsim.logic.model.am2900/components/GUIram2.json
@@
-280,7
+280,7
@@
}
},
{
}
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#0",
"pos": {
"x": 109.0,
"name": "WireCrossPoint#0",
"pos": {
"x": 109.0,
@@
-289,7
+289,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#1",
"pos": {
"x": 104.0,
"name": "WireCrossPoint#1",
"pos": {
"x": 104.0,
@@
-298,7
+298,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#10",
"pos": {
"x": 44.0,
"name": "WireCrossPoint#10",
"pos": {
"x": 44.0,
@@
-307,7
+307,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#11",
"pos": {
"x": 49.0,
"name": "WireCrossPoint#11",
"pos": {
"x": 49.0,
@@
-316,7
+316,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#12",
"pos": {
"x": 34.0,
"name": "WireCrossPoint#12",
"pos": {
"x": 34.0,
@@
-325,7
+325,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#13",
"pos": {
"x": 39.0,
"name": "WireCrossPoint#13",
"pos": {
"x": 39.0,
@@
-334,7
+334,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#14",
"pos": {
"x": 44.0,
"name": "WireCrossPoint#14",
"pos": {
"x": 44.0,
@@
-343,7
+343,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#15",
"pos": {
"x": 49.0,
"name": "WireCrossPoint#15",
"pos": {
"x": 49.0,
@@
-352,7
+352,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#16",
"pos": {
"x": 129.0,
"name": "WireCrossPoint#16",
"pos": {
"x": 129.0,
@@
-361,7
+361,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#17",
"pos": {
"x": 124.0,
"name": "WireCrossPoint#17",
"pos": {
"x": 124.0,
@@
-370,7
+370,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#18",
"pos": {
"x": 119.0,
"name": "WireCrossPoint#18",
"pos": {
"x": 119.0,
@@
-379,7
+379,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#19",
"pos": {
"x": 114.0,
"name": "WireCrossPoint#19",
"pos": {
"x": 114.0,
@@
-388,7
+388,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#2",
"pos": {
"x": 99.0,
"name": "WireCrossPoint#2",
"pos": {
"x": 99.0,
@@
-397,7
+397,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#20",
"pos": {
"x": 129.0,
"name": "WireCrossPoint#20",
"pos": {
"x": 129.0,
@@
-406,7
+406,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#21",
"pos": {
"x": 124.0,
"name": "WireCrossPoint#21",
"pos": {
"x": 124.0,
@@
-415,7
+415,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#22",
"pos": {
"x": 119.0,
"name": "WireCrossPoint#22",
"pos": {
"x": 119.0,
@@
-424,7
+424,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#23",
"pos": {
"x": 114.0,
"name": "WireCrossPoint#23",
"pos": {
"x": 114.0,
@@
-433,7
+433,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#24",
"pos": {
"x": 129.0,
"name": "WireCrossPoint#24",
"pos": {
"x": 129.0,
@@
-442,7
+442,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#25",
"pos": {
"x": 124.0,
"name": "WireCrossPoint#25",
"pos": {
"x": 124.0,
@@
-451,7
+451,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#26",
"pos": {
"x": 119.0,
"name": "WireCrossPoint#26",
"pos": {
"x": 119.0,
@@
-460,7
+460,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#27",
"pos": {
"x": 114.0,
"name": "WireCrossPoint#27",
"pos": {
"x": 114.0,
@@
-469,7
+469,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#28",
"pos": {
"x": 129.0,
"name": "WireCrossPoint#28",
"pos": {
"x": 129.0,
@@
-478,7
+478,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#29",
"pos": {
"x": 124.0,
"name": "WireCrossPoint#29",
"pos": {
"x": 124.0,
@@
-487,7
+487,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#3",
"pos": {
"x": 94.0,
"name": "WireCrossPoint#3",
"pos": {
"x": 94.0,
@@
-496,7
+496,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#30",
"pos": {
"x": 119.0,
"name": "WireCrossPoint#30",
"pos": {
"x": 119.0,
@@
-505,7
+505,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#31",
"pos": {
"x": 114.0,
"name": "WireCrossPoint#31",
"pos": {
"x": 114.0,
@@
-514,7
+514,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#4",
"pos": {
"x": 34.0,
"name": "WireCrossPoint#4",
"pos": {
"x": 34.0,
@@
-523,7
+523,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#5",
"pos": {
"x": 39.0,
"name": "WireCrossPoint#5",
"pos": {
"x": 39.0,
@@
-532,7
+532,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#6",
"pos": {
"x": 44.0,
"name": "WireCrossPoint#6",
"pos": {
"x": 44.0,
@@
-541,7
+541,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#7",
"pos": {
"x": 49.0,
"name": "WireCrossPoint#7",
"pos": {
"x": 49.0,
@@
-550,7
+550,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#8",
"pos": {
"x": 34.0,
"name": "WireCrossPoint#8",
"pos": {
"x": 34.0,
@@
-559,7
+559,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#9",
"pos": {
"x": 39.0,
"name": "WireCrossPoint#9",
"pos": {
"x": 39.0,
@@
-2968,7
+2968,7
@@
],
"version": "0.1.1"
},
],
"version": "0.1.1"
},
- "symbolRendererSnippetID": "
class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "GUIram2",
"centerTextHeight": 5.0,
"symbolRendererParams": {
"centerText": "GUIram2",
"centerTextHeight": 5.0,
@@
-2976,30
+2976,30
@@
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
- "outlineRendererSnippetID": "
class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer
",
- "highLevelStateHandlerSnippetID": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.StandardHighLevelStateHandler
",
+ "outlineRendererSnippetID": "
default
",
+ "highLevelStateHandlerSnippetID": "
standard
",
"highLevelStateHandlerParams": {
"subcomponentHighLevelStates": {
"c00": {
"highLevelStateHandlerParams": {
"subcomponentHighLevelStates": {
"c00": {
- "id": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler
",
+ "id": "
delegating
",
"params": {
"delegateTarget": "GUIdlatch4#0"
}
},
"c11": {
"params": {
"delegateTarget": "GUIdlatch4#0"
}
},
"c11": {
- "id": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler
",
+ "id": "
delegating
",
"params": {
"delegateTarget": "GUIdlatch4#3"
}
},
"c10": {
"params": {
"delegateTarget": "GUIdlatch4#3"
}
},
"c10": {
- "id": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler
",
+ "id": "
delegating
",
"params": {
"delegateTarget": "GUIdlatch4#2"
}
},
"c01": {
"params": {
"delegateTarget": "GUIdlatch4#2"
}
},
"c01": {
- "id": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler
",
+ "id": "
delegating
",
"params": {
"delegateTarget": "GUIdlatch4#1"
}
"params": {
"delegateTarget": "GUIdlatch4#1"
}
@@
-3007,7
+3007,7
@@
},
"atomicHighLevelStates": {
"q": {
},
"atomicHighLevelStates": {
"q": {
- "id": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.BitVectorSplittingAtomicHighLevelStateHandler
",
+ "id": "
bitVectorSplitting
",
"params": {
"vectorPartTargets": [
"c11.q",
"params": {
"vectorPartTargets": [
"c11.q",
diff --git
a/net.mograsim.logic.model.am2900/components/GUIram4.json
b/net.mograsim.logic.model.am2900/components/GUIram4.json
index
527fc35
..
55ddef8
100644
(file)
--- a/
net.mograsim.logic.model.am2900/components/GUIram4.json
+++ b/
net.mograsim.logic.model.am2900/components/GUIram4.json
@@
-316,7
+316,7
@@
}
},
{
}
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#0",
"pos": {
"x": 229.0,
"name": "WireCrossPoint#0",
"pos": {
"x": 229.0,
@@
-325,7
+325,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#1",
"pos": {
"x": 224.0,
"name": "WireCrossPoint#1",
"pos": {
"x": 224.0,
@@
-334,7
+334,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#10",
"pos": {
"x": 69.0,
"name": "WireCrossPoint#10",
"pos": {
"x": 69.0,
@@
-343,7
+343,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#11",
"pos": {
"x": 74.0,
"name": "WireCrossPoint#11",
"pos": {
"x": 74.0,
@@
-352,7
+352,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#12",
"pos": {
"x": 59.0,
"name": "WireCrossPoint#12",
"pos": {
"x": 59.0,
@@
-361,7
+361,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#13",
"pos": {
"x": 64.0,
"name": "WireCrossPoint#13",
"pos": {
"x": 64.0,
@@
-370,7
+370,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#14",
"pos": {
"x": 69.0,
"name": "WireCrossPoint#14",
"pos": {
"x": 69.0,
@@
-379,7
+379,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#15",
"pos": {
"x": 74.0,
"name": "WireCrossPoint#15",
"pos": {
"x": 74.0,
@@
-388,7
+388,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#16",
"pos": {
"x": 39.0,
"name": "WireCrossPoint#16",
"pos": {
"x": 39.0,
@@
-397,7
+397,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#17",
"pos": {
"x": 44.0,
"name": "WireCrossPoint#17",
"pos": {
"x": 44.0,
@@
-406,7
+406,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#18",
"pos": {
"x": 49.0,
"name": "WireCrossPoint#18",
"pos": {
"x": 49.0,
@@
-415,7
+415,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#19",
"pos": {
"x": 54.0,
"name": "WireCrossPoint#19",
"pos": {
"x": 54.0,
@@
-424,7
+424,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#2",
"pos": {
"x": 219.0,
"name": "WireCrossPoint#2",
"pos": {
"x": 219.0,
@@
-433,7
+433,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#20",
"pos": {
"x": 39.0,
"name": "WireCrossPoint#20",
"pos": {
"x": 39.0,
@@
-442,7
+442,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#21",
"pos": {
"x": 44.0,
"name": "WireCrossPoint#21",
"pos": {
"x": 44.0,
@@
-451,7
+451,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#22",
"pos": {
"x": 49.0,
"name": "WireCrossPoint#22",
"pos": {
"x": 49.0,
@@
-460,7
+460,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#23",
"pos": {
"x": 54.0,
"name": "WireCrossPoint#23",
"pos": {
"x": 54.0,
@@
-469,7
+469,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#24",
"pos": {
"x": 39.0,
"name": "WireCrossPoint#24",
"pos": {
"x": 39.0,
@@
-478,7
+478,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#25",
"pos": {
"x": 44.0,
"name": "WireCrossPoint#25",
"pos": {
"x": 44.0,
@@
-487,7
+487,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#26",
"pos": {
"x": 49.0,
"name": "WireCrossPoint#26",
"pos": {
"x": 49.0,
@@
-496,7
+496,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#27",
"pos": {
"x": 54.0,
"name": "WireCrossPoint#27",
"pos": {
"x": 54.0,
@@
-505,7
+505,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#3",
"pos": {
"x": 214.0,
"name": "WireCrossPoint#3",
"pos": {
"x": 214.0,
@@
-514,7
+514,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#4",
"pos": {
"x": 59.0,
"name": "WireCrossPoint#4",
"pos": {
"x": 59.0,
@@
-523,7
+523,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#5",
"pos": {
"x": 64.0,
"name": "WireCrossPoint#5",
"pos": {
"x": 64.0,
@@
-532,7
+532,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#6",
"pos": {
"x": 69.0,
"name": "WireCrossPoint#6",
"pos": {
"x": 69.0,
@@
-541,7
+541,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#7",
"pos": {
"x": 74.0,
"name": "WireCrossPoint#7",
"pos": {
"x": 74.0,
@@
-550,7
+550,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#8",
"pos": {
"x": 59.0,
"name": "WireCrossPoint#8",
"pos": {
"x": 59.0,
@@
-559,7
+559,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#9",
"pos": {
"x": 64.0,
"name": "WireCrossPoint#9",
"pos": {
"x": 64.0,
@@
-3352,7
+3352,7
@@
],
"version": "0.1.1"
},
],
"version": "0.1.1"
},
- "symbolRendererSnippetID": "
class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "GUIram4",
"centerTextHeight": 5.0,
"symbolRendererParams": {
"centerText": "GUIram4",
"centerTextHeight": 5.0,
@@
-3360,141
+3360,141
@@
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
- "outlineRendererSnippetID": "
class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer
",
- "highLevelStateHandlerSnippetID": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.StandardHighLevelStateHandler
",
+ "outlineRendererSnippetID": "
default
",
+ "highLevelStateHandlerSnippetID": "
standard
",
"highLevelStateHandlerParams": {
"subcomponentHighLevelStates": {
"c00": {
"highLevelStateHandlerParams": {
"subcomponentHighLevelStates": {
"c00": {
- "id": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler
",
+ "id": "
delegating
",
"params": {
"delegateTarget": "GUIram2#0"
}
},
"c11": {
"params": {
"delegateTarget": "GUIram2#0"
}
},
"c11": {
- "id": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler
",
+ "id": "
delegating
",
"params": {
"delegateTarget": "GUIram2#3"
}
},
"c10": {
"params": {
"delegateTarget": "GUIram2#3"
}
},
"c10": {
- "id": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler
",
+ "id": "
delegating
",
"params": {
"delegateTarget": "GUIram2#2"
}
},
"c01": {
"params": {
"delegateTarget": "GUIram2#2"
}
},
"c01": {
- "id": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler
",
+ "id": "
delegating
",
"params": {
"delegateTarget": "GUIram2#1"
}
},
"c1000": {
"params": {
"delegateTarget": "GUIram2#1"
}
},
"c1000": {
- "id": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler
",
+ "id": "
delegating
",
"params": {
"delegateTarget": "GUIram2#0",
"prefix": "c10"
}
},
"c1011": {
"params": {
"delegateTarget": "GUIram2#0",
"prefix": "c10"
}
},
"c1011": {
- "id": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler
",
+ "id": "
delegating
",
"params": {
"delegateTarget": "GUIram2#3",
"prefix": "c10"
}
},
"c1110": {
"params": {
"delegateTarget": "GUIram2#3",
"prefix": "c10"
}
},
"c1110": {
- "id": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler
",
+ "id": "
delegating
",
"params": {
"delegateTarget": "GUIram2#2",
"prefix": "c11"
}
},
"c1001": {
"params": {
"delegateTarget": "GUIram2#2",
"prefix": "c11"
}
},
"c1001": {
- "id": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler
",
+ "id": "
delegating
",
"params": {
"delegateTarget": "GUIram2#1",
"prefix": "c10"
}
},
"c1100": {
"params": {
"delegateTarget": "GUIram2#1",
"prefix": "c10"
}
},
"c1100": {
- "id": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler
",
+ "id": "
delegating
",
"params": {
"delegateTarget": "GUIram2#0",
"prefix": "c11"
}
},
"c1111": {
"params": {
"delegateTarget": "GUIram2#0",
"prefix": "c11"
}
},
"c1111": {
- "id": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler
",
+ "id": "
delegating
",
"params": {
"delegateTarget": "GUIram2#3",
"prefix": "c11"
}
},
"c0000": {
"params": {
"delegateTarget": "GUIram2#3",
"prefix": "c11"
}
},
"c0000": {
- "id": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler
",
+ "id": "
delegating
",
"params": {
"delegateTarget": "GUIram2#0",
"prefix": "c00"
}
},
"c0011": {
"params": {
"delegateTarget": "GUIram2#0",
"prefix": "c00"
}
},
"c0011": {
- "id": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler
",
+ "id": "
delegating
",
"params": {
"delegateTarget": "GUIram2#3",
"prefix": "c00"
}
},
"c0110": {
"params": {
"delegateTarget": "GUIram2#3",
"prefix": "c00"
}
},
"c0110": {
- "id": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler
",
+ "id": "
delegating
",
"params": {
"delegateTarget": "GUIram2#2",
"prefix": "c01"
}
},
"c0010": {
"params": {
"delegateTarget": "GUIram2#2",
"prefix": "c01"
}
},
"c0010": {
- "id": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler
",
+ "id": "
delegating
",
"params": {
"delegateTarget": "GUIram2#2",
"prefix": "c00"
}
},
"c1010": {
"params": {
"delegateTarget": "GUIram2#2",
"prefix": "c00"
}
},
"c1010": {
- "id": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler
",
+ "id": "
delegating
",
"params": {
"delegateTarget": "GUIram2#2",
"prefix": "c10"
}
},
"c0101": {
"params": {
"delegateTarget": "GUIram2#2",
"prefix": "c10"
}
},
"c0101": {
- "id": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler
",
+ "id": "
delegating
",
"params": {
"delegateTarget": "GUIram2#1",
"prefix": "c01"
}
},
"c0001": {
"params": {
"delegateTarget": "GUIram2#1",
"prefix": "c01"
}
},
"c0001": {
- "id": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler
",
+ "id": "
delegating
",
"params": {
"delegateTarget": "GUIram2#1",
"prefix": "c00"
}
},
"c0100": {
"params": {
"delegateTarget": "GUIram2#1",
"prefix": "c00"
}
},
"c0100": {
- "id": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler
",
+ "id": "
delegating
",
"params": {
"delegateTarget": "GUIram2#0",
"prefix": "c01"
}
},
"c0111": {
"params": {
"delegateTarget": "GUIram2#0",
"prefix": "c01"
}
},
"c0111": {
- "id": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler
",
+ "id": "
delegating
",
"params": {
"delegateTarget": "GUIram2#3",
"prefix": "c01"
}
},
"c1101": {
"params": {
"delegateTarget": "GUIram2#3",
"prefix": "c01"
}
},
"c1101": {
- "id": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler
",
+ "id": "
delegating
",
"params": {
"delegateTarget": "GUIram2#1",
"prefix": "c11"
"params": {
"delegateTarget": "GUIram2#1",
"prefix": "c11"
@@
-3503,7
+3503,7
@@
},
"atomicHighLevelStates": {
"q": {
},
"atomicHighLevelStates": {
"q": {
- "id": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.BitVectorSplittingAtomicHighLevelStateHandler
",
+ "id": "
bitVectorSplitting
",
"params": {
"vectorPartTargets": [
"c11.q",
"params": {
"vectorPartTargets": [
"c11.q",
diff --git
a/net.mograsim.logic.model.am2900/components/GUIsel1.json
b/net.mograsim.logic.model.am2900/components/GUIsel1.json
index
50c7005
..
093657b
100644
(file)
--- a/
net.mograsim.logic.model.am2900/components/GUIsel1.json
+++ b/
net.mograsim.logic.model.am2900/components/GUIsel1.json
@@
-52,7
+52,7
@@
"submodel": {
"components": [
{
"submodel": {
"components": [
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#1",
"pos": {
"x": 35.0,
"name": "GUINandGate#1",
"pos": {
"x": 35.0,
@@
-61,7
+61,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#2",
"pos": {
"x": 35.0,
"name": "GUINandGate#2",
"pos": {
"x": 35.0,
@@
-70,7
+70,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#3",
"pos": {
"x": 60.0,
"name": "GUINandGate#3",
"pos": {
"x": 60.0,
@@
-200,7
+200,7
@@
],
"version": "0.1.1"
},
],
"version": "0.1.1"
},
- "symbolRendererSnippetID": "
class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "GUIsel1",
"centerTextHeight": 5.0,
"symbolRendererParams": {
"centerText": "GUIsel1",
"centerTextHeight": 5.0,
@@
-208,7
+208,7
@@
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
- "outlineRendererSnippetID": "
class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer
",
- "highLevelStateHandlerSnippetID": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.DefaultHighLevelStateHandler
",
+ "outlineRendererSnippetID": "
default
",
+ "highLevelStateHandlerSnippetID": "
default
",
"version": "0.1.5"
}
\ No newline at end of file
"version": "0.1.5"
}
\ No newline at end of file
diff --git
a/net.mograsim.logic.model.am2900/components/GUIsel2_4.json
b/net.mograsim.logic.model.am2900/components/GUIsel2_4.json
index
f84c205
..
a9234a2
100644
(file)
--- a/
net.mograsim.logic.model.am2900/components/GUIsel2_4.json
+++ b/
net.mograsim.logic.model.am2900/components/GUIsel2_4.json
@@
-133,7
+133,7
@@
"submodel": {
"components": [
{
"submodel": {
"components": [
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#0",
"pos": {
"x": 20.0,
"name": "GUINandGate#0",
"pos": {
"x": 20.0,
@@
-142,7
+142,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#1",
"pos": {
"x": 20.0,
"name": "GUINandGate#1",
"pos": {
"x": 20.0,
@@
-151,7
+151,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#10",
"pos": {
"x": 65.0,
"name": "GUINandGate#10",
"pos": {
"x": 65.0,
@@
-160,7
+160,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#11",
"pos": {
"x": 65.0,
"name": "GUINandGate#11",
"pos": {
"x": 65.0,
@@
-169,7
+169,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#2",
"pos": {
"x": 20.0,
"name": "GUINandGate#2",
"pos": {
"x": 20.0,
@@
-178,7
+178,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#3",
"pos": {
"x": 20.0,
"name": "GUINandGate#3",
"pos": {
"x": 20.0,
@@
-187,7
+187,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#4",
"pos": {
"x": 20.0,
"name": "GUINandGate#4",
"pos": {
"x": 20.0,
@@
-196,7
+196,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#5",
"pos": {
"x": 20.0,
"name": "GUINandGate#5",
"pos": {
"x": 20.0,
@@
-205,7
+205,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#6",
"pos": {
"x": 20.0,
"name": "GUINandGate#6",
"pos": {
"x": 20.0,
@@
-214,7
+214,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#7",
"pos": {
"x": 20.0,
"name": "GUINandGate#7",
"pos": {
"x": 20.0,
@@
-223,7
+223,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#8",
"pos": {
"x": 65.0,
"name": "GUINandGate#8",
"pos": {
"x": 65.0,
@@
-232,7
+232,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#9",
"pos": {
"x": 65.0,
"name": "GUINandGate#9",
"pos": {
"x": 65.0,
@@
-241,7
+241,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#0",
"pos": {
"x": 6.5,
"name": "WireCrossPoint#0",
"pos": {
"x": 6.5,
@@
-250,7
+250,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#1",
"pos": {
"x": 6.5,
"name": "WireCrossPoint#1",
"pos": {
"x": 6.5,
@@
-259,7
+259,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#2",
"pos": {
"x": 6.5,
"name": "WireCrossPoint#2",
"pos": {
"x": 6.5,
@@
-268,7
+268,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#3",
"pos": {
"x": 4.0,
"name": "WireCrossPoint#3",
"pos": {
"x": 4.0,
@@
-277,7
+277,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#4",
"pos": {
"x": 4.0,
"name": "WireCrossPoint#4",
"pos": {
"x": 4.0,
@@
-286,7
+286,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#5",
"pos": {
"x": 4.0,
"name": "WireCrossPoint#5",
"pos": {
"x": 4.0,
@@
-849,7
+849,7
@@
],
"version": "0.1.1"
},
],
"version": "0.1.1"
},
- "symbolRendererSnippetID": "
class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "GUIsel2_4",
"centerTextHeight": 5.0,
"symbolRendererParams": {
"centerText": "GUIsel2_4",
"centerTextHeight": 5.0,
@@
-857,7
+857,7
@@
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
- "outlineRendererSnippetID": "
class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer
",
- "highLevelStateHandlerSnippetID": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.DefaultHighLevelStateHandler
",
+ "outlineRendererSnippetID": "
default
",
+ "highLevelStateHandlerSnippetID": "
default
",
"version": "0.1.5"
}
\ No newline at end of file
"version": "0.1.5"
}
\ No newline at end of file
diff --git
a/net.mograsim.logic.model.am2900/components/GUIsel3_4.json
b/net.mograsim.logic.model.am2900/components/GUIsel3_4.json
index
951c0e8
..
5951bdc
100644
(file)
--- a/
net.mograsim.logic.model.am2900/components/GUIsel3_4.json
+++ b/
net.mograsim.logic.model.am2900/components/GUIsel3_4.json
@@
-178,7
+178,7
@@
"submodel": {
"components": [
{
"submodel": {
"components": [
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#0",
"pos": {
"x": 50.0,
"name": "GUINandGate#0",
"pos": {
"x": 50.0,
@@
-187,7
+187,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#1",
"pos": {
"x": 50.0,
"name": "GUINandGate#1",
"pos": {
"x": 50.0,
@@
-196,7
+196,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#2",
"pos": {
"x": 50.0,
"name": "GUINandGate#2",
"pos": {
"x": 50.0,
@@
-205,7
+205,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#3",
"pos": {
"x": 50.0,
"name": "GUINandGate#3",
"pos": {
"x": 50.0,
@@
-214,7
+214,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#4",
"pos": {
"x": 152.5,
"name": "GUINandGate#4",
"pos": {
"x": 152.5,
@@
-223,7
+223,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#5",
"pos": {
"x": 152.5,
"name": "GUINandGate#5",
"pos": {
"x": 152.5,
@@
-232,7
+232,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#6",
"pos": {
"x": 152.5,
"name": "GUINandGate#6",
"pos": {
"x": 152.5,
@@
-241,7
+241,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#7",
"pos": {
"x": 152.5,
"name": "GUINandGate#7",
"pos": {
"x": 152.5,
@@
-266,7
+266,7
@@
}
},
{
}
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#0",
"pos": {
"x": 29.0,
"name": "WireCrossPoint#0",
"pos": {
"x": 29.0,
@@
-275,7
+275,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#1",
"pos": {
"x": 29.0,
"name": "WireCrossPoint#1",
"pos": {
"x": 29.0,
@@
-284,7
+284,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#2",
"pos": {
"x": 29.0,
"name": "WireCrossPoint#2",
"pos": {
"x": 29.0,
@@
-923,7
+923,7
@@
],
"version": "0.1.1"
},
],
"version": "0.1.1"
},
- "symbolRendererSnippetID": "
class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "GUIsel3_4",
"centerTextHeight": 5.0,
"symbolRendererParams": {
"centerText": "GUIsel3_4",
"centerTextHeight": 5.0,
@@
-931,7
+931,7
@@
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
- "outlineRendererSnippetID": "
class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer
",
- "highLevelStateHandlerSnippetID": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.DefaultHighLevelStateHandler
",
+ "outlineRendererSnippetID": "
default
",
+ "highLevelStateHandlerSnippetID": "
default
",
"version": "0.1.5"
}
\ No newline at end of file
"version": "0.1.5"
}
\ No newline at end of file
diff --git
a/net.mograsim.logic.model.am2900/components/GUIxor.json
b/net.mograsim.logic.model.am2900/components/GUIxor.json
index
d6c8de1
..
48c22e5
100644
(file)
--- a/
net.mograsim.logic.model.am2900/components/GUIxor.json
+++ b/
net.mograsim.logic.model.am2900/components/GUIxor.json
@@
-34,7
+34,7
@@
"submodel": {
"components": [
{
"submodel": {
"components": [
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#0",
"pos": {
"x": 7.5,
"name": "GUINandGate#0",
"pos": {
"x": 7.5,
@@
-43,7
+43,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#1",
"pos": {
"x": 35.0,
"name": "GUINandGate#1",
"pos": {
"x": 35.0,
@@
-52,7
+52,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#2",
"pos": {
"x": 35.0,
"name": "GUINandGate#2",
"pos": {
"x": 35.0,
@@
-61,7
+61,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#3",
"pos": {
"x": 62.5,
"name": "GUINandGate#3",
"pos": {
"x": 62.5,
@@
-70,7
+70,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#0",
"pos": {
"x": 4.0,
"name": "WireCrossPoint#0",
"pos": {
"x": 4.0,
@@
-79,7
+79,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#1",
"pos": {
"x": 4.0,
"name": "WireCrossPoint#1",
"pos": {
"x": 4.0,
@@
-88,7
+88,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#2",
"pos": {
"x": 29.0,
"name": "WireCrossPoint#2",
"pos": {
"x": 29.0,
@@
-271,7
+271,7
@@
],
"version": "0.1.1"
},
],
"version": "0.1.1"
},
- "symbolRendererSnippetID": "
class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "GUIxor",
"centerTextHeight": 5.0,
"symbolRendererParams": {
"centerText": "GUIxor",
"centerTextHeight": 5.0,
@@
-279,7
+279,7
@@
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
- "outlineRendererSnippetID": "
class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer
",
- "highLevelStateHandlerSnippetID": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.DefaultHighLevelStateHandler
",
+ "outlineRendererSnippetID": "
default
",
+ "highLevelStateHandlerSnippetID": "
default
",
"version": "0.1.5"
}
\ No newline at end of file
"version": "0.1.5"
}
\ No newline at end of file
diff --git
a/net.mograsim.logic.model.am2900/components/am2901/GUIAm2901.json
b/net.mograsim.logic.model.am2900/components/am2901/GUIAm2901.json
index
ed2ced9
..
64f12af
100644
(file)
--- a/
net.mograsim.logic.model.am2900/components/am2901/GUIAm2901.json
+++ b/
net.mograsim.logic.model.am2900/components/am2901/GUIAm2901.json
@@
-374,7
+374,7
@@
}
},
{
}
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#0",
"pos": {
"x": 160.0,
"name": "GUINandGate#0",
"pos": {
"x": 160.0,
@@
-383,7
+383,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#1",
"pos": {
"x": 320.0,
"name": "GUINandGate#1",
"pos": {
"x": 320.0,
@@
-464,7
+464,7
@@
}
},
{
}
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#0",
"pos": {
"x": 154.0,
"name": "WireCrossPoint#0",
"pos": {
"x": 154.0,
@@
-473,7
+473,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#1",
"pos": {
"x": 154.0,
"name": "WireCrossPoint#1",
"pos": {
"x": 154.0,
@@
-482,7
+482,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#10",
"pos": {
"x": 234.0,
"name": "WireCrossPoint#10",
"pos": {
"x": 234.0,
@@
-491,7
+491,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#11",
"pos": {
"x": 129.0,
"name": "WireCrossPoint#11",
"pos": {
"x": 129.0,
@@
-500,7
+500,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#12",
"pos": {
"x": 134.0,
"name": "WireCrossPoint#12",
"pos": {
"x": 134.0,
@@
-509,7
+509,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#13",
"pos": {
"x": 139.0,
"name": "WireCrossPoint#13",
"pos": {
"x": 139.0,
@@
-518,7
+518,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#14",
"pos": {
"x": 144.0,
"name": "WireCrossPoint#14",
"pos": {
"x": 144.0,
@@
-527,7
+527,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#15",
"pos": {
"x": 219.0,
"name": "WireCrossPoint#15",
"pos": {
"x": 219.0,
@@
-536,7
+536,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#16",
"pos": {
"x": 234.0,
"name": "WireCrossPoint#16",
"pos": {
"x": 234.0,
@@
-545,7
+545,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#17",
"pos": {
"x": 34.0,
"name": "WireCrossPoint#17",
"pos": {
"x": 34.0,
@@
-554,7
+554,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#18",
"pos": {
"x": 39.0,
"name": "WireCrossPoint#18",
"pos": {
"x": 39.0,
@@
-563,7
+563,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#19",
"pos": {
"x": 279.0,
"name": "WireCrossPoint#19",
"pos": {
"x": 279.0,
@@
-572,7
+572,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#2",
"pos": {
"x": 154.0,
"name": "WireCrossPoint#2",
"pos": {
"x": 154.0,
@@
-581,7
+581,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#20",
"pos": {
"x": 294.0,
"name": "WireCrossPoint#20",
"pos": {
"x": 294.0,
@@
-590,7
+590,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#21",
"pos": {
"x": 329.0,
"name": "WireCrossPoint#21",
"pos": {
"x": 329.0,
@@
-599,7
+599,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#22",
"pos": {
"x": 254.0,
"name": "WireCrossPoint#22",
"pos": {
"x": 254.0,
@@
-608,7
+608,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#23",
"pos": {
"x": 259.0,
"name": "WireCrossPoint#23",
"pos": {
"x": 259.0,
@@
-617,7
+617,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#24",
"pos": {
"x": 264.0,
"name": "WireCrossPoint#24",
"pos": {
"x": 264.0,
@@
-626,7
+626,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#25",
"pos": {
"x": 269.0,
"name": "WireCrossPoint#25",
"pos": {
"x": 269.0,
@@
-635,7
+635,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#26",
"pos": {
"x": 254.0,
"name": "WireCrossPoint#26",
"pos": {
"x": 254.0,
@@
-644,7
+644,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#27",
"pos": {
"x": 259.0,
"name": "WireCrossPoint#27",
"pos": {
"x": 259.0,
@@
-653,7
+653,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#28",
"pos": {
"x": 264.0,
"name": "WireCrossPoint#28",
"pos": {
"x": 264.0,
@@
-662,7
+662,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#29",
"pos": {
"x": 269.0,
"name": "WireCrossPoint#29",
"pos": {
"x": 269.0,
@@
-671,7
+671,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#3",
"pos": {
"x": 154.0,
"name": "WireCrossPoint#3",
"pos": {
"x": 154.0,
@@
-680,7
+680,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#30",
"pos": {
"x": 9.0,
"name": "WireCrossPoint#30",
"pos": {
"x": 9.0,
@@
-689,7
+689,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#31",
"pos": {
"x": 14.0,
"name": "WireCrossPoint#31",
"pos": {
"x": 14.0,
@@
-698,7
+698,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#32",
"pos": {
"x": 19.0,
"name": "WireCrossPoint#32",
"pos": {
"x": 19.0,
@@
-707,7
+707,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#33",
"pos": {
"x": 14.0,
"name": "WireCrossPoint#33",
"pos": {
"x": 14.0,
@@
-716,7
+716,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#34",
"pos": {
"x": 19.0,
"name": "WireCrossPoint#34",
"pos": {
"x": 19.0,
@@
-725,7
+725,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#35",
"pos": {
"x": 24.0,
"name": "WireCrossPoint#35",
"pos": {
"x": 24.0,
@@
-734,7
+734,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#36",
"pos": {
"x": 9.0,
"name": "WireCrossPoint#36",
"pos": {
"x": 9.0,
@@
-743,7
+743,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#37",
"pos": {
"x": 14.0,
"name": "WireCrossPoint#37",
"pos": {
"x": 14.0,
@@
-752,7
+752,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#38",
"pos": {
"x": 19.0,
"name": "WireCrossPoint#38",
"pos": {
"x": 19.0,
@@
-761,7
+761,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#39",
"pos": {
"x": 24.0,
"name": "WireCrossPoint#39",
"pos": {
"x": 24.0,
@@
-770,7
+770,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#4",
"pos": {
"x": 39.0,
"name": "WireCrossPoint#4",
"pos": {
"x": 39.0,
@@
-779,7
+779,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#40",
"pos": {
"x": 314.0,
"name": "WireCrossPoint#40",
"pos": {
"x": 314.0,
@@
-788,7
+788,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#5",
"pos": {
"x": 34.0,
"name": "WireCrossPoint#5",
"pos": {
"x": 34.0,
@@
-797,7
+797,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#6",
"pos": {
"x": 29.0,
"name": "WireCrossPoint#6",
"pos": {
"x": 29.0,
@@
-806,7
+806,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#7",
"pos": {
"x": 219.0,
"name": "WireCrossPoint#7",
"pos": {
"x": 219.0,
@@
-815,7
+815,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#8",
"pos": {
"x": 224.0,
"name": "WireCrossPoint#8",
"pos": {
"x": 224.0,
@@
-824,7
+824,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#9",
"pos": {
"x": 229.0,
"name": "WireCrossPoint#9",
"pos": {
"x": 229.0,
@@
-3430,7
+3430,7
@@
],
"version": "0.1.1"
},
],
"version": "0.1.1"
},
- "symbolRendererSnippetID": "
class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "GUIAm2901",
"centerTextHeight": 5.0,
"symbolRendererParams": {
"centerText": "GUIAm2901",
"centerTextHeight": 5.0,
@@
-3438,18
+3438,18
@@
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
- "outlineRendererSnippetID": "
class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer
",
- "highLevelStateHandlerSnippetID": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.StandardHighLevelStateHandler
",
+ "outlineRendererSnippetID": "
default
",
+ "highLevelStateHandlerSnippetID": "
standard
",
"highLevelStateHandlerParams": {
"subcomponentHighLevelStates": {
"qreg": {
"highLevelStateHandlerParams": {
"subcomponentHighLevelStates": {
"qreg": {
- "id": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler
",
+ "id": "
delegating
",
"params": {
"delegateTarget": "GUIdff4#0"
}
},
"regs": {
"params": {
"delegateTarget": "GUIdff4#0"
}
},
"regs": {
- "id": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler
",
+ "id": "
delegating
",
"params": {
"delegateTarget": "GUIram4#0"
}
"params": {
"delegateTarget": "GUIram4#0"
}
diff --git
a/net.mograsim.logic.model.am2900/components/am2901/GUIAm2901ALUFuncDecode.json
b/net.mograsim.logic.model.am2900/components/am2901/GUIAm2901ALUFuncDecode.json
index
7e0ccc3
..
92d2200
100644
(file)
--- a/
net.mograsim.logic.model.am2900/components/am2901/GUIAm2901ALUFuncDecode.json
+++ b/
net.mograsim.logic.model.am2900/components/am2901/GUIAm2901ALUFuncDecode.json
@@
-88,7
+88,7
@@
"submodel": {
"components": [
{
"submodel": {
"components": [
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#0",
"pos": {
"x": 15.0,
"name": "GUINandGate#0",
"pos": {
"x": 15.0,
@@
-97,7
+97,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#1",
"pos": {
"x": 15.0,
"name": "GUINandGate#1",
"pos": {
"x": 15.0,
@@
-106,7
+106,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#2",
"pos": {
"x": 55.0,
"name": "GUINandGate#2",
"pos": {
"x": 55.0,
@@
-115,7
+115,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#3",
"pos": {
"x": 55.0,
"name": "GUINandGate#3",
"pos": {
"x": 55.0,
@@
-124,7
+124,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#4",
"pos": {
"x": 100.0,
"name": "GUINandGate#4",
"pos": {
"x": 100.0,
@@
-149,7
+149,7
@@
}
},
{
}
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#0",
"pos": {
"x": 4.0,
"name": "WireCrossPoint#0",
"pos": {
"x": 4.0,
@@
-158,7
+158,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#1",
"pos": {
"x": 4.0,
"name": "WireCrossPoint#1",
"pos": {
"x": 4.0,
@@
-167,7
+167,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#10",
"pos": {
"x": 39.0,
"name": "WireCrossPoint#10",
"pos": {
"x": 39.0,
@@
-176,7
+176,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#2",
"pos": {
"x": 4.0,
"name": "WireCrossPoint#2",
"pos": {
"x": 4.0,
@@
-185,7
+185,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#3",
"pos": {
"x": 9.0,
"name": "WireCrossPoint#3",
"pos": {
"x": 9.0,
@@
-194,7
+194,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#4",
"pos": {
"x": 9.0,
"name": "WireCrossPoint#4",
"pos": {
"x": 9.0,
@@
-203,7
+203,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#5",
"pos": {
"x": 9.0,
"name": "WireCrossPoint#5",
"pos": {
"x": 9.0,
@@
-212,7
+212,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#6",
"pos": {
"x": 9.0,
"name": "WireCrossPoint#6",
"pos": {
"x": 9.0,
@@
-221,7
+221,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#7",
"pos": {
"x": 49.0,
"name": "WireCrossPoint#7",
"pos": {
"x": 49.0,
@@
-230,7
+230,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#8",
"pos": {
"x": 49.0,
"name": "WireCrossPoint#8",
"pos": {
"x": 49.0,
@@
-239,7
+239,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#9",
"pos": {
"x": 39.0,
"name": "WireCrossPoint#9",
"pos": {
"x": 39.0,
@@
-711,7
+711,7
@@
],
"version": "0.1.1"
},
],
"version": "0.1.1"
},
- "symbolRendererSnippetID": "
class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "GUIAm2901ALUFuncDecode",
"centerTextHeight": 5.0,
"symbolRendererParams": {
"centerText": "GUIAm2901ALUFuncDecode",
"centerTextHeight": 5.0,
@@
-719,7
+719,7
@@
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
- "outlineRendererSnippetID": "
class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer
",
- "highLevelStateHandlerSnippetID": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.DefaultHighLevelStateHandler
",
+ "outlineRendererSnippetID": "
default
",
+ "highLevelStateHandlerSnippetID": "
default
",
"version": "0.1.5"
}
\ No newline at end of file
"version": "0.1.5"
}
\ No newline at end of file
diff --git
a/net.mograsim.logic.model.am2900/components/am2901/GUIAm2901ALUInclDecode.json
b/net.mograsim.logic.model.am2900/components/am2901/GUIAm2901ALUInclDecode.json
index
1a8da52
..
2dec1af
100644
(file)
--- a/
net.mograsim.logic.model.am2900/components/am2901/GUIAm2901ALUInclDecode.json
+++ b/
net.mograsim.logic.model.am2900/components/am2901/GUIAm2901ALUInclDecode.json
@@
-217,7
+217,7
@@
}
},
{
}
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#0",
"pos": {
"x": 24.0,
"name": "WireCrossPoint#0",
"pos": {
"x": 24.0,
@@
-226,7
+226,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#1",
"pos": {
"x": 24.0,
"name": "WireCrossPoint#1",
"pos": {
"x": 24.0,
@@
-235,7
+235,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#10",
"pos": {
"x": 31.5,
"name": "WireCrossPoint#10",
"pos": {
"x": 31.5,
@@
-244,7
+244,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#11",
"pos": {
"x": 31.5,
"name": "WireCrossPoint#11",
"pos": {
"x": 31.5,
@@
-253,7
+253,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#12",
"pos": {
"x": 34.0,
"name": "WireCrossPoint#12",
"pos": {
"x": 34.0,
@@
-262,7
+262,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#13",
"pos": {
"x": 34.0,
"name": "WireCrossPoint#13",
"pos": {
"x": 34.0,
@@
-271,7
+271,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#14",
"pos": {
"x": 34.0,
"name": "WireCrossPoint#14",
"pos": {
"x": 34.0,
@@
-280,7
+280,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#15",
"pos": {
"x": 36.5,
"name": "WireCrossPoint#15",
"pos": {
"x": 36.5,
@@
-289,7
+289,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#16",
"pos": {
"x": 36.5,
"name": "WireCrossPoint#16",
"pos": {
"x": 36.5,
@@
-298,7
+298,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#17",
"pos": {
"x": 36.5,
"name": "WireCrossPoint#17",
"pos": {
"x": 36.5,
@@
-307,7
+307,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#18",
"pos": {
"x": 84.0,
"name": "WireCrossPoint#18",
"pos": {
"x": 84.0,
@@
-316,7
+316,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#19",
"pos": {
"x": 84.0,
"name": "WireCrossPoint#19",
"pos": {
"x": 84.0,
@@
-325,7
+325,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#2",
"pos": {
"x": 24.0,
"name": "WireCrossPoint#2",
"pos": {
"x": 24.0,
@@
-334,7
+334,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#3",
"pos": {
"x": 26.5,
"name": "WireCrossPoint#3",
"pos": {
"x": 26.5,
@@
-343,7
+343,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#4",
"pos": {
"x": 26.5,
"name": "WireCrossPoint#4",
"pos": {
"x": 26.5,
@@
-352,7
+352,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#5",
"pos": {
"x": 26.5,
"name": "WireCrossPoint#5",
"pos": {
"x": 26.5,
@@
-361,7
+361,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#6",
"pos": {
"x": 29.0,
"name": "WireCrossPoint#6",
"pos": {
"x": 29.0,
@@
-370,7
+370,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#7",
"pos": {
"x": 29.0,
"name": "WireCrossPoint#7",
"pos": {
"x": 29.0,
@@
-379,7
+379,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#8",
"pos": {
"x": 29.0,
"name": "WireCrossPoint#8",
"pos": {
"x": 29.0,
@@
-388,7
+388,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#9",
"pos": {
"x": 31.5,
"name": "WireCrossPoint#9",
"pos": {
"x": 31.5,
@@
-1527,7
+1527,7
@@
],
"version": "0.1.1"
},
],
"version": "0.1.1"
},
- "symbolRendererSnippetID": "
class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "GUIAm2901ALUInclDecode",
"centerTextHeight": 5.0,
"symbolRendererParams": {
"centerText": "GUIAm2901ALUInclDecode",
"centerTextHeight": 5.0,
@@
-1535,7
+1535,7
@@
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
- "outlineRendererSnippetID": "
class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer
",
- "highLevelStateHandlerSnippetID": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.DefaultHighLevelStateHandler
",
+ "outlineRendererSnippetID": "
default
",
+ "highLevelStateHandlerSnippetID": "
default
",
"version": "0.1.5"
}
\ No newline at end of file
"version": "0.1.5"
}
\ No newline at end of file
diff --git
a/net.mograsim.logic.model.am2900/components/am2901/GUIAm2901ALUInclSourceDecodeInclFunctionDecode.json
b/net.mograsim.logic.model.am2900/components/am2901/GUIAm2901ALUInclSourceDecodeInclFunctionDecode.json
index
4bfbadc
..
2fa5c1b
100644
(file)
--- a/
net.mograsim.logic.model.am2900/components/am2901/GUIAm2901ALUInclSourceDecodeInclFunctionDecode.json
+++ b/
net.mograsim.logic.model.am2900/components/am2901/GUIAm2901ALUInclSourceDecodeInclFunctionDecode.json
@@
-300,7
+300,7
@@
}
},
{
}
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#0",
"pos": {
"x": 9.0,
"name": "WireCrossPoint#0",
"pos": {
"x": 9.0,
@@
-309,7
+309,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#1",
"pos": {
"x": 14.0,
"name": "WireCrossPoint#1",
"pos": {
"x": 14.0,
@@
-318,7
+318,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#2",
"pos": {
"x": 19.0,
"name": "WireCrossPoint#2",
"pos": {
"x": 19.0,
@@
-327,7
+327,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#3",
"pos": {
"x": 24.0,
"name": "WireCrossPoint#3",
"pos": {
"x": 24.0,
@@
-1381,7
+1381,7
@@
],
"version": "0.1.1"
},
],
"version": "0.1.1"
},
- "symbolRendererSnippetID": "
class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "GUIAm2901ALUInclSourceDecodeInclFunctionDecode",
"centerTextHeight": 5.0,
"symbolRendererParams": {
"centerText": "GUIAm2901ALUInclSourceDecodeInclFunctionDecode",
"centerTextHeight": 5.0,
@@
-1389,7
+1389,7
@@
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
- "outlineRendererSnippetID": "
class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer
",
- "highLevelStateHandlerSnippetID": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.DefaultHighLevelStateHandler
",
+ "outlineRendererSnippetID": "
default
",
+ "highLevelStateHandlerSnippetID": "
default
",
"version": "0.1.5"
}
\ No newline at end of file
"version": "0.1.5"
}
\ No newline at end of file
diff --git
a/net.mograsim.logic.model.am2900/components/am2901/GUIAm2901ALUOneBit.json
b/net.mograsim.logic.model.am2900/components/am2901/GUIAm2901ALUOneBit.json
index
afe676b
..
1fd3ed8
100644
(file)
--- a/
net.mograsim.logic.model.am2900/components/am2901/GUIAm2901ALUOneBit.json
+++ b/
net.mograsim.logic.model.am2900/components/am2901/GUIAm2901ALUOneBit.json
@@
-106,7
+106,7
@@
"submodel": {
"components": [
{
"submodel": {
"components": [
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#0",
"pos": {
"x": 60.0,
"name": "GUINandGate#0",
"pos": {
"x": 60.0,
@@
-171,7
+171,7
@@
}
},
{
}
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#0",
"pos": {
"x": 49.0,
"name": "WireCrossPoint#0",
"pos": {
"x": 49.0,
@@
-180,7
+180,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#1",
"pos": {
"x": 54.0,
"name": "WireCrossPoint#1",
"pos": {
"x": 54.0,
@@
-543,7
+543,7
@@
],
"version": "0.1.1"
},
],
"version": "0.1.1"
},
- "symbolRendererSnippetID": "
class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "GUIAm2901ALUOneBit",
"centerTextHeight": 5.0,
"symbolRendererParams": {
"centerText": "GUIAm2901ALUOneBit",
"centerTextHeight": 5.0,
@@
-551,7
+551,7
@@
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
- "outlineRendererSnippetID": "
class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer
",
- "highLevelStateHandlerSnippetID": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.DefaultHighLevelStateHandler
",
+ "outlineRendererSnippetID": "
default
",
+ "highLevelStateHandlerSnippetID": "
default
",
"version": "0.1.5"
}
\ No newline at end of file
"version": "0.1.5"
}
\ No newline at end of file
diff --git
a/net.mograsim.logic.model.am2900/components/am2901/GUIAm2901DestDecode.json
b/net.mograsim.logic.model.am2900/components/am2901/GUIAm2901DestDecode.json
index
b68379d
..
0b2d611
100644
(file)
--- a/
net.mograsim.logic.model.am2900/components/am2901/GUIAm2901DestDecode.json
+++ b/
net.mograsim.logic.model.am2900/components/am2901/GUIAm2901DestDecode.json
@@
-88,7
+88,7
@@
"submodel": {
"components": [
{
"submodel": {
"components": [
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#0",
"pos": {
"x": 15.0,
"name": "GUINandGate#0",
"pos": {
"x": 15.0,
@@
-97,7
+97,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#1",
"pos": {
"x": 15.0,
"name": "GUINandGate#1",
"pos": {
"x": 15.0,
@@
-106,7
+106,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#10",
"pos": {
"x": 80.0,
"name": "GUINandGate#10",
"pos": {
"x": 80.0,
@@
-115,7
+115,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#11",
"pos": {
"x": 110.0,
"name": "GUINandGate#11",
"pos": {
"x": 110.0,
@@
-124,7
+124,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#12",
"pos": {
"x": 115.0,
"name": "GUINandGate#12",
"pos": {
"x": 115.0,
@@
-133,7
+133,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#2",
"pos": {
"x": 15.0,
"name": "GUINandGate#2",
"pos": {
"x": 15.0,
@@
-142,7
+142,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#3",
"pos": {
"x": 15.0,
"name": "GUINandGate#3",
"pos": {
"x": 15.0,
@@
-151,7
+151,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#4",
"pos": {
"x": 50.0,
"name": "GUINandGate#4",
"pos": {
"x": 50.0,
@@
-160,7
+160,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#5",
"pos": {
"x": 50.0,
"name": "GUINandGate#5",
"pos": {
"x": 50.0,
@@
-169,7
+169,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#6",
"pos": {
"x": 50.0,
"name": "GUINandGate#6",
"pos": {
"x": 50.0,
@@
-178,7
+178,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#7",
"pos": {
"x": 50.0,
"name": "GUINandGate#7",
"pos": {
"x": 50.0,
@@
-187,7
+187,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#8",
"pos": {
"x": 80.0,
"name": "GUINandGate#8",
"pos": {
"x": 80.0,
@@
-196,7
+196,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#9",
"pos": {
"x": 80.0,
"name": "GUINandGate#9",
"pos": {
"x": 80.0,
@@
-205,7
+205,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#0",
"pos": {
"x": 4.0,
"name": "WireCrossPoint#0",
"pos": {
"x": 4.0,
@@
-214,7
+214,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#1",
"pos": {
"x": 4.0,
"name": "WireCrossPoint#1",
"pos": {
"x": 4.0,
@@
-223,7
+223,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#10",
"pos": {
"x": 39.0,
"name": "WireCrossPoint#10",
"pos": {
"x": 39.0,
@@
-232,7
+232,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#11",
"pos": {
"x": 74.0,
"name": "WireCrossPoint#11",
"pos": {
"x": 74.0,
@@
-241,7
+241,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#12",
"pos": {
"x": 74.0,
"name": "WireCrossPoint#12",
"pos": {
"x": 74.0,
@@
-250,7
+250,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#13",
"pos": {
"x": 74.0,
"name": "WireCrossPoint#13",
"pos": {
"x": 74.0,
@@
-259,7
+259,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#14",
"pos": {
"x": 74.0,
"name": "WireCrossPoint#14",
"pos": {
"x": 74.0,
@@
-268,7
+268,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#15",
"pos": {
"x": 109.0,
"name": "WireCrossPoint#15",
"pos": {
"x": 109.0,
@@
-277,7
+277,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#2",
"pos": {
"x": 4.0,
"name": "WireCrossPoint#2",
"pos": {
"x": 4.0,
@@
-286,7
+286,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#3",
"pos": {
"x": 9.0,
"name": "WireCrossPoint#3",
"pos": {
"x": 9.0,
@@
-295,7
+295,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#4",
"pos": {
"x": 9.0,
"name": "WireCrossPoint#4",
"pos": {
"x": 9.0,
@@
-304,7
+304,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#5",
"pos": {
"x": 9.0,
"name": "WireCrossPoint#5",
"pos": {
"x": 9.0,
@@
-313,7
+313,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#6",
"pos": {
"x": 4.0,
"name": "WireCrossPoint#6",
"pos": {
"x": 4.0,
@@
-322,7
+322,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#7",
"pos": {
"x": 39.0,
"name": "WireCrossPoint#7",
"pos": {
"x": 39.0,
@@
-331,7
+331,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#8",
"pos": {
"x": 44.0,
"name": "WireCrossPoint#8",
"pos": {
"x": 44.0,
@@
-340,7
+340,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#9",
"pos": {
"x": 44.0,
"name": "WireCrossPoint#9",
"pos": {
"x": 44.0,
@@
-1081,7
+1081,7
@@
],
"version": "0.1.1"
},
],
"version": "0.1.1"
},
- "symbolRendererSnippetID": "
class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "GUIAm2901DestDecode",
"centerTextHeight": 5.0,
"symbolRendererParams": {
"centerText": "GUIAm2901DestDecode",
"centerTextHeight": 5.0,
@@
-1089,7
+1089,7
@@
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
- "outlineRendererSnippetID": "
class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer
",
- "highLevelStateHandlerSnippetID": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.DefaultHighLevelStateHandler
",
+ "outlineRendererSnippetID": "
default
",
+ "highLevelStateHandlerSnippetID": "
default
",
"version": "0.1.5"
}
\ No newline at end of file
"version": "0.1.5"
}
\ No newline at end of file
diff --git
a/net.mograsim.logic.model.am2900/components/am2901/GUIAm2901SourceDecode.json
b/net.mograsim.logic.model.am2900/components/am2901/GUIAm2901SourceDecode.json
index
d9966e1
..
112fecb
100644
(file)
--- a/
net.mograsim.logic.model.am2900/components/am2901/GUIAm2901SourceDecode.json
+++ b/
net.mograsim.logic.model.am2900/components/am2901/GUIAm2901SourceDecode.json
@@
-79,7
+79,7
@@
"submodel": {
"components": [
{
"submodel": {
"components": [
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#0",
"pos": {
"x": 10.0,
"name": "GUINandGate#0",
"pos": {
"x": 10.0,
@@
-88,7
+88,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#1",
"pos": {
"x": 10.0,
"name": "GUINandGate#1",
"pos": {
"x": 10.0,
@@
-97,7
+97,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#10",
"pos": {
"x": 70.0,
"name": "GUINandGate#10",
"pos": {
"x": 70.0,
@@
-106,7
+106,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#11",
"pos": {
"x": 70.0,
"name": "GUINandGate#11",
"pos": {
"x": 70.0,
@@
-115,7
+115,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#12",
"pos": {
"x": 70.0,
"name": "GUINandGate#12",
"pos": {
"x": 70.0,
@@
-124,7
+124,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#13",
"pos": {
"x": 100.0,
"name": "GUINandGate#13",
"pos": {
"x": 100.0,
@@
-133,7
+133,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#14",
"pos": {
"x": 100.0,
"name": "GUINandGate#14",
"pos": {
"x": 100.0,
@@
-142,7
+142,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#2",
"pos": {
"x": 10.0,
"name": "GUINandGate#2",
"pos": {
"x": 10.0,
@@
-151,7
+151,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#3",
"pos": {
"x": 40.0,
"name": "GUINandGate#3",
"pos": {
"x": 40.0,
@@
-160,7
+160,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#4",
"pos": {
"x": 40.0,
"name": "GUINandGate#4",
"pos": {
"x": 40.0,
@@
-169,7
+169,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#5",
"pos": {
"x": 40.0,
"name": "GUINandGate#5",
"pos": {
"x": 40.0,
@@
-178,7
+178,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#6",
"pos": {
"x": 40.0,
"name": "GUINandGate#6",
"pos": {
"x": 40.0,
@@
-187,7
+187,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#7",
"pos": {
"x": 40.0,
"name": "GUINandGate#7",
"pos": {
"x": 40.0,
@@
-196,7
+196,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#8",
"pos": {
"x": 70.0,
"name": "GUINandGate#8",
"pos": {
"x": 70.0,
@@
-205,7
+205,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#9",
"pos": {
"x": 70.0,
"name": "GUINandGate#9",
"pos": {
"x": 70.0,
@@
-214,7
+214,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#0",
"pos": {
"x": 4.0,
"name": "WireCrossPoint#0",
"pos": {
"x": 4.0,
@@
-223,7
+223,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#1",
"pos": {
"x": 6.5,
"name": "WireCrossPoint#1",
"pos": {
"x": 6.5,
@@
-232,7
+232,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#10",
"pos": {
"x": 36.5,
"name": "WireCrossPoint#10",
"pos": {
"x": 36.5,
@@
-241,7
+241,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#11",
"pos": {
"x": 64.0,
"name": "WireCrossPoint#11",
"pos": {
"x": 64.0,
@@
-250,7
+250,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#12",
"pos": {
"x": 64.0,
"name": "WireCrossPoint#12",
"pos": {
"x": 64.0,
@@
-259,7
+259,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#13",
"pos": {
"x": 64.0,
"name": "WireCrossPoint#13",
"pos": {
"x": 64.0,
@@
-268,7
+268,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#14",
"pos": {
"x": 94.0,
"name": "WireCrossPoint#14",
"pos": {
"x": 94.0,
@@
-277,7
+277,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#15",
"pos": {
"x": 94.0,
"name": "WireCrossPoint#15",
"pos": {
"x": 94.0,
@@
-286,7
+286,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#2",
"pos": {
"x": 4.0,
"name": "WireCrossPoint#2",
"pos": {
"x": 4.0,
@@
-295,7
+295,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#3",
"pos": {
"x": 6.5,
"name": "WireCrossPoint#3",
"pos": {
"x": 6.5,
@@
-304,7
+304,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#4",
"pos": {
"x": 6.5,
"name": "WireCrossPoint#4",
"pos": {
"x": 6.5,
@@
-313,7
+313,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#5",
"pos": {
"x": 6.5,
"name": "WireCrossPoint#5",
"pos": {
"x": 6.5,
@@
-322,7
+322,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#6",
"pos": {
"x": 31.5,
"name": "WireCrossPoint#6",
"pos": {
"x": 31.5,
@@
-331,7
+331,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#7",
"pos": {
"x": 34.0,
"name": "WireCrossPoint#7",
"pos": {
"x": 34.0,
@@
-340,7
+340,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#8",
"pos": {
"x": 34.0,
"name": "WireCrossPoint#8",
"pos": {
"x": 34.0,
@@
-349,7
+349,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#9",
"pos": {
"x": 34.0,
"name": "WireCrossPoint#9",
"pos": {
"x": 34.0,
@@
-1124,7
+1124,7
@@
],
"version": "0.1.1"
},
],
"version": "0.1.1"
},
- "symbolRendererSnippetID": "
class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "Am2901SourceDecode",
"centerTextHeight": 5.0,
"symbolRendererParams": {
"centerText": "Am2901SourceDecode",
"centerTextHeight": 5.0,
@@
-1132,7
+1132,7
@@
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
- "outlineRendererSnippetID": "
class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer
",
- "highLevelStateHandlerSnippetID": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.DefaultHighLevelStateHandler
",
+ "outlineRendererSnippetID": "
default
",
+ "highLevelStateHandlerSnippetID": "
default
",
"version": "0.1.5"
}
\ No newline at end of file
"version": "0.1.5"
}
\ No newline at end of file
diff --git
a/net.mograsim.logic.model.am2900/components/am2904/GUIAm2904.json
b/net.mograsim.logic.model.am2900/components/am2904/GUIAm2904.json
index
7a5dffc
..
82d233c
100644
(file)
--- a/
net.mograsim.logic.model.am2900/components/am2904/GUIAm2904.json
+++ b/
net.mograsim.logic.model.am2900/components/am2904/GUIAm2904.json
@@
-417,7
+417,7
@@
}
},
{
}
},
{
- "id": "
class:net.mograsim.logic.model.am2900.components.am2904.
GUIAm2904RegCTInstrDecode",
+ "id": "GUIAm2904RegCTInstrDecode",
"name": "GUIAm2904RegCTInstrDecode#0",
"pos": {
"x": 50.0,
"name": "GUIAm2904RegCTInstrDecode#0",
"pos": {
"x": 50.0,
@@
-425,7
+425,7
@@
}
},
{
}
},
{
- "id": "
class:net.mograsim.logic.model.am2900.components.am2904.
GUIAm2904ShiftInstrDecode",
+ "id": "GUIAm2904ShiftInstrDecode",
"name": "GUIAm2904ShiftInstrDecode#0",
"pos": {
"x": 50.0,
"name": "GUIAm2904ShiftInstrDecode#0",
"pos": {
"x": 50.0,
@@
-433,7
+433,7
@@
}
},
{
}
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUIBitDisplay",
+ "id": "GUIBitDisplay",
"name": "GUIBitDisplay#0",
"pos": {
"x": 530.0,
"name": "GUIBitDisplay#0",
"pos": {
"x": 530.0,
@@
-442,7
+442,7
@@
"params": 4
},
{
"params": 4
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUIBitDisplay",
+ "id": "GUIBitDisplay",
"name": "GUIBitDisplay#1",
"pos": {
"x": 565.0,
"name": "GUIBitDisplay#1",
"pos": {
"x": 565.0,
@@
-451,7
+451,7
@@
"params": 4
},
{
"params": 4
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUIBitDisplay",
+ "id": "GUIBitDisplay",
"name": "GUIBitDisplay#2",
"pos": {
"x": 530.0,
"name": "GUIBitDisplay#2",
"pos": {
"x": 530.0,
@@
-460,7
+460,7
@@
"params": 4
},
{
"params": 4
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUIBitDisplay",
+ "id": "GUIBitDisplay",
"name": "GUIBitDisplay#3",
"pos": {
"x": 560.0,
"name": "GUIBitDisplay#3",
"pos": {
"x": 560.0,
@@
-469,7
+469,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUIMerger",
+ "id": "GUIMerger",
"name": "GUIMerger#0",
"pos": {
"x": 25.0,
"name": "GUIMerger#0",
"pos": {
"x": 25.0,
@@
-478,7
+478,7
@@
"params": 6
},
{
"params": 6
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUIMerger",
+ "id": "GUIMerger",
"name": "GUIMerger#1",
"pos": {
"x": 25.0,
"name": "GUIMerger#1",
"pos": {
"x": 25.0,
@@
-487,7
+487,7
@@
"params": 5
},
{
"params": 5
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUIMerger",
+ "id": "GUIMerger",
"name": "GUIMerger#2",
"pos": {
"x": 15.0,
"name": "GUIMerger#2",
"pos": {
"x": 15.0,
@@
-496,7
+496,7
@@
"params": 4
},
{
"params": 4
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUIMerger",
+ "id": "GUIMerger",
"name": "GUIMerger#3",
"pos": {
"x": 510.0,
"name": "GUIMerger#3",
"pos": {
"x": 510.0,
@@
-505,7
+505,7
@@
"params": 4
},
{
"params": 4
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUIMerger",
+ "id": "GUIMerger",
"name": "GUIMerger#4",
"pos": {
"x": 25.0,
"name": "GUIMerger#4",
"pos": {
"x": 25.0,
@@
-514,7
+514,7
@@
"params": 2
},
{
"params": 2
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#0",
"pos": {
"x": 190.0,
"name": "GUINandGate#0",
"pos": {
"x": 190.0,
@@
-523,7
+523,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#1",
"pos": {
"x": 130.0,
"name": "GUINandGate#1",
"pos": {
"x": 130.0,
@@
-532,7
+532,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#10",
"pos": {
"x": 340.0,
"name": "GUINandGate#10",
"pos": {
"x": 340.0,
@@
-541,7
+541,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#12",
"pos": {
"x": 540.0,
"name": "GUINandGate#12",
"pos": {
"x": 540.0,
@@
-550,7
+550,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#2",
"pos": {
"x": 225.0,
"name": "GUINandGate#2",
"pos": {
"x": 225.0,
@@
-559,7
+559,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#3",
"pos": {
"x": 225.0,
"name": "GUINandGate#3",
"pos": {
"x": 225.0,
@@
-568,7
+568,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#4",
"pos": {
"x": 225.0,
"name": "GUINandGate#4",
"pos": {
"x": 225.0,
@@
-577,7
+577,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#5",
"pos": {
"x": 225.0,
"name": "GUINandGate#5",
"pos": {
"x": 225.0,
@@
-586,7
+586,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#6",
"pos": {
"x": 205.0,
"name": "GUINandGate#6",
"pos": {
"x": 205.0,
@@
-595,7
+595,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#7",
"pos": {
"x": 205.0,
"name": "GUINandGate#7",
"pos": {
"x": 205.0,
@@
-604,7
+604,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#8",
"pos": {
"x": 205.0,
"name": "GUINandGate#8",
"pos": {
"x": 205.0,
@@
-613,7
+613,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#9",
"pos": {
"x": 205.0,
"name": "GUINandGate#9",
"pos": {
"x": 205.0,
@@
-622,7
+622,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUISplitter",
+ "id": "GUISplitter",
"name": "GUISplitter#0",
"pos": {
"x": 10.0,
"name": "GUISplitter#0",
"pos": {
"x": 10.0,
@@
-631,7
+631,7
@@
"params": 13
},
{
"params": 13
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUISplitter",
+ "id": "GUISplitter",
"name": "GUISplitter#1",
"pos": {
"x": 555.0,
"name": "GUISplitter#1",
"pos": {
"x": 555.0,
@@
-640,7
+640,7
@@
"params": 4
},
{
"params": 4
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUISplitter",
+ "id": "GUISplitter",
"name": "GUISplitter#10",
"pos": {
"x": 420.0,
"name": "GUISplitter#10",
"pos": {
"x": 420.0,
@@
-649,7
+649,7
@@
"params": 4
},
{
"params": 4
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUISplitter",
+ "id": "GUISplitter",
"name": "GUISplitter#11",
"pos": {
"x": 405.0,
"name": "GUISplitter#11",
"pos": {
"x": 405.0,
@@
-658,7
+658,7
@@
"params": 3
},
{
"params": 3
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUISplitter",
+ "id": "GUISplitter",
"name": "GUISplitter#12",
"pos": {
"x": 405.0,
"name": "GUISplitter#12",
"pos": {
"x": 405.0,
@@
-667,7
+667,7
@@
"params": 3
},
{
"params": 3
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUISplitter",
+ "id": "GUISplitter",
"name": "GUISplitter#13",
"pos": {
"x": 265.0,
"name": "GUISplitter#13",
"pos": {
"x": 265.0,
@@
-676,7
+676,7
@@
"params": 3
},
{
"params": 3
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUISplitter",
+ "id": "GUISplitter",
"name": "GUISplitter#14",
"pos": {
"x": 90.0,
"name": "GUISplitter#14",
"pos": {
"x": 90.0,
@@
-685,7
+685,7
@@
"params": 3
},
{
"params": 3
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUISplitter",
+ "id": "GUISplitter",
"name": "GUISplitter#15",
"pos": {
"x": 120.0,
"name": "GUISplitter#15",
"pos": {
"x": 120.0,
@@
-694,7
+694,7
@@
"params": 2
},
{
"params": 2
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUISplitter",
+ "id": "GUISplitter",
"name": "GUISplitter#2",
"pos": {
"x": 395.0,
"name": "GUISplitter#2",
"pos": {
"x": 395.0,
@@
-703,7
+703,7
@@
"params": 2
},
{
"params": 2
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUISplitter",
+ "id": "GUISplitter",
"name": "GUISplitter#3",
"pos": {
"x": 450.0,
"name": "GUISplitter#3",
"pos": {
"x": 450.0,
@@
-712,7
+712,7
@@
"params": 4
},
{
"params": 4
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUISplitter",
+ "id": "GUISplitter",
"name": "GUISplitter#4",
"pos": {
"x": 395.0,
"name": "GUISplitter#4",
"pos": {
"x": 395.0,
@@
-721,7
+721,7
@@
"params": 4
},
{
"params": 4
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUISplitter",
+ "id": "GUISplitter",
"name": "GUISplitter#5",
"pos": {
"x": 395.0,
"name": "GUISplitter#5",
"pos": {
"x": 395.0,
@@
-730,7
+730,7
@@
"params": 4
},
{
"params": 4
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUISplitter",
+ "id": "GUISplitter",
"name": "GUISplitter#6",
"pos": {
"x": 285.0,
"name": "GUISplitter#6",
"pos": {
"x": 285.0,
@@
-739,7
+739,7
@@
"params": 3
},
{
"params": 3
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUISplitter",
+ "id": "GUISplitter",
"name": "GUISplitter#7",
"pos": {
"x": 420.0,
"name": "GUISplitter#7",
"pos": {
"x": 420.0,
@@
-748,7
+748,7
@@
"params": 4
},
{
"params": 4
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUISplitter",
+ "id": "GUISplitter",
"name": "GUISplitter#8",
"pos": {
"x": 420.0,
"name": "GUISplitter#8",
"pos": {
"x": 420.0,
@@
-757,7
+757,7
@@
"params": 4
},
{
"params": 4
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUISplitter",
+ "id": "GUISplitter",
"name": "GUISplitter#9",
"pos": {
"x": 240.0,
"name": "GUISplitter#9",
"pos": {
"x": 240.0,
@@
-766,7
+766,7
@@
"params": 4
},
{
"params": 4
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUITriStateBuffer",
+ "id": "GUITriStateBuffer",
"name": "GUITriStateBuffer#0",
"pos": {
"x": 535.0,
"name": "GUITriStateBuffer#0",
"pos": {
"x": 535.0,
@@
-778,7
+778,7
@@
}
},
{
}
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUITriStateBuffer",
+ "id": "GUITriStateBuffer",
"name": "GUITriStateBuffer#1",
"pos": {
"x": 10.0,
"name": "GUITriStateBuffer#1",
"pos": {
"x": 10.0,
@@
-790,7
+790,7
@@
}
},
{
}
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUITriStateBuffer",
+ "id": "GUITriStateBuffer",
"name": "GUITriStateBuffer#2",
"pos": {
"x": 10.0,
"name": "GUITriStateBuffer#2",
"pos": {
"x": 10.0,
@@
-802,7
+802,7
@@
}
},
{
}
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUITriStateBuffer",
+ "id": "GUITriStateBuffer",
"name": "GUITriStateBuffer#3",
"pos": {
"x": 560.0,
"name": "GUITriStateBuffer#3",
"pos": {
"x": 560.0,
@@
-814,7
+814,7
@@
}
},
{
}
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUITriStateBuffer",
+ "id": "GUITriStateBuffer",
"name": "GUITriStateBuffer#4",
"pos": {
"x": 565.0,
"name": "GUITriStateBuffer#4",
"pos": {
"x": 565.0,
@@
-826,7
+826,7
@@
}
},
{
}
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUITriStateBuffer",
+ "id": "GUITriStateBuffer",
"name": "GUITriStateBuffer#5",
"pos": {
"x": 560.0,
"name": "GUITriStateBuffer#5",
"pos": {
"x": 560.0,
@@
-838,7
+838,7
@@
}
},
{
}
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#0",
"pos": {
"x": 165.0,
"name": "WireCrossPoint#0",
"pos": {
"x": 165.0,
@@
-847,7
+847,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#1",
"pos": {
"x": 180.0,
"name": "WireCrossPoint#1",
"pos": {
"x": 180.0,
@@
-856,7
+856,7
@@
"params": 4
},
{
"params": 4
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#10",
"pos": {
"x": 195.0,
"name": "WireCrossPoint#10",
"pos": {
"x": 195.0,
@@
-865,7
+865,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#11",
"pos": {
"x": 195.0,
"name": "WireCrossPoint#11",
"pos": {
"x": 195.0,
@@
-874,7
+874,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#12",
"pos": {
"x": 195.0,
"name": "WireCrossPoint#12",
"pos": {
"x": 195.0,
@@
-883,7
+883,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#13",
"pos": {
"x": 330.0,
"name": "WireCrossPoint#13",
"pos": {
"x": 330.0,
@@
-892,7
+892,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#14",
"pos": {
"x": 520.0,
"name": "WireCrossPoint#14",
"pos": {
"x": 520.0,
@@
-901,7
+901,7
@@
"params": 4
},
{
"params": 4
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#15",
"pos": {
"x": 255.0,
"name": "WireCrossPoint#15",
"pos": {
"x": 255.0,
@@
-910,7
+910,7
@@
"params": 4
},
{
"params": 4
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#16",
"pos": {
"x": 255.0,
"name": "WireCrossPoint#16",
"pos": {
"x": 255.0,
@@
-919,7
+919,7
@@
"params": 4
},
{
"params": 4
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#17",
"pos": {
"x": 360.0,
"name": "WireCrossPoint#17",
"pos": {
"x": 360.0,
@@
-928,7
+928,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#18",
"pos": {
"x": 35.0,
"name": "WireCrossPoint#18",
"pos": {
"x": 35.0,
@@
-937,7
+937,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#19",
"pos": {
"x": 35.0,
"name": "WireCrossPoint#19",
"pos": {
"x": 35.0,
@@
-946,7
+946,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#2",
"pos": {
"x": 295.0,
"name": "WireCrossPoint#2",
"pos": {
"x": 295.0,
@@
-955,7
+955,7
@@
"params": 4
},
{
"params": 4
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#20",
"pos": {
"x": 585.0,
"name": "WireCrossPoint#20",
"pos": {
"x": 585.0,
@@
-964,7
+964,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#21",
"pos": {
"x": 585.0,
"name": "WireCrossPoint#21",
"pos": {
"x": 585.0,
@@
-973,7
+973,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#22",
"pos": {
"x": 250.0,
"name": "WireCrossPoint#22",
"pos": {
"x": 250.0,
@@
-982,7
+982,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#23",
"pos": {
"x": 330.0,
"name": "WireCrossPoint#23",
"pos": {
"x": 330.0,
@@
-991,7
+991,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#24",
"pos": {
"x": 285.0,
"name": "WireCrossPoint#24",
"pos": {
"x": 285.0,
@@
-1000,7
+1000,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#25",
"pos": {
"x": 285.0,
"name": "WireCrossPoint#25",
"pos": {
"x": 285.0,
@@
-1009,7
+1009,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#26",
"pos": {
"x": 290.0,
"name": "WireCrossPoint#26",
"pos": {
"x": 290.0,
@@
-1018,7
+1018,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#27",
"pos": {
"x": 440.0,
"name": "WireCrossPoint#27",
"pos": {
"x": 440.0,
@@
-1027,7
+1027,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#28",
"pos": {
"x": 440.0,
"name": "WireCrossPoint#28",
"pos": {
"x": 440.0,
@@
-1036,7
+1036,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#3",
"pos": {
"x": 335.0,
"name": "WireCrossPoint#3",
"pos": {
"x": 335.0,
@@
-1045,7
+1045,7
@@
"params": 4
},
{
"params": 4
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#30",
"pos": {
"x": 550.0,
"name": "WireCrossPoint#30",
"pos": {
"x": 550.0,
@@
-1054,7
+1054,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#32",
"pos": {
"x": 85.0,
"name": "WireCrossPoint#32",
"pos": {
"x": 85.0,
@@
-1063,7
+1063,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#33",
"pos": {
"x": 530.0,
"name": "WireCrossPoint#33",
"pos": {
"x": 530.0,
@@
-1072,7
+1072,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#4",
"pos": {
"x": 150.0,
"name": "WireCrossPoint#4",
"pos": {
"x": 150.0,
@@
-1081,7
+1081,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#5",
"pos": {
"x": 530.0,
"name": "WireCrossPoint#5",
"pos": {
"x": 530.0,
@@
-1090,7
+1090,7
@@
"params": 4
},
{
"params": 4
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#6",
"pos": {
"x": 120.0,
"name": "WireCrossPoint#6",
"pos": {
"x": 120.0,
@@
-1099,7
+1099,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#7",
"pos": {
"x": 215.0,
"name": "WireCrossPoint#7",
"pos": {
"x": 215.0,
@@
-1108,7
+1108,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#8",
"pos": {
"x": 215.0,
"name": "WireCrossPoint#8",
"pos": {
"x": 215.0,
@@
-1117,7
+1117,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#9",
"pos": {
"x": 215.0,
"name": "WireCrossPoint#9",
"pos": {
"x": 215.0,
@@
-3995,7
+3995,7
@@
],
"version": "0.1.1"
},
],
"version": "0.1.1"
},
- "symbolRendererSnippetID": "
class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "Am2904",
"centerTextHeight": 5.0,
"symbolRendererParams": {
"centerText": "Am2904",
"centerTextHeight": 5.0,
@@
-4003,20
+4003,20
@@
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
- "outlineRendererSnippetID": "
class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer
",
- "highLevelStateHandlerSnippetID": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.StandardHighLevelStateHandler
",
+ "outlineRendererSnippetID": "
default
",
+ "highLevelStateHandlerSnippetID": "
standard
",
"highLevelStateHandlerParams": {
"subcomponentHighLevelStates": {
"highLevelStateHandlerParams": {
"subcomponentHighLevelStates": {
- "msr": {
- "id": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler
",
+ "m
u
sr": {
+ "id": "
delegating
",
"params": {
"params": {
- "delegateTarget": "DeserializedSubmodelComponent#
0
"
+ "delegateTarget": "DeserializedSubmodelComponent#
1
"
}
},
}
},
- "m
u
sr": {
- "id": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler
",
+ "msr": {
+ "id": "
delegating
",
"params": {
"params": {
- "delegateTarget": "DeserializedSubmodelComponent#
1
"
+ "delegateTarget": "DeserializedSubmodelComponent#
0
"
}
}
},
}
}
},
diff --git
a/net.mograsim.logic.model.am2900/components/am2904/GUIAm2904MSR.json
b/net.mograsim.logic.model.am2900/components/am2904/GUIAm2904MSR.json
index
bf0ea33
..
6e93abf
100644
(file)
--- a/
net.mograsim.logic.model.am2900/components/am2904/GUIAm2904MSR.json
+++ b/
net.mograsim.logic.model.am2900/components/am2904/GUIAm2904MSR.json
@@
-187,7
+187,7
@@
}
},
{
}
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUIMerger",
+ "id": "GUIMerger",
"name": "GUIMerger#0",
"pos": {
"x": 435.0,
"name": "GUIMerger#0",
"pos": {
"x": 435.0,
@@
-196,7
+196,7
@@
"params": 4
},
{
"params": 4
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#0",
"pos": {
"x": 325.0,
"name": "GUINandGate#0",
"pos": {
"x": 325.0,
@@
-205,7
+205,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUISplitter",
+ "id": "GUISplitter",
"name": "GUISplitter#0",
"pos": {
"x": 5.0,
"name": "GUISplitter#0",
"pos": {
"x": 5.0,
@@
-214,7
+214,7
@@
"params": 4
},
{
"params": 4
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUISplitter",
+ "id": "GUISplitter",
"name": "GUISplitter#1",
"pos": {
"x": 5.0,
"name": "GUISplitter#1",
"pos": {
"x": 5.0,
@@
-223,7
+223,7
@@
"params": 4
},
{
"params": 4
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUISplitter",
+ "id": "GUISplitter",
"name": "GUISplitter#2",
"pos": {
"x": 45.0,
"name": "GUISplitter#2",
"pos": {
"x": 45.0,
@@
-232,7
+232,7
@@
"params": 3
},
{
"params": 3
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUISplitter",
+ "id": "GUISplitter",
"name": "GUISplitter#3",
"pos": {
"x": 5.0,
"name": "GUISplitter#3",
"pos": {
"x": 5.0,
@@
-241,7
+241,7
@@
"params": 4
},
{
"params": 4
},
{
- "id": "
class:net.mograsim.logic.model.am2900.components.
GUIdff4_finewe",
+ "id": "GUIdff4_finewe",
"name": "GUIdff4_finewe#0",
"pos": {
"x": 375.0,
"name": "GUIdff4_finewe#0",
"pos": {
"x": 375.0,
@@
-249,7
+249,7
@@
}
},
{
}
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#0",
"pos": {
"x": 29.0,
"name": "WireCrossPoint#0",
"pos": {
"x": 29.0,
@@
-258,7
+258,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#1",
"pos": {
"x": 414.0,
"name": "WireCrossPoint#1",
"pos": {
"x": 414.0,
@@
-267,7
+267,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#10",
"pos": {
"x": 89.0,
"name": "WireCrossPoint#10",
"pos": {
"x": 89.0,
@@
-276,7
+276,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#11",
"pos": {
"x": 89.0,
"name": "WireCrossPoint#11",
"pos": {
"x": 89.0,
@@
-285,7
+285,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#12",
"pos": {
"x": 19.0,
"name": "WireCrossPoint#12",
"pos": {
"x": 19.0,
@@
-294,7
+294,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#13",
"pos": {
"x": 194.0,
"name": "WireCrossPoint#13",
"pos": {
"x": 194.0,
@@
-303,7
+303,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#14",
"pos": {
"x": 89.0,
"name": "WireCrossPoint#14",
"pos": {
"x": 89.0,
@@
-312,7
+312,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#15",
"pos": {
"x": 319.0,
"name": "WireCrossPoint#15",
"pos": {
"x": 319.0,
@@
-321,7
+321,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#16",
"pos": {
"x": 319.0,
"name": "WireCrossPoint#16",
"pos": {
"x": 319.0,
@@
-330,7
+330,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#2",
"pos": {
"x": 419.0,
"name": "WireCrossPoint#2",
"pos": {
"x": 419.0,
@@
-339,7
+339,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#3",
"pos": {
"x": 424.0,
"name": "WireCrossPoint#3",
"pos": {
"x": 424.0,
@@
-348,7
+348,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#4",
"pos": {
"x": 429.0,
"name": "WireCrossPoint#4",
"pos": {
"x": 429.0,
@@
-357,7
+357,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#5",
"pos": {
"x": 84.0,
"name": "WireCrossPoint#5",
"pos": {
"x": 84.0,
@@
-366,7
+366,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#6",
"pos": {
"x": 94.0,
"name": "WireCrossPoint#6",
"pos": {
"x": 94.0,
@@
-375,7
+375,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#7",
"pos": {
"x": 29.0,
"name": "WireCrossPoint#7",
"pos": {
"x": 29.0,
@@
-384,7
+384,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#8",
"pos": {
"x": 74.0,
"name": "WireCrossPoint#8",
"pos": {
"x": 74.0,
@@
-393,7
+393,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#9",
"pos": {
"x": 49.0,
"name": "WireCrossPoint#9",
"pos": {
"x": 49.0,
@@
-1902,7
+1902,7
@@
],
"version": "0.1.1"
},
],
"version": "0.1.1"
},
- "symbolRendererSnippetID": "
class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "MSR",
"centerTextHeight": 5.0,
"symbolRendererParams": {
"centerText": "MSR",
"centerTextHeight": 5.0,
@@
-1910,13
+1910,13
@@
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
- "outlineRendererSnippetID": "
class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer
",
- "highLevelStateHandlerSnippetID": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.StandardHighLevelStateHandler
",
+ "outlineRendererSnippetID": "
default
",
+ "highLevelStateHandlerSnippetID": "
standard
",
"highLevelStateHandlerParams": {
"subcomponentHighLevelStates": {},
"atomicHighLevelStates": {
"q": {
"highLevelStateHandlerParams": {
"subcomponentHighLevelStates": {},
"atomicHighLevelStates": {
"q": {
- "id": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.DelegatingAtomicHighLevelStateHandler
",
+ "id": "
delegating
",
"params": {
"delegateTarget": "GUIdff4_finewe#0",
"subStateID": "q"
"params": {
"delegateTarget": "GUIdff4_finewe#0",
"subStateID": "q"
diff --git
a/net.mograsim.logic.model.am2900/components/am2904/GUIAm2904TestLogic.json
b/net.mograsim.logic.model.am2900/components/am2904/GUIAm2904TestLogic.json
index
e4017fe
..
93b91e5
100644
(file)
--- a/
net.mograsim.logic.model.am2900/components/am2904/GUIAm2904TestLogic.json
+++ b/
net.mograsim.logic.model.am2900/components/am2904/GUIAm2904TestLogic.json
@@
-96,7
+96,7
@@
}
},
{
}
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#0",
"pos": {
"x": 85.0,
"name": "GUINandGate#0",
"pos": {
"x": 85.0,
@@
-105,7
+105,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#1",
"pos": {
"x": 45.0,
"name": "GUINandGate#1",
"pos": {
"x": 45.0,
@@
-114,7
+114,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#2",
"pos": {
"x": 120.0,
"name": "GUINandGate#2",
"pos": {
"x": 120.0,
@@
-123,7
+123,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#3",
"pos": {
"x": 45.0,
"name": "GUINandGate#3",
"pos": {
"x": 45.0,
@@
-132,7
+132,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#4",
"pos": {
"x": 80.0,
"name": "GUINandGate#4",
"pos": {
"x": 80.0,
@@
-141,7
+141,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#5",
"pos": {
"x": 80.0,
"name": "GUINandGate#5",
"pos": {
"x": 80.0,
@@
-150,7
+150,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUISplitter",
+ "id": "GUISplitter",
"name": "GUISplitter#0",
"pos": {
"x": 5.0,
"name": "GUISplitter#0",
"pos": {
"x": 5.0,
@@
-159,7
+159,7
@@
"params": 4
},
{
"params": 4
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#0",
"pos": {
"x": 29.0,
"name": "WireCrossPoint#0",
"pos": {
"x": 29.0,
@@
-168,7
+168,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#1",
"pos": {
"x": 34.0,
"name": "WireCrossPoint#1",
"pos": {
"x": 34.0,
@@
-177,7
+177,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#10",
"pos": {
"x": 39.0,
"name": "WireCrossPoint#10",
"pos": {
"x": 39.0,
@@
-186,7
+186,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#2",
"pos": {
"x": 79.0,
"name": "WireCrossPoint#2",
"pos": {
"x": 79.0,
@@
-195,7
+195,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#3",
"pos": {
"x": 79.0,
"name": "WireCrossPoint#3",
"pos": {
"x": 79.0,
@@
-204,7
+204,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#4",
"pos": {
"x": 19.0,
"name": "WireCrossPoint#4",
"pos": {
"x": 19.0,
@@
-213,7
+213,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#5",
"pos": {
"x": 24.0,
"name": "WireCrossPoint#5",
"pos": {
"x": 24.0,
@@
-222,7
+222,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#6",
"pos": {
"x": 39.0,
"name": "WireCrossPoint#6",
"pos": {
"x": 39.0,
@@
-231,7
+231,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#7",
"pos": {
"x": 74.0,
"name": "WireCrossPoint#7",
"pos": {
"x": 74.0,
@@
-240,7
+240,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#8",
"pos": {
"x": 74.0,
"name": "WireCrossPoint#8",
"pos": {
"x": 74.0,
@@
-249,7
+249,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#9",
"pos": {
"x": 24.0,
"name": "WireCrossPoint#9",
"pos": {
"x": 24.0,
@@
-757,7
+757,7
@@
],
"version": "0.1.1"
},
],
"version": "0.1.1"
},
- "symbolRendererSnippetID": "
class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "Test\nlogic",
"centerTextHeight": 5.0,
"symbolRendererParams": {
"centerText": "Test\nlogic",
"centerTextHeight": 5.0,
@@
-765,8
+765,8
@@
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
- "outlineRendererSnippetID": "
class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer
",
- "highLevelStateHandlerSnippetID": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.StandardHighLevelStateHandler
",
+ "outlineRendererSnippetID": "
default
",
+ "highLevelStateHandlerSnippetID": "
standard
",
"highLevelStateHandlerParams": {
"subcomponentHighLevelStates": {},
"atomicHighLevelStates": {}
"highLevelStateHandlerParams": {
"subcomponentHighLevelStates": {},
"atomicHighLevelStates": {}
diff --git
a/net.mograsim.logic.model.am2900/components/am2904/GUIAm2904muSR.json
b/net.mograsim.logic.model.am2900/components/am2904/GUIAm2904muSR.json
index
3c5845a
..
05fbd4e
100644
(file)
--- a/
net.mograsim.logic.model.am2900/components/am2904/GUIAm2904muSR.json
+++ b/
net.mograsim.logic.model.am2900/components/am2904/GUIAm2904muSR.json
@@
-130,7
+130,7
@@
}
},
{
}
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUIMerger",
+ "id": "GUIMerger",
"name": "GUIMerger#0",
"pos": {
"x": 435.0,
"name": "GUIMerger#0",
"pos": {
"x": 435.0,
@@
-139,7
+139,7
@@
"params": 4
},
{
"params": 4
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#0",
"pos": {
"x": 245.0,
"name": "GUINandGate#0",
"pos": {
"x": 245.0,
@@
-148,7
+148,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#1",
"pos": {
"x": 215.0,
"name": "GUINandGate#1",
"pos": {
"x": 215.0,
@@
-157,7
+157,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#2",
"pos": {
"x": 215.0,
"name": "GUINandGate#2",
"pos": {
"x": 215.0,
@@
-166,7
+166,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUISplitter",
+ "id": "GUISplitter",
"name": "GUISplitter#0",
"pos": {
"x": 5.0,
"name": "GUISplitter#0",
"pos": {
"x": 5.0,
@@
-175,7
+175,7
@@
"params": 4
},
{
"params": 4
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUISplitter",
+ "id": "GUISplitter",
"name": "GUISplitter#1",
"pos": {
"x": 5.0,
"name": "GUISplitter#1",
"pos": {
"x": 5.0,
@@
-184,7
+184,7
@@
"params": 4
},
{
"params": 4
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUISplitter",
+ "id": "GUISplitter",
"name": "GUISplitter#2",
"pos": {
"x": 45.0,
"name": "GUISplitter#2",
"pos": {
"x": 45.0,
@@
-193,7
+193,7
@@
"params": 2
},
{
"params": 2
},
{
- "id": "
class:net.mograsim.logic.model.am2900.components.
GUIdff4_finewe",
+ "id": "GUIdff4_finewe",
"name": "GUIdff4_finewe#0",
"pos": {
"x": 375.0,
"name": "GUIdff4_finewe#0",
"pos": {
"x": 375.0,
@@
-201,7
+201,7
@@
}
},
{
}
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#0",
"pos": {
"x": 89.0,
"name": "WireCrossPoint#0",
"pos": {
"x": 89.0,
@@
-210,7
+210,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#1",
"pos": {
"x": 89.0,
"name": "WireCrossPoint#1",
"pos": {
"x": 89.0,
@@
-219,7
+219,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#2",
"pos": {
"x": 89.0,
"name": "WireCrossPoint#2",
"pos": {
"x": 89.0,
@@
-228,7
+228,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#3",
"pos": {
"x": 429.0,
"name": "WireCrossPoint#3",
"pos": {
"x": 429.0,
@@
-237,7
+237,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#4",
"pos": {
"x": 209.0,
"name": "WireCrossPoint#4",
"pos": {
"x": 209.0,
@@
-1075,7
+1075,7
@@
],
"version": "0.1.1"
},
],
"version": "0.1.1"
},
- "symbolRendererSnippetID": "
class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "muSR",
"centerTextHeight": 5.0,
"symbolRendererParams": {
"centerText": "muSR",
"centerTextHeight": 5.0,
@@
-1083,13
+1083,13
@@
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
- "outlineRendererSnippetID": "
class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer
",
- "highLevelStateHandlerSnippetID": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.StandardHighLevelStateHandler
",
+ "outlineRendererSnippetID": "
default
",
+ "highLevelStateHandlerSnippetID": "
standard
",
"highLevelStateHandlerParams": {
"subcomponentHighLevelStates": {},
"atomicHighLevelStates": {
"q": {
"highLevelStateHandlerParams": {
"subcomponentHighLevelStates": {},
"atomicHighLevelStates": {
"q": {
- "id": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.DelegatingAtomicHighLevelStateHandler
",
+ "id": "
delegating
",
"params": {
"delegateTarget": "GUIdff4_finewe#0",
"subStateID": "q"
"params": {
"delegateTarget": "GUIdff4_finewe#0",
"subStateID": "q"
diff --git
a/net.mograsim.logic.model.editor/components/GUI_rsLatch.json
b/net.mograsim.logic.model.editor/components/GUI_rsLatch.json
index
4dd03a9
..
89eab0a
100644
(file)
--- a/
net.mograsim.logic.model.editor/components/GUI_rsLatch.json
+++ b/
net.mograsim.logic.model.editor/components/GUI_rsLatch.json
@@
-43,7
+43,7
@@
"submodel": {
"components": [
{
"submodel": {
"components": [
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#0",
"pos": {
"x": 10.0,
"name": "GUINandGate#0",
"pos": {
"x": 10.0,
@@
-52,7
+52,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#1",
"pos": {
"x": 40.0,
"name": "GUINandGate#1",
"pos": {
"x": 40.0,
@@
-61,7
+61,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#0",
"pos": {
"x": 34.0,
"name": "WireCrossPoint#0",
"pos": {
"x": 34.0,
@@
-70,7
+70,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#1",
"pos": {
"x": 64.0,
"name": "WireCrossPoint#1",
"pos": {
"x": 64.0,
@@
-223,7
+223,7
@@
],
"version": "0.1.1"
},
],
"version": "0.1.1"
},
- "symbolRendererSnippetID": "
class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "_rsLatch",
"centerTextHeight": 5.0,
"symbolRendererParams": {
"centerText": "_rsLatch",
"centerTextHeight": 5.0,
@@
-231,13
+231,13
@@
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
- "outlineRendererSnippetID": "
class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer
",
- "highLevelStateHandlerSnippetID": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.StandardHighLevelStateHandler
",
+ "outlineRendererSnippetID": "
default
",
+ "highLevelStateHandlerSnippetID": "
standard
",
"highLevelStateHandlerParams": {
"subcomponentHighLevelStates": {},
"atomicHighLevelStates": {
"q": {
"highLevelStateHandlerParams": {
"subcomponentHighLevelStates": {},
"atomicHighLevelStates": {
"q": {
- "id": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.WireForcingAtomicHighLevelStateHandler
",
+ "id": "
wireForcing
",
"params": {
"wiresToForce": [
"q"
"params": {
"wiresToForce": [
"q"
diff --git
a/net.mograsim.logic.model.editor/components/GUIand.json
b/net.mograsim.logic.model.editor/components/GUIand.json
index
beeec77
..
5e343e0
100644
(file)
--- a/
net.mograsim.logic.model.editor/components/GUIand.json
+++ b/
net.mograsim.logic.model.editor/components/GUIand.json
@@
-34,7
+34,7
@@
"submodel": {
"components": [
{
"submodel": {
"components": [
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#0",
"pos": {
"x": 20.0,
"name": "GUINandGate#0",
"pos": {
"x": 20.0,
@@
-43,7
+43,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#1",
"pos": {
"x": 50.0,
"name": "GUINandGate#1",
"pos": {
"x": 50.0,
@@
-52,7
+52,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#0",
"pos": {
"x": 44.0,
"name": "WireCrossPoint#0",
"pos": {
"x": 44.0,
@@
-144,7
+144,7
@@
],
"version": "0.1.1"
},
],
"version": "0.1.1"
},
- "symbolRendererSnippetID": "
class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "GUIand",
"centerTextHeight": 5.0,
"symbolRendererParams": {
"centerText": "GUIand",
"centerTextHeight": 5.0,
@@
-152,7
+152,7
@@
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
- "outlineRendererSnippetID": "
class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer
",
- "highLevelStateHandlerSnippetID": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.DefaultHighLevelStateHandler
",
+ "outlineRendererSnippetID": "
default
",
+ "highLevelStateHandlerSnippetID": "
default
",
"version": "0.1.5"
}
\ No newline at end of file
"version": "0.1.5"
}
\ No newline at end of file
diff --git
a/net.mograsim.logic.model.editor/components/GUIand41.json
b/net.mograsim.logic.model.editor/components/GUIand41.json
index
acebe97
..
c7ae05e
100644
(file)
--- a/
net.mograsim.logic.model.editor/components/GUIand41.json
+++ b/
net.mograsim.logic.model.editor/components/GUIand41.json
@@
-120,7
+120,7
@@
}
},
{
}
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#0",
"pos": {
"x": 24.0,
"name": "WireCrossPoint#0",
"pos": {
"x": 24.0,
@@
-129,7
+129,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#1",
"pos": {
"x": 24.0,
"name": "WireCrossPoint#1",
"pos": {
"x": 24.0,
@@
-138,7
+138,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#2",
"pos": {
"x": 24.0,
"name": "WireCrossPoint#2",
"pos": {
"x": 24.0,
@@
-341,7
+341,7
@@
],
"version": "0.1.1"
},
],
"version": "0.1.1"
},
- "symbolRendererSnippetID": "
class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "GUIand41",
"centerTextHeight": 5.0,
"symbolRendererParams": {
"centerText": "GUIand41",
"centerTextHeight": 5.0,
@@
-349,7
+349,7
@@
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
- "outlineRendererSnippetID": "
class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer
",
- "highLevelStateHandlerSnippetID": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.DefaultHighLevelStateHandler
",
+ "outlineRendererSnippetID": "
default
",
+ "highLevelStateHandlerSnippetID": "
default
",
"version": "0.1.5"
}
\ No newline at end of file
"version": "0.1.5"
}
\ No newline at end of file
diff --git
a/net.mograsim.logic.model.editor/components/GUIandor414.json
b/net.mograsim.logic.model.editor/components/GUIandor414.json
index
8e97325
..
5f6d292
100644
(file)
--- a/
net.mograsim.logic.model.editor/components/GUIandor414.json
+++ b/
net.mograsim.logic.model.editor/components/GUIandor414.json
@@
-506,7
+506,7
@@
],
"version": "0.1.1"
},
],
"version": "0.1.1"
},
- "symbolRendererSnippetID": "
class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "GUIandor414",
"centerTextHeight": 5.0,
"symbolRendererParams": {
"centerText": "GUIandor414",
"centerTextHeight": 5.0,
@@
-514,7
+514,7
@@
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
- "outlineRendererSnippetID": "
class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer
",
- "highLevelStateHandlerSnippetID": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.DefaultHighLevelStateHandler
",
+ "outlineRendererSnippetID": "
default
",
+ "highLevelStateHandlerSnippetID": "
default
",
"version": "0.1.5"
}
\ No newline at end of file
"version": "0.1.5"
}
\ No newline at end of file
diff --git
a/net.mograsim.logic.model.editor/components/GUIdemux2.json
b/net.mograsim.logic.model.editor/components/GUIdemux2.json
index
9b2ea44
..
7e28bfd
100644
(file)
--- a/
net.mograsim.logic.model.editor/components/GUIdemux2.json
+++ b/
net.mograsim.logic.model.editor/components/GUIdemux2.json
@@
-61,7
+61,7
@@
"submodel": {
"components": [
{
"submodel": {
"components": [
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#0",
"pos": {
"x": 10.0,
"name": "GUINandGate#0",
"pos": {
"x": 10.0,
@@
-70,7
+70,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#1",
"pos": {
"x": 10.0,
"name": "GUINandGate#1",
"pos": {
"x": 10.0,
@@
-111,7
+111,7
@@
}
},
{
}
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#0",
"pos": {
"x": 6.5,
"name": "WireCrossPoint#0",
"pos": {
"x": 6.5,
@@
-120,7
+120,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#1",
"pos": {
"x": 6.5,
"name": "WireCrossPoint#1",
"pos": {
"x": 6.5,
@@
-129,7
+129,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#2",
"pos": {
"x": 36.5,
"name": "WireCrossPoint#2",
"pos": {
"x": 36.5,
@@
-138,7
+138,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#3",
"pos": {
"x": 4.0,
"name": "WireCrossPoint#3",
"pos": {
"x": 4.0,
@@
-147,7
+147,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#4",
"pos": {
"x": 4.0,
"name": "WireCrossPoint#4",
"pos": {
"x": 4.0,
@@
-156,7
+156,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#5",
"pos": {
"x": 31.5,
"name": "WireCrossPoint#5",
"pos": {
"x": 31.5,
@@
-165,7
+165,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#6",
"pos": {
"x": 31.5,
"name": "WireCrossPoint#6",
"pos": {
"x": 31.5,
@@
-174,7
+174,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#7",
"pos": {
"x": 34.0,
"name": "WireCrossPoint#7",
"pos": {
"x": 34.0,
@@
-530,7
+530,7
@@
],
"version": "0.1.1"
},
],
"version": "0.1.1"
},
- "symbolRendererSnippetID": "
class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "GUIdemux2",
"centerTextHeight": 5.0,
"symbolRendererParams": {
"centerText": "GUIdemux2",
"centerTextHeight": 5.0,
@@
-538,7
+538,7
@@
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
- "outlineRendererSnippetID": "
class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer
",
- "highLevelStateHandlerSnippetID": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.DefaultHighLevelStateHandler
",
+ "outlineRendererSnippetID": "
default
",
+ "highLevelStateHandlerSnippetID": "
default
",
"version": "0.1.5"
}
\ No newline at end of file
"version": "0.1.5"
}
\ No newline at end of file
diff --git
a/net.mograsim.logic.model.editor/components/GUIdff.json
b/net.mograsim.logic.model.editor/components/GUIdff.json
index
35eba16
..
30c17e6
100644
(file)
--- a/
net.mograsim.logic.model.editor/components/GUIdff.json
+++ b/
net.mograsim.logic.model.editor/components/GUIdff.json
@@
-43,7
+43,7
@@
"submodel": {
"components": [
{
"submodel": {
"components": [
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#0",
"pos": {
"x": 120.0,
"name": "GUINandGate#0",
"pos": {
"x": 120.0,
@@
-76,7
+76,7
@@
}
},
{
}
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#0",
"pos": {
"x": 9.0,
"name": "WireCrossPoint#0",
"pos": {
"x": 9.0,
@@
-85,7
+85,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#1",
"pos": {
"x": 19.0,
"name": "WireCrossPoint#1",
"pos": {
"x": 19.0,
@@
-94,7
+94,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#2",
"pos": {
"x": 99.0,
"name": "WireCrossPoint#2",
"pos": {
"x": 99.0,
@@
-103,7
+103,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#3",
"pos": {
"x": 99.0,
"name": "WireCrossPoint#3",
"pos": {
"x": 99.0,
@@
-336,7
+336,7
@@
],
"version": "0.1.1"
},
],
"version": "0.1.1"
},
- "symbolRendererSnippetID": "
class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "GUIdff",
"centerTextHeight": 5.0,
"symbolRendererParams": {
"centerText": "GUIdff",
"centerTextHeight": 5.0,
@@
-344,13
+344,13
@@
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
- "outlineRendererSnippetID": "
class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer
",
- "highLevelStateHandlerSnippetID": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.StandardHighLevelStateHandler
",
+ "outlineRendererSnippetID": "
default
",
+ "highLevelStateHandlerSnippetID": "
standard
",
"highLevelStateHandlerParams": {
"subcomponentHighLevelStates": {},
"atomicHighLevelStates": {
"q": {
"highLevelStateHandlerParams": {
"subcomponentHighLevelStates": {},
"atomicHighLevelStates": {
"q": {
- "id": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.DelegatingAtomicHighLevelStateHandler
",
+ "id": "
delegating
",
"params": {
"delegateTarget": "GUI_rsLatch#1",
"subStateID": "q"
"params": {
"delegateTarget": "GUI_rsLatch#1",
"subStateID": "q"
diff --git
a/net.mograsim.logic.model.editor/components/GUIdff4.json
b/net.mograsim.logic.model.editor/components/GUIdff4.json
index
23edb9a
..
a717818
100644
(file)
--- a/
net.mograsim.logic.model.editor/components/GUIdff4.json
+++ b/
net.mograsim.logic.model.editor/components/GUIdff4.json
@@
-137,7
+137,7
@@
}
},
{
}
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#0",
"pos": {
"x": 104.0,
"name": "WireCrossPoint#0",
"pos": {
"x": 104.0,
@@
-146,7
+146,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#1",
"pos": {
"x": 104.0,
"name": "WireCrossPoint#1",
"pos": {
"x": 104.0,
@@
-155,7
+155,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#2",
"pos": {
"x": 104.0,
"name": "WireCrossPoint#2",
"pos": {
"x": 104.0,
@@
-164,7
+164,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#3",
"pos": {
"x": 169.0,
"name": "WireCrossPoint#3",
"pos": {
"x": 169.0,
@@
-173,7
+173,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#4",
"pos": {
"x": 164.0,
"name": "WireCrossPoint#4",
"pos": {
"x": 164.0,
@@
-182,7
+182,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#5",
"pos": {
"x": 159.0,
"name": "WireCrossPoint#5",
"pos": {
"x": 159.0,
@@
-191,7
+191,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#6",
"pos": {
"x": 154.0,
"name": "WireCrossPoint#6",
"pos": {
"x": 154.0,
@@
-663,7
+663,7
@@
],
"version": "0.1.1"
},
],
"version": "0.1.1"
},
- "symbolRendererSnippetID": "
class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "D flip flop\n4 bit",
"centerTextHeight": 5.0,
"symbolRendererParams": {
"centerText": "D flip flop\n4 bit",
"centerTextHeight": 5.0,
@@
-671,27
+671,27
@@
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
- "outlineRendererSnippetID": "
class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer
",
- "highLevelStateHandlerSnippetID": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.StandardHighLevelStateHandler
",
+ "outlineRendererSnippetID": "
default
",
+ "highLevelStateHandlerSnippetID": "
standard
",
"highLevelStateHandlerParams": {
"subcomponentHighLevelStates": {},
"atomicHighLevelStates": {
"q1": {
"highLevelStateHandlerParams": {
"subcomponentHighLevelStates": {},
"atomicHighLevelStates": {
"q1": {
- "id": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.DelegatingAtomicHighLevelStateHandler
",
+ "id": "
delegating
",
"params": {
"delegateTarget": "GUIdff#0",
"subStateID": "q"
}
},
"q2": {
"params": {
"delegateTarget": "GUIdff#0",
"subStateID": "q"
}
},
"q2": {
- "id": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.DelegatingAtomicHighLevelStateHandler
",
+ "id": "
delegating
",
"params": {
"delegateTarget": "GUIdff#1",
"subStateID": "q"
}
},
"q": {
"params": {
"delegateTarget": "GUIdff#1",
"subStateID": "q"
}
},
"q": {
- "id": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.BitVectorSplittingAtomicHighLevelStateHandler
",
+ "id": "
bitVectorSplitting
",
"params": {
"vectorPartTargets": [
"q1",
"params": {
"vectorPartTargets": [
"q1",
@@
-708,14
+708,14
@@
}
},
"q3": {
}
},
"q3": {
- "id": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.DelegatingAtomicHighLevelStateHandler
",
+ "id": "
delegating
",
"params": {
"delegateTarget": "GUIdff#2",
"subStateID": "q"
}
},
"q4": {
"params": {
"delegateTarget": "GUIdff#2",
"subStateID": "q"
}
},
"q4": {
- "id": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.DelegatingAtomicHighLevelStateHandler
",
+ "id": "
delegating
",
"params": {
"delegateTarget": "GUIdff#3",
"subStateID": "q"
"params": {
"delegateTarget": "GUIdff#3",
"subStateID": "q"
diff --git
a/net.mograsim.logic.model.editor/components/GUIdff4_invwe.json
b/net.mograsim.logic.model.editor/components/GUIdff4_invwe.json
index
89d09fb
..
c34cb35
100644
(file)
--- a/
net.mograsim.logic.model.editor/components/GUIdff4_invwe.json
+++ b/
net.mograsim.logic.model.editor/components/GUIdff4_invwe.json
@@
-137,7
+137,7
@@
}
},
{
}
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#0",
"pos": {
"x": 104.0,
"name": "WireCrossPoint#0",
"pos": {
"x": 104.0,
@@
-146,7
+146,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#1",
"pos": {
"x": 104.0,
"name": "WireCrossPoint#1",
"pos": {
"x": 104.0,
@@
-155,7
+155,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#2",
"pos": {
"x": 104.0,
"name": "WireCrossPoint#2",
"pos": {
"x": 104.0,
@@
-164,7
+164,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#3",
"pos": {
"x": 169.0,
"name": "WireCrossPoint#3",
"pos": {
"x": 169.0,
@@
-173,7
+173,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#4",
"pos": {
"x": 164.0,
"name": "WireCrossPoint#4",
"pos": {
"x": 164.0,
@@
-182,7
+182,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#5",
"pos": {
"x": 159.0,
"name": "WireCrossPoint#5",
"pos": {
"x": 159.0,
@@
-191,7
+191,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#6",
"pos": {
"x": 154.0,
"name": "WireCrossPoint#6",
"pos": {
"x": 154.0,
@@
-672,7
+672,7
@@
],
"version": "0.1.1"
},
],
"version": "0.1.1"
},
- "symbolRendererSnippetID": "
class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "D flip flop\n4 bit",
"centerTextHeight": 5.0,
"symbolRendererParams": {
"centerText": "D flip flop\n4 bit",
"centerTextHeight": 5.0,
@@
-680,27
+680,27
@@
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
- "outlineRendererSnippetID": "
class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer
",
- "highLevelStateHandlerSnippetID": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.StandardHighLevelStateHandler
",
+ "outlineRendererSnippetID": "
default
",
+ "highLevelStateHandlerSnippetID": "
standard
",
"highLevelStateHandlerParams": {
"subcomponentHighLevelStates": {},
"atomicHighLevelStates": {
"q1": {
"highLevelStateHandlerParams": {
"subcomponentHighLevelStates": {},
"atomicHighLevelStates": {
"q1": {
- "id": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.DelegatingAtomicHighLevelStateHandler
",
+ "id": "
delegating
",
"params": {
"delegateTarget": "GUIdff#0",
"subStateID": "q"
}
},
"q2": {
"params": {
"delegateTarget": "GUIdff#0",
"subStateID": "q"
}
},
"q2": {
- "id": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.DelegatingAtomicHighLevelStateHandler
",
+ "id": "
delegating
",
"params": {
"delegateTarget": "GUIdff#1",
"subStateID": "q"
}
},
"q": {
"params": {
"delegateTarget": "GUIdff#1",
"subStateID": "q"
}
},
"q": {
- "id": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.BitVectorSplittingAtomicHighLevelStateHandler
",
+ "id": "
bitVectorSplitting
",
"params": {
"vectorPartTargets": [
"q1",
"params": {
"vectorPartTargets": [
"q1",
@@
-717,14
+717,14
@@
}
},
"q3": {
}
},
"q3": {
- "id": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.DelegatingAtomicHighLevelStateHandler
",
+ "id": "
delegating
",
"params": {
"delegateTarget": "GUIdff#2",
"subStateID": "q"
}
},
"q4": {
"params": {
"delegateTarget": "GUIdff#2",
"subStateID": "q"
}
},
"q4": {
- "id": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.DelegatingAtomicHighLevelStateHandler
",
+ "id": "
delegating
",
"params": {
"delegateTarget": "GUIdff#3",
"subStateID": "q"
"params": {
"delegateTarget": "GUIdff#3",
"subStateID": "q"
diff --git
a/net.mograsim.logic.model.editor/components/GUIdlatch.json
b/net.mograsim.logic.model.editor/components/GUIdlatch.json
index
9e01a2c
..
b09c439
100644
(file)
--- a/
net.mograsim.logic.model.editor/components/GUIdlatch.json
+++ b/
net.mograsim.logic.model.editor/components/GUIdlatch.json
@@
-43,7
+43,7
@@
"submodel": {
"components": [
{
"submodel": {
"components": [
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#0",
"pos": {
"x": 10.0,
"name": "GUINandGate#0",
"pos": {
"x": 10.0,
@@
-52,7
+52,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#1",
"pos": {
"x": 15.0,
"name": "GUINandGate#1",
"pos": {
"x": 15.0,
@@
-69,7
+69,7
@@
}
},
{
}
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#0",
"pos": {
"x": 4.0,
"name": "WireCrossPoint#0",
"pos": {
"x": 4.0,
@@
-78,7
+78,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#1",
"pos": {
"x": 34.0,
"name": "WireCrossPoint#1",
"pos": {
"x": 34.0,
@@
-241,7
+241,7
@@
],
"version": "0.1.1"
},
],
"version": "0.1.1"
},
- "symbolRendererSnippetID": "
class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "GUIdlatch",
"centerTextHeight": 5.0,
"symbolRendererParams": {
"centerText": "GUIdlatch",
"centerTextHeight": 5.0,
@@
-249,13
+249,13
@@
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
- "outlineRendererSnippetID": "
class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer
",
- "highLevelStateHandlerSnippetID": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.StandardHighLevelStateHandler
",
+ "outlineRendererSnippetID": "
default
",
+ "highLevelStateHandlerSnippetID": "
standard
",
"highLevelStateHandlerParams": {
"subcomponentHighLevelStates": {},
"atomicHighLevelStates": {
"q": {
"highLevelStateHandlerParams": {
"subcomponentHighLevelStates": {},
"atomicHighLevelStates": {
"q": {
- "id": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.DelegatingAtomicHighLevelStateHandler
",
+ "id": "
delegating
",
"params": {
"delegateTarget": "GUI_rsLatch#0",
"subStateID": "q"
"params": {
"delegateTarget": "GUI_rsLatch#0",
"subStateID": "q"
diff --git
a/net.mograsim.logic.model.editor/components/GUIdlatch4.json
b/net.mograsim.logic.model.editor/components/GUIdlatch4.json
index
7b72993
..
3bc4df7
100644
(file)
--- a/
net.mograsim.logic.model.editor/components/GUIdlatch4.json
+++ b/
net.mograsim.logic.model.editor/components/GUIdlatch4.json
@@
-120,7
+120,7
@@
}
},
{
}
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#0",
"pos": {
"x": 14.0,
"name": "WireCrossPoint#0",
"pos": {
"x": 14.0,
@@
-129,7
+129,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#1",
"pos": {
"x": 14.0,
"name": "WireCrossPoint#1",
"pos": {
"x": 14.0,
@@
-138,7
+138,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#2",
"pos": {
"x": 14.0,
"name": "WireCrossPoint#2",
"pos": {
"x": 14.0,
@@
-341,7
+341,7
@@
],
"version": "0.1.1"
},
],
"version": "0.1.1"
},
- "symbolRendererSnippetID": "
class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "GUIdlatch4",
"centerTextHeight": 5.0,
"symbolRendererParams": {
"centerText": "GUIdlatch4",
"centerTextHeight": 5.0,
@@
-349,27
+349,27
@@
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
- "outlineRendererSnippetID": "
class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer
",
- "highLevelStateHandlerSnippetID": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.StandardHighLevelStateHandler
",
+ "outlineRendererSnippetID": "
default
",
+ "highLevelStateHandlerSnippetID": "
standard
",
"highLevelStateHandlerParams": {
"subcomponentHighLevelStates": {},
"atomicHighLevelStates": {
"q1": {
"highLevelStateHandlerParams": {
"subcomponentHighLevelStates": {},
"atomicHighLevelStates": {
"q1": {
- "id": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.DelegatingAtomicHighLevelStateHandler
",
+ "id": "
delegating
",
"params": {
"delegateTarget": "GUIdlatch#0",
"subStateID": "q"
}
},
"q2": {
"params": {
"delegateTarget": "GUIdlatch#0",
"subStateID": "q"
}
},
"q2": {
- "id": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.DelegatingAtomicHighLevelStateHandler
",
+ "id": "
delegating
",
"params": {
"delegateTarget": "GUIdlatch#1",
"subStateID": "q"
}
},
"q": {
"params": {
"delegateTarget": "GUIdlatch#1",
"subStateID": "q"
}
},
"q": {
- "id": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.BitVectorSplittingAtomicHighLevelStateHandler
",
+ "id": "
bitVectorSplitting
",
"params": {
"vectorPartTargets": [
"q1",
"params": {
"vectorPartTargets": [
"q1",
@@
-386,14
+386,14
@@
}
},
"q3": {
}
},
"q3": {
- "id": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.DelegatingAtomicHighLevelStateHandler
",
+ "id": "
delegating
",
"params": {
"delegateTarget": "GUIdlatch#2",
"subStateID": "q"
}
},
"q4": {
"params": {
"delegateTarget": "GUIdlatch#2",
"subStateID": "q"
}
},
"q4": {
- "id": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.DelegatingAtomicHighLevelStateHandler
",
+ "id": "
delegating
",
"params": {
"delegateTarget": "GUIdlatch#3",
"subStateID": "q"
"params": {
"delegateTarget": "GUIdlatch#3",
"subStateID": "q"
diff --git
a/net.mograsim.logic.model.editor/components/GUIfulladder.json
b/net.mograsim.logic.model.editor/components/GUIfulladder.json
index
c91f9be
..
8b41bd3
100644
(file)
--- a/
net.mograsim.logic.model.editor/components/GUIfulladder.json
+++ b/
net.mograsim.logic.model.editor/components/GUIfulladder.json
@@
-52,7
+52,7
@@
"submodel": {
"components": [
{
"submodel": {
"components": [
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#0",
"pos": {
"x": 57.5,
"name": "GUINandGate#0",
"pos": {
"x": 57.5,
@@
-190,7
+190,7
@@
],
"version": "0.1.1"
},
],
"version": "0.1.1"
},
- "symbolRendererSnippetID": "
class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "GUIfulladder",
"centerTextHeight": 5.0,
"symbolRendererParams": {
"centerText": "GUIfulladder",
"centerTextHeight": 5.0,
@@
-198,7
+198,7
@@
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
- "outlineRendererSnippetID": "
class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer
",
- "highLevelStateHandlerSnippetID": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.DefaultHighLevelStateHandler
",
+ "outlineRendererSnippetID": "
default
",
+ "highLevelStateHandlerSnippetID": "
default
",
"version": "0.1.5"
}
\ No newline at end of file
"version": "0.1.5"
}
\ No newline at end of file
diff --git
a/net.mograsim.logic.model.editor/components/GUIhalfadder.json
b/net.mograsim.logic.model.editor/components/GUIhalfadder.json
index
5475ded
..
92720a8
100644
(file)
--- a/
net.mograsim.logic.model.editor/components/GUIhalfadder.json
+++ b/
net.mograsim.logic.model.editor/components/GUIhalfadder.json
@@
-43,7
+43,7
@@
"submodel": {
"components": [
{
"submodel": {
"components": [
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#0",
"pos": {
"x": 10.0,
"name": "GUINandGate#0",
"pos": {
"x": 10.0,
@@
-52,7
+52,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#1",
"pos": {
"x": 40.0,
"name": "GUINandGate#1",
"pos": {
"x": 40.0,
@@
-61,7
+61,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#2",
"pos": {
"x": 40.0,
"name": "GUINandGate#2",
"pos": {
"x": 40.0,
@@
-70,7
+70,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#3",
"pos": {
"x": 65.0,
"name": "GUINandGate#3",
"pos": {
"x": 65.0,
@@
-79,7
+79,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#0",
"pos": {
"x": 4.0,
"name": "WireCrossPoint#0",
"pos": {
"x": 4.0,
@@
-88,7
+88,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#1",
"pos": {
"x": 4.0,
"name": "WireCrossPoint#1",
"pos": {
"x": 4.0,
@@
-97,7
+97,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#2",
"pos": {
"x": 34.0,
"name": "WireCrossPoint#2",
"pos": {
"x": 34.0,
@@
-323,7
+323,7
@@
],
"version": "0.1.1"
},
],
"version": "0.1.1"
},
- "symbolRendererSnippetID": "
class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "GUIhalfadder",
"centerTextHeight": 5.0,
"symbolRendererParams": {
"centerText": "GUIhalfadder",
"centerTextHeight": 5.0,
@@
-331,7
+331,7
@@
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
- "outlineRendererSnippetID": "
class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer
",
- "highLevelStateHandlerSnippetID": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.DefaultHighLevelStateHandler
",
+ "outlineRendererSnippetID": "
default
",
+ "highLevelStateHandlerSnippetID": "
default
",
"version": "0.1.5"
}
\ No newline at end of file
"version": "0.1.5"
}
\ No newline at end of file
diff --git
a/net.mograsim.logic.model.editor/components/GUImux1.json
b/net.mograsim.logic.model.editor/components/GUImux1.json
index
978801d
..
279f905
100644
(file)
--- a/
net.mograsim.logic.model.editor/components/GUImux1.json
+++ b/
net.mograsim.logic.model.editor/components/GUImux1.json
@@
-43,7
+43,7
@@
"submodel": {
"components": [
{
"submodel": {
"components": [
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#0",
"pos": {
"x": 10.0,
"name": "GUINandGate#0",
"pos": {
"x": 10.0,
@@
-52,7
+52,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#1",
"pos": {
"x": 35.0,
"name": "GUINandGate#1",
"pos": {
"x": 35.0,
@@
-61,7
+61,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#2",
"pos": {
"x": 35.0,
"name": "GUINandGate#2",
"pos": {
"x": 35.0,
@@
-70,7
+70,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#3",
"pos": {
"x": 60.0,
"name": "GUINandGate#3",
"pos": {
"x": 60.0,
@@
-79,7
+79,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#0",
"pos": {
"x": 4.0,
"name": "WireCrossPoint#0",
"pos": {
"x": 4.0,
@@
-88,7
+88,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#1",
"pos": {
"x": 4.0,
"name": "WireCrossPoint#1",
"pos": {
"x": 4.0,
@@
-234,7
+234,7
@@
],
"version": "0.1.1"
},
],
"version": "0.1.1"
},
- "symbolRendererSnippetID": "
class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "GUImux1",
"centerTextHeight": 5.0,
"symbolRendererParams": {
"centerText": "GUImux1",
"centerTextHeight": 5.0,
@@
-242,7
+242,7
@@
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
- "outlineRendererSnippetID": "
class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer
",
- "highLevelStateHandlerSnippetID": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.DefaultHighLevelStateHandler
",
+ "outlineRendererSnippetID": "
default
",
+ "highLevelStateHandlerSnippetID": "
default
",
"version": "0.1.5"
}
\ No newline at end of file
"version": "0.1.5"
}
\ No newline at end of file
diff --git
a/net.mograsim.logic.model.editor/components/GUImux1_4.json
b/net.mograsim.logic.model.editor/components/GUImux1_4.json
index
11216b0
..
1caab2c
100644
(file)
--- a/
net.mograsim.logic.model.editor/components/GUImux1_4.json
+++ b/
net.mograsim.logic.model.editor/components/GUImux1_4.json
@@
-156,7
+156,7
@@
}
},
{
}
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#0",
"pos": {
"x": 24.0,
"name": "WireCrossPoint#0",
"pos": {
"x": 24.0,
@@
-165,7
+165,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#1",
"pos": {
"x": 24.0,
"name": "WireCrossPoint#1",
"pos": {
"x": 24.0,
@@
-174,7
+174,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#2",
"pos": {
"x": 24.0,
"name": "WireCrossPoint#2",
"pos": {
"x": 24.0,
@@
-489,7
+489,7
@@
],
"version": "0.1.1"
},
],
"version": "0.1.1"
},
- "symbolRendererSnippetID": "
class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "GUImux1_4",
"centerTextHeight": 5.0,
"symbolRendererParams": {
"centerText": "GUImux1_4",
"centerTextHeight": 5.0,
@@
-497,7
+497,7
@@
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
- "outlineRendererSnippetID": "
class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer
",
- "highLevelStateHandlerSnippetID": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.DefaultHighLevelStateHandler
",
+ "outlineRendererSnippetID": "
default
",
+ "highLevelStateHandlerSnippetID": "
default
",
"version": "0.1.5"
}
\ No newline at end of file
"version": "0.1.5"
}
\ No newline at end of file
diff --git
a/net.mograsim.logic.model.editor/components/GUImux2.json
b/net.mograsim.logic.model.editor/components/GUImux2.json
index
a0b8dd3
..
b1cf3a6
100644
(file)
--- a/
net.mograsim.logic.model.editor/components/GUImux2.json
+++ b/
net.mograsim.logic.model.editor/components/GUImux2.json
@@
-94,7
+94,7
@@
}
},
{
}
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#0",
"pos": {
"x": 30.0,
"name": "GUINandGate#0",
"pos": {
"x": 30.0,
@@
-103,7
+103,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#0",
"pos": {
"x": 24.0,
"name": "WireCrossPoint#0",
"pos": {
"x": 24.0,
@@
-112,7
+112,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#1",
"pos": {
"x": 24.0,
"name": "WireCrossPoint#1",
"pos": {
"x": 24.0,
@@
-121,7
+121,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#2",
"pos": {
"x": 24.0,
"name": "WireCrossPoint#2",
"pos": {
"x": 24.0,
@@
-130,7
+130,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#3",
"pos": {
"x": 54.0,
"name": "WireCrossPoint#3",
"pos": {
"x": 54.0,
@@
-441,7
+441,7
@@
],
"version": "0.1.1"
},
],
"version": "0.1.1"
},
- "symbolRendererSnippetID": "
class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "GUImux2",
"centerTextHeight": 5.0,
"symbolRendererParams": {
"centerText": "GUImux2",
"centerTextHeight": 5.0,
@@
-449,7
+449,7
@@
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
- "outlineRendererSnippetID": "
class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer
",
- "highLevelStateHandlerSnippetID": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.DefaultHighLevelStateHandler
",
+ "outlineRendererSnippetID": "
default
",
+ "highLevelStateHandlerSnippetID": "
default
",
"version": "0.1.5"
}
\ No newline at end of file
"version": "0.1.5"
}
\ No newline at end of file
diff --git
a/net.mograsim.logic.model.editor/components/GUImux2_4.json
b/net.mograsim.logic.model.editor/components/GUImux2_4.json
index
e5d6932
..
7d1342a
100644
(file)
--- a/
net.mograsim.logic.model.editor/components/GUImux2_4.json
+++ b/
net.mograsim.logic.model.editor/components/GUImux2_4.json
@@
-94,7
+94,7
@@
}
},
{
}
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUIMerger",
+ "id": "GUIMerger",
"name": "GUIMerger#0",
"pos": {
"x": 140.0,
"name": "GUIMerger#0",
"pos": {
"x": 140.0,
@@
-103,7
+103,7
@@
"params": 4
},
{
"params": 4
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUISplitter",
+ "id": "GUISplitter",
"name": "GUISplitter#0",
"pos": {
"x": 25.0,
"name": "GUISplitter#0",
"pos": {
"x": 25.0,
@@
-112,7
+112,7
@@
"params": 4
},
{
"params": 4
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUISplitter",
+ "id": "GUISplitter",
"name": "GUISplitter#1",
"pos": {
"x": 25.0,
"name": "GUISplitter#1",
"pos": {
"x": 25.0,
@@
-121,7
+121,7
@@
"params": 4
},
{
"params": 4
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUISplitter",
+ "id": "GUISplitter",
"name": "GUISplitter#2",
"pos": {
"x": 25.0,
"name": "GUISplitter#2",
"pos": {
"x": 25.0,
@@
-130,7
+130,7
@@
"params": 4
},
{
"params": 4
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUISplitter",
+ "id": "GUISplitter",
"name": "GUISplitter#3",
"pos": {
"x": 25.0,
"name": "GUISplitter#3",
"pos": {
"x": 25.0,
@@
-139,7
+139,7
@@
"params": 4
},
{
"params": 4
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#0",
"pos": {
"x": 19.0,
"name": "WireCrossPoint#0",
"pos": {
"x": 19.0,
@@
-686,7
+686,7
@@
],
"version": "0.1.1"
},
],
"version": "0.1.1"
},
- "symbolRendererSnippetID": "
class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "GUImux1_4",
"centerTextHeight": 5.0,
"symbolRendererParams": {
"centerText": "GUImux1_4",
"centerTextHeight": 5.0,
@@
-694,7
+694,7
@@
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
- "outlineRendererSnippetID": "
class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer
",
- "highLevelStateHandlerSnippetID": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.DefaultHighLevelStateHandler
",
+ "outlineRendererSnippetID": "
default
",
+ "highLevelStateHandlerSnippetID": "
default
",
"version": "0.1.5"
}
\ No newline at end of file
"version": "0.1.5"
}
\ No newline at end of file
diff --git
a/net.mograsim.logic.model.editor/components/GUImux3.json
b/net.mograsim.logic.model.editor/components/GUImux3.json
index
3058d7a
..
a27f5ca
100644
(file)
--- a/
net.mograsim.logic.model.editor/components/GUImux3.json
+++ b/
net.mograsim.logic.model.editor/components/GUImux3.json
@@
-139,7
+139,7
@@
}
},
{
}
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#0",
"pos": {
"x": 19.0,
"name": "WireCrossPoint#0",
"pos": {
"x": 19.0,
@@
-148,7
+148,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#1",
"pos": {
"x": 24.0,
"name": "WireCrossPoint#1",
"pos": {
"x": 24.0,
@@
-478,7
+478,7
@@
],
"version": "0.1.1"
},
],
"version": "0.1.1"
},
- "symbolRendererSnippetID": "
class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "GUImux3",
"centerTextHeight": 5.0,
"symbolRendererParams": {
"centerText": "GUImux3",
"centerTextHeight": 5.0,
@@
-486,7
+486,7
@@
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
- "outlineRendererSnippetID": "
class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer
",
- "highLevelStateHandlerSnippetID": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.DefaultHighLevelStateHandler
",
+ "outlineRendererSnippetID": "
default
",
+ "highLevelStateHandlerSnippetID": "
default
",
"version": "0.1.5"
}
\ No newline at end of file
"version": "0.1.5"
}
\ No newline at end of file
diff --git
a/net.mograsim.logic.model.editor/components/GUInand3.json
b/net.mograsim.logic.model.editor/components/GUInand3.json
index
d88e3e8
..
28b9a60
100644
(file)
--- a/
net.mograsim.logic.model.editor/components/GUInand3.json
+++ b/
net.mograsim.logic.model.editor/components/GUInand3.json
@@
-43,7
+43,7
@@
"submodel": {
"components": [
{
"submodel": {
"components": [
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#0",
"pos": {
"x": 10.0,
"name": "GUINandGate#0",
"pos": {
"x": 10.0,
@@
-52,7
+52,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#1",
"pos": {
"x": 35.0,
"name": "GUINandGate#1",
"pos": {
"x": 35.0,
@@
-61,7
+61,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#2",
"pos": {
"x": 62.5,
"name": "GUINandGate#2",
"pos": {
"x": 62.5,
@@
-70,7
+70,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#0",
"pos": {
"x": 31.5,
"name": "WireCrossPoint#0",
"pos": {
"x": 31.5,
@@
-205,7
+205,7
@@
],
"version": "0.1.1"
},
],
"version": "0.1.1"
},
- "symbolRendererSnippetID": "
class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "GUInand3",
"centerTextHeight": 5.0,
"symbolRendererParams": {
"centerText": "GUInand3",
"centerTextHeight": 5.0,
@@
-213,7
+213,7
@@
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
- "outlineRendererSnippetID": "
class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer
",
- "highLevelStateHandlerSnippetID": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.DefaultHighLevelStateHandler
",
+ "outlineRendererSnippetID": "
default
",
+ "highLevelStateHandlerSnippetID": "
default
",
"version": "0.1.5"
}
\ No newline at end of file
"version": "0.1.5"
}
\ No newline at end of file
diff --git
a/net.mograsim.logic.model.editor/components/GUInot4.json
b/net.mograsim.logic.model.editor/components/GUInot4.json
index
536a38d
..
b80166a
100644
(file)
--- a/
net.mograsim.logic.model.editor/components/GUInot4.json
+++ b/
net.mograsim.logic.model.editor/components/GUInot4.json
@@
-79,7
+79,7
@@
"submodel": {
"components": [
{
"submodel": {
"components": [
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#0",
"pos": {
"x": 30.0,
"name": "GUINandGate#0",
"pos": {
"x": 30.0,
@@
-88,7
+88,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#1",
"pos": {
"x": 30.0,
"name": "GUINandGate#1",
"pos": {
"x": 30.0,
@@
-97,7
+97,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#2",
"pos": {
"x": 30.0,
"name": "GUINandGate#2",
"pos": {
"x": 30.0,
@@
-106,7
+106,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#3",
"pos": {
"x": 30.0,
"name": "GUINandGate#3",
"pos": {
"x": 30.0,
@@
-115,7
+115,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#0",
"pos": {
"x": 14.0,
"name": "WireCrossPoint#0",
"pos": {
"x": 14.0,
@@
-124,7
+124,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#1",
"pos": {
"x": 14.0,
"name": "WireCrossPoint#1",
"pos": {
"x": 14.0,
@@
-133,7
+133,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#2",
"pos": {
"x": 14.0,
"name": "WireCrossPoint#2",
"pos": {
"x": 14.0,
@@
-142,7
+142,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#3",
"pos": {
"x": 14.0,
"name": "WireCrossPoint#3",
"pos": {
"x": 14.0,
@@
-387,7
+387,7
@@
],
"version": "0.1.1"
},
],
"version": "0.1.1"
},
- "symbolRendererSnippetID": "
class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "GUInot4",
"centerTextHeight": 5.0,
"symbolRendererParams": {
"centerText": "GUInot4",
"centerTextHeight": 5.0,
@@
-395,7
+395,7
@@
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
- "outlineRendererSnippetID": "
class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer
",
- "highLevelStateHandlerSnippetID": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.DefaultHighLevelStateHandler
",
+ "outlineRendererSnippetID": "
default
",
+ "highLevelStateHandlerSnippetID": "
default
",
"version": "0.1.5"
}
\ No newline at end of file
"version": "0.1.5"
}
\ No newline at end of file
diff --git
a/net.mograsim.logic.model.editor/components/GUIor4.json
b/net.mograsim.logic.model.editor/components/GUIor4.json
index
59ce75b
..
9b6e1bf
100644
(file)
--- a/
net.mograsim.logic.model.editor/components/GUIor4.json
+++ b/
net.mograsim.logic.model.editor/components/GUIor4.json
@@
-52,7
+52,7
@@
"submodel": {
"components": [
{
"submodel": {
"components": [
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#0",
"pos": {
"x": 20.0,
"name": "GUINandGate#0",
"pos": {
"x": 20.0,
@@
-61,7
+61,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#1",
"pos": {
"x": 20.0,
"name": "GUINandGate#1",
"pos": {
"x": 20.0,
@@
-70,7
+70,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#2",
"pos": {
"x": 20.0,
"name": "GUINandGate#2",
"pos": {
"x": 20.0,
@@
-79,7
+79,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#3",
"pos": {
"x": 20.0,
"name": "GUINandGate#3",
"pos": {
"x": 20.0,
@@
-88,7
+88,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#4",
"pos": {
"x": 50.0,
"name": "GUINandGate#4",
"pos": {
"x": 50.0,
@@
-97,7
+97,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#5",
"pos": {
"x": 50.0,
"name": "GUINandGate#5",
"pos": {
"x": 50.0,
@@
-106,7
+106,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#6",
"pos": {
"x": 110.0,
"name": "GUINandGate#6",
"pos": {
"x": 110.0,
@@
-115,7
+115,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#7",
"pos": {
"x": 110.0,
"name": "GUINandGate#7",
"pos": {
"x": 110.0,
@@
-124,7
+124,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#8",
"pos": {
"x": 140.0,
"name": "GUINandGate#8",
"pos": {
"x": 140.0,
@@
-133,7
+133,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#0",
"pos": {
"x": 14.0,
"name": "WireCrossPoint#0",
"pos": {
"x": 14.0,
@@
-142,7
+142,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#1",
"pos": {
"x": 14.0,
"name": "WireCrossPoint#1",
"pos": {
"x": 14.0,
@@
-151,7
+151,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#2",
"pos": {
"x": 14.0,
"name": "WireCrossPoint#2",
"pos": {
"x": 14.0,
@@
-160,7
+160,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#3",
"pos": {
"x": 14.0,
"name": "WireCrossPoint#3",
"pos": {
"x": 14.0,
@@
-169,7
+169,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#4",
"pos": {
"x": 104.0,
"name": "WireCrossPoint#4",
"pos": {
"x": 104.0,
@@
-178,7
+178,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#5",
"pos": {
"x": 104.0,
"name": "WireCrossPoint#5",
"pos": {
"x": 104.0,
@@
-544,7
+544,7
@@
],
"version": "0.1.1"
},
],
"version": "0.1.1"
},
- "symbolRendererSnippetID": "
class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "GUIor4",
"centerTextHeight": 5.0,
"symbolRendererParams": {
"centerText": "GUIor4",
"centerTextHeight": 5.0,
@@
-552,7
+552,7
@@
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
- "outlineRendererSnippetID": "
class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer
",
- "highLevelStateHandlerSnippetID": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.DefaultHighLevelStateHandler
",
+ "outlineRendererSnippetID": "
default
",
+ "highLevelStateHandlerSnippetID": "
default
",
"version": "0.1.5"
}
\ No newline at end of file
"version": "0.1.5"
}
\ No newline at end of file
diff --git
a/net.mograsim.logic.model.editor/components/GUIor_4.json
b/net.mograsim.logic.model.editor/components/GUIor_4.json
index
6701045
..
232a77f
100644
(file)
--- a/
net.mograsim.logic.model.editor/components/GUIor_4.json
+++ b/
net.mograsim.logic.model.editor/components/GUIor_4.json
@@
-115,7
+115,7
@@
"submodel": {
"components": [
{
"submodel": {
"components": [
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#0",
"pos": {
"x": 15.0,
"name": "GUINandGate#0",
"pos": {
"x": 15.0,
@@
-124,7
+124,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#1",
"pos": {
"x": 15.0,
"name": "GUINandGate#1",
"pos": {
"x": 15.0,
@@
-133,7
+133,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#10",
"pos": {
"x": 65.0,
"name": "GUINandGate#10",
"pos": {
"x": 65.0,
@@
-142,7
+142,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#11",
"pos": {
"x": 65.0,
"name": "GUINandGate#11",
"pos": {
"x": 65.0,
@@
-151,7
+151,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#2",
"pos": {
"x": 15.0,
"name": "GUINandGate#2",
"pos": {
"x": 15.0,
@@
-160,7
+160,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#3",
"pos": {
"x": 15.0,
"name": "GUINandGate#3",
"pos": {
"x": 15.0,
@@
-169,7
+169,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#4",
"pos": {
"x": 15.0,
"name": "GUINandGate#4",
"pos": {
"x": 15.0,
@@
-178,7
+178,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#5",
"pos": {
"x": 15.0,
"name": "GUINandGate#5",
"pos": {
"x": 15.0,
@@
-187,7
+187,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#6",
"pos": {
"x": 15.0,
"name": "GUINandGate#6",
"pos": {
"x": 15.0,
@@
-196,7
+196,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#7",
"pos": {
"x": 15.0,
"name": "GUINandGate#7",
"pos": {
"x": 15.0,
@@
-205,7
+205,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#8",
"pos": {
"x": 65.0,
"name": "GUINandGate#8",
"pos": {
"x": 65.0,
@@
-214,7
+214,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#9",
"pos": {
"x": 65.0,
"name": "GUINandGate#9",
"pos": {
"x": 65.0,
@@
-223,7
+223,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#0",
"pos": {
"x": 6.5,
"name": "WireCrossPoint#0",
"pos": {
"x": 6.5,
@@
-232,7
+232,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#1",
"pos": {
"x": 6.5,
"name": "WireCrossPoint#1",
"pos": {
"x": 6.5,
@@
-241,7
+241,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#2",
"pos": {
"x": 6.5,
"name": "WireCrossPoint#2",
"pos": {
"x": 6.5,
@@
-250,7
+250,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#3",
"pos": {
"x": 6.5,
"name": "WireCrossPoint#3",
"pos": {
"x": 6.5,
@@
-259,7
+259,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#4",
"pos": {
"x": 6.5,
"name": "WireCrossPoint#4",
"pos": {
"x": 6.5,
@@
-268,7
+268,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#5",
"pos": {
"x": 6.5,
"name": "WireCrossPoint#5",
"pos": {
"x": 6.5,
@@
-277,7
+277,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#6",
"pos": {
"x": 6.5,
"name": "WireCrossPoint#6",
"pos": {
"x": 6.5,
@@
-286,7
+286,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#7",
"pos": {
"x": 6.5,
"name": "WireCrossPoint#7",
"pos": {
"x": 6.5,
@@
-883,7
+883,7
@@
],
"version": "0.1.1"
},
],
"version": "0.1.1"
},
- "symbolRendererSnippetID": "
class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "GUIor_4",
"centerTextHeight": 5.0,
"symbolRendererParams": {
"centerText": "GUIor_4",
"centerTextHeight": 5.0,
@@
-891,7
+891,7
@@
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
- "outlineRendererSnippetID": "
class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer
",
- "highLevelStateHandlerSnippetID": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.DefaultHighLevelStateHandler
",
+ "outlineRendererSnippetID": "
default
",
+ "highLevelStateHandlerSnippetID": "
default
",
"version": "0.1.5"
}
\ No newline at end of file
"version": "0.1.5"
}
\ No newline at end of file
diff --git
a/net.mograsim.logic.model.editor/components/GUIram2.json
b/net.mograsim.logic.model.editor/components/GUIram2.json
index
a5637f1
..
6322110
100644
(file)
--- a/
net.mograsim.logic.model.editor/components/GUIram2.json
+++ b/
net.mograsim.logic.model.editor/components/GUIram2.json
@@
-280,7
+280,7
@@
}
},
{
}
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#0",
"pos": {
"x": 109.0,
"name": "WireCrossPoint#0",
"pos": {
"x": 109.0,
@@
-289,7
+289,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#1",
"pos": {
"x": 104.0,
"name": "WireCrossPoint#1",
"pos": {
"x": 104.0,
@@
-298,7
+298,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#10",
"pos": {
"x": 44.0,
"name": "WireCrossPoint#10",
"pos": {
"x": 44.0,
@@
-307,7
+307,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#11",
"pos": {
"x": 49.0,
"name": "WireCrossPoint#11",
"pos": {
"x": 49.0,
@@
-316,7
+316,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#12",
"pos": {
"x": 34.0,
"name": "WireCrossPoint#12",
"pos": {
"x": 34.0,
@@
-325,7
+325,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#13",
"pos": {
"x": 39.0,
"name": "WireCrossPoint#13",
"pos": {
"x": 39.0,
@@
-334,7
+334,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#14",
"pos": {
"x": 44.0,
"name": "WireCrossPoint#14",
"pos": {
"x": 44.0,
@@
-343,7
+343,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#15",
"pos": {
"x": 49.0,
"name": "WireCrossPoint#15",
"pos": {
"x": 49.0,
@@
-352,7
+352,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#16",
"pos": {
"x": 129.0,
"name": "WireCrossPoint#16",
"pos": {
"x": 129.0,
@@
-361,7
+361,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#17",
"pos": {
"x": 124.0,
"name": "WireCrossPoint#17",
"pos": {
"x": 124.0,
@@
-370,7
+370,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#18",
"pos": {
"x": 119.0,
"name": "WireCrossPoint#18",
"pos": {
"x": 119.0,
@@
-379,7
+379,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#19",
"pos": {
"x": 114.0,
"name": "WireCrossPoint#19",
"pos": {
"x": 114.0,
@@
-388,7
+388,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#2",
"pos": {
"x": 99.0,
"name": "WireCrossPoint#2",
"pos": {
"x": 99.0,
@@
-397,7
+397,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#20",
"pos": {
"x": 129.0,
"name": "WireCrossPoint#20",
"pos": {
"x": 129.0,
@@
-406,7
+406,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#21",
"pos": {
"x": 124.0,
"name": "WireCrossPoint#21",
"pos": {
"x": 124.0,
@@
-415,7
+415,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#22",
"pos": {
"x": 119.0,
"name": "WireCrossPoint#22",
"pos": {
"x": 119.0,
@@
-424,7
+424,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#23",
"pos": {
"x": 114.0,
"name": "WireCrossPoint#23",
"pos": {
"x": 114.0,
@@
-433,7
+433,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#24",
"pos": {
"x": 129.0,
"name": "WireCrossPoint#24",
"pos": {
"x": 129.0,
@@
-442,7
+442,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#25",
"pos": {
"x": 124.0,
"name": "WireCrossPoint#25",
"pos": {
"x": 124.0,
@@
-451,7
+451,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#26",
"pos": {
"x": 119.0,
"name": "WireCrossPoint#26",
"pos": {
"x": 119.0,
@@
-460,7
+460,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#27",
"pos": {
"x": 114.0,
"name": "WireCrossPoint#27",
"pos": {
"x": 114.0,
@@
-469,7
+469,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#28",
"pos": {
"x": 129.0,
"name": "WireCrossPoint#28",
"pos": {
"x": 129.0,
@@
-478,7
+478,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#29",
"pos": {
"x": 124.0,
"name": "WireCrossPoint#29",
"pos": {
"x": 124.0,
@@
-487,7
+487,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#3",
"pos": {
"x": 94.0,
"name": "WireCrossPoint#3",
"pos": {
"x": 94.0,
@@
-496,7
+496,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#30",
"pos": {
"x": 119.0,
"name": "WireCrossPoint#30",
"pos": {
"x": 119.0,
@@
-505,7
+505,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#31",
"pos": {
"x": 114.0,
"name": "WireCrossPoint#31",
"pos": {
"x": 114.0,
@@
-514,7
+514,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#4",
"pos": {
"x": 34.0,
"name": "WireCrossPoint#4",
"pos": {
"x": 34.0,
@@
-523,7
+523,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#5",
"pos": {
"x": 39.0,
"name": "WireCrossPoint#5",
"pos": {
"x": 39.0,
@@
-532,7
+532,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#6",
"pos": {
"x": 44.0,
"name": "WireCrossPoint#6",
"pos": {
"x": 44.0,
@@
-541,7
+541,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#7",
"pos": {
"x": 49.0,
"name": "WireCrossPoint#7",
"pos": {
"x": 49.0,
@@
-550,7
+550,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#8",
"pos": {
"x": 34.0,
"name": "WireCrossPoint#8",
"pos": {
"x": 34.0,
@@
-559,7
+559,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#9",
"pos": {
"x": 39.0,
"name": "WireCrossPoint#9",
"pos": {
"x": 39.0,
@@
-2968,7
+2968,7
@@
],
"version": "0.1.1"
},
],
"version": "0.1.1"
},
- "symbolRendererSnippetID": "
class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "GUIram2",
"centerTextHeight": 5.0,
"symbolRendererParams": {
"centerText": "GUIram2",
"centerTextHeight": 5.0,
@@
-2976,30
+2976,30
@@
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
- "outlineRendererSnippetID": "
class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer
",
- "highLevelStateHandlerSnippetID": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.StandardHighLevelStateHandler
",
+ "outlineRendererSnippetID": "
default
",
+ "highLevelStateHandlerSnippetID": "
standard
",
"highLevelStateHandlerParams": {
"subcomponentHighLevelStates": {
"c00": {
"highLevelStateHandlerParams": {
"subcomponentHighLevelStates": {
"c00": {
- "id": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler
",
+ "id": "
delegating
",
"params": {
"delegateTarget": "GUIdlatch4#0"
}
},
"c11": {
"params": {
"delegateTarget": "GUIdlatch4#0"
}
},
"c11": {
- "id": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler
",
+ "id": "
delegating
",
"params": {
"delegateTarget": "GUIdlatch4#3"
}
},
"c10": {
"params": {
"delegateTarget": "GUIdlatch4#3"
}
},
"c10": {
- "id": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler
",
+ "id": "
delegating
",
"params": {
"delegateTarget": "GUIdlatch4#2"
}
},
"c01": {
"params": {
"delegateTarget": "GUIdlatch4#2"
}
},
"c01": {
- "id": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler
",
+ "id": "
delegating
",
"params": {
"delegateTarget": "GUIdlatch4#1"
}
"params": {
"delegateTarget": "GUIdlatch4#1"
}
@@
-3007,7
+3007,7
@@
},
"atomicHighLevelStates": {
"q": {
},
"atomicHighLevelStates": {
"q": {
- "id": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.BitVectorSplittingAtomicHighLevelStateHandler
",
+ "id": "
bitVectorSplitting
",
"params": {
"vectorPartTargets": [
"c11.q",
"params": {
"vectorPartTargets": [
"c11.q",
diff --git
a/net.mograsim.logic.model.editor/components/GUIram4.json
b/net.mograsim.logic.model.editor/components/GUIram4.json
index
527fc35
..
55ddef8
100644
(file)
--- a/
net.mograsim.logic.model.editor/components/GUIram4.json
+++ b/
net.mograsim.logic.model.editor/components/GUIram4.json
@@
-316,7
+316,7
@@
}
},
{
}
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#0",
"pos": {
"x": 229.0,
"name": "WireCrossPoint#0",
"pos": {
"x": 229.0,
@@
-325,7
+325,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#1",
"pos": {
"x": 224.0,
"name": "WireCrossPoint#1",
"pos": {
"x": 224.0,
@@
-334,7
+334,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#10",
"pos": {
"x": 69.0,
"name": "WireCrossPoint#10",
"pos": {
"x": 69.0,
@@
-343,7
+343,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#11",
"pos": {
"x": 74.0,
"name": "WireCrossPoint#11",
"pos": {
"x": 74.0,
@@
-352,7
+352,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#12",
"pos": {
"x": 59.0,
"name": "WireCrossPoint#12",
"pos": {
"x": 59.0,
@@
-361,7
+361,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#13",
"pos": {
"x": 64.0,
"name": "WireCrossPoint#13",
"pos": {
"x": 64.0,
@@
-370,7
+370,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#14",
"pos": {
"x": 69.0,
"name": "WireCrossPoint#14",
"pos": {
"x": 69.0,
@@
-379,7
+379,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#15",
"pos": {
"x": 74.0,
"name": "WireCrossPoint#15",
"pos": {
"x": 74.0,
@@
-388,7
+388,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#16",
"pos": {
"x": 39.0,
"name": "WireCrossPoint#16",
"pos": {
"x": 39.0,
@@
-397,7
+397,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#17",
"pos": {
"x": 44.0,
"name": "WireCrossPoint#17",
"pos": {
"x": 44.0,
@@
-406,7
+406,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#18",
"pos": {
"x": 49.0,
"name": "WireCrossPoint#18",
"pos": {
"x": 49.0,
@@
-415,7
+415,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#19",
"pos": {
"x": 54.0,
"name": "WireCrossPoint#19",
"pos": {
"x": 54.0,
@@
-424,7
+424,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#2",
"pos": {
"x": 219.0,
"name": "WireCrossPoint#2",
"pos": {
"x": 219.0,
@@
-433,7
+433,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#20",
"pos": {
"x": 39.0,
"name": "WireCrossPoint#20",
"pos": {
"x": 39.0,
@@
-442,7
+442,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#21",
"pos": {
"x": 44.0,
"name": "WireCrossPoint#21",
"pos": {
"x": 44.0,
@@
-451,7
+451,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#22",
"pos": {
"x": 49.0,
"name": "WireCrossPoint#22",
"pos": {
"x": 49.0,
@@
-460,7
+460,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#23",
"pos": {
"x": 54.0,
"name": "WireCrossPoint#23",
"pos": {
"x": 54.0,
@@
-469,7
+469,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#24",
"pos": {
"x": 39.0,
"name": "WireCrossPoint#24",
"pos": {
"x": 39.0,
@@
-478,7
+478,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#25",
"pos": {
"x": 44.0,
"name": "WireCrossPoint#25",
"pos": {
"x": 44.0,
@@
-487,7
+487,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#26",
"pos": {
"x": 49.0,
"name": "WireCrossPoint#26",
"pos": {
"x": 49.0,
@@
-496,7
+496,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#27",
"pos": {
"x": 54.0,
"name": "WireCrossPoint#27",
"pos": {
"x": 54.0,
@@
-505,7
+505,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#3",
"pos": {
"x": 214.0,
"name": "WireCrossPoint#3",
"pos": {
"x": 214.0,
@@
-514,7
+514,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#4",
"pos": {
"x": 59.0,
"name": "WireCrossPoint#4",
"pos": {
"x": 59.0,
@@
-523,7
+523,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#5",
"pos": {
"x": 64.0,
"name": "WireCrossPoint#5",
"pos": {
"x": 64.0,
@@
-532,7
+532,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#6",
"pos": {
"x": 69.0,
"name": "WireCrossPoint#6",
"pos": {
"x": 69.0,
@@
-541,7
+541,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#7",
"pos": {
"x": 74.0,
"name": "WireCrossPoint#7",
"pos": {
"x": 74.0,
@@
-550,7
+550,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#8",
"pos": {
"x": 59.0,
"name": "WireCrossPoint#8",
"pos": {
"x": 59.0,
@@
-559,7
+559,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#9",
"pos": {
"x": 64.0,
"name": "WireCrossPoint#9",
"pos": {
"x": 64.0,
@@
-3352,7
+3352,7
@@
],
"version": "0.1.1"
},
],
"version": "0.1.1"
},
- "symbolRendererSnippetID": "
class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "GUIram4",
"centerTextHeight": 5.0,
"symbolRendererParams": {
"centerText": "GUIram4",
"centerTextHeight": 5.0,
@@
-3360,141
+3360,141
@@
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
- "outlineRendererSnippetID": "
class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer
",
- "highLevelStateHandlerSnippetID": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.StandardHighLevelStateHandler
",
+ "outlineRendererSnippetID": "
default
",
+ "highLevelStateHandlerSnippetID": "
standard
",
"highLevelStateHandlerParams": {
"subcomponentHighLevelStates": {
"c00": {
"highLevelStateHandlerParams": {
"subcomponentHighLevelStates": {
"c00": {
- "id": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler
",
+ "id": "
delegating
",
"params": {
"delegateTarget": "GUIram2#0"
}
},
"c11": {
"params": {
"delegateTarget": "GUIram2#0"
}
},
"c11": {
- "id": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler
",
+ "id": "
delegating
",
"params": {
"delegateTarget": "GUIram2#3"
}
},
"c10": {
"params": {
"delegateTarget": "GUIram2#3"
}
},
"c10": {
- "id": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler
",
+ "id": "
delegating
",
"params": {
"delegateTarget": "GUIram2#2"
}
},
"c01": {
"params": {
"delegateTarget": "GUIram2#2"
}
},
"c01": {
- "id": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler
",
+ "id": "
delegating
",
"params": {
"delegateTarget": "GUIram2#1"
}
},
"c1000": {
"params": {
"delegateTarget": "GUIram2#1"
}
},
"c1000": {
- "id": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler
",
+ "id": "
delegating
",
"params": {
"delegateTarget": "GUIram2#0",
"prefix": "c10"
}
},
"c1011": {
"params": {
"delegateTarget": "GUIram2#0",
"prefix": "c10"
}
},
"c1011": {
- "id": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler
",
+ "id": "
delegating
",
"params": {
"delegateTarget": "GUIram2#3",
"prefix": "c10"
}
},
"c1110": {
"params": {
"delegateTarget": "GUIram2#3",
"prefix": "c10"
}
},
"c1110": {
- "id": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler
",
+ "id": "
delegating
",
"params": {
"delegateTarget": "GUIram2#2",
"prefix": "c11"
}
},
"c1001": {
"params": {
"delegateTarget": "GUIram2#2",
"prefix": "c11"
}
},
"c1001": {
- "id": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler
",
+ "id": "
delegating
",
"params": {
"delegateTarget": "GUIram2#1",
"prefix": "c10"
}
},
"c1100": {
"params": {
"delegateTarget": "GUIram2#1",
"prefix": "c10"
}
},
"c1100": {
- "id": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler
",
+ "id": "
delegating
",
"params": {
"delegateTarget": "GUIram2#0",
"prefix": "c11"
}
},
"c1111": {
"params": {
"delegateTarget": "GUIram2#0",
"prefix": "c11"
}
},
"c1111": {
- "id": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler
",
+ "id": "
delegating
",
"params": {
"delegateTarget": "GUIram2#3",
"prefix": "c11"
}
},
"c0000": {
"params": {
"delegateTarget": "GUIram2#3",
"prefix": "c11"
}
},
"c0000": {
- "id": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler
",
+ "id": "
delegating
",
"params": {
"delegateTarget": "GUIram2#0",
"prefix": "c00"
}
},
"c0011": {
"params": {
"delegateTarget": "GUIram2#0",
"prefix": "c00"
}
},
"c0011": {
- "id": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler
",
+ "id": "
delegating
",
"params": {
"delegateTarget": "GUIram2#3",
"prefix": "c00"
}
},
"c0110": {
"params": {
"delegateTarget": "GUIram2#3",
"prefix": "c00"
}
},
"c0110": {
- "id": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler
",
+ "id": "
delegating
",
"params": {
"delegateTarget": "GUIram2#2",
"prefix": "c01"
}
},
"c0010": {
"params": {
"delegateTarget": "GUIram2#2",
"prefix": "c01"
}
},
"c0010": {
- "id": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler
",
+ "id": "
delegating
",
"params": {
"delegateTarget": "GUIram2#2",
"prefix": "c00"
}
},
"c1010": {
"params": {
"delegateTarget": "GUIram2#2",
"prefix": "c00"
}
},
"c1010": {
- "id": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler
",
+ "id": "
delegating
",
"params": {
"delegateTarget": "GUIram2#2",
"prefix": "c10"
}
},
"c0101": {
"params": {
"delegateTarget": "GUIram2#2",
"prefix": "c10"
}
},
"c0101": {
- "id": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler
",
+ "id": "
delegating
",
"params": {
"delegateTarget": "GUIram2#1",
"prefix": "c01"
}
},
"c0001": {
"params": {
"delegateTarget": "GUIram2#1",
"prefix": "c01"
}
},
"c0001": {
- "id": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler
",
+ "id": "
delegating
",
"params": {
"delegateTarget": "GUIram2#1",
"prefix": "c00"
}
},
"c0100": {
"params": {
"delegateTarget": "GUIram2#1",
"prefix": "c00"
}
},
"c0100": {
- "id": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler
",
+ "id": "
delegating
",
"params": {
"delegateTarget": "GUIram2#0",
"prefix": "c01"
}
},
"c0111": {
"params": {
"delegateTarget": "GUIram2#0",
"prefix": "c01"
}
},
"c0111": {
- "id": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler
",
+ "id": "
delegating
",
"params": {
"delegateTarget": "GUIram2#3",
"prefix": "c01"
}
},
"c1101": {
"params": {
"delegateTarget": "GUIram2#3",
"prefix": "c01"
}
},
"c1101": {
- "id": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler
",
+ "id": "
delegating
",
"params": {
"delegateTarget": "GUIram2#1",
"prefix": "c11"
"params": {
"delegateTarget": "GUIram2#1",
"prefix": "c11"
@@
-3503,7
+3503,7
@@
},
"atomicHighLevelStates": {
"q": {
},
"atomicHighLevelStates": {
"q": {
- "id": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.BitVectorSplittingAtomicHighLevelStateHandler
",
+ "id": "
bitVectorSplitting
",
"params": {
"vectorPartTargets": [
"c11.q",
"params": {
"vectorPartTargets": [
"c11.q",
diff --git
a/net.mograsim.logic.model.editor/components/GUIsel1.json
b/net.mograsim.logic.model.editor/components/GUIsel1.json
index
50c7005
..
093657b
100644
(file)
--- a/
net.mograsim.logic.model.editor/components/GUIsel1.json
+++ b/
net.mograsim.logic.model.editor/components/GUIsel1.json
@@
-52,7
+52,7
@@
"submodel": {
"components": [
{
"submodel": {
"components": [
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#1",
"pos": {
"x": 35.0,
"name": "GUINandGate#1",
"pos": {
"x": 35.0,
@@
-61,7
+61,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#2",
"pos": {
"x": 35.0,
"name": "GUINandGate#2",
"pos": {
"x": 35.0,
@@
-70,7
+70,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#3",
"pos": {
"x": 60.0,
"name": "GUINandGate#3",
"pos": {
"x": 60.0,
@@
-200,7
+200,7
@@
],
"version": "0.1.1"
},
],
"version": "0.1.1"
},
- "symbolRendererSnippetID": "
class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "GUIsel1",
"centerTextHeight": 5.0,
"symbolRendererParams": {
"centerText": "GUIsel1",
"centerTextHeight": 5.0,
@@
-208,7
+208,7
@@
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
- "outlineRendererSnippetID": "
class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer
",
- "highLevelStateHandlerSnippetID": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.DefaultHighLevelStateHandler
",
+ "outlineRendererSnippetID": "
default
",
+ "highLevelStateHandlerSnippetID": "
default
",
"version": "0.1.5"
}
\ No newline at end of file
"version": "0.1.5"
}
\ No newline at end of file
diff --git
a/net.mograsim.logic.model.editor/components/GUIsel2_4.json
b/net.mograsim.logic.model.editor/components/GUIsel2_4.json
index
f84c205
..
a9234a2
100644
(file)
--- a/
net.mograsim.logic.model.editor/components/GUIsel2_4.json
+++ b/
net.mograsim.logic.model.editor/components/GUIsel2_4.json
@@
-133,7
+133,7
@@
"submodel": {
"components": [
{
"submodel": {
"components": [
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#0",
"pos": {
"x": 20.0,
"name": "GUINandGate#0",
"pos": {
"x": 20.0,
@@
-142,7
+142,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#1",
"pos": {
"x": 20.0,
"name": "GUINandGate#1",
"pos": {
"x": 20.0,
@@
-151,7
+151,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#10",
"pos": {
"x": 65.0,
"name": "GUINandGate#10",
"pos": {
"x": 65.0,
@@
-160,7
+160,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#11",
"pos": {
"x": 65.0,
"name": "GUINandGate#11",
"pos": {
"x": 65.0,
@@
-169,7
+169,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#2",
"pos": {
"x": 20.0,
"name": "GUINandGate#2",
"pos": {
"x": 20.0,
@@
-178,7
+178,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#3",
"pos": {
"x": 20.0,
"name": "GUINandGate#3",
"pos": {
"x": 20.0,
@@
-187,7
+187,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#4",
"pos": {
"x": 20.0,
"name": "GUINandGate#4",
"pos": {
"x": 20.0,
@@
-196,7
+196,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#5",
"pos": {
"x": 20.0,
"name": "GUINandGate#5",
"pos": {
"x": 20.0,
@@
-205,7
+205,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#6",
"pos": {
"x": 20.0,
"name": "GUINandGate#6",
"pos": {
"x": 20.0,
@@
-214,7
+214,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#7",
"pos": {
"x": 20.0,
"name": "GUINandGate#7",
"pos": {
"x": 20.0,
@@
-223,7
+223,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#8",
"pos": {
"x": 65.0,
"name": "GUINandGate#8",
"pos": {
"x": 65.0,
@@
-232,7
+232,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#9",
"pos": {
"x": 65.0,
"name": "GUINandGate#9",
"pos": {
"x": 65.0,
@@
-241,7
+241,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#0",
"pos": {
"x": 6.5,
"name": "WireCrossPoint#0",
"pos": {
"x": 6.5,
@@
-250,7
+250,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#1",
"pos": {
"x": 6.5,
"name": "WireCrossPoint#1",
"pos": {
"x": 6.5,
@@
-259,7
+259,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#2",
"pos": {
"x": 6.5,
"name": "WireCrossPoint#2",
"pos": {
"x": 6.5,
@@
-268,7
+268,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#3",
"pos": {
"x": 4.0,
"name": "WireCrossPoint#3",
"pos": {
"x": 4.0,
@@
-277,7
+277,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#4",
"pos": {
"x": 4.0,
"name": "WireCrossPoint#4",
"pos": {
"x": 4.0,
@@
-286,7
+286,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#5",
"pos": {
"x": 4.0,
"name": "WireCrossPoint#5",
"pos": {
"x": 4.0,
@@
-849,7
+849,7
@@
],
"version": "0.1.1"
},
],
"version": "0.1.1"
},
- "symbolRendererSnippetID": "
class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "GUIsel2_4",
"centerTextHeight": 5.0,
"symbolRendererParams": {
"centerText": "GUIsel2_4",
"centerTextHeight": 5.0,
@@
-857,7
+857,7
@@
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
- "outlineRendererSnippetID": "
class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer
",
- "highLevelStateHandlerSnippetID": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.DefaultHighLevelStateHandler
",
+ "outlineRendererSnippetID": "
default
",
+ "highLevelStateHandlerSnippetID": "
default
",
"version": "0.1.5"
}
\ No newline at end of file
"version": "0.1.5"
}
\ No newline at end of file
diff --git
a/net.mograsim.logic.model.editor/components/GUIsel3_4.json
b/net.mograsim.logic.model.editor/components/GUIsel3_4.json
index
951c0e8
..
5951bdc
100644
(file)
--- a/
net.mograsim.logic.model.editor/components/GUIsel3_4.json
+++ b/
net.mograsim.logic.model.editor/components/GUIsel3_4.json
@@
-178,7
+178,7
@@
"submodel": {
"components": [
{
"submodel": {
"components": [
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#0",
"pos": {
"x": 50.0,
"name": "GUINandGate#0",
"pos": {
"x": 50.0,
@@
-187,7
+187,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#1",
"pos": {
"x": 50.0,
"name": "GUINandGate#1",
"pos": {
"x": 50.0,
@@
-196,7
+196,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#2",
"pos": {
"x": 50.0,
"name": "GUINandGate#2",
"pos": {
"x": 50.0,
@@
-205,7
+205,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#3",
"pos": {
"x": 50.0,
"name": "GUINandGate#3",
"pos": {
"x": 50.0,
@@
-214,7
+214,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#4",
"pos": {
"x": 152.5,
"name": "GUINandGate#4",
"pos": {
"x": 152.5,
@@
-223,7
+223,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#5",
"pos": {
"x": 152.5,
"name": "GUINandGate#5",
"pos": {
"x": 152.5,
@@
-232,7
+232,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#6",
"pos": {
"x": 152.5,
"name": "GUINandGate#6",
"pos": {
"x": 152.5,
@@
-241,7
+241,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#7",
"pos": {
"x": 152.5,
"name": "GUINandGate#7",
"pos": {
"x": 152.5,
@@
-266,7
+266,7
@@
}
},
{
}
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#0",
"pos": {
"x": 29.0,
"name": "WireCrossPoint#0",
"pos": {
"x": 29.0,
@@
-275,7
+275,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#1",
"pos": {
"x": 29.0,
"name": "WireCrossPoint#1",
"pos": {
"x": 29.0,
@@
-284,7
+284,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#2",
"pos": {
"x": 29.0,
"name": "WireCrossPoint#2",
"pos": {
"x": 29.0,
@@
-923,7
+923,7
@@
],
"version": "0.1.1"
},
],
"version": "0.1.1"
},
- "symbolRendererSnippetID": "
class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "GUIsel3_4",
"centerTextHeight": 5.0,
"symbolRendererParams": {
"centerText": "GUIsel3_4",
"centerTextHeight": 5.0,
@@
-931,7
+931,7
@@
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
- "outlineRendererSnippetID": "
class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer
",
- "highLevelStateHandlerSnippetID": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.DefaultHighLevelStateHandler
",
+ "outlineRendererSnippetID": "
default
",
+ "highLevelStateHandlerSnippetID": "
default
",
"version": "0.1.5"
}
\ No newline at end of file
"version": "0.1.5"
}
\ No newline at end of file
diff --git
a/net.mograsim.logic.model.editor/components/GUIxor.json
b/net.mograsim.logic.model.editor/components/GUIxor.json
index
d6c8de1
..
48c22e5
100644
(file)
--- a/
net.mograsim.logic.model.editor/components/GUIxor.json
+++ b/
net.mograsim.logic.model.editor/components/GUIxor.json
@@
-34,7
+34,7
@@
"submodel": {
"components": [
{
"submodel": {
"components": [
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#0",
"pos": {
"x": 7.5,
"name": "GUINandGate#0",
"pos": {
"x": 7.5,
@@
-43,7
+43,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#1",
"pos": {
"x": 35.0,
"name": "GUINandGate#1",
"pos": {
"x": 35.0,
@@
-52,7
+52,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#2",
"pos": {
"x": 35.0,
"name": "GUINandGate#2",
"pos": {
"x": 35.0,
@@
-61,7
+61,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#3",
"pos": {
"x": 62.5,
"name": "GUINandGate#3",
"pos": {
"x": 62.5,
@@
-70,7
+70,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#0",
"pos": {
"x": 4.0,
"name": "WireCrossPoint#0",
"pos": {
"x": 4.0,
@@
-79,7
+79,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#1",
"pos": {
"x": 4.0,
"name": "WireCrossPoint#1",
"pos": {
"x": 4.0,
@@
-88,7
+88,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#2",
"pos": {
"x": 29.0,
"name": "WireCrossPoint#2",
"pos": {
"x": 29.0,
@@
-271,7
+271,7
@@
],
"version": "0.1.1"
},
],
"version": "0.1.1"
},
- "symbolRendererSnippetID": "
class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "GUIxor",
"centerTextHeight": 5.0,
"symbolRendererParams": {
"centerText": "GUIxor",
"centerTextHeight": 5.0,
@@
-279,7
+279,7
@@
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
- "outlineRendererSnippetID": "
class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer
",
- "highLevelStateHandlerSnippetID": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.DefaultHighLevelStateHandler
",
+ "outlineRendererSnippetID": "
default
",
+ "highLevelStateHandlerSnippetID": "
default
",
"version": "0.1.5"
}
\ No newline at end of file
"version": "0.1.5"
}
\ No newline at end of file
diff --git
a/net.mograsim.logic.model.editor/components/am2901/GUIAm2901.json
b/net.mograsim.logic.model.editor/components/am2901/GUIAm2901.json
index
ed2ced9
..
64f12af
100644
(file)
--- a/
net.mograsim.logic.model.editor/components/am2901/GUIAm2901.json
+++ b/
net.mograsim.logic.model.editor/components/am2901/GUIAm2901.json
@@
-374,7
+374,7
@@
}
},
{
}
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#0",
"pos": {
"x": 160.0,
"name": "GUINandGate#0",
"pos": {
"x": 160.0,
@@
-383,7
+383,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#1",
"pos": {
"x": 320.0,
"name": "GUINandGate#1",
"pos": {
"x": 320.0,
@@
-464,7
+464,7
@@
}
},
{
}
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#0",
"pos": {
"x": 154.0,
"name": "WireCrossPoint#0",
"pos": {
"x": 154.0,
@@
-473,7
+473,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#1",
"pos": {
"x": 154.0,
"name": "WireCrossPoint#1",
"pos": {
"x": 154.0,
@@
-482,7
+482,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#10",
"pos": {
"x": 234.0,
"name": "WireCrossPoint#10",
"pos": {
"x": 234.0,
@@
-491,7
+491,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#11",
"pos": {
"x": 129.0,
"name": "WireCrossPoint#11",
"pos": {
"x": 129.0,
@@
-500,7
+500,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#12",
"pos": {
"x": 134.0,
"name": "WireCrossPoint#12",
"pos": {
"x": 134.0,
@@
-509,7
+509,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#13",
"pos": {
"x": 139.0,
"name": "WireCrossPoint#13",
"pos": {
"x": 139.0,
@@
-518,7
+518,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#14",
"pos": {
"x": 144.0,
"name": "WireCrossPoint#14",
"pos": {
"x": 144.0,
@@
-527,7
+527,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#15",
"pos": {
"x": 219.0,
"name": "WireCrossPoint#15",
"pos": {
"x": 219.0,
@@
-536,7
+536,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#16",
"pos": {
"x": 234.0,
"name": "WireCrossPoint#16",
"pos": {
"x": 234.0,
@@
-545,7
+545,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#17",
"pos": {
"x": 34.0,
"name": "WireCrossPoint#17",
"pos": {
"x": 34.0,
@@
-554,7
+554,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#18",
"pos": {
"x": 39.0,
"name": "WireCrossPoint#18",
"pos": {
"x": 39.0,
@@
-563,7
+563,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#19",
"pos": {
"x": 279.0,
"name": "WireCrossPoint#19",
"pos": {
"x": 279.0,
@@
-572,7
+572,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#2",
"pos": {
"x": 154.0,
"name": "WireCrossPoint#2",
"pos": {
"x": 154.0,
@@
-581,7
+581,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#20",
"pos": {
"x": 294.0,
"name": "WireCrossPoint#20",
"pos": {
"x": 294.0,
@@
-590,7
+590,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#21",
"pos": {
"x": 329.0,
"name": "WireCrossPoint#21",
"pos": {
"x": 329.0,
@@
-599,7
+599,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#22",
"pos": {
"x": 254.0,
"name": "WireCrossPoint#22",
"pos": {
"x": 254.0,
@@
-608,7
+608,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#23",
"pos": {
"x": 259.0,
"name": "WireCrossPoint#23",
"pos": {
"x": 259.0,
@@
-617,7
+617,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#24",
"pos": {
"x": 264.0,
"name": "WireCrossPoint#24",
"pos": {
"x": 264.0,
@@
-626,7
+626,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#25",
"pos": {
"x": 269.0,
"name": "WireCrossPoint#25",
"pos": {
"x": 269.0,
@@
-635,7
+635,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#26",
"pos": {
"x": 254.0,
"name": "WireCrossPoint#26",
"pos": {
"x": 254.0,
@@
-644,7
+644,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#27",
"pos": {
"x": 259.0,
"name": "WireCrossPoint#27",
"pos": {
"x": 259.0,
@@
-653,7
+653,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#28",
"pos": {
"x": 264.0,
"name": "WireCrossPoint#28",
"pos": {
"x": 264.0,
@@
-662,7
+662,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#29",
"pos": {
"x": 269.0,
"name": "WireCrossPoint#29",
"pos": {
"x": 269.0,
@@
-671,7
+671,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#3",
"pos": {
"x": 154.0,
"name": "WireCrossPoint#3",
"pos": {
"x": 154.0,
@@
-680,7
+680,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#30",
"pos": {
"x": 9.0,
"name": "WireCrossPoint#30",
"pos": {
"x": 9.0,
@@
-689,7
+689,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#31",
"pos": {
"x": 14.0,
"name": "WireCrossPoint#31",
"pos": {
"x": 14.0,
@@
-698,7
+698,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#32",
"pos": {
"x": 19.0,
"name": "WireCrossPoint#32",
"pos": {
"x": 19.0,
@@
-707,7
+707,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#33",
"pos": {
"x": 14.0,
"name": "WireCrossPoint#33",
"pos": {
"x": 14.0,
@@
-716,7
+716,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#34",
"pos": {
"x": 19.0,
"name": "WireCrossPoint#34",
"pos": {
"x": 19.0,
@@
-725,7
+725,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#35",
"pos": {
"x": 24.0,
"name": "WireCrossPoint#35",
"pos": {
"x": 24.0,
@@
-734,7
+734,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#36",
"pos": {
"x": 9.0,
"name": "WireCrossPoint#36",
"pos": {
"x": 9.0,
@@
-743,7
+743,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#37",
"pos": {
"x": 14.0,
"name": "WireCrossPoint#37",
"pos": {
"x": 14.0,
@@
-752,7
+752,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#38",
"pos": {
"x": 19.0,
"name": "WireCrossPoint#38",
"pos": {
"x": 19.0,
@@
-761,7
+761,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#39",
"pos": {
"x": 24.0,
"name": "WireCrossPoint#39",
"pos": {
"x": 24.0,
@@
-770,7
+770,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#4",
"pos": {
"x": 39.0,
"name": "WireCrossPoint#4",
"pos": {
"x": 39.0,
@@
-779,7
+779,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#40",
"pos": {
"x": 314.0,
"name": "WireCrossPoint#40",
"pos": {
"x": 314.0,
@@
-788,7
+788,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#5",
"pos": {
"x": 34.0,
"name": "WireCrossPoint#5",
"pos": {
"x": 34.0,
@@
-797,7
+797,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#6",
"pos": {
"x": 29.0,
"name": "WireCrossPoint#6",
"pos": {
"x": 29.0,
@@
-806,7
+806,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#7",
"pos": {
"x": 219.0,
"name": "WireCrossPoint#7",
"pos": {
"x": 219.0,
@@
-815,7
+815,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#8",
"pos": {
"x": 224.0,
"name": "WireCrossPoint#8",
"pos": {
"x": 224.0,
@@
-824,7
+824,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#9",
"pos": {
"x": 229.0,
"name": "WireCrossPoint#9",
"pos": {
"x": 229.0,
@@
-3430,7
+3430,7
@@
],
"version": "0.1.1"
},
],
"version": "0.1.1"
},
- "symbolRendererSnippetID": "
class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "GUIAm2901",
"centerTextHeight": 5.0,
"symbolRendererParams": {
"centerText": "GUIAm2901",
"centerTextHeight": 5.0,
@@
-3438,18
+3438,18
@@
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
- "outlineRendererSnippetID": "
class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer
",
- "highLevelStateHandlerSnippetID": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.StandardHighLevelStateHandler
",
+ "outlineRendererSnippetID": "
default
",
+ "highLevelStateHandlerSnippetID": "
standard
",
"highLevelStateHandlerParams": {
"subcomponentHighLevelStates": {
"qreg": {
"highLevelStateHandlerParams": {
"subcomponentHighLevelStates": {
"qreg": {
- "id": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler
",
+ "id": "
delegating
",
"params": {
"delegateTarget": "GUIdff4#0"
}
},
"regs": {
"params": {
"delegateTarget": "GUIdff4#0"
}
},
"regs": {
- "id": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler
",
+ "id": "
delegating
",
"params": {
"delegateTarget": "GUIram4#0"
}
"params": {
"delegateTarget": "GUIram4#0"
}
diff --git
a/net.mograsim.logic.model.editor/components/am2901/GUIAm2901ALUFuncDecode.json
b/net.mograsim.logic.model.editor/components/am2901/GUIAm2901ALUFuncDecode.json
index
7e0ccc3
..
92d2200
100644
(file)
--- a/
net.mograsim.logic.model.editor/components/am2901/GUIAm2901ALUFuncDecode.json
+++ b/
net.mograsim.logic.model.editor/components/am2901/GUIAm2901ALUFuncDecode.json
@@
-88,7
+88,7
@@
"submodel": {
"components": [
{
"submodel": {
"components": [
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#0",
"pos": {
"x": 15.0,
"name": "GUINandGate#0",
"pos": {
"x": 15.0,
@@
-97,7
+97,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#1",
"pos": {
"x": 15.0,
"name": "GUINandGate#1",
"pos": {
"x": 15.0,
@@
-106,7
+106,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#2",
"pos": {
"x": 55.0,
"name": "GUINandGate#2",
"pos": {
"x": 55.0,
@@
-115,7
+115,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#3",
"pos": {
"x": 55.0,
"name": "GUINandGate#3",
"pos": {
"x": 55.0,
@@
-124,7
+124,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#4",
"pos": {
"x": 100.0,
"name": "GUINandGate#4",
"pos": {
"x": 100.0,
@@
-149,7
+149,7
@@
}
},
{
}
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#0",
"pos": {
"x": 4.0,
"name": "WireCrossPoint#0",
"pos": {
"x": 4.0,
@@
-158,7
+158,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#1",
"pos": {
"x": 4.0,
"name": "WireCrossPoint#1",
"pos": {
"x": 4.0,
@@
-167,7
+167,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#10",
"pos": {
"x": 39.0,
"name": "WireCrossPoint#10",
"pos": {
"x": 39.0,
@@
-176,7
+176,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#2",
"pos": {
"x": 4.0,
"name": "WireCrossPoint#2",
"pos": {
"x": 4.0,
@@
-185,7
+185,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#3",
"pos": {
"x": 9.0,
"name": "WireCrossPoint#3",
"pos": {
"x": 9.0,
@@
-194,7
+194,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#4",
"pos": {
"x": 9.0,
"name": "WireCrossPoint#4",
"pos": {
"x": 9.0,
@@
-203,7
+203,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#5",
"pos": {
"x": 9.0,
"name": "WireCrossPoint#5",
"pos": {
"x": 9.0,
@@
-212,7
+212,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#6",
"pos": {
"x": 9.0,
"name": "WireCrossPoint#6",
"pos": {
"x": 9.0,
@@
-221,7
+221,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#7",
"pos": {
"x": 49.0,
"name": "WireCrossPoint#7",
"pos": {
"x": 49.0,
@@
-230,7
+230,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#8",
"pos": {
"x": 49.0,
"name": "WireCrossPoint#8",
"pos": {
"x": 49.0,
@@
-239,7
+239,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#9",
"pos": {
"x": 39.0,
"name": "WireCrossPoint#9",
"pos": {
"x": 39.0,
@@
-711,7
+711,7
@@
],
"version": "0.1.1"
},
],
"version": "0.1.1"
},
- "symbolRendererSnippetID": "
class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "GUIAm2901ALUFuncDecode",
"centerTextHeight": 5.0,
"symbolRendererParams": {
"centerText": "GUIAm2901ALUFuncDecode",
"centerTextHeight": 5.0,
@@
-719,7
+719,7
@@
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
- "outlineRendererSnippetID": "
class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer
",
- "highLevelStateHandlerSnippetID": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.DefaultHighLevelStateHandler
",
+ "outlineRendererSnippetID": "
default
",
+ "highLevelStateHandlerSnippetID": "
default
",
"version": "0.1.5"
}
\ No newline at end of file
"version": "0.1.5"
}
\ No newline at end of file
diff --git
a/net.mograsim.logic.model.editor/components/am2901/GUIAm2901ALUInclDecode.json
b/net.mograsim.logic.model.editor/components/am2901/GUIAm2901ALUInclDecode.json
index
1a8da52
..
2dec1af
100644
(file)
--- a/
net.mograsim.logic.model.editor/components/am2901/GUIAm2901ALUInclDecode.json
+++ b/
net.mograsim.logic.model.editor/components/am2901/GUIAm2901ALUInclDecode.json
@@
-217,7
+217,7
@@
}
},
{
}
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#0",
"pos": {
"x": 24.0,
"name": "WireCrossPoint#0",
"pos": {
"x": 24.0,
@@
-226,7
+226,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#1",
"pos": {
"x": 24.0,
"name": "WireCrossPoint#1",
"pos": {
"x": 24.0,
@@
-235,7
+235,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#10",
"pos": {
"x": 31.5,
"name": "WireCrossPoint#10",
"pos": {
"x": 31.5,
@@
-244,7
+244,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#11",
"pos": {
"x": 31.5,
"name": "WireCrossPoint#11",
"pos": {
"x": 31.5,
@@
-253,7
+253,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#12",
"pos": {
"x": 34.0,
"name": "WireCrossPoint#12",
"pos": {
"x": 34.0,
@@
-262,7
+262,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#13",
"pos": {
"x": 34.0,
"name": "WireCrossPoint#13",
"pos": {
"x": 34.0,
@@
-271,7
+271,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#14",
"pos": {
"x": 34.0,
"name": "WireCrossPoint#14",
"pos": {
"x": 34.0,
@@
-280,7
+280,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#15",
"pos": {
"x": 36.5,
"name": "WireCrossPoint#15",
"pos": {
"x": 36.5,
@@
-289,7
+289,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#16",
"pos": {
"x": 36.5,
"name": "WireCrossPoint#16",
"pos": {
"x": 36.5,
@@
-298,7
+298,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#17",
"pos": {
"x": 36.5,
"name": "WireCrossPoint#17",
"pos": {
"x": 36.5,
@@
-307,7
+307,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#18",
"pos": {
"x": 84.0,
"name": "WireCrossPoint#18",
"pos": {
"x": 84.0,
@@
-316,7
+316,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#19",
"pos": {
"x": 84.0,
"name": "WireCrossPoint#19",
"pos": {
"x": 84.0,
@@
-325,7
+325,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#2",
"pos": {
"x": 24.0,
"name": "WireCrossPoint#2",
"pos": {
"x": 24.0,
@@
-334,7
+334,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#3",
"pos": {
"x": 26.5,
"name": "WireCrossPoint#3",
"pos": {
"x": 26.5,
@@
-343,7
+343,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#4",
"pos": {
"x": 26.5,
"name": "WireCrossPoint#4",
"pos": {
"x": 26.5,
@@
-352,7
+352,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#5",
"pos": {
"x": 26.5,
"name": "WireCrossPoint#5",
"pos": {
"x": 26.5,
@@
-361,7
+361,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#6",
"pos": {
"x": 29.0,
"name": "WireCrossPoint#6",
"pos": {
"x": 29.0,
@@
-370,7
+370,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#7",
"pos": {
"x": 29.0,
"name": "WireCrossPoint#7",
"pos": {
"x": 29.0,
@@
-379,7
+379,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#8",
"pos": {
"x": 29.0,
"name": "WireCrossPoint#8",
"pos": {
"x": 29.0,
@@
-388,7
+388,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#9",
"pos": {
"x": 31.5,
"name": "WireCrossPoint#9",
"pos": {
"x": 31.5,
@@
-1527,7
+1527,7
@@
],
"version": "0.1.1"
},
],
"version": "0.1.1"
},
- "symbolRendererSnippetID": "
class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "GUIAm2901ALUInclDecode",
"centerTextHeight": 5.0,
"symbolRendererParams": {
"centerText": "GUIAm2901ALUInclDecode",
"centerTextHeight": 5.0,
@@
-1535,7
+1535,7
@@
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
- "outlineRendererSnippetID": "
class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer
",
- "highLevelStateHandlerSnippetID": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.DefaultHighLevelStateHandler
",
+ "outlineRendererSnippetID": "
default
",
+ "highLevelStateHandlerSnippetID": "
default
",
"version": "0.1.5"
}
\ No newline at end of file
"version": "0.1.5"
}
\ No newline at end of file
diff --git
a/net.mograsim.logic.model.editor/components/am2901/GUIAm2901ALUInclSourceDecodeInclFunctionDecode.json
b/net.mograsim.logic.model.editor/components/am2901/GUIAm2901ALUInclSourceDecodeInclFunctionDecode.json
index
4bfbadc
..
2fa5c1b
100644
(file)
--- a/
net.mograsim.logic.model.editor/components/am2901/GUIAm2901ALUInclSourceDecodeInclFunctionDecode.json
+++ b/
net.mograsim.logic.model.editor/components/am2901/GUIAm2901ALUInclSourceDecodeInclFunctionDecode.json
@@
-300,7
+300,7
@@
}
},
{
}
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#0",
"pos": {
"x": 9.0,
"name": "WireCrossPoint#0",
"pos": {
"x": 9.0,
@@
-309,7
+309,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#1",
"pos": {
"x": 14.0,
"name": "WireCrossPoint#1",
"pos": {
"x": 14.0,
@@
-318,7
+318,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#2",
"pos": {
"x": 19.0,
"name": "WireCrossPoint#2",
"pos": {
"x": 19.0,
@@
-327,7
+327,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#3",
"pos": {
"x": 24.0,
"name": "WireCrossPoint#3",
"pos": {
"x": 24.0,
@@
-1381,7
+1381,7
@@
],
"version": "0.1.1"
},
],
"version": "0.1.1"
},
- "symbolRendererSnippetID": "
class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "GUIAm2901ALUInclSourceDecodeInclFunctionDecode",
"centerTextHeight": 5.0,
"symbolRendererParams": {
"centerText": "GUIAm2901ALUInclSourceDecodeInclFunctionDecode",
"centerTextHeight": 5.0,
@@
-1389,7
+1389,7
@@
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
- "outlineRendererSnippetID": "
class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer
",
- "highLevelStateHandlerSnippetID": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.DefaultHighLevelStateHandler
",
+ "outlineRendererSnippetID": "
default
",
+ "highLevelStateHandlerSnippetID": "
default
",
"version": "0.1.5"
}
\ No newline at end of file
"version": "0.1.5"
}
\ No newline at end of file
diff --git
a/net.mograsim.logic.model.editor/components/am2901/GUIAm2901ALUOneBit.json
b/net.mograsim.logic.model.editor/components/am2901/GUIAm2901ALUOneBit.json
index
afe676b
..
1fd3ed8
100644
(file)
--- a/
net.mograsim.logic.model.editor/components/am2901/GUIAm2901ALUOneBit.json
+++ b/
net.mograsim.logic.model.editor/components/am2901/GUIAm2901ALUOneBit.json
@@
-106,7
+106,7
@@
"submodel": {
"components": [
{
"submodel": {
"components": [
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#0",
"pos": {
"x": 60.0,
"name": "GUINandGate#0",
"pos": {
"x": 60.0,
@@
-171,7
+171,7
@@
}
},
{
}
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#0",
"pos": {
"x": 49.0,
"name": "WireCrossPoint#0",
"pos": {
"x": 49.0,
@@
-180,7
+180,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#1",
"pos": {
"x": 54.0,
"name": "WireCrossPoint#1",
"pos": {
"x": 54.0,
@@
-543,7
+543,7
@@
],
"version": "0.1.1"
},
],
"version": "0.1.1"
},
- "symbolRendererSnippetID": "
class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "GUIAm2901ALUOneBit",
"centerTextHeight": 5.0,
"symbolRendererParams": {
"centerText": "GUIAm2901ALUOneBit",
"centerTextHeight": 5.0,
@@
-551,7
+551,7
@@
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
- "outlineRendererSnippetID": "
class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer
",
- "highLevelStateHandlerSnippetID": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.DefaultHighLevelStateHandler
",
+ "outlineRendererSnippetID": "
default
",
+ "highLevelStateHandlerSnippetID": "
default
",
"version": "0.1.5"
}
\ No newline at end of file
"version": "0.1.5"
}
\ No newline at end of file
diff --git
a/net.mograsim.logic.model.editor/components/am2901/GUIAm2901DestDecode.json
b/net.mograsim.logic.model.editor/components/am2901/GUIAm2901DestDecode.json
index
b68379d
..
0b2d611
100644
(file)
--- a/
net.mograsim.logic.model.editor/components/am2901/GUIAm2901DestDecode.json
+++ b/
net.mograsim.logic.model.editor/components/am2901/GUIAm2901DestDecode.json
@@
-88,7
+88,7
@@
"submodel": {
"components": [
{
"submodel": {
"components": [
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#0",
"pos": {
"x": 15.0,
"name": "GUINandGate#0",
"pos": {
"x": 15.0,
@@
-97,7
+97,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#1",
"pos": {
"x": 15.0,
"name": "GUINandGate#1",
"pos": {
"x": 15.0,
@@
-106,7
+106,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#10",
"pos": {
"x": 80.0,
"name": "GUINandGate#10",
"pos": {
"x": 80.0,
@@
-115,7
+115,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#11",
"pos": {
"x": 110.0,
"name": "GUINandGate#11",
"pos": {
"x": 110.0,
@@
-124,7
+124,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#12",
"pos": {
"x": 115.0,
"name": "GUINandGate#12",
"pos": {
"x": 115.0,
@@
-133,7
+133,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#2",
"pos": {
"x": 15.0,
"name": "GUINandGate#2",
"pos": {
"x": 15.0,
@@
-142,7
+142,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#3",
"pos": {
"x": 15.0,
"name": "GUINandGate#3",
"pos": {
"x": 15.0,
@@
-151,7
+151,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#4",
"pos": {
"x": 50.0,
"name": "GUINandGate#4",
"pos": {
"x": 50.0,
@@
-160,7
+160,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#5",
"pos": {
"x": 50.0,
"name": "GUINandGate#5",
"pos": {
"x": 50.0,
@@
-169,7
+169,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#6",
"pos": {
"x": 50.0,
"name": "GUINandGate#6",
"pos": {
"x": 50.0,
@@
-178,7
+178,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#7",
"pos": {
"x": 50.0,
"name": "GUINandGate#7",
"pos": {
"x": 50.0,
@@
-187,7
+187,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#8",
"pos": {
"x": 80.0,
"name": "GUINandGate#8",
"pos": {
"x": 80.0,
@@
-196,7
+196,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#9",
"pos": {
"x": 80.0,
"name": "GUINandGate#9",
"pos": {
"x": 80.0,
@@
-205,7
+205,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#0",
"pos": {
"x": 4.0,
"name": "WireCrossPoint#0",
"pos": {
"x": 4.0,
@@
-214,7
+214,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#1",
"pos": {
"x": 4.0,
"name": "WireCrossPoint#1",
"pos": {
"x": 4.0,
@@
-223,7
+223,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#10",
"pos": {
"x": 39.0,
"name": "WireCrossPoint#10",
"pos": {
"x": 39.0,
@@
-232,7
+232,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#11",
"pos": {
"x": 74.0,
"name": "WireCrossPoint#11",
"pos": {
"x": 74.0,
@@
-241,7
+241,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#12",
"pos": {
"x": 74.0,
"name": "WireCrossPoint#12",
"pos": {
"x": 74.0,
@@
-250,7
+250,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#13",
"pos": {
"x": 74.0,
"name": "WireCrossPoint#13",
"pos": {
"x": 74.0,
@@
-259,7
+259,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#14",
"pos": {
"x": 74.0,
"name": "WireCrossPoint#14",
"pos": {
"x": 74.0,
@@
-268,7
+268,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#15",
"pos": {
"x": 109.0,
"name": "WireCrossPoint#15",
"pos": {
"x": 109.0,
@@
-277,7
+277,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#2",
"pos": {
"x": 4.0,
"name": "WireCrossPoint#2",
"pos": {
"x": 4.0,
@@
-286,7
+286,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#3",
"pos": {
"x": 9.0,
"name": "WireCrossPoint#3",
"pos": {
"x": 9.0,
@@
-295,7
+295,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#4",
"pos": {
"x": 9.0,
"name": "WireCrossPoint#4",
"pos": {
"x": 9.0,
@@
-304,7
+304,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#5",
"pos": {
"x": 9.0,
"name": "WireCrossPoint#5",
"pos": {
"x": 9.0,
@@
-313,7
+313,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#6",
"pos": {
"x": 4.0,
"name": "WireCrossPoint#6",
"pos": {
"x": 4.0,
@@
-322,7
+322,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#7",
"pos": {
"x": 39.0,
"name": "WireCrossPoint#7",
"pos": {
"x": 39.0,
@@
-331,7
+331,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#8",
"pos": {
"x": 44.0,
"name": "WireCrossPoint#8",
"pos": {
"x": 44.0,
@@
-340,7
+340,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#9",
"pos": {
"x": 44.0,
"name": "WireCrossPoint#9",
"pos": {
"x": 44.0,
@@
-1081,7
+1081,7
@@
],
"version": "0.1.1"
},
],
"version": "0.1.1"
},
- "symbolRendererSnippetID": "
class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "GUIAm2901DestDecode",
"centerTextHeight": 5.0,
"symbolRendererParams": {
"centerText": "GUIAm2901DestDecode",
"centerTextHeight": 5.0,
@@
-1089,7
+1089,7
@@
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
- "outlineRendererSnippetID": "
class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer
",
- "highLevelStateHandlerSnippetID": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.DefaultHighLevelStateHandler
",
+ "outlineRendererSnippetID": "
default
",
+ "highLevelStateHandlerSnippetID": "
default
",
"version": "0.1.5"
}
\ No newline at end of file
"version": "0.1.5"
}
\ No newline at end of file
diff --git
a/net.mograsim.logic.model.editor/components/am2901/GUIAm2901SourceDecode.json
b/net.mograsim.logic.model.editor/components/am2901/GUIAm2901SourceDecode.json
index
d9966e1
..
112fecb
100644
(file)
--- a/
net.mograsim.logic.model.editor/components/am2901/GUIAm2901SourceDecode.json
+++ b/
net.mograsim.logic.model.editor/components/am2901/GUIAm2901SourceDecode.json
@@
-79,7
+79,7
@@
"submodel": {
"components": [
{
"submodel": {
"components": [
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#0",
"pos": {
"x": 10.0,
"name": "GUINandGate#0",
"pos": {
"x": 10.0,
@@
-88,7
+88,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#1",
"pos": {
"x": 10.0,
"name": "GUINandGate#1",
"pos": {
"x": 10.0,
@@
-97,7
+97,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#10",
"pos": {
"x": 70.0,
"name": "GUINandGate#10",
"pos": {
"x": 70.0,
@@
-106,7
+106,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#11",
"pos": {
"x": 70.0,
"name": "GUINandGate#11",
"pos": {
"x": 70.0,
@@
-115,7
+115,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#12",
"pos": {
"x": 70.0,
"name": "GUINandGate#12",
"pos": {
"x": 70.0,
@@
-124,7
+124,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#13",
"pos": {
"x": 100.0,
"name": "GUINandGate#13",
"pos": {
"x": 100.0,
@@
-133,7
+133,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#14",
"pos": {
"x": 100.0,
"name": "GUINandGate#14",
"pos": {
"x": 100.0,
@@
-142,7
+142,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#2",
"pos": {
"x": 10.0,
"name": "GUINandGate#2",
"pos": {
"x": 10.0,
@@
-151,7
+151,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#3",
"pos": {
"x": 40.0,
"name": "GUINandGate#3",
"pos": {
"x": 40.0,
@@
-160,7
+160,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#4",
"pos": {
"x": 40.0,
"name": "GUINandGate#4",
"pos": {
"x": 40.0,
@@
-169,7
+169,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#5",
"pos": {
"x": 40.0,
"name": "GUINandGate#5",
"pos": {
"x": 40.0,
@@
-178,7
+178,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#6",
"pos": {
"x": 40.0,
"name": "GUINandGate#6",
"pos": {
"x": 40.0,
@@
-187,7
+187,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#7",
"pos": {
"x": 40.0,
"name": "GUINandGate#7",
"pos": {
"x": 40.0,
@@
-196,7
+196,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#8",
"pos": {
"x": 70.0,
"name": "GUINandGate#8",
"pos": {
"x": 70.0,
@@
-205,7
+205,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#9",
"pos": {
"x": 70.0,
"name": "GUINandGate#9",
"pos": {
"x": 70.0,
@@
-214,7
+214,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#0",
"pos": {
"x": 4.0,
"name": "WireCrossPoint#0",
"pos": {
"x": 4.0,
@@
-223,7
+223,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#1",
"pos": {
"x": 6.5,
"name": "WireCrossPoint#1",
"pos": {
"x": 6.5,
@@
-232,7
+232,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#10",
"pos": {
"x": 36.5,
"name": "WireCrossPoint#10",
"pos": {
"x": 36.5,
@@
-241,7
+241,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#11",
"pos": {
"x": 64.0,
"name": "WireCrossPoint#11",
"pos": {
"x": 64.0,
@@
-250,7
+250,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#12",
"pos": {
"x": 64.0,
"name": "WireCrossPoint#12",
"pos": {
"x": 64.0,
@@
-259,7
+259,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#13",
"pos": {
"x": 64.0,
"name": "WireCrossPoint#13",
"pos": {
"x": 64.0,
@@
-268,7
+268,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#14",
"pos": {
"x": 94.0,
"name": "WireCrossPoint#14",
"pos": {
"x": 94.0,
@@
-277,7
+277,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#15",
"pos": {
"x": 94.0,
"name": "WireCrossPoint#15",
"pos": {
"x": 94.0,
@@
-286,7
+286,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#2",
"pos": {
"x": 4.0,
"name": "WireCrossPoint#2",
"pos": {
"x": 4.0,
@@
-295,7
+295,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#3",
"pos": {
"x": 6.5,
"name": "WireCrossPoint#3",
"pos": {
"x": 6.5,
@@
-304,7
+304,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#4",
"pos": {
"x": 6.5,
"name": "WireCrossPoint#4",
"pos": {
"x": 6.5,
@@
-313,7
+313,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#5",
"pos": {
"x": 6.5,
"name": "WireCrossPoint#5",
"pos": {
"x": 6.5,
@@
-322,7
+322,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#6",
"pos": {
"x": 31.5,
"name": "WireCrossPoint#6",
"pos": {
"x": 31.5,
@@
-331,7
+331,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#7",
"pos": {
"x": 34.0,
"name": "WireCrossPoint#7",
"pos": {
"x": 34.0,
@@
-340,7
+340,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#8",
"pos": {
"x": 34.0,
"name": "WireCrossPoint#8",
"pos": {
"x": 34.0,
@@
-349,7
+349,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#9",
"pos": {
"x": 34.0,
"name": "WireCrossPoint#9",
"pos": {
"x": 34.0,
@@
-1124,7
+1124,7
@@
],
"version": "0.1.1"
},
],
"version": "0.1.1"
},
- "symbolRendererSnippetID": "
class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "Am2901SourceDecode",
"centerTextHeight": 5.0,
"symbolRendererParams": {
"centerText": "Am2901SourceDecode",
"centerTextHeight": 5.0,
@@
-1132,7
+1132,7
@@
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
- "outlineRendererSnippetID": "
class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer
",
- "highLevelStateHandlerSnippetID": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.DefaultHighLevelStateHandler
",
+ "outlineRendererSnippetID": "
default
",
+ "highLevelStateHandlerSnippetID": "
default
",
"version": "0.1.5"
}
\ No newline at end of file
"version": "0.1.5"
}
\ No newline at end of file
diff --git
a/net.mograsim.logic.model.editor/components/am2904/GUIAm2904.json
b/net.mograsim.logic.model.editor/components/am2904/GUIAm2904.json
index
7a5dffc
..
82d233c
100644
(file)
--- a/
net.mograsim.logic.model.editor/components/am2904/GUIAm2904.json
+++ b/
net.mograsim.logic.model.editor/components/am2904/GUIAm2904.json
@@
-417,7
+417,7
@@
}
},
{
}
},
{
- "id": "
class:net.mograsim.logic.model.am2900.components.am2904.
GUIAm2904RegCTInstrDecode",
+ "id": "GUIAm2904RegCTInstrDecode",
"name": "GUIAm2904RegCTInstrDecode#0",
"pos": {
"x": 50.0,
"name": "GUIAm2904RegCTInstrDecode#0",
"pos": {
"x": 50.0,
@@
-425,7
+425,7
@@
}
},
{
}
},
{
- "id": "
class:net.mograsim.logic.model.am2900.components.am2904.
GUIAm2904ShiftInstrDecode",
+ "id": "GUIAm2904ShiftInstrDecode",
"name": "GUIAm2904ShiftInstrDecode#0",
"pos": {
"x": 50.0,
"name": "GUIAm2904ShiftInstrDecode#0",
"pos": {
"x": 50.0,
@@
-433,7
+433,7
@@
}
},
{
}
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUIBitDisplay",
+ "id": "GUIBitDisplay",
"name": "GUIBitDisplay#0",
"pos": {
"x": 530.0,
"name": "GUIBitDisplay#0",
"pos": {
"x": 530.0,
@@
-442,7
+442,7
@@
"params": 4
},
{
"params": 4
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUIBitDisplay",
+ "id": "GUIBitDisplay",
"name": "GUIBitDisplay#1",
"pos": {
"x": 565.0,
"name": "GUIBitDisplay#1",
"pos": {
"x": 565.0,
@@
-451,7
+451,7
@@
"params": 4
},
{
"params": 4
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUIBitDisplay",
+ "id": "GUIBitDisplay",
"name": "GUIBitDisplay#2",
"pos": {
"x": 530.0,
"name": "GUIBitDisplay#2",
"pos": {
"x": 530.0,
@@
-460,7
+460,7
@@
"params": 4
},
{
"params": 4
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUIBitDisplay",
+ "id": "GUIBitDisplay",
"name": "GUIBitDisplay#3",
"pos": {
"x": 560.0,
"name": "GUIBitDisplay#3",
"pos": {
"x": 560.0,
@@
-469,7
+469,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUIMerger",
+ "id": "GUIMerger",
"name": "GUIMerger#0",
"pos": {
"x": 25.0,
"name": "GUIMerger#0",
"pos": {
"x": 25.0,
@@
-478,7
+478,7
@@
"params": 6
},
{
"params": 6
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUIMerger",
+ "id": "GUIMerger",
"name": "GUIMerger#1",
"pos": {
"x": 25.0,
"name": "GUIMerger#1",
"pos": {
"x": 25.0,
@@
-487,7
+487,7
@@
"params": 5
},
{
"params": 5
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUIMerger",
+ "id": "GUIMerger",
"name": "GUIMerger#2",
"pos": {
"x": 15.0,
"name": "GUIMerger#2",
"pos": {
"x": 15.0,
@@
-496,7
+496,7
@@
"params": 4
},
{
"params": 4
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUIMerger",
+ "id": "GUIMerger",
"name": "GUIMerger#3",
"pos": {
"x": 510.0,
"name": "GUIMerger#3",
"pos": {
"x": 510.0,
@@
-505,7
+505,7
@@
"params": 4
},
{
"params": 4
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUIMerger",
+ "id": "GUIMerger",
"name": "GUIMerger#4",
"pos": {
"x": 25.0,
"name": "GUIMerger#4",
"pos": {
"x": 25.0,
@@
-514,7
+514,7
@@
"params": 2
},
{
"params": 2
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#0",
"pos": {
"x": 190.0,
"name": "GUINandGate#0",
"pos": {
"x": 190.0,
@@
-523,7
+523,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#1",
"pos": {
"x": 130.0,
"name": "GUINandGate#1",
"pos": {
"x": 130.0,
@@
-532,7
+532,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#10",
"pos": {
"x": 340.0,
"name": "GUINandGate#10",
"pos": {
"x": 340.0,
@@
-541,7
+541,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#12",
"pos": {
"x": 540.0,
"name": "GUINandGate#12",
"pos": {
"x": 540.0,
@@
-550,7
+550,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#2",
"pos": {
"x": 225.0,
"name": "GUINandGate#2",
"pos": {
"x": 225.0,
@@
-559,7
+559,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#3",
"pos": {
"x": 225.0,
"name": "GUINandGate#3",
"pos": {
"x": 225.0,
@@
-568,7
+568,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#4",
"pos": {
"x": 225.0,
"name": "GUINandGate#4",
"pos": {
"x": 225.0,
@@
-577,7
+577,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#5",
"pos": {
"x": 225.0,
"name": "GUINandGate#5",
"pos": {
"x": 225.0,
@@
-586,7
+586,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#6",
"pos": {
"x": 205.0,
"name": "GUINandGate#6",
"pos": {
"x": 205.0,
@@
-595,7
+595,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#7",
"pos": {
"x": 205.0,
"name": "GUINandGate#7",
"pos": {
"x": 205.0,
@@
-604,7
+604,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#8",
"pos": {
"x": 205.0,
"name": "GUINandGate#8",
"pos": {
"x": 205.0,
@@
-613,7
+613,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#9",
"pos": {
"x": 205.0,
"name": "GUINandGate#9",
"pos": {
"x": 205.0,
@@
-622,7
+622,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUISplitter",
+ "id": "GUISplitter",
"name": "GUISplitter#0",
"pos": {
"x": 10.0,
"name": "GUISplitter#0",
"pos": {
"x": 10.0,
@@
-631,7
+631,7
@@
"params": 13
},
{
"params": 13
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUISplitter",
+ "id": "GUISplitter",
"name": "GUISplitter#1",
"pos": {
"x": 555.0,
"name": "GUISplitter#1",
"pos": {
"x": 555.0,
@@
-640,7
+640,7
@@
"params": 4
},
{
"params": 4
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUISplitter",
+ "id": "GUISplitter",
"name": "GUISplitter#10",
"pos": {
"x": 420.0,
"name": "GUISplitter#10",
"pos": {
"x": 420.0,
@@
-649,7
+649,7
@@
"params": 4
},
{
"params": 4
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUISplitter",
+ "id": "GUISplitter",
"name": "GUISplitter#11",
"pos": {
"x": 405.0,
"name": "GUISplitter#11",
"pos": {
"x": 405.0,
@@
-658,7
+658,7
@@
"params": 3
},
{
"params": 3
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUISplitter",
+ "id": "GUISplitter",
"name": "GUISplitter#12",
"pos": {
"x": 405.0,
"name": "GUISplitter#12",
"pos": {
"x": 405.0,
@@
-667,7
+667,7
@@
"params": 3
},
{
"params": 3
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUISplitter",
+ "id": "GUISplitter",
"name": "GUISplitter#13",
"pos": {
"x": 265.0,
"name": "GUISplitter#13",
"pos": {
"x": 265.0,
@@
-676,7
+676,7
@@
"params": 3
},
{
"params": 3
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUISplitter",
+ "id": "GUISplitter",
"name": "GUISplitter#14",
"pos": {
"x": 90.0,
"name": "GUISplitter#14",
"pos": {
"x": 90.0,
@@
-685,7
+685,7
@@
"params": 3
},
{
"params": 3
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUISplitter",
+ "id": "GUISplitter",
"name": "GUISplitter#15",
"pos": {
"x": 120.0,
"name": "GUISplitter#15",
"pos": {
"x": 120.0,
@@
-694,7
+694,7
@@
"params": 2
},
{
"params": 2
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUISplitter",
+ "id": "GUISplitter",
"name": "GUISplitter#2",
"pos": {
"x": 395.0,
"name": "GUISplitter#2",
"pos": {
"x": 395.0,
@@
-703,7
+703,7
@@
"params": 2
},
{
"params": 2
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUISplitter",
+ "id": "GUISplitter",
"name": "GUISplitter#3",
"pos": {
"x": 450.0,
"name": "GUISplitter#3",
"pos": {
"x": 450.0,
@@
-712,7
+712,7
@@
"params": 4
},
{
"params": 4
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUISplitter",
+ "id": "GUISplitter",
"name": "GUISplitter#4",
"pos": {
"x": 395.0,
"name": "GUISplitter#4",
"pos": {
"x": 395.0,
@@
-721,7
+721,7
@@
"params": 4
},
{
"params": 4
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUISplitter",
+ "id": "GUISplitter",
"name": "GUISplitter#5",
"pos": {
"x": 395.0,
"name": "GUISplitter#5",
"pos": {
"x": 395.0,
@@
-730,7
+730,7
@@
"params": 4
},
{
"params": 4
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUISplitter",
+ "id": "GUISplitter",
"name": "GUISplitter#6",
"pos": {
"x": 285.0,
"name": "GUISplitter#6",
"pos": {
"x": 285.0,
@@
-739,7
+739,7
@@
"params": 3
},
{
"params": 3
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUISplitter",
+ "id": "GUISplitter",
"name": "GUISplitter#7",
"pos": {
"x": 420.0,
"name": "GUISplitter#7",
"pos": {
"x": 420.0,
@@
-748,7
+748,7
@@
"params": 4
},
{
"params": 4
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUISplitter",
+ "id": "GUISplitter",
"name": "GUISplitter#8",
"pos": {
"x": 420.0,
"name": "GUISplitter#8",
"pos": {
"x": 420.0,
@@
-757,7
+757,7
@@
"params": 4
},
{
"params": 4
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUISplitter",
+ "id": "GUISplitter",
"name": "GUISplitter#9",
"pos": {
"x": 240.0,
"name": "GUISplitter#9",
"pos": {
"x": 240.0,
@@
-766,7
+766,7
@@
"params": 4
},
{
"params": 4
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUITriStateBuffer",
+ "id": "GUITriStateBuffer",
"name": "GUITriStateBuffer#0",
"pos": {
"x": 535.0,
"name": "GUITriStateBuffer#0",
"pos": {
"x": 535.0,
@@
-778,7
+778,7
@@
}
},
{
}
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUITriStateBuffer",
+ "id": "GUITriStateBuffer",
"name": "GUITriStateBuffer#1",
"pos": {
"x": 10.0,
"name": "GUITriStateBuffer#1",
"pos": {
"x": 10.0,
@@
-790,7
+790,7
@@
}
},
{
}
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUITriStateBuffer",
+ "id": "GUITriStateBuffer",
"name": "GUITriStateBuffer#2",
"pos": {
"x": 10.0,
"name": "GUITriStateBuffer#2",
"pos": {
"x": 10.0,
@@
-802,7
+802,7
@@
}
},
{
}
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUITriStateBuffer",
+ "id": "GUITriStateBuffer",
"name": "GUITriStateBuffer#3",
"pos": {
"x": 560.0,
"name": "GUITriStateBuffer#3",
"pos": {
"x": 560.0,
@@
-814,7
+814,7
@@
}
},
{
}
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUITriStateBuffer",
+ "id": "GUITriStateBuffer",
"name": "GUITriStateBuffer#4",
"pos": {
"x": 565.0,
"name": "GUITriStateBuffer#4",
"pos": {
"x": 565.0,
@@
-826,7
+826,7
@@
}
},
{
}
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUITriStateBuffer",
+ "id": "GUITriStateBuffer",
"name": "GUITriStateBuffer#5",
"pos": {
"x": 560.0,
"name": "GUITriStateBuffer#5",
"pos": {
"x": 560.0,
@@
-838,7
+838,7
@@
}
},
{
}
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#0",
"pos": {
"x": 165.0,
"name": "WireCrossPoint#0",
"pos": {
"x": 165.0,
@@
-847,7
+847,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#1",
"pos": {
"x": 180.0,
"name": "WireCrossPoint#1",
"pos": {
"x": 180.0,
@@
-856,7
+856,7
@@
"params": 4
},
{
"params": 4
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#10",
"pos": {
"x": 195.0,
"name": "WireCrossPoint#10",
"pos": {
"x": 195.0,
@@
-865,7
+865,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#11",
"pos": {
"x": 195.0,
"name": "WireCrossPoint#11",
"pos": {
"x": 195.0,
@@
-874,7
+874,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#12",
"pos": {
"x": 195.0,
"name": "WireCrossPoint#12",
"pos": {
"x": 195.0,
@@
-883,7
+883,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#13",
"pos": {
"x": 330.0,
"name": "WireCrossPoint#13",
"pos": {
"x": 330.0,
@@
-892,7
+892,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#14",
"pos": {
"x": 520.0,
"name": "WireCrossPoint#14",
"pos": {
"x": 520.0,
@@
-901,7
+901,7
@@
"params": 4
},
{
"params": 4
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#15",
"pos": {
"x": 255.0,
"name": "WireCrossPoint#15",
"pos": {
"x": 255.0,
@@
-910,7
+910,7
@@
"params": 4
},
{
"params": 4
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#16",
"pos": {
"x": 255.0,
"name": "WireCrossPoint#16",
"pos": {
"x": 255.0,
@@
-919,7
+919,7
@@
"params": 4
},
{
"params": 4
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#17",
"pos": {
"x": 360.0,
"name": "WireCrossPoint#17",
"pos": {
"x": 360.0,
@@
-928,7
+928,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#18",
"pos": {
"x": 35.0,
"name": "WireCrossPoint#18",
"pos": {
"x": 35.0,
@@
-937,7
+937,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#19",
"pos": {
"x": 35.0,
"name": "WireCrossPoint#19",
"pos": {
"x": 35.0,
@@
-946,7
+946,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#2",
"pos": {
"x": 295.0,
"name": "WireCrossPoint#2",
"pos": {
"x": 295.0,
@@
-955,7
+955,7
@@
"params": 4
},
{
"params": 4
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#20",
"pos": {
"x": 585.0,
"name": "WireCrossPoint#20",
"pos": {
"x": 585.0,
@@
-964,7
+964,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#21",
"pos": {
"x": 585.0,
"name": "WireCrossPoint#21",
"pos": {
"x": 585.0,
@@
-973,7
+973,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#22",
"pos": {
"x": 250.0,
"name": "WireCrossPoint#22",
"pos": {
"x": 250.0,
@@
-982,7
+982,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#23",
"pos": {
"x": 330.0,
"name": "WireCrossPoint#23",
"pos": {
"x": 330.0,
@@
-991,7
+991,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#24",
"pos": {
"x": 285.0,
"name": "WireCrossPoint#24",
"pos": {
"x": 285.0,
@@
-1000,7
+1000,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#25",
"pos": {
"x": 285.0,
"name": "WireCrossPoint#25",
"pos": {
"x": 285.0,
@@
-1009,7
+1009,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#26",
"pos": {
"x": 290.0,
"name": "WireCrossPoint#26",
"pos": {
"x": 290.0,
@@
-1018,7
+1018,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#27",
"pos": {
"x": 440.0,
"name": "WireCrossPoint#27",
"pos": {
"x": 440.0,
@@
-1027,7
+1027,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#28",
"pos": {
"x": 440.0,
"name": "WireCrossPoint#28",
"pos": {
"x": 440.0,
@@
-1036,7
+1036,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#3",
"pos": {
"x": 335.0,
"name": "WireCrossPoint#3",
"pos": {
"x": 335.0,
@@
-1045,7
+1045,7
@@
"params": 4
},
{
"params": 4
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#30",
"pos": {
"x": 550.0,
"name": "WireCrossPoint#30",
"pos": {
"x": 550.0,
@@
-1054,7
+1054,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#32",
"pos": {
"x": 85.0,
"name": "WireCrossPoint#32",
"pos": {
"x": 85.0,
@@
-1063,7
+1063,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#33",
"pos": {
"x": 530.0,
"name": "WireCrossPoint#33",
"pos": {
"x": 530.0,
@@
-1072,7
+1072,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#4",
"pos": {
"x": 150.0,
"name": "WireCrossPoint#4",
"pos": {
"x": 150.0,
@@
-1081,7
+1081,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#5",
"pos": {
"x": 530.0,
"name": "WireCrossPoint#5",
"pos": {
"x": 530.0,
@@
-1090,7
+1090,7
@@
"params": 4
},
{
"params": 4
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#6",
"pos": {
"x": 120.0,
"name": "WireCrossPoint#6",
"pos": {
"x": 120.0,
@@
-1099,7
+1099,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#7",
"pos": {
"x": 215.0,
"name": "WireCrossPoint#7",
"pos": {
"x": 215.0,
@@
-1108,7
+1108,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#8",
"pos": {
"x": 215.0,
"name": "WireCrossPoint#8",
"pos": {
"x": 215.0,
@@
-1117,7
+1117,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#9",
"pos": {
"x": 215.0,
"name": "WireCrossPoint#9",
"pos": {
"x": 215.0,
@@
-3995,7
+3995,7
@@
],
"version": "0.1.1"
},
],
"version": "0.1.1"
},
- "symbolRendererSnippetID": "
class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "Am2904",
"centerTextHeight": 5.0,
"symbolRendererParams": {
"centerText": "Am2904",
"centerTextHeight": 5.0,
@@
-4003,20
+4003,20
@@
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
- "outlineRendererSnippetID": "
class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer
",
- "highLevelStateHandlerSnippetID": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.StandardHighLevelStateHandler
",
+ "outlineRendererSnippetID": "
default
",
+ "highLevelStateHandlerSnippetID": "
standard
",
"highLevelStateHandlerParams": {
"subcomponentHighLevelStates": {
"highLevelStateHandlerParams": {
"subcomponentHighLevelStates": {
- "msr": {
- "id": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler
",
+ "m
u
sr": {
+ "id": "
delegating
",
"params": {
"params": {
- "delegateTarget": "DeserializedSubmodelComponent#
0
"
+ "delegateTarget": "DeserializedSubmodelComponent#
1
"
}
},
}
},
- "m
u
sr": {
- "id": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.subcomponent.DelegatingSubcomponentHighLevelStateHandler
",
+ "msr": {
+ "id": "
delegating
",
"params": {
"params": {
- "delegateTarget": "DeserializedSubmodelComponent#
1
"
+ "delegateTarget": "DeserializedSubmodelComponent#
0
"
}
}
},
}
}
},
diff --git
a/net.mograsim.logic.model.editor/components/am2904/GUIAm2904MSR.json
b/net.mograsim.logic.model.editor/components/am2904/GUIAm2904MSR.json
index
bf0ea33
..
6e93abf
100644
(file)
--- a/
net.mograsim.logic.model.editor/components/am2904/GUIAm2904MSR.json
+++ b/
net.mograsim.logic.model.editor/components/am2904/GUIAm2904MSR.json
@@
-187,7
+187,7
@@
}
},
{
}
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUIMerger",
+ "id": "GUIMerger",
"name": "GUIMerger#0",
"pos": {
"x": 435.0,
"name": "GUIMerger#0",
"pos": {
"x": 435.0,
@@
-196,7
+196,7
@@
"params": 4
},
{
"params": 4
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#0",
"pos": {
"x": 325.0,
"name": "GUINandGate#0",
"pos": {
"x": 325.0,
@@
-205,7
+205,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUISplitter",
+ "id": "GUISplitter",
"name": "GUISplitter#0",
"pos": {
"x": 5.0,
"name": "GUISplitter#0",
"pos": {
"x": 5.0,
@@
-214,7
+214,7
@@
"params": 4
},
{
"params": 4
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUISplitter",
+ "id": "GUISplitter",
"name": "GUISplitter#1",
"pos": {
"x": 5.0,
"name": "GUISplitter#1",
"pos": {
"x": 5.0,
@@
-223,7
+223,7
@@
"params": 4
},
{
"params": 4
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUISplitter",
+ "id": "GUISplitter",
"name": "GUISplitter#2",
"pos": {
"x": 45.0,
"name": "GUISplitter#2",
"pos": {
"x": 45.0,
@@
-232,7
+232,7
@@
"params": 3
},
{
"params": 3
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUISplitter",
+ "id": "GUISplitter",
"name": "GUISplitter#3",
"pos": {
"x": 5.0,
"name": "GUISplitter#3",
"pos": {
"x": 5.0,
@@
-241,7
+241,7
@@
"params": 4
},
{
"params": 4
},
{
- "id": "
class:net.mograsim.logic.model.am2900.components.
GUIdff4_finewe",
+ "id": "GUIdff4_finewe",
"name": "GUIdff4_finewe#0",
"pos": {
"x": 375.0,
"name": "GUIdff4_finewe#0",
"pos": {
"x": 375.0,
@@
-249,7
+249,7
@@
}
},
{
}
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#0",
"pos": {
"x": 29.0,
"name": "WireCrossPoint#0",
"pos": {
"x": 29.0,
@@
-258,7
+258,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#1",
"pos": {
"x": 414.0,
"name": "WireCrossPoint#1",
"pos": {
"x": 414.0,
@@
-267,7
+267,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#10",
"pos": {
"x": 89.0,
"name": "WireCrossPoint#10",
"pos": {
"x": 89.0,
@@
-276,7
+276,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#11",
"pos": {
"x": 89.0,
"name": "WireCrossPoint#11",
"pos": {
"x": 89.0,
@@
-285,7
+285,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#12",
"pos": {
"x": 19.0,
"name": "WireCrossPoint#12",
"pos": {
"x": 19.0,
@@
-294,7
+294,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#13",
"pos": {
"x": 194.0,
"name": "WireCrossPoint#13",
"pos": {
"x": 194.0,
@@
-303,7
+303,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#14",
"pos": {
"x": 89.0,
"name": "WireCrossPoint#14",
"pos": {
"x": 89.0,
@@
-312,7
+312,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#15",
"pos": {
"x": 319.0,
"name": "WireCrossPoint#15",
"pos": {
"x": 319.0,
@@
-321,7
+321,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#16",
"pos": {
"x": 319.0,
"name": "WireCrossPoint#16",
"pos": {
"x": 319.0,
@@
-330,7
+330,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#2",
"pos": {
"x": 419.0,
"name": "WireCrossPoint#2",
"pos": {
"x": 419.0,
@@
-339,7
+339,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#3",
"pos": {
"x": 424.0,
"name": "WireCrossPoint#3",
"pos": {
"x": 424.0,
@@
-348,7
+348,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#4",
"pos": {
"x": 429.0,
"name": "WireCrossPoint#4",
"pos": {
"x": 429.0,
@@
-357,7
+357,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#5",
"pos": {
"x": 84.0,
"name": "WireCrossPoint#5",
"pos": {
"x": 84.0,
@@
-366,7
+366,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#6",
"pos": {
"x": 94.0,
"name": "WireCrossPoint#6",
"pos": {
"x": 94.0,
@@
-375,7
+375,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#7",
"pos": {
"x": 29.0,
"name": "WireCrossPoint#7",
"pos": {
"x": 29.0,
@@
-384,7
+384,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#8",
"pos": {
"x": 74.0,
"name": "WireCrossPoint#8",
"pos": {
"x": 74.0,
@@
-393,7
+393,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#9",
"pos": {
"x": 49.0,
"name": "WireCrossPoint#9",
"pos": {
"x": 49.0,
@@
-1902,7
+1902,7
@@
],
"version": "0.1.1"
},
],
"version": "0.1.1"
},
- "symbolRendererSnippetID": "
class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "MSR",
"centerTextHeight": 5.0,
"symbolRendererParams": {
"centerText": "MSR",
"centerTextHeight": 5.0,
@@
-1910,13
+1910,13
@@
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
- "outlineRendererSnippetID": "
class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer
",
- "highLevelStateHandlerSnippetID": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.StandardHighLevelStateHandler
",
+ "outlineRendererSnippetID": "
default
",
+ "highLevelStateHandlerSnippetID": "
standard
",
"highLevelStateHandlerParams": {
"subcomponentHighLevelStates": {},
"atomicHighLevelStates": {
"q": {
"highLevelStateHandlerParams": {
"subcomponentHighLevelStates": {},
"atomicHighLevelStates": {
"q": {
- "id": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.DelegatingAtomicHighLevelStateHandler
",
+ "id": "
delegating
",
"params": {
"delegateTarget": "GUIdff4_finewe#0",
"subStateID": "q"
"params": {
"delegateTarget": "GUIdff4_finewe#0",
"subStateID": "q"
diff --git
a/net.mograsim.logic.model.editor/components/am2904/GUIAm2904TestLogic.json
b/net.mograsim.logic.model.editor/components/am2904/GUIAm2904TestLogic.json
index
e4017fe
..
93b91e5
100644
(file)
--- a/
net.mograsim.logic.model.editor/components/am2904/GUIAm2904TestLogic.json
+++ b/
net.mograsim.logic.model.editor/components/am2904/GUIAm2904TestLogic.json
@@
-96,7
+96,7
@@
}
},
{
}
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#0",
"pos": {
"x": 85.0,
"name": "GUINandGate#0",
"pos": {
"x": 85.0,
@@
-105,7
+105,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#1",
"pos": {
"x": 45.0,
"name": "GUINandGate#1",
"pos": {
"x": 45.0,
@@
-114,7
+114,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#2",
"pos": {
"x": 120.0,
"name": "GUINandGate#2",
"pos": {
"x": 120.0,
@@
-123,7
+123,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#3",
"pos": {
"x": 45.0,
"name": "GUINandGate#3",
"pos": {
"x": 45.0,
@@
-132,7
+132,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#4",
"pos": {
"x": 80.0,
"name": "GUINandGate#4",
"pos": {
"x": 80.0,
@@
-141,7
+141,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#5",
"pos": {
"x": 80.0,
"name": "GUINandGate#5",
"pos": {
"x": 80.0,
@@
-150,7
+150,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUISplitter",
+ "id": "GUISplitter",
"name": "GUISplitter#0",
"pos": {
"x": 5.0,
"name": "GUISplitter#0",
"pos": {
"x": 5.0,
@@
-159,7
+159,7
@@
"params": 4
},
{
"params": 4
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#0",
"pos": {
"x": 29.0,
"name": "WireCrossPoint#0",
"pos": {
"x": 29.0,
@@
-168,7
+168,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#1",
"pos": {
"x": 34.0,
"name": "WireCrossPoint#1",
"pos": {
"x": 34.0,
@@
-177,7
+177,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#10",
"pos": {
"x": 39.0,
"name": "WireCrossPoint#10",
"pos": {
"x": 39.0,
@@
-186,7
+186,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#2",
"pos": {
"x": 79.0,
"name": "WireCrossPoint#2",
"pos": {
"x": 79.0,
@@
-195,7
+195,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#3",
"pos": {
"x": 79.0,
"name": "WireCrossPoint#3",
"pos": {
"x": 79.0,
@@
-204,7
+204,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#4",
"pos": {
"x": 19.0,
"name": "WireCrossPoint#4",
"pos": {
"x": 19.0,
@@
-213,7
+213,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#5",
"pos": {
"x": 24.0,
"name": "WireCrossPoint#5",
"pos": {
"x": 24.0,
@@
-222,7
+222,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#6",
"pos": {
"x": 39.0,
"name": "WireCrossPoint#6",
"pos": {
"x": 39.0,
@@
-231,7
+231,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#7",
"pos": {
"x": 74.0,
"name": "WireCrossPoint#7",
"pos": {
"x": 74.0,
@@
-240,7
+240,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#8",
"pos": {
"x": 74.0,
"name": "WireCrossPoint#8",
"pos": {
"x": 74.0,
@@
-249,7
+249,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#9",
"pos": {
"x": 24.0,
"name": "WireCrossPoint#9",
"pos": {
"x": 24.0,
@@
-757,7
+757,7
@@
],
"version": "0.1.1"
},
],
"version": "0.1.1"
},
- "symbolRendererSnippetID": "
class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "Test\nlogic",
"centerTextHeight": 5.0,
"symbolRendererParams": {
"centerText": "Test\nlogic",
"centerTextHeight": 5.0,
@@
-765,8
+765,8
@@
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
- "outlineRendererSnippetID": "
class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer
",
- "highLevelStateHandlerSnippetID": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.StandardHighLevelStateHandler
",
+ "outlineRendererSnippetID": "
default
",
+ "highLevelStateHandlerSnippetID": "
standard
",
"highLevelStateHandlerParams": {
"subcomponentHighLevelStates": {},
"atomicHighLevelStates": {}
"highLevelStateHandlerParams": {
"subcomponentHighLevelStates": {},
"atomicHighLevelStates": {}
diff --git
a/net.mograsim.logic.model.editor/components/am2904/GUIAm2904muSR.json
b/net.mograsim.logic.model.editor/components/am2904/GUIAm2904muSR.json
index
3c5845a
..
05fbd4e
100644
(file)
--- a/
net.mograsim.logic.model.editor/components/am2904/GUIAm2904muSR.json
+++ b/
net.mograsim.logic.model.editor/components/am2904/GUIAm2904muSR.json
@@
-130,7
+130,7
@@
}
},
{
}
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUIMerger",
+ "id": "GUIMerger",
"name": "GUIMerger#0",
"pos": {
"x": 435.0,
"name": "GUIMerger#0",
"pos": {
"x": 435.0,
@@
-139,7
+139,7
@@
"params": 4
},
{
"params": 4
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#0",
"pos": {
"x": 245.0,
"name": "GUINandGate#0",
"pos": {
"x": 245.0,
@@
-148,7
+148,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#1",
"pos": {
"x": 215.0,
"name": "GUINandGate#1",
"pos": {
"x": 215.0,
@@
-157,7
+157,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUINandGate",
+ "id": "GUINandGate",
"name": "GUINandGate#2",
"pos": {
"x": 215.0,
"name": "GUINandGate#2",
"pos": {
"x": 215.0,
@@
-166,7
+166,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUISplitter",
+ "id": "GUISplitter",
"name": "GUISplitter#0",
"pos": {
"x": 5.0,
"name": "GUISplitter#0",
"pos": {
"x": 5.0,
@@
-175,7
+175,7
@@
"params": 4
},
{
"params": 4
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUISplitter",
+ "id": "GUISplitter",
"name": "GUISplitter#1",
"pos": {
"x": 5.0,
"name": "GUISplitter#1",
"pos": {
"x": 5.0,
@@
-184,7
+184,7
@@
"params": 4
},
{
"params": 4
},
{
- "id": "
class:net.mograsim.logic.model.model.components.atomic.
GUISplitter",
+ "id": "GUISplitter",
"name": "GUISplitter#2",
"pos": {
"x": 45.0,
"name": "GUISplitter#2",
"pos": {
"x": 45.0,
@@
-193,7
+193,7
@@
"params": 2
},
{
"params": 2
},
{
- "id": "
class:net.mograsim.logic.model.am2900.components.
GUIdff4_finewe",
+ "id": "GUIdff4_finewe",
"name": "GUIdff4_finewe#0",
"pos": {
"x": 375.0,
"name": "GUIdff4_finewe#0",
"pos": {
"x": 375.0,
@@
-201,7
+201,7
@@
}
},
{
}
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#0",
"pos": {
"x": 89.0,
"name": "WireCrossPoint#0",
"pos": {
"x": 89.0,
@@
-210,7
+210,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#1",
"pos": {
"x": 89.0,
"name": "WireCrossPoint#1",
"pos": {
"x": 89.0,
@@
-219,7
+219,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#2",
"pos": {
"x": 89.0,
"name": "WireCrossPoint#2",
"pos": {
"x": 89.0,
@@
-228,7
+228,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#3",
"pos": {
"x": 429.0,
"name": "WireCrossPoint#3",
"pos": {
"x": 429.0,
@@
-237,7
+237,7
@@
"params": 1
},
{
"params": 1
},
{
- "id": "
class:net.mograsim.logic.model.model.wires.
WireCrossPoint",
+ "id": "WireCrossPoint",
"name": "WireCrossPoint#4",
"pos": {
"x": 209.0,
"name": "WireCrossPoint#4",
"pos": {
"x": 209.0,
@@
-1075,7
+1075,7
@@
],
"version": "0.1.1"
},
],
"version": "0.1.1"
},
- "symbolRendererSnippetID": "
class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer
",
+ "symbolRendererSnippetID": "
simpleRectangularLike
",
"symbolRendererParams": {
"centerText": "muSR",
"centerTextHeight": 5.0,
"symbolRendererParams": {
"centerText": "muSR",
"centerTextHeight": 5.0,
@@
-1083,13
+1083,13
@@
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
"pinLabelHeight": 3.5,
"pinLabelMargin": 0.5
},
- "outlineRendererSnippetID": "
class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer
",
- "highLevelStateHandlerSnippetID": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.StandardHighLevelStateHandler
",
+ "outlineRendererSnippetID": "
default
",
+ "highLevelStateHandlerSnippetID": "
standard
",
"highLevelStateHandlerParams": {
"subcomponentHighLevelStates": {},
"atomicHighLevelStates": {
"q": {
"highLevelStateHandlerParams": {
"subcomponentHighLevelStates": {},
"atomicHighLevelStates": {
"q": {
- "id": "
class:net.mograsim.logic.model.snippets.highlevelstatehandlers.standard.atomic.DelegatingAtomicHighLevelStateHandler
",
+ "id": "
delegating
",
"params": {
"delegateTarget": "GUIdff4_finewe#0",
"subStateID": "q"
"params": {
"delegateTarget": "GUIdff4_finewe#0",
"subStateID": "q"