X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=plugins%2Fnet.mograsim.logic.model.am2900%2Fcomponents%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fam2900%2Fcomponents%2Fand41.json;h=d2ce1ab4ae5b7ae3e216a37a96dc88d73401e00c;hb=85b63d39efadbe019fb8c743c9964bf94c6c42c9;hp=b8c988633beccb7b9c01a2a9861ddaa3288ea112;hpb=7d05144c25daa53e60fc9ed9fd503546a86567f8;p=Mograsim.git

diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/and41.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/and41.json
index b8c98863..d2ce1ab4 100644
--- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/and41.json
+++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/and41.json
@@ -1,5 +1,5 @@
 {
-  "width": 35.0,
+  "width": 15.0,
   "height": 50.0,
   "interfacePins": [
     {
@@ -49,7 +49,7 @@
     },
     {
       "location": {
-        "x": 35.0,
+        "x": 15.0,
         "y": 5.0
       },
       "name": "Y1",
@@ -58,7 +58,7 @@
     },
     {
       "location": {
-        "x": 35.0,
+        "x": 15.0,
         "y": 15.0
       },
       "name": "Y2",
@@ -67,7 +67,7 @@
     },
     {
       "location": {
-        "x": 35.0,
+        "x": 15.0,
         "y": 25.0
       },
       "name": "Y3",
@@ -76,7 +76,7 @@
     },
     {
       "location": {
-        "x": 35.0,
+        "x": 15.0,
         "y": 35.0
       },
       "name": "Y4",
@@ -91,7 +91,7 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#0",
         "pos": {
-          "x": 24.0,
+          "x": 4.0,
           "y": 46.5
         },
         "params": 1
@@ -100,7 +100,7 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#1",
         "pos": {
-          "x": 24.0,
+          "x": 4.0,
           "y": 71.5
         },
         "params": 1
@@ -109,7 +109,7 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#2",
         "pos": {
-          "x": 24.0,
+          "x": 4.0,
           "y": 96.5
         },
         "params": 1
@@ -118,7 +118,7 @@
         "id": "and",
         "name": "and#0",
         "pos": {
-          "x": 30.0,
+          "x": 7.5,
           "y": 7.5
         }
       },
@@ -126,7 +126,7 @@
         "id": "and",
         "name": "and#1",
         "pos": {
-          "x": 30.0,
+          "x": 7.5,
           "y": 32.5
         }
       },
@@ -134,7 +134,7 @@
         "id": "and",
         "name": "and#2",
         "pos": {
-          "x": 30.0,
+          "x": 7.5,
           "y": 57.5
         }
       },
@@ -142,7 +142,7 @@
         "id": "and",
         "name": "and#3",
         "pos": {
-          "x": 30.0,
+          "x": 7.5,
           "y": 82.5
         }
       }
@@ -172,71 +172,6 @@
         "name": "unnamedWire#1",
         "path": []
       },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "and#0",
-          "pinName": "B"
-        },
-        "name": "unnamedWire#10",
-        "path": [
-          {
-            "x": 25.0,
-            "y": 22.5
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "and#0",
-          "pinName": "Y"
-        },
-        "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "Y1"
-        },
-        "name": "unnamedWire#11",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "and#1",
-          "pinName": "Y"
-        },
-        "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "Y2"
-        },
-        "name": "unnamedWire#12",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "and#2",
-          "pinName": "Y"
-        },
-        "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "Y3"
-        },
-        "name": "unnamedWire#13",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "and#3",
-          "pinName": "Y"
-        },
-        "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "Y4"
-        },
-        "name": "unnamedWire#14",
-        "path": []
-      },
       {
         "pin1": {
           "compName": "_submodelinterface",
@@ -273,7 +208,7 @@
         "name": "unnamedWire#4",
         "path": [
           {
-            "x": 25.0,
+            "x": 5.0,
             "y": 112.5
           }
         ]
@@ -337,6 +272,71 @@
         },
         "name": "unnamedWire#9",
         "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "and#0",
+          "pinName": "B"
+        },
+        "name": "unnamedWire#10",
+        "path": [
+          {
+            "x": 5.0,
+            "y": 22.5
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "and#0",
+          "pinName": "Y"
+        },
+        "pin2": {
+          "compName": "_submodelinterface",
+          "pinName": "Y1"
+        },
+        "name": "unnamedWire#11",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "and#1",
+          "pinName": "Y"
+        },
+        "pin2": {
+          "compName": "_submodelinterface",
+          "pinName": "Y2"
+        },
+        "name": "unnamedWire#12",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "and#2",
+          "pinName": "Y"
+        },
+        "pin2": {
+          "compName": "_submodelinterface",
+          "pinName": "Y3"
+        },
+        "name": "unnamedWire#13",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "and#3",
+          "pinName": "Y"
+        },
+        "pin2": {
+          "compName": "_submodelinterface",
+          "pinName": "Y4"
+        },
+        "name": "unnamedWire#14",
+        "path": []
       }
     ],
     "version": "0.1.1"