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

diff --git a/net.mograsim.logic.ui.am2900/components/GUIandor414.json b/net.mograsim.logic.ui.am2900/components/GUIandor414.json
index 5021dbaa..5cadf0f6 100644
--- a/net.mograsim.logic.ui.am2900/components/GUIandor414.json
+++ b/net.mograsim.logic.ui.am2900/components/GUIandor414.json
@@ -113,27 +113,29 @@ mograsim version: 0.1.3
     "subComps": [
       {
         "pos": {
-          "x": 15.0,
-          "y": 137.5
+          "x": 35.0,
+          "y": 37.5
         },
-        "id": "GUIand41"
+        "id": "GUIor_4",
+        "name": "GUIor_4#0"
       },
       {
         "pos": {
-          "x": 35.0,
-          "y": 37.5
+          "x": 15.0,
+          "y": 137.5
         },
-        "id": "GUIor_4"
+        "id": "GUIand41",
+        "name": "GUIand41#0"
       }
     ],
     "innerWires": [
       {
         "pin1": {
-          "compId": 0,
+          "compName": "_submodelinterface",
           "pinName": "A1"
         },
         "pin2": {
-          "compId": 1,
+          "compName": "GUIand41#0",
           "pinName": "A1"
         },
         "path": [
@@ -149,11 +151,11 @@ mograsim version: 0.1.3
       },
       {
         "pin1": {
-          "compId": 0,
+          "compName": "_submodelinterface",
           "pinName": "A2"
         },
         "pin2": {
-          "compId": 1,
+          "compName": "GUIand41#0",
           "pinName": "A2"
         },
         "path": [
@@ -169,22 +171,22 @@ mograsim version: 0.1.3
       },
       {
         "pin1": {
-          "compId": 0,
+          "compName": "_submodelinterface",
           "pinName": "A3"
         },
         "pin2": {
-          "compId": 1,
+          "compName": "GUIand41#0",
           "pinName": "A3"
         },
         "path": []
       },
       {
         "pin1": {
-          "compId": 0,
+          "compName": "_submodelinterface",
           "pinName": "A4"
         },
         "pin2": {
-          "compId": 1,
+          "compName": "GUIand41#0",
           "pinName": "A4"
         },
         "path": [
@@ -200,11 +202,11 @@ mograsim version: 0.1.3
       },
       {
         "pin1": {
-          "compId": 0,
+          "compName": "_submodelinterface",
           "pinName": "B"
         },
         "pin2": {
-          "compId": 1,
+          "compName": "GUIand41#0",
           "pinName": "B"
         },
         "path": [
@@ -220,11 +222,11 @@ mograsim version: 0.1.3
       },
       {
         "pin1": {
-          "compId": 0,
+          "compName": "_submodelinterface",
           "pinName": "C1"
         },
         "pin2": {
-          "compId": 2,
+          "compName": "GUIor_4#0",
           "pinName": "A1"
         },
         "path": [
@@ -240,11 +242,11 @@ mograsim version: 0.1.3
       },
       {
         "pin1": {
-          "compId": 0,
+          "compName": "_submodelinterface",
           "pinName": "C2"
         },
         "pin2": {
-          "compId": 2,
+          "compName": "GUIor_4#0",
           "pinName": "A2"
         },
         "path": [
@@ -260,22 +262,22 @@ mograsim version: 0.1.3
       },
       {
         "pin1": {
-          "compId": 0,
+          "compName": "_submodelinterface",
           "pinName": "C3"
         },
         "pin2": {
-          "compId": 2,
+          "compName": "GUIor_4#0",
           "pinName": "A3"
         },
         "path": []
       },
       {
         "pin1": {
-          "compId": 0,
+          "compName": "_submodelinterface",
           "pinName": "C4"
         },
         "pin2": {
-          "compId": 2,
+          "compName": "GUIor_4#0",
           "pinName": "A4"
         },
         "path": [
@@ -291,11 +293,11 @@ mograsim version: 0.1.3
       },
       {
         "pin1": {
-          "compId": 1,
+          "compName": "GUIand41#0",
           "pinName": "Y1"
         },
         "pin2": {
-          "compId": 2,
+          "compName": "GUIor_4#0",
           "pinName": "B1"
         },
         "path": [
@@ -319,11 +321,11 @@ mograsim version: 0.1.3
       },
       {
         "pin1": {
-          "compId": 1,
+          "compName": "GUIand41#0",
           "pinName": "Y2"
         },
         "pin2": {
-          "compId": 2,
+          "compName": "GUIor_4#0",
           "pinName": "B2"
         },
         "path": [
@@ -347,11 +349,11 @@ mograsim version: 0.1.3
       },
       {
         "pin1": {
-          "compId": 1,
+          "compName": "GUIand41#0",
           "pinName": "Y3"
         },
         "pin2": {
-          "compId": 2,
+          "compName": "GUIor_4#0",
           "pinName": "B3"
         },
         "path": [
@@ -375,11 +377,11 @@ mograsim version: 0.1.3
       },
       {
         "pin1": {
-          "compId": 1,
+          "compName": "GUIand41#0",
           "pinName": "Y4"
         },
         "pin2": {
-          "compId": 2,
+          "compName": "GUIor_4#0",
           "pinName": "B4"
         },
         "path": [
@@ -403,11 +405,11 @@ mograsim version: 0.1.3
       },
       {
         "pin1": {
-          "compId": 2,
+          "compName": "GUIor_4#0",
           "pinName": "Y1"
         },
         "pin2": {
-          "compId": 0,
+          "compName": "_submodelinterface",
           "pinName": "Y1"
         },
         "path": [
@@ -423,11 +425,11 @@ mograsim version: 0.1.3
       },
       {
         "pin1": {
-          "compId": 2,
+          "compName": "GUIor_4#0",
           "pinName": "Y2"
         },
         "pin2": {
-          "compId": 0,
+          "compName": "_submodelinterface",
           "pinName": "Y2"
         },
         "path": [
@@ -443,22 +445,22 @@ mograsim version: 0.1.3
       },
       {
         "pin1": {
-          "compId": 2,
+          "compName": "GUIor_4#0",
           "pinName": "Y3"
         },
         "pin2": {
-          "compId": 0,
+          "compName": "_submodelinterface",
           "pinName": "Y3"
         },
         "path": []
       },
       {
         "pin1": {
-          "compId": 2,
+          "compName": "GUIor_4#0",
           "pinName": "Y4"
         },
         "pin2": {
-          "compId": 0,
+          "compName": "_submodelinterface",
           "pinName": "Y4"
         },
         "path": [