X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model.editor%2Fcomponents%2Fam2904%2FGUIAm2904MSR.json;h=c1b8cbc5af2721f375603cd8b26299c668502946;hb=148a58630b38b30d4d24a21e3f55c357f5b4d0bc;hp=d5e6094aa2e3c413270eb5f036e7e1a406058fcd;hpb=fb382c02950cbff4cdb769819799bb4afafe7b6e;p=Mograsim.git

diff --git a/net.mograsim.logic.model.editor/components/am2904/GUIAm2904MSR.json b/net.mograsim.logic.model.editor/components/am2904/GUIAm2904MSR.json
index d5e6094a..c1b8cbc5 100644
--- 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,
@@ -196,7 +196,7 @@
         "params": 4
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.GUINandGate",
+        "id": "GUINandGate",
         "name": "GUINandGate#0",
         "pos": {
           "x": 325.0,
@@ -205,7 +205,7 @@
         "params": 1
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.GUISplitter",
+        "id": "GUISplitter",
         "name": "GUISplitter#0",
         "pos": {
           "x": 5.0,
@@ -214,7 +214,7 @@
         "params": 4
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.GUISplitter",
+        "id": "GUISplitter",
         "name": "GUISplitter#1",
         "pos": {
           "x": 5.0,
@@ -223,7 +223,7 @@
         "params": 4
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.GUISplitter",
+        "id": "GUISplitter",
         "name": "GUISplitter#2",
         "pos": {
           "x": 45.0,
@@ -232,7 +232,7 @@
         "params": 3
       },
       {
-        "id": "class:net.mograsim.logic.model.model.components.atomic.GUISplitter",
+        "id": "GUISplitter",
         "name": "GUISplitter#3",
         "pos": {
           "x": 5.0,
@@ -241,7 +241,7 @@
         "params": 4
       },
       {
-        "id": "class:net.mograsim.logic.model.am2900.components.GUIdff4_finewe",
+        "id": "GUIdff4_finewe",
         "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,
@@ -258,7 +258,7 @@
         "params": 1
       },
       {
-        "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint",
+        "id": "WireCrossPoint",
         "name": "WireCrossPoint#1",
         "pos": {
           "x": 414.0,
@@ -267,7 +267,7 @@
         "params": 1
       },
       {
-        "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint",
+        "id": "WireCrossPoint",
         "name": "WireCrossPoint#10",
         "pos": {
           "x": 89.0,
@@ -276,7 +276,7 @@
         "params": 1
       },
       {
-        "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint",
+        "id": "WireCrossPoint",
         "name": "WireCrossPoint#11",
         "pos": {
           "x": 89.0,
@@ -285,7 +285,7 @@
         "params": 1
       },
       {
-        "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint",
+        "id": "WireCrossPoint",
         "name": "WireCrossPoint#12",
         "pos": {
           "x": 19.0,
@@ -294,7 +294,7 @@
         "params": 1
       },
       {
-        "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint",
+        "id": "WireCrossPoint",
         "name": "WireCrossPoint#13",
         "pos": {
           "x": 194.0,
@@ -303,7 +303,7 @@
         "params": 1
       },
       {
-        "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint",
+        "id": "WireCrossPoint",
         "name": "WireCrossPoint#14",
         "pos": {
           "x": 89.0,
@@ -312,7 +312,7 @@
         "params": 1
       },
       {
-        "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint",
+        "id": "WireCrossPoint",
         "name": "WireCrossPoint#15",
         "pos": {
           "x": 319.0,
@@ -321,7 +321,7 @@
         "params": 1
       },
       {
-        "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint",
+        "id": "WireCrossPoint",
         "name": "WireCrossPoint#16",
         "pos": {
           "x": 319.0,
@@ -330,7 +330,7 @@
         "params": 1
       },
       {
-        "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint",
+        "id": "WireCrossPoint",
         "name": "WireCrossPoint#2",
         "pos": {
           "x": 419.0,
@@ -339,7 +339,7 @@
         "params": 1
       },
       {
-        "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint",
+        "id": "WireCrossPoint",
         "name": "WireCrossPoint#3",
         "pos": {
           "x": 424.0,
@@ -348,7 +348,7 @@
         "params": 1
       },
       {
-        "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint",
+        "id": "WireCrossPoint",
         "name": "WireCrossPoint#4",
         "pos": {
           "x": 429.0,
@@ -357,7 +357,7 @@
         "params": 1
       },
       {
-        "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint",
+        "id": "WireCrossPoint",
         "name": "WireCrossPoint#5",
         "pos": {
           "x": 84.0,
@@ -366,7 +366,7 @@
         "params": 1
       },
       {
-        "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint",
+        "id": "WireCrossPoint",
         "name": "WireCrossPoint#6",
         "pos": {
           "x": 94.0,
@@ -375,7 +375,7 @@
         "params": 1
       },
       {
-        "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint",
+        "id": "WireCrossPoint",
         "name": "WireCrossPoint#7",
         "pos": {
           "x": 29.0,
@@ -384,7 +384,7 @@
         "params": 1
       },
       {
-        "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint",
+        "id": "WireCrossPoint",
         "name": "WireCrossPoint#8",
         "pos": {
           "x": 74.0,
@@ -393,7 +393,7 @@
         "params": 1
       },
       {
-        "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint",
+        "id": "WireCrossPoint",
         "name": "WireCrossPoint#9",
         "pos": {
           "x": 49.0,
@@ -416,11 +416,11 @@
         "path": [
           {
             "x": 140.0,
-            "y": 415.0
+            "y": 445.0
           },
           {
             "x": 255.0,
-            "y": 415.0
+            "y": 445.0
           },
           {
             "x": 255.0,
@@ -483,50 +483,50 @@
       },
       {
         "pin1": {
-          "compName": "GUISplitter#0",
-          "pinName": "O0"
-        },
-        "pin2": {
           "compName": "DeserializedSubmodelComponent#0",
           "pinName": "I0_1"
         },
+        "pin2": {
+          "compName": "GUISplitter#0",
+          "pinName": "O3"
+        },
         "name": "unnamedWire#12",
         "path": [
           {
             "x": 35.0,
-            "y": 35.0
+            "y": 125.0
           },
           {
             "x": 35.0,
-            "y": 125.0
+            "y": 35.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#0",
-          "pinName": "I0_2"
+          "compName": "GUISplitter#0",
+          "pinName": "O2"
         },
         "pin2": {
-          "compName": "GUISplitter#0",
-          "pinName": "O1"
+          "compName": "DeserializedSubmodelComponent#0",
+          "pinName": "I0_2"
         },
         "name": "unnamedWire#13",
         "path": [
           {
             "x": 30.0,
-            "y": 135.0
+            "y": 45.0
           },
           {
             "x": 30.0,
-            "y": 45.0
+            "y": 135.0
           }
         ]
       },
       {
         "pin1": {
           "compName": "GUISplitter#0",
-          "pinName": "O2"
+          "pinName": "O1"
         },
         "pin2": {
           "compName": "DeserializedSubmodelComponent#0",
@@ -546,29 +546,29 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#0",
-          "pinName": "I0_4"
+          "compName": "GUISplitter#0",
+          "pinName": "O0"
         },
         "pin2": {
-          "compName": "GUISplitter#0",
-          "pinName": "O3"
+          "compName": "DeserializedSubmodelComponent#0",
+          "pinName": "I0_4"
         },
         "name": "unnamedWire#15",
         "path": [
           {
             "x": 20.0,
-            "y": 155.0
+            "y": 65.0
           },
           {
             "x": 20.0,
-            "y": 65.0
+            "y": 155.0
           }
         ]
       },
       {
         "pin1": {
           "compName": "GUISplitter#1",
-          "pinName": "O0"
+          "pinName": "O3"
         },
         "pin2": {
           "compName": "DeserializedSubmodelComponent#0",
@@ -584,7 +584,7 @@
         },
         "pin2": {
           "compName": "GUISplitter#1",
-          "pinName": "O1"
+          "pinName": "O2"
         },
         "name": "unnamedWire#17",
         "path": []
@@ -592,7 +592,7 @@
       {
         "pin1": {
           "compName": "GUISplitter#1",
-          "pinName": "O2"
+          "pinName": "O1"
         },
         "pin2": {
           "compName": "DeserializedSubmodelComponent#0",
@@ -603,13 +603,13 @@
       },
       {
         "pin1": {
-          "compName": "GUISplitter#1",
-          "pinName": "O3"
-        },
-        "pin2": {
           "compName": "DeserializedSubmodelComponent#0",
           "pinName": "I1_4"
         },
+        "pin2": {
+          "compName": "GUISplitter#1",
+          "pinName": "O0"
+        },
         "name": "unnamedWire#19",
         "path": []
       },
@@ -682,7 +682,7 @@
       {
         "pin1": {
           "compName": "GUISplitter#3",
-          "pinName": "O1"
+          "pinName": "O2"
         },
         "pin2": {
           "compName": "DeserializedSubmodelComponent#1",
@@ -713,7 +713,7 @@
         "path": [
           {
             "x": 60.0,
-            "y": 425.0
+            "y": 445.0
           },
           {
             "x": 60.0,
@@ -751,7 +751,7 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#3",
+          "compName": "WireCrossPoint#2",
           "pinName": ""
         },
         "pin2": {
@@ -767,7 +767,7 @@
           "pinName": "I3"
         },
         "pin2": {
-          "compName": "WireCrossPoint#4",
+          "compName": "WireCrossPoint#1",
           "pinName": ""
         },
         "name": "unnamedWire#28",
@@ -952,13 +952,13 @@
       },
       {
         "pin1": {
-          "compName": "GUISplitter#3",
-          "pinName": "O0"
-        },
-        "pin2": {
           "compName": "WireCrossPoint#12",
           "pinName": ""
         },
+        "pin2": {
+          "compName": "GUISplitter#3",
+          "pinName": "O3"
+        },
         "name": "unnamedWire#38",
         "path": []
       },
@@ -1259,7 +1259,7 @@
       {
         "pin1": {
           "compName": "GUISplitter#3",
-          "pinName": "O2"
+          "pinName": "O1"
         },
         "pin2": {
           "compName": "WireCrossPoint#8",
@@ -1329,7 +1329,7 @@
       {
         "pin1": {
           "compName": "GUISplitter#3",
-          "pinName": "O3"
+          "pinName": "O0"
         },
         "pin2": {
           "compName": "DeserializedSubmodelComponent#5",
@@ -1447,7 +1447,7 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#1",
+          "compName": "WireCrossPoint#4",
           "pinName": ""
         },
         "pin2": {
@@ -1645,7 +1645,7 @@
           "pinName": "I1"
         },
         "pin2": {
-          "compName": "WireCrossPoint#2",
+          "compName": "WireCrossPoint#3",
           "pinName": ""
         },
         "name": "unnamedWire#8",
@@ -1706,7 +1706,7 @@
         "path": [
           {
             "x": 245.0,
-            "y": 445.0
+            "y": 425.0
           },
           {
             "x": 245.0,
@@ -1902,7 +1902,7 @@
     ],
     "version": "0.1.1"
   },
-  "symbolRendererSnippetID": "class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer",
+  "symbolRendererSnippetID": "simpleRectangularLike",
   "symbolRendererParams": {
     "centerText": "MSR",
     "centerTextHeight": 5.0,
@@ -1910,11 +1910,19 @@
     "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": {}
+    "atomicHighLevelStates": {
+      "q": {
+        "id": "delegating",
+        "params": {
+          "delegateTarget": "GUIdff4_finewe#0",
+          "subStateID": "q"
+        }
+      }
+    }
   },
   "version": "0.1.5"
 }
\ No newline at end of file