Improved layout of andor414

[Mograsim.git] / plugins / net.mograsim.logic.model.am2900 / components / net / mograsim / logic / model / am2900 / components / andor414.json

diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/andor414.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/andor414.json
index a2b4512..6a1554e 100644 (file)
--- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/andor414.json
+++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/andor414.json
@@ -128,7 +128,7 @@
         "name": "and41#0",
         "pos": {
           "x": 15.0,
-          "y": 137.5
+          "y": 142.5
         }
       },
       {
@@ -158,7 +158,7 @@
           },
           {
             "x": 10.0,
-            "y": 142.5
+            "y": 147.5
           }
         ]
       },
@@ -179,327 +179,336 @@
           },
           {
             "x": 5.0,
-            "y": 152.5
+            "y": 157.5
           }
         ]
       },
       {
         "pin1": {
-          "compName": "and41#0",
-          "pinName": "Y2"
+          "compName": "_submodelinterface",
+          "pinName": "A3"
         },
         "pin2": {
-          "compName": "or_4#0",
-          "pinName": "B2"
+          "compName": "and41#0",
+          "pinName": "A3"
         },
-        "name": "unnamedWire#10",
+        "name": "unnamedWire#2",
         "path": [
           {
-            "x": 65.0,
-            "y": 152.5
-          },
-          {
-            "x": 65.0,
-            "y": 125.0
-          },
-          {
-            "x": 25.0,
-            "y": 125.0
+            "x": 10.0,
+            "y": 162.5
           },
           {
-            "x": 25.0,
-            "y": 92.5
+            "x": 10.0,
+            "y": 167.5
           }
         ]
       },
       {
         "pin1": {
-          "compName": "and41#0",
-          "pinName": "Y3"
+          "compName": "_submodelinterface",
+          "pinName": "A4"
         },
         "pin2": {
-          "compName": "or_4#0",
-          "pinName": "B3"
+          "compName": "and41#0",
+          "pinName": "A4"
         },
-        "name": "unnamedWire#11",
+        "name": "unnamedWire#3",
         "path": [
           {
-            "x": 60.0,
-            "y": 162.5
-          },
-          {
-            "x": 60.0,
-            "y": 130.0
-          },
-          {
-            "x": 20.0,
-            "y": 130.0
+            "x": 5.0,
+            "y": 187.5
           },
           {
-            "x": 20.0,
-            "y": 102.5
+            "x": 5.0,
+            "y": 177.5
           }
         ]
       },
       {
         "pin1": {
-          "compName": "and41#0",
-          "pinName": "Y4"
+          "compName": "_submodelinterface",
+          "pinName": "B"
         },
         "pin2": {
-          "compName": "or_4#0",
-          "pinName": "B4"
+          "compName": "and41#0",
+          "pinName": "B"
         },
-        "name": "unnamedWire#12",
+        "name": "unnamedWire#4",
         "path": [
           {
-            "x": 55.0,
-            "y": 172.5
-          },
-          {
-            "x": 55.0,
-            "y": 135.0
-          },
-          {
-            "x": 15.0,
-            "y": 135.0
+            "x": 10.0,
+            "y": 212.5
           },
           {
-            "x": 15.0,
-            "y": 112.5
+            "x": 10.0,
+            "y": 187.5
           }
         ]
       },
       {
         "pin1": {
-          "compName": "or_4#0",
-          "pinName": "Y1"
+          "compName": "_submodelinterface",
+          "pinName": "C1"
         },
         "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "Y1"
+          "compName": "or_4#0",
+          "pinName": "A1"
         },
-        "name": "unnamedWire#13",
+        "name": "unnamedWire#5",
         "path": [
           {
-            "x": 75.0,
-            "y": 42.5
+            "x": 10.0,
+            "y": 12.5
           },
           {
-            "x": 75.0,
-            "y": 12.5
+            "x": 10.0,
+            "y": 42.5
           }
         ]
       },
       {
         "pin1": {
-          "compName": "or_4#0",
-          "pinName": "Y2"
+          "compName": "_submodelinterface",
+          "pinName": "C2"
         },
         "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "Y2"
+          "compName": "or_4#0",
+          "pinName": "A2"
         },
-        "name": "unnamedWire#14",
+        "name": "unnamedWire#6",
         "path": [
           {
-            "x": 80.0,
-            "y": 52.5
+            "x": 5.0,
+            "y": 37.5
           },
           {
-            "x": 80.0,
-            "y": 37.5
+            "x": 5.0,
+            "y": 52.5
           }
         ]
       },
       {
         "pin1": {
-          "compName": "or_4#0",
-          "pinName": "Y3"
+          "compName": "_submodelinterface",
+          "pinName": "C3"
         },
         "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "Y3"
+          "compName": "or_4#0",
+          "pinName": "A3"
         },
-        "name": "unnamedWire#15",
+        "name": "unnamedWire#7",
         "path": []
       },
       {
         "pin1": {
-          "compName": "or_4#0",
-          "pinName": "Y4"
+          "compName": "_submodelinterface",
+          "pinName": "C4"
         },
         "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "Y4"
+          "compName": "or_4#0",
+          "pinName": "A4"
         },
