X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model.am2900%2Fcomponents%2FGUIand.json;h=beeec77f7e732743192974d69e8c02d902ff513b;hb=aa17d1b4aa4d13ac885130e990dc05d9e38c3913;hp=bb69f119503549c0735374fa00289e8dc2b4a144;hpb=a86976434d00dce2652d93256cc12b6e3a0f324a;p=Mograsim.git

diff --git a/net.mograsim.logic.model.am2900/components/GUIand.json b/net.mograsim.logic.model.am2900/components/GUIand.json
index bb69f119..beeec77f 100644
--- a/net.mograsim.logic.model.am2900/components/GUIand.json
+++ b/net.mograsim.logic.model.am2900/components/GUIand.json
@@ -1,4 +1,3 @@
-mograsim version: 0.1.3
 {
   "width": 35.0,
   "height": 20.0,
@@ -9,7 +8,8 @@ mograsim version: 0.1.3
         "y": 5.0
       },
       "name": "A",
-      "logicWidth": 1
+      "logicWidth": 1,
+      "usage": "INPUT"
     },
     {
       "location": {
@@ -17,7 +17,8 @@ mograsim version: 0.1.3
         "y": 15.0
       },
       "name": "B",
-      "logicWidth": 1
+      "logicWidth": 1,
+      "usage": "INPUT"
     },
     {
       "location": {
@@ -25,32 +26,33 @@ mograsim version: 0.1.3
         "y": 5.0
       },
       "name": "Y",
-      "logicWidth": 1
+      "logicWidth": 1,
+      "usage": "OUTPUT"
     }
   ],
+  "innerScale": 0.4,
   "submodel": {
-    "innerScale": 0.4,
-    "subComps": [
+    "components": [
       {
-        "id": "GUINandGate",
-        "name": "GUINandGate#1",
+        "id": "class:net.mograsim.logic.model.model.components.atomic.GUINandGate",
+        "name": "GUINandGate#0",
         "pos": {
-          "x": 50.0,
+          "x": 20.0,
           "y": 15.0
         },
         "params": 1
       },
       {
-        "id": "GUINandGate",
-        "name": "GUINandGate#0",
+        "id": "class:net.mograsim.logic.model.model.components.atomic.GUINandGate",
+        "name": "GUINandGate#1",
         "pos": {
-          "x": 20.0,
+          "x": 50.0,
           "y": 15.0
         },
         "params": 1
       },
       {
-        "id": "WireCrossPoint",
+        "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint",
         "name": "WireCrossPoint#0",
         "pos": {
           "x": 44.0,
@@ -59,39 +61,40 @@ mograsim version: 0.1.3
         "params": 1
       }
     ],
-    "innerWires": [
+    "wires": [
       {
         "pin1": {
           "compName": "_submodelinterface",
-          "pinName": "B"
+          "pinName": "A"
         },
         "pin2": {
           "compName": "GUINandGate#0",
-          "pinName": "B"
+          "pinName": "A"
         },
-        "name": "unnamedWire#1"
+        "name": "unnamedWire#0"
       },
       {
         "pin1": {
           "compName": "_submodelinterface",
-          "pinName": "A"
+          "pinName": "B"
         },
         "pin2": {
           "compName": "GUINandGate#0",
-          "pinName": "A"
+          "pinName": "B"
         },
-        "name": "unnamedWire#0"
+        "name": "unnamedWire#1"
       },
       {
         "pin1": {
-          "compName": "GUINandGate#1",
+          "compName": "GUINandGate#0",
           "pinName": "Y"
         },
         "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "Y"
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
         },
-        "name": "unnamedWire#5"
+        "name": "unnamedWire#2",
+        "path": []
       },
       {
         "pin1": {
@@ -100,13 +103,13 @@ mograsim version: 0.1.3
         },
         "pin2": {
           "compName": "GUINandGate#1",
-          "pinName": "B"
+          "pinName": "A"
         },
-        "name": "unnamedWire#4",
+        "name": "unnamedWire#3",
         "path": [
           {
             "x": 45.0,
-            "y": 30.0
+            "y": 20.0
           }
         ]
       },
@@ -117,36 +120,39 @@ mograsim version: 0.1.3
         },
         "pin2": {
           "compName": "GUINandGate#1",
-          "pinName": "A"
+          "pinName": "B"
         },
-        "name": "unnamedWire#3",
+        "name": "unnamedWire#4",
         "path": [
           {
             "x": 45.0,
-            "y": 20.0
+            "y": 30.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "GUINandGate#0",
+          "compName": "GUINandGate#1",
           "pinName": "Y"
         },
         "pin2": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "Y"
         },
-        "name": "unnamedWire#2",
-        "path": []
+        "name": "unnamedWire#5"
       }
-    ]
+    ],
+    "version": "0.1.1"
   },
-  "symbolRendererSnippetID": "simpleRectangularLike",
+  "symbolRendererSnippetID": "class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer",
   "symbolRendererParams": {
     "centerText": "GUIand",
     "centerTextHeight": 5.0,
     "horizontalComponentCenter": 17.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",
+  "version": "0.1.5"
 }
\ No newline at end of file