Cleaned or_4

[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 a9b9719..e7f5e6e 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
@@ -1,47 +1,20 @@
 {
-  "width": 35.0,
-  "height": 90.0,
+  "width": 30.0,
+  "height": 40.0,
   "interfacePins": [
     {
       "location": {
         "x": 0.0,
-        "y": 45.0
-      },
-      "name": "A1",
-      "logicWidth": 1,
-      "usage": "INPUT"
-    },
-    {
-      "location": {
-        "x": 0.0,
-        "y": 55.0
-      },
-      "name": "A2",
-      "logicWidth": 1,
-      "usage": "INPUT"
-    },
-    {
-      "location": {
-        "x": 0.0,
-        "y": 65.0
-      },
-      "name": "A3",
-      "logicWidth": 1,
-      "usage": "INPUT"
-    },
-    {
-      "location": {
-        "x": 0.0,
-        "y": 75.0
+        "y": 25.0
       },
-      "name": "A4",
-      "logicWidth": 1,
+      "name": "A",
+      "logicWidth": 4,
       "usage": "INPUT"
     },
     {
       "location": {
         "x": 0.0,
-        "y": 85.0
+        "y": 35.0
       },
       "name": "B",
       "logicWidth": 1,
@@ -52,115 +25,37 @@
         "x": 0.0,
         "y": 5.0
       },
-      "name": "C1",
-      "logicWidth": 1,
+      "name": "C",
+      "logicWidth": 4,
       "usage": "INPUT"
     },
     {
       "location": {
-        "x": 0.0,
-        "y": 15.0
-      },
-      "name": "C2",
-      "logicWidth": 1,
-      "usage": "INPUT"
-    },
-    {
-      "location": {
-        "x": 0.0,
-        "y": 25.0
-      },
-      "name": "C3",
-      "logicWidth": 1,
-      "usage": "INPUT"
-    },
-    {
-      "location": {
-        "x": 0.0,
-        "y": 35.0
-      },
-      "name": "C4",
-      "logicWidth": 1,
-      "usage": "INPUT"
-    },
-    {
-      "location": {
-        "x": 35.0,
+        "x": 30.0,
         "y": 5.0
       },
-      "name": "Y1",
-      "logicWidth": 1,
-      "usage": "OUTPUT"
-    },
-    {
-      "location": {
-        "x": 35.0,
-        "y": 15.0
-      },
-      "name": "Y2",
-      "logicWidth": 1,
-      "usage": "OUTPUT"
-    },
-    {
-      "location": {
-        "x": 35.0,
-        "y": 25.0
-      },
-      "name": "Y3",
-      "logicWidth": 1,
-      "usage": "OUTPUT"
-    },
-    {
-      "location": {
-        "x": 35.0,
-        "y": 35.0
-      },
-      "name": "Y4",
-      "logicWidth": 1,
+      "name": "Y",
+      "logicWidth": 4,
       "usage": "OUTPUT"
     }
   ],
   "innerScale": 0.4,
   "submodel": {
     "components": [
-      {
-        "id": "Splitter",
-        "name": "Splitter#0",
-        "pos": {
-          "x": 20.0,
-          "y": 82.5
-        },
-        "params": {
-          "logicWidth": 4,
-          "orientation": "RIGHT"
-        }
-      },
-      {
-        "id": "Splitter",
-        "name": "Splitter#1",
-        "pos": {
-          "x": 15.0,
-          "y": 142.5
-        },
-        "params": {
-          "logicWidth": 4,
-          "orientation": "LEFT"
-        }
-      },
       {
         "id": "and41",
         "name": "and41#0",
         "pos": {
-          "x": 35.0,
-          "y": 142.5
+          "x": 20.0,
+          "y": 57.5
         }
       },
       {
         "id": "or_4",
         "name": "or_4#0",
         "pos": {
-          "x": 35.0,
-          "y": 37.5
+          "x": 15.0,
+          "y": 2.5
         }
       }
     ],
@@ -168,309 +63,87 @@
       {
         "pin1": {
           "compName": "_submodelinterface",
-          "pinName": "A4"
-        },
-        "pin2": {
-          "compName": "Splitter#1",
-          "pinName": "O3"
-        },
-        "name": "unnamedWire#0",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "A3"
-        },
-        "pin2": {
-          "compName": "Splitter#1",
-          "pinName": "O2"
-        },
-        "name": "unnamedWire#1",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "A2"
-        },
-        "pin2": {
-          "compName": "Splitter#1",
-          "pinName": "O1"
-        },
-        "name": "unnamedWire#2",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#1",
-          "pinName": "O0"
-        },
-        "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "A1"
-        },
-        "name": "unnamedWire#3",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "B"
+          "pinName": "A"
         },
         "pin2": {
           "compName": "and41#0",
-          "pinName": "B"
-        },
-        "name": "unnamedWire#4",
-        "path": [
-          {
-            "x": 30.0,
-            "y": 212.5
-          },
-          {
-            "x": 30.0,
-            "y": 172.5
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "C1"
-        },
-        "pin2": {
-          "compName": "or_4#0",
-          "pinName": "A1"
+          "pinName": "A"
         },
-        "name": "unnamedWire#5",
+        "name": "unnamedWire#0",
         "path": [
           {
             "x": 10.0,
-            "y": 12.5
+            "y": 62.5
           },
           {
             "x": 10.0,
-            "y": 42.5
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "C2"
-        },
-        "pin2": {
-          "compName": "or_4#0",
-          "pinName": "A2"
-        },
-        "name": "unnamedWire#6",
-        "path": [
-          {
-            "x": 5.0,
-            "y": 37.5
-          },
-          {
-            "x": 5.0,
-            "y": 52.5
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "C3"
-        },
-        "pin2": {
-          "compName": "or_4#0",
-          "pinName": "A3"
-        },
-        "name": "unnamedWire#7",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "C4"
-        },
-        "pin2": {
-          "compName": "or_4#0",
-          "pinName": "A4"
-        },
-        "name": "unnamedWire#8",
-        "path": [
-          {
-            "x": 5.0,
-            "y": 87.5
-          },
-          {
-            "x": 5.0,
             "y": 72.5
           }
         ]
       },
       {
         "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "O3"
-        },
-        "pin2": {
           "compName": "or_4#0",
-          "pinName": "B4"
-        },
-        "name": "unnamedWire#9",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "O2"
-        },
-        "pin2": {
-          "compName": "or_4#0",
-          "pinName": "B3"
-        },
-        "name": "unnamedWire#10",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "or_4#0",
-          "pinName": "B2"
-        },
-        "pin2": {
-          "compName": "Splitter#0",
-          "pinName": "O1"
-        },
-        "name": "unnamedWire#11",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "O0"
+          "pinName": "Y"
         },
         "pin2": {
-          "compName": "or_4#0",
-          "pinName": "B1"
+          "compName": "_submodelinterface",
+          "pinName": "Y"
         },