-        "name": "unnamedWire#16",
+        "name": "unnamedWire#8",
         "path": [
           {
-            "x": 80.0,
-            "y": 72.5
+            "x": 5.0,
+            "y": 87.5
           },
           {
-            "x": 80.0,
-            "y": 87.5
+            "x": 5.0,
+            "y": 72.5
           }
         ]
       },
       {
         "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "A3"
-        },
-        "pin2": {
           "compName": "and41#0",
-          "pinName": "A3"
-        },
-        "name": "unnamedWire#2",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "A4"
+          "pinName": "Y1"
         },
         "pin2": {
-          "compName": "and41#0",
-          "pinName": "A4"
+          "compName": "or_4#0",
+          "pinName": "B1"
         },
-        "name": "unnamedWire#3",
+        "name": "unnamedWire#9",
         "path": [
           {
-            "x": 5.0,
-            "y": 187.5
+            "x": 50.0,
+            "y": 147.5
           },
           {
-            "x": 5.0,
-            "y": 172.5
+            "x": 50.0,
+            "y": 122.5
+          },
+          {
+            "x": 30.0,
+            "y": 122.5
+          },
+          {
+            "x": 30.0,
+            "y": 82.5
           }
         ]
       },
       {
         "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "B"
+          "compName": "and41#0",
+          "pinName": "Y2"
         },
         "pin2": {
-          "compName": "and41#0",
-          "pinName": "B"
+          "compName": "or_4#0",
+          "pinName": "B2"
         },
-        "name": "unnamedWire#4",
+        "name": "unnamedWire#10",
         "path": [
           {
-            "x": 10.0,
-            "y": 212.5
+            "x": 45.0,
+            "y": 157.5
           },
           {
-            "x": 10.0,
-            "y": 182.5
+            "x": 45.0,
+            "y": 127.5
+          },
+          {
+            "x": 25.0,
+            "y": 127.5
+          },
+          {
+            "x": 25.0,
+            "y": 92.5
           }
         ]
       },
       {
         "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "C1"
+          "compName": "and41#0",
+          "pinName": "Y3"
         },
         "pin2": {
           "compName": "or_4#0",
-          "pinName": "A1"
+          "pinName": "B3"
         },
-        "name": "unnamedWire#5",
+        "name": "unnamedWire#11",
         "path": [
           {
-            "x": 10.0,
-            "y": 12.5
+            "x": 40.0,
+            "y": 167.5
           },
           {
-            "x": 10.0,
-            "y": 42.5
+            "x": 40.0,
+            "y": 132.5
+          },
+          {
+            "x": 20.0,
+            "y": 132.5
+          },
+          {
+            "x": 20.0,
+            "y": 102.5
           }
         ]
       },
       {
         "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "C2"
+          "compName": "and41#0",
+          "pinName": "Y4"
         },
         "pin2": {
           "compName": "or_4#0",
-          "pinName": "A2"
+          "pinName": "B4"
         },
-        "name": "unnamedWire#6",
+        "name": "unnamedWire#12",
         "path": [
           {
-            "x": 5.0,
-            "y": 37.5
+            "x": 35.0,
+            "y": 177.5
           },
           {
-            "x": 5.0,
-            "y": 52.5
+            "x": 35.0,
+            "y": 137.5
+          },
+          {
+            "x": 15.0,
+            "y": 137.5
+          },
+          {
+            "x": 15.0,
+            "y": 112.5
           }
         ]
       },
       {
         "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "C3"
+          "compName": "or_4#0",
+          "pinName": "Y1"
         },
         "pin2": {
-          "compName": "or_4#0",
-          "pinName": "A3"
+          "compName": "_submodelinterface",
+          "pinName": "Y1"
         },
-        "name": "unnamedWire#7",
-        "path": []
+        "name": "unnamedWire#13",
+        "path": [
+          {
+            "x": 75.0,
+            "y": 42.5
+          },
+          {
+            "x": 75.0,
+            "y": 12.5
+          }
+        ]
       },
       {
         "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "C4"
+          "compName": "or_4#0",
+          "pinName": "Y2"
         },
         "pin2": {
-          "compName": "or_4#0",
-          "pinName": "A4"
+          "compName": "_submodelinterface",
+          "pinName": "Y2"
         },
-        "name": "unnamedWire#8",
+        "name": "unnamedWire#14",
         "path": [
           {
-            "x": 5.0,
-            "y": 87.5
+            "x": 80.0,
+            "y": 52.5
           },
           {
-            "x": 5.0,
-            "y": 72.5
+            "x": 80.0,
+            "y": 37.5
           }
         ]
       },
       {
         "pin1": {
-          "compName": "and41#0",
-          "pinName": "Y1"
+          "compName": "or_4#0",
+          "pinName": "Y3"
         },
         "pin2": {
+          "compName": "_submodelinterface",
+          "pinName": "Y3"
+        },
+        "name": "unnamedWire#15",
+        "path": []
+      },
+      {
+        "pin1": {
           "compName": "or_4#0",
-          "pinName": "B1"
+          "pinName": "Y4"
         },
-        "name": "unnamedWire#9",
+        "pin2": {
+          "compName": "_submodelinterface",
+          "pinName": "Y4"
+        },
+        "name": "unnamedWire#16",
         "path": [
           {
-            "x": 70.0,
-            "y": 142.5
-          },
-          {
-            "x": 70.0,
-            "y": 120.0
-          },
-          {
-            "x": 30.0,
-            "y": 120.0
+            "x": 80.0,
+            "y": 72.5
           },
           {
-            "x": 30.0,
-            "y": 82.5
+            "x": 80.0,
+            "y": 87.5
           }
         ]
       }