X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model.am2900%2FGUIAm2904Testbench.json;h=b96609a8818ff30b68a8cd4e6a5cb4405193072a;hb=b9dfbfb6f3db3a2676f79d7ce381957f77f54050;hp=568ee0467816cf6d36453be795f1483bdc97251b;hpb=fb382c02950cbff4cdb769819799bb4afafe7b6e;p=Mograsim.git

diff --git a/net.mograsim.logic.model.am2900/GUIAm2904Testbench.json b/net.mograsim.logic.model.am2900/GUIAm2904Testbench.json
index 568ee046..b96609a8 100644
--- 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,
@@ -23,7 +23,7 @@
         "params": 1
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.GUIBitDisplay",
+        "id": "GUIBitDisplay",
         "name": "GUIBitDisplay#1",
         "pos": {
           "x": 391.0,
@@ -32,7 +32,7 @@
         "params": 1
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.GUIBitDisplay",
+        "id": "GUIBitDisplay",
         "name": "GUIBitDisplay#2",
         "pos": {
           "x": 391.0,
@@ -41,7 +41,7 @@
         "params": 1
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.GUIBitDisplay",
+        "id": "GUIBitDisplay",
         "name": "GUIBitDisplay#3",
         "pos": {
           "x": 391.0,
@@ -50,7 +50,7 @@
         "params": 1
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.GUIBitDisplay",
+        "id": "GUIBitDisplay",
         "name": "GUIBitDisplay#4",
         "pos": {
           "x": 365.0,
@@ -59,7 +59,7 @@
         "params": 1
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.GUIBitDisplay",
+        "id": "GUIBitDisplay",
         "name": "GUIBitDisplay#5",
         "pos": {
           "x": 365.0,
@@ -68,7 +68,7 @@
         "params": 1
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.GUIBitDisplay",
+        "id": "GUIBitDisplay",
         "name": "GUIBitDisplay#6",
         "pos": {
           "x": 365.0,
@@ -77,7 +77,7 @@
         "params": 1
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.GUIBitDisplay",
+        "id": "GUIBitDisplay",
         "name": "GUIBitDisplay#7",
         "pos": {
           "x": 365.0,
@@ -86,7 +86,7 @@
         "params": 1
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.GUIBitDisplay",
+        "id": "GUIBitDisplay",
         "name": "GUIBitDisplay#8",
         "pos": {
           "x": 365.0,
@@ -95,7 +95,7 @@
         "params": 1
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.GUIBitDisplay",
+        "id": "GUIBitDisplay",
         "name": "GUIBitDisplay#9",
         "pos": {
           "x": 365.0,
@@ -104,7 +104,7 @@
         "params": 1
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.GUIManualSwitch",
+        "id": "GUIManualSwitch",
         "name": "GUIManualSwitch#0",
         "pos": {
           "x": 255.0,
@@ -113,7 +113,7 @@
         "params": 1
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.GUIManualSwitch",
+        "id": "GUIManualSwitch",
         "name": "GUIManualSwitch#1",
         "pos": {
           "x": 170.0,
@@ -122,7 +122,7 @@
         "params": 1
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.GUIManualSwitch",
+        "id": "GUIManualSwitch",
         "name": "GUIManualSwitch#10",
         "pos": {
           "x": 160.0,
@@ -131,7 +131,7 @@
         "params": 1
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.GUIManualSwitch",
+        "id": "GUIManualSwitch",
         "name": "GUIManualSwitch#11",
         "pos": {
           "x": 160.0,
@@ -140,7 +140,7 @@
         "params": 1
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.GUIManualSwitch",
+        "id": "GUIManualSwitch",
         "name": "GUIManualSwitch#12",
         "pos": {
           "x": 160.0,
@@ -149,7 +149,7 @@
         "params": 1
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.GUIManualSwitch",
+        "id": "GUIManualSwitch",
         "name": "GUIManualSwitch#13",
         "pos": {
           "x": 60.0,
@@ -158,7 +158,7 @@
         "params": 1
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.GUIManualSwitch",
+        "id": "GUIManualSwitch",
         "name": "GUIManualSwitch#14",
         "pos": {
           "x": 165.0,
@@ -167,7 +167,7 @@
         "params": 1
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.GUIManualSwitch",
+        "id": "GUIManualSwitch",
         "name": "GUIManualSwitch#15",
         "pos": {
           "x": 140.0,
@@ -176,7 +176,7 @@
         "params": 1
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.GUIManualSwitch",
+        "id": "GUIManualSwitch",
         "name": "GUIManualSwitch#16",
         "pos": {
           "x": 140.0,
@@ -185,7 +185,7 @@
         "params": 1
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.GUIManualSwitch",
+        "id": "GUIManualSwitch",
         "name": "GUIManualSwitch#17",
         "pos": {
           "x": 140.0,
@@ -194,7 +194,7 @@
         "params": 1
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.GUIManualSwitch",
+        "id": "GUIManualSwitch",
         "name": "GUIManualSwitch#18",
         "pos": {
           "x": 140.0,
@@ -203,7 +203,7 @@
         "params": 1
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.GUIManualSwitch",
+        "id": "GUIManualSwitch",
         "name": "GUIManualSwitch#19",
         "pos": {
           "x": 140.0,
@@ -212,7 +212,7 @@
         "params": 1
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.GUIManualSwitch",
+        "id": "GUIManualSwitch",
         "name": "GUIManualSwitch#2",
         "pos": {
           "x": 170.0,
@@ -221,7 +221,7 @@
         "params": 1
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.GUIManualSwitch",
+        "id": "GUIManualSwitch",
         "name": "GUIManualSwitch#20",
         "pos": {
           "x": 140.0,
@@ -230,7 +230,7 @@
         "params": 1
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.GUIManualSwitch",
+        "id": "GUIManualSwitch",
         "name": "GUIManualSwitch#21",
         "pos": {
           "x": 55.0,
@@ -239,7 +239,7 @@
         "params": 1
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.GUIManualSwitch",
+        "id": "GUIManualSwitch",
         "name": "GUIManualSwitch#22",
         "pos": {
           "x": 60.0,
@@ -248,7 +248,7 @@
         "params": 1
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.GUIManualSwitch",
+        "id": "GUIManualSwitch",
         "name": "GUIManualSwitch#23",
         "pos": {
           "x": 60.0,
@@ -257,7 +257,7 @@
         "params": 1
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.GUIManualSwitch",
+        "id": "GUIManualSwitch",
         "name": "GUIManualSwitch#24",
         "pos": {
           "x": 55.0,
@@ -266,7 +266,7 @@
         "params": 1
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.GUIManualSwitch",
+        "id": "GUIManualSwitch",
         "name": "GUIManualSwitch#25",
         "pos": {
           "x": 55.0,
@@ -275,7 +275,7 @@
         "params": 1
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.GUIManualSwitch",
+        "id": "GUIManualSwitch",
         "name": "GUIManualSwitch#26",
         "pos": {
           "x": 60.0,
@@ -284,7 +284,7 @@
         "params": 1
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.GUIManualSwitch",
+        "id": "GUIManualSwitch",
         "name": "GUIManualSwitch#27",
         "pos": {
           "x": 60.0,
@@ -293,7 +293,7 @@
         "params": 1
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.GUIManualSwitch",
+        "id": "GUIManualSwitch",
         "name": "GUIManualSwitch#28",
         "pos": {
           "x": 55.0,
@@ -302,7 +302,7 @@
         "params": 1
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.GUIManualSwitch",
+        "id": "GUIManualSwitch",
         "name": "GUIManualSwitch#29",
         "pos": {
           "x": 55.0,
@@ -311,7 +311,7 @@
         "params": 1
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.GUIManualSwitch",
+        "id": "GUIManualSwitch",
         "name": "GUIManualSwitch#3",
         "pos": {
           "x": 55.0,
@@ -320,7 +320,7 @@
         "params": 1
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.GUIManualSwitch",
+        "id": "GUIManualSwitch",
         "name": "GUIManualSwitch#30",
         "pos": {
           "x": 60.0,
@@ -329,7 +329,7 @@
         "params": 1
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.GUIManualSwitch",
+        "id": "GUIManualSwitch",
         "name": "GUIManualSwitch#31",
         "pos": {
           "x": 55.0,
@@ -338,7 +338,7 @@
         "params": 1
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.GUIManualSwitch",
+        "id": "GUIManualSwitch",
         "name": "GUIManualSwitch#32",
         "pos": {
           "x": 300.0,
@@ -347,7 +347,7 @@
         "params": 1
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.GUIManualSwitch",
+        "id": "GUIManualSwitch",
         "name": "GUIManualSwitch#33",
         "pos": {
           "x": 300.0,
@@ -356,7 +356,7 @@
         "params": 1
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.GUIManualSwitch",
+        "id": "GUIManualSwitch",
         "name": "GUIManualSwitch#34",
         "pos": {
           "x": 300.0,
@@ -365,7 +365,7 @@
         "params": 1
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.GUIManualSwitch",
+        "id": "GUIManualSwitch",
         "name": "GUIManualSwitch#35",
         "pos": {
           "x": 300.0,
@@ -374,7 +374,7 @@
         "params": 1
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.GUIManualSwitch",
+        "id": "GUIManualSwitch",
         "name": "GUIManualSwitch#36",
         "pos": {
           "x": 300.0,
@@ -383,7 +383,7 @@
         "params": 1
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.GUIManualSwitch",
+        "id": "GUIManualSwitch",
         "name": "GUIManualSwitch#37",
         "pos": {
           "x": 165.0,
@@ -392,7 +392,7 @@
         "params": 1
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.GUIManualSwitch",
+        "id": "GUIManualSwitch",
         "name": "GUIManualSwitch#38",
         "pos": {
           "x": 385.0,
@@ -401,7 +401,7 @@
         "params": 1
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.GUIManualSwitch",
+        "id": "GUIManualSwitch",
         "name": "GUIManualSwitch#4",
         "pos": {
           "x": 170.0,
@@ -410,7 +410,7 @@
         "params": 1
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.GUIManualSwitch",
+        "id": "GUIManualSwitch",
         "name": "GUIManualSwitch#5",
         "pos": {
           "x": 170.0,
@@ -419,7 +419,7 @@
         "params": 1
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.GUIManualSwitch",
+        "id": "GUIManualSwitch",
         "name": "GUIManualSwitch#6",
         "pos": {
           "x": 170.0,
@@ -428,7 +428,7 @@
         "params": 1
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.GUIManualSwitch",
+        "id": "GUIManualSwitch",
         "name": "GUIManualSwitch#7",
         "pos": {
           "x": 155.0,
@@ -437,7 +437,7 @@
         "params": 1
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.GUIManualSwitch",
+        "id": "GUIManualSwitch",
         "name": "GUIManualSwitch#8",
         "pos": {
           "x": 155.0,
@@ -446,7 +446,7 @@
         "params": 1
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.GUIManualSwitch",
+        "id": "GUIManualSwitch",
         "name": "GUIManualSwitch#9",
         "pos": {
           "x": 160.0,
@@ -455,7 +455,7 @@
         "params": 1
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.GUIMerger",
+        "id": "GUIMerger",
         "name": "GUIMerger#0",
         "pos": {
           "x": 85.0,
@@ -464,7 +464,7 @@
         "params": 13
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.GUITriStateBuffer",
+        "id": "GUITriStateBuffer",
         "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,
@@ -488,7 +488,7 @@
         }
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.GUITriStateBuffer",
+        "id": "GUITriStateBuffer",
         "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,
@@ -512,7 +512,7 @@
         }
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.GUITriStateBuffer",
+        "id": "GUITriStateBuffer",
         "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,
@@ -536,7 +536,7 @@
         }
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.GUITriStateBuffer",
+        "id": "GUITriStateBuffer",
         "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,
@@ -560,7 +560,7 @@
         }
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.TextComponent",
+        "id": "TextComponent",
         "name": "TextComponent#0",
         "pos": {
           "x": 140.0,
@@ -569,7 +569,7 @@
         "params": "IZ"
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.TextComponent",
+        "id": "TextComponent",
         "name": "TextComponent#1",
         "pos": {
           "x": 140.0,
@@ -578,70 +578,70 @@
         "params": "IC"
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.TextComponent",
+        "id": "TextComponent",
         "name": "TextComponent#10",
         "pos": {
           "x": 35.0,
-          "y": 120.0
+          "y": 240.0
         },
         "params": "I0"
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.TextComponent",
+        "id": "TextComponent",
         "name": "TextComponent#11",
         "pos": {
           "x": 35.0,
-          "y": 240.0
+          "y": 120.0
         },
         "params": "I12"
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.TextComponent",
+        "id": "TextComponent",
         "name": "TextComponent#12",
         "pos": {
           "x": 35.0,
-          "y": 140.0
+          "y": 220.0
         },
         "params": "I2"
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.TextComponent",
+        "id": "TextComponent",
         "name": "TextComponent#13",
         "pos": {
           "x": 40.0,
-          "y": 170.0
+          "y": 190.0
         },
         "params": "I5"
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.TextComponent",
+        "id": "TextComponent",
         "name": "TextComponent#14",
         "pos": {
           "x": 40.0,
-          "y": 130.0
+          "y": 230.0
         },
         "params": "I1"
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.TextComponent",
+        "id": "TextComponent",
         "name": "TextComponent#15",
         "pos": {
           "x": 40.0,
-          "y": 150.0
+          "y": 210.0
         },
         "params": "I3"
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.TextComponent",
+        "id": "TextComponent",
         "name": "TextComponent#16",
         "pos": {
           "x": 35.0,
-          "y": 160.0
+          "y": 200.0
         },
         "params": "I4"
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.TextComponent",
+        "id": "TextComponent",
         "name": "TextComponent#17",
         "pos": {
           "x": 35.0,
@@ -650,25 +650,25 @@
         "params": "I6"
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.TextComponent",
+        "id": "TextComponent",
         "name": "TextComponent#18",
         "pos": {
           "x": 40.0,
-          "y": 190.0
+          "y": 170.0
         },
         "params": "I7"
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.TextComponent",
+        "id": "TextComponent",
         "name": "TextComponent#19",
         "pos": {
           "x": 35.0,
-          "y": 200.0
+          "y": 160.0
         },
         "params": "I8"
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.TextComponent",
+        "id": "TextComponent",
         "name": "TextComponent#2",
         "pos": {
           "x": 140.0,
@@ -677,34 +677,34 @@
         "params": "IN"
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.TextComponent",
+        "id": "TextComponent",
         "name": "TextComponent#20",
         "pos": {
           "x": 40.0,
-          "y": 210.0
+          "y": 150.0
         },
         "params": "I9"
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.TextComponent",
+        "id": "TextComponent",
         "name": "TextComponent#21",
         "pos": {
           "x": 35.0,
-          "y": 220.0
+          "y": 140.0
         },
         "params": "I10"
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.TextComponent",
+        "id": "TextComponent",
         "name": "TextComponent#22",
         "pos": {
           "x": 40.0,
-          "y": 230.0
+          "y": 130.0
         },
         "params": "I11"
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.TextComponent",
+        "id": "TextComponent",
         "name": "TextComponent#23",
         "pos": {
           "x": 145.0,
@@ -713,7 +713,7 @@
         "params": "CX"
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.TextComponent",
+        "id": "TextComponent",
         "name": "TextComponent#24",
         "pos": {
           "x": 150.0,
@@ -722,7 +722,7 @@
         "params": "C"
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.TextComponent",
+        "id": "TextComponent",
         "name": "TextComponent#25",
         "pos": {
           "x": 225.0,
@@ -731,7 +731,7 @@
         "params": "_OEY"
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.TextComponent",
+        "id": "TextComponent",
         "name": "TextComponent#26",
         "pos": {
           "x": 416.0,
@@ -740,7 +740,7 @@
         "params": "YZ"
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.TextComponent",
+        "id": "TextComponent",
         "name": "TextComponent#27",
         "pos": {
           "x": 416.0,
@@ -749,7 +749,7 @@
         "params": "YC"
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.TextComponent",
+        "id": "TextComponent",
         "name": "TextComponent#28",
         "pos": {
           "x": 416.0,
@@ -758,7 +758,7 @@
         "params": "YN"
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.TextComponent",
+        "id": "TextComponent",
         "name": "TextComponent#29",
         "pos": {
           "x": 416.0,
@@ -767,7 +767,7 @@
         "params": "YOVR"
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.TextComponent",
+        "id": "TextComponent",
         "name": "TextComponent#3",
         "pos": {
           "x": 140.0,
@@ -776,7 +776,7 @@
         "params": "IOVR"
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.TextComponent",
+        "id": "TextComponent",
         "name": "TextComponent#30",
         "pos": {
           "x": 390.0,
@@ -785,7 +785,7 @@
         "params": "CT"
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.TextComponent",
+        "id": "TextComponent",
         "name": "TextComponent#31",
         "pos": {
           "x": 390.0,
@@ -794,7 +794,7 @@
         "params": "C0"
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.TextComponent",
+        "id": "TextComponent",
         "name": "TextComponent#32",
         "pos": {
           "x": 390.0,
@@ -803,7 +803,7 @@
         "params": "SIOn"
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.TextComponent",
+        "id": "TextComponent",
         "name": "TextComponent#33",
         "pos": {
           "x": 390.0,
@@ -812,7 +812,7 @@
         "params": "QIOn"
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.TextComponent",
+        "id": "TextComponent",
         "name": "TextComponent#34",
         "pos": {
           "x": 390.0,
@@ -821,7 +821,7 @@
         "params": "SIO0"
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.TextComponent",
+        "id": "TextComponent",
         "name": "TextComponent#35",
         "pos": {
           "x": 390.0,
@@ -830,7 +830,7 @@
         "params": "QIO0"
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.TextComponent",
+        "id": "TextComponent",
         "name": "TextComponent#36",
         "pos": {
           "x": 30.0,
@@ -839,7 +839,7 @@
         "params": "enable S/QIOn input"
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.TextComponent",
+        "id": "TextComponent",
         "name": "TextComponent#37",
         "pos": {
           "x": 30.0,
@@ -848,7 +848,7 @@
         "params": "enable S/QIO0 input"
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.TextComponent",
+        "id": "TextComponent",
         "name": "TextComponent#38",
         "pos": {
           "x": 110.0,
@@ -857,7 +857,7 @@
         "params": "QIO0"
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.TextComponent",
+        "id": "TextComponent",
         "name": "TextComponent#39",
         "pos": {
           "x": 110.0,
@@ -866,7 +866,7 @@
         "params": "SIO0"
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.TextComponent",
+        "id": "TextComponent",
         "name": "TextComponent#4",
         "pos": {
           "x": 115.0,
@@ -875,7 +875,7 @@
         "params": "_CEM"
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.TextComponent",
+        "id": "TextComponent",
         "name": "TextComponent#40",
         "pos": {
           "x": 110.0,
@@ -884,7 +884,7 @@
         "params": "SIOn"
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.TextComponent",
+        "id": "TextComponent",
         "name": "TextComponent#41",
         "pos": {
           "x": 110.0,
@@ -893,7 +893,7 @@
         "params": "QIOn"
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.TextComponent",
+        "id": "TextComponent",
         "name": "TextComponent#42",
         "pos": {
           "x": 270.0,
@@ -902,7 +902,7 @@
         "params": "YOVR"
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.TextComponent",
+        "id": "TextComponent",
         "name": "TextComponent#43",
         "pos": {
           "x": 270.0,
@@ -911,7 +911,7 @@
         "params": "YN"
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.TextComponent",
+        "id": "TextComponent",
         "name": "TextComponent#44",
         "pos": {
           "x": 270.0,
@@ -920,7 +920,7 @@
         "params": "YZ"
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.TextComponent",
+        "id": "TextComponent",
         "name": "TextComponent#45",
         "pos": {
           "x": 270.0,
@@ -929,7 +929,7 @@
         "params": "YC"
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.TextComponent",
+        "id": "TextComponent",
         "name": "TextComponent#46",
         "pos": {
           "x": 220.0,
@@ -938,7 +938,7 @@
         "params": "enable Y input"
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.TextComponent",
+        "id": "TextComponent",
         "name": "TextComponent#47",
         "pos": {
           "x": 145.0,
@@ -947,7 +947,7 @@
         "params": "_SE"
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.TextComponent",
+        "id": "TextComponent",
         "name": "TextComponent#48",
         "pos": {
           "x": 350.0,
@@ -956,7 +956,7 @@
         "params": "_OECT"
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.TextComponent",
+        "id": "TextComponent",
         "name": "TextComponent#5",
         "pos": {
           "x": 115.0,
@@ -965,7 +965,7 @@
         "params": "_CEmu"
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.TextComponent",
+        "id": "TextComponent",
         "name": "TextComponent#6",
         "pos": {
           "x": 125.0,
@@ -974,7 +974,7 @@
         "params": "_EZ"
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.TextComponent",
+        "id": "TextComponent",
         "name": "TextComponent#7",
         "pos": {
           "x": 125.0,
@@ -983,7 +983,7 @@
         "params": "_EC"
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.TextComponent",
+        "id": "TextComponent",
         "name": "TextComponent#8",
         "pos": {
           "x": 125.0,
@@ -992,7 +992,7 @@
         "params": "_EN"
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.TextComponent",
+        "id": "TextComponent",
         "name": "TextComponent#9",
         "pos": {
           "x": 125.0,
@@ -1001,7 +1001,7 @@
         "params": "_EOVR"
       },
       {
-        "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint",
+        "id": "WireCrossPoint",
         "name": "WireCrossPoint#0",
         "pos": {
           "x": 185.0,
@@ -1010,7 +1010,7 @@
         "params": 1
       },
       {
-        "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint",
+        "id": "WireCrossPoint",
         "name": "WireCrossPoint#1",
         "pos": {
           "x": 185.0,
@@ -1019,7 +1019,7 @@
         "params": 1
       },
       {
-        "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint",
+        "id": "WireCrossPoint",
         "name": "WireCrossPoint#10",
         "pos": {
           "x": 370.0,
@@ -1028,7 +1028,7 @@
         "params": 1
       },
       {
-        "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint",
+        "id": "WireCrossPoint",
         "name": "WireCrossPoint#11",
         "pos": {
           "x": 375.0,
@@ -1037,7 +1037,7 @@
         "params": 1
       },
       {
-        "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint",
+        "id": "WireCrossPoint",
         "name": "WireCrossPoint#12",
         "pos": {
           "x": 380.0,
@@ -1046,7 +1046,7 @@
         "params": 1
       },
       {
-        "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint",
+        "id": "WireCrossPoint",
         "name": "WireCrossPoint#2",
         "pos": {
           "x": 210.0,
@@ -1055,7 +1055,7 @@
         "params": 1
       },
       {
-        "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint",
+        "id": "WireCrossPoint",
         "name": "WireCrossPoint#3",
         "pos": {
           "x": 215.0,
@@ -1064,7 +1064,7 @@
         "params": 1
       },
       {
-        "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint",
+        "id": "WireCrossPoint",
         "name": "WireCrossPoint#4",
         "pos": {
           "x": 355.0,
@@ -1073,7 +1073,7 @@
         "params": 1
       },
       {
-        "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint",
+        "id": "WireCrossPoint",
         "name": "WireCrossPoint#5",
         "pos": {
           "x": 360.0,
@@ -1082,7 +1082,7 @@
         "params": 1
       },
       {
-        "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint",
+        "id": "WireCrossPoint",
         "name": "WireCrossPoint#6",
         "pos": {
           "x": 345.0,
@@ -1091,7 +1091,7 @@
         "params": 1
       },
       {
-        "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint",
+        "id": "WireCrossPoint",
         "name": "WireCrossPoint#7",
         "pos": {
           "x": 360.0,
@@ -1100,7 +1100,7 @@
         "params": 1
       },
       {
-        "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint",
+        "id": "WireCrossPoint",
         "name": "WireCrossPoint#8",
         "pos": {
           "x": 360.0,
@@ -1109,7 +1109,7 @@
         "params": 1
       },
       {
-        "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint",
+        "id": "WireCrossPoint",
         "name": "WireCrossPoint#9",
         "pos": {
           "x": 365.0,
@@ -1765,31 +1765,31 @@
         },
         "pin2": {
           "compName": "GUIMerger#0",
-          "pinName": "I0"
+          "pinName": "I12"
         },
         "name": "unnamedWire#42",
         "path": []
       },
       {
         "pin1": {
-          "compName": "GUIManualSwitch#31",
-          "pinName": ""
+          "compName": "GUIMerger#0",
+          "pinName": "I11"
         },
         "pin2": {
-          "compName": "GUIMerger#0",
-          "pinName": "I12"
+          "compName": "GUIManualSwitch#13",
+          "pinName": ""
         },
         "name": "unnamedWire#43",
         "path": []
       },
       {
         "pin1": {
-          "compName": "GUIMerger#0",
-          "pinName": "I11"
+          "compName": "GUIManualSwitch#21",
+          "pinName": ""
         },
         "pin2": {
-          "compName": "GUIManualSwitch#27",
-          "pinName": ""
+          "compName": "GUIMerger#0",
+          "pinName": "I10"
         },
         "name": "unnamedWire#44",
         "path": []
@@ -1797,10 +1797,10 @@
       {
         "pin1": {
           "compName": "GUIMerger#0",
-          "pinName": "I10"
+          "pinName": "I9"
         },
         "pin2": {
-          "compName": "GUIManualSwitch#29",
+          "compName": "GUIManualSwitch#22",
           "pinName": ""
         },
         "name": "unnamedWire#45",
@@ -1808,12 +1808,12 @@
       },
       {
         "pin1": {
-          "compName": "GUIManualSwitch#30",
+          "compName": "GUIManualSwitch#24",
           "pinName": ""
         },
         "pin2": {
           "compName": "GUIMerger#0",
-          "pinName": "I9"
+          "pinName": "I8"
         },
         "name": "unnamedWire#46",
         "path": []
@@ -1821,10 +1821,10 @@
       {
         "pin1": {
           "compName": "GUIMerger#0",
-          "pinName": "I8"
+          "pinName": "I7"
         },
         "pin2": {
-          "compName": "GUIManualSwitch#28",
+          "compName": "GUIManualSwitch#23",
           "pinName": ""
         },
         "name": "unnamedWire#47",
@@ -1832,12 +1832,12 @@
       },
       {
         "pin1": {
-          "compName": "GUIManualSwitch#26",
+          "compName": "GUIManualSwitch#25",
           "pinName": ""
         },
         "pin2": {
           "compName": "GUIMerger#0",
-          "pinName": "I7"
+          "pinName": "I6"
         },
         "name": "unnamedWire#48",
         "path": []
@@ -1845,10 +1845,10 @@
       {
         "pin1": {
           "compName": "GUIMerger#0",
-          "pinName": "I6"
+          "pinName": "I5"
         },
         "pin2": {
-          "compName": "GUIManualSwitch#25",
+          "compName": "GUIManualSwitch#26",
           "pinName": ""
         },
         "name": "unnamedWire#49",
@@ -1877,12 +1877,12 @@
       },
       {
         "pin1": {
-          "compName": "GUIManualSwitch#23",
+          "compName": "GUIManualSwitch#28",
           "pinName": ""
         },
         "pin2": {
           "compName": "GUIMerger#0",
-          "pinName": "I5"
+          "pinName": "I4"
         },
         "name": "unnamedWire#50",
         "path": []
@@ -1890,10 +1890,10 @@
       {
         "pin1": {
           "compName": "GUIMerger#0",
-          "pinName": "I4"
+          "pinName": "I3"
         },
         "pin2": {
-          "compName": "GUIManualSwitch#24",
+          "compName": "GUIManualSwitch#30",
           "pinName": ""
         },
         "name": "unnamedWire#51",
@@ -1901,12 +1901,12 @@
       },
       {
         "pin1": {
-          "compName": "GUIManualSwitch#22",
+          "compName": "GUIManualSwitch#29",
           "pinName": ""
         },
         "pin2": {
           "compName": "GUIMerger#0",
-          "pinName": "I3"
+          "pinName": "I2"
         },
         "name": "unnamedWire#52",
         "path": []
@@ -1914,10 +1914,10 @@
       {
         "pin1": {
           "compName": "GUIMerger#0",
-          "pinName": "I2"
+          "pinName": "I1"
         },
         "pin2": {
-          "compName": "GUIManualSwitch#21",
+          "compName": "GUIManualSwitch#27",
           "pinName": ""
         },
         "name": "unnamedWire#53",
@@ -1925,12 +1925,12 @@
       },
       {
         "pin1": {
-          "compName": "GUIMerger#0",
-          "pinName": "I1"
+          "compName": "GUIManualSwitch#31",
+          "pinName": ""
         },
         "pin2": {
-          "compName": "GUIManualSwitch#13",
-          "pinName": ""
+          "compName": "GUIMerger#0",
+          "pinName": "I0"
         },
         "name": "unnamedWire#54",
         "path": []
@@ -2331,8 +2331,8 @@
     ],
     "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