-        "name": "unnamedWire#12",
+        "name": "unnamedWire#1",
         "path": []
       },
       {
         "pin1": {
           "compName": "or_4#0",
-          "pinName": "Y1"
+          "pinName": "B"
         },
         "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "Y1"
+          "compName": "and41#0",
+          "pinName": "Y"
         },
-        "name": "unnamedWire#13",
+        "name": "unnamedWire#2",
         "path": [
           {
-            "x": 75.0,
-            "y": 42.5
+            "x": 10.0,
+            "y": 32.5
           },
           {
-            "x": 75.0,
-            "y": 12.5
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "or_4#0",
-          "pinName": "Y2"
-        },
-        "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "Y2"
-        },
-        "name": "unnamedWire#14",
-        "path": [
-          {
-            "x": 80.0,
+            "x": 10.0,
             "y": 52.5
           },
           {
-            "x": 80.0,
-            "y": 37.5
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "or_4#0",
-          "pinName": "Y3"
-        },
-        "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "Y3"
-        },
-        "name": "unnamedWire#15",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "or_4#0",
-          "pinName": "Y4"
-        },
-        "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "Y4"
-        },
-        "name": "unnamedWire#16",
-        "path": [
-          {
-            "x": 80.0,
-            "y": 72.5
+            "x": 60.0,
+            "y": 52.5
           },
           {
-            "x": 80.0,
-            "y": 87.5
+            "x": 60.0,
+            "y": 72.5
           }
         ]
       },
       {
         "pin1": {
-          "compName": "Splitter#0",
-          "pinName": "I"
+          "compName": "_submodelinterface",
+          "pinName": "B"
         },
         "pin2": {
           "compName": "and41#0",
-          "pinName": "Y"
+          "pinName": "B"
         },
-        "name": "unnamedWire#17",
-        "path": [
-          {
-            "x": 15.0,
-            "y": 97.5
-          },
-          {
-            "x": 15.0,
-            "y": 127.5
-          },
-          {
-            "x": 75.0,
-            "y": 127.5
-          },
-          {
-            "x": 75.0,
-            "y": 157.5
-          }
-        ]
+        "name": "unnamedWire#3",
+        "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#1",
-          "pinName": "I"
+          "compName": "_submodelinterface",
+          "pinName": "C"
         },
         "pin2": {
-          "compName": "and41#0",
+          "compName": "or_4#0",
           "pinName": "A"
         },
-        "name": "unnamedWire#18",
+        "name": "unnamedWire#4",
         "path": []
       }
     ],