X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.ui.am2900%2Fcomponents%2FGUIand41.json;h=973a4c9dfe2737cb07d754d2977914223012f16e;hb=5ece0acf049bf9af2933f513fe0206565681f622;hp=c3157e9f8eab6d87259e0b1fb0550f2488f5a945;hpb=05f3deb7ee3a0b7162c75e1963be9a739618e3df;p=Mograsim.git

diff --git a/net.mograsim.logic.ui.am2900/components/GUIand41.json b/net.mograsim.logic.ui.am2900/components/GUIand41.json
index c3157e9f..973a4c9d 100644
--- a/net.mograsim.logic.ui.am2900/components/GUIand41.json
+++ b/net.mograsim.logic.ui.am2900/components/GUIand41.json
@@ -81,109 +81,116 @@ mograsim version: 0.1.3
     "subComps": [
       {
         "pos": {
-          "x": 30.0,
-          "y": 7.5
+          "x": 24.0,
+          "y": 71.5
         },
-        "id": "GUIand"
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#1",
+        "params": 1
       },
       {
         "pos": {
-          "x": 30.0,
-          "y": 32.5
+          "x": 24.0,
+          "y": 46.5
         },
-        "id": "GUIand"
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#0",
+        "params": 1
       },
       {
         "pos": {
-          "x": 30.0,
-          "y": 57.5
+          "x": 24.0,
+          "y": 96.5
         },
-        "id": "GUIand"
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#2",
+        "params": 1
       },
       {
         "pos": {
           "x": 30.0,
-          "y": 82.5
+          "y": 7.5
         },
-        "id": "GUIand"
+        "id": "GUIand",
+        "name": "GUIand#0"
       },
       {
         "pos": {
-          "x": 24.0,
-          "y": 46.5
+          "x": 30.0,
+          "y": 57.5
         },
-        "id": "WireCrossPoint",
-        "params": 1
+        "id": "GUIand",
+        "name": "GUIand#2"
       },
       {
         "pos": {
-          "x": 24.0,
-          "y": 71.5
+          "x": 30.0,
+          "y": 32.5
         },
-        "id": "WireCrossPoint",
-        "params": 1
+        "id": "GUIand",
+        "name": "GUIand#1"
       },
       {
         "pos": {
-          "x": 24.0,
-          "y": 96.5
+          "x": 30.0,
+          "y": 82.5
         },
-        "id": "WireCrossPoint",
-        "params": 1
+        "id": "GUIand",
+        "name": "GUIand#3"
       }
     ],
     "innerWires": [
       {
         "pin1": {
-          "compId": 0,
+          "compName": "_submodelinterface",
           "pinName": "A1"
         },
         "pin2": {
-          "compId": 1,
+          "compName": "GUIand#0",
           "pinName": "A"
         },
         "path": []
       },
       {
         "pin1": {
-          "compId": 0,
+          "compName": "_submodelinterface",
           "pinName": "A2"
         },
         "pin2": {
-          "compId": 2,
+          "compName": "GUIand#1",
           "pinName": "A"
         },
         "path": []
       },
       {
         "pin1": {
-          "compId": 0,
+          "compName": "_submodelinterface",
           "pinName": "A3"
         },
         "pin2": {
-          "compId": 3,
+          "compName": "GUIand#2",
           "pinName": "A"
         },
         "path": []
       },
       {
         "pin1": {
-          "compId": 0,
+          "compName": "_submodelinterface",
           "pinName": "A4"
         },
         "pin2": {
-          "compId": 4,
+          "compName": "GUIand#3",
           "pinName": "A"
         },
         "path": []
       },
       {
         "pin1": {
-          "compId": 0,
+          "compName": "_submodelinterface",
           "pinName": "B"
         },
         "pin2": {
-          "compId": 7,
+          "compName": "WireCrossPoint#2",
           "pinName": ""
         },
         "path": [
@@ -195,66 +202,66 @@ mograsim version: 0.1.3
       },
       {
         "pin1": {
-          "compId": 7,
+          "compName": "WireCrossPoint#2",
           "pinName": ""
         },
         "pin2": {
-          "compId": 4,
+          "compName": "GUIand#3",
           "pinName": "B"
         },
         "path": []
       },
       {
         "pin1": {
-          "compId": 7,
+          "compName": "WireCrossPoint#2",
           "pinName": ""
         },
         "pin2": {
-          "compId": 6,
+          "compName": "WireCrossPoint#1",
           "pinName": ""
         },
         "path": []
       },
       {
         "pin1": {
-          "compId": 6,
+          "compName": "WireCrossPoint#1",
           "pinName": ""
         },
         "pin2": {
-          "compId": 3,
+          "compName": "GUIand#2",
           "pinName": "B"
         },
         "path": []
       },
       {
         "pin1": {
-          "compId": 6,
+          "compName": "WireCrossPoint#1",
           "pinName": ""
         },
         "pin2": {
-          "compId": 5,
+          "compName": "WireCrossPoint#0",
           "pinName": ""
         },
         "path": []
       },
       {
         "pin1": {
-          "compId": 5,
+          "compName": "WireCrossPoint#0",
           "pinName": ""
         },
         "pin2": {
-          "compId": 2,
+          "compName": "GUIand#1",
           "pinName": "B"
         },
         "path": []
       },
       {
         "pin1": {
-          "compId": 5,
+          "compName": "WireCrossPoint#0",
           "pinName": ""
         },
         "pin2": {
-          "compId": 1,
+          "compName": "GUIand#0",
           "pinName": "B"
         },
         "path": [
@@ -266,44 +273,44 @@ mograsim version: 0.1.3
       },
       {
         "pin1": {
-          "compId": 1,
+          "compName": "GUIand#0",
           "pinName": "Y"
         },
         "pin2": {
-          "compId": 0,
+          "compName": "_submodelinterface",
           "pinName": "Y1"
         },
         "path": []
       },
       {
         "pin1": {
-          "compId": 2,
+          "compName": "GUIand#1",
           "pinName": "Y"
         },
         "pin2": {
-          "compId": 0,
+          "compName": "_submodelinterface",
           "pinName": "Y2"
         },
         "path": []
       },
       {
         "pin1": {
-          "compId": 3,
+          "compName": "GUIand#2",
           "pinName": "Y"
         },
         "pin2": {
-          "compId": 0,
+          "compName": "_submodelinterface",
           "pinName": "Y3"
         },
         "path": []
       },
       {
         "pin1": {
-          "compId": 4,
+          "compName": "GUIand#3",
           "pinName": "Y"
         },
         "pin2": {
-          "compId": 0,
+          "compName": "_submodelinterface",
           "pinName": "Y4"
         },
         "path": []