Cleaned or_4

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

diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/ram2.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/ram2.json
index 64d509c..8de3e2a 100644 (file)
--- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/ram2.json
+++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/ram2.json
@@ -187,8 +187,8 @@
         "id": "Splitter",
         "name": "Splitter#2",
         "pos": {
-          "x": 285.0,
-          "y": 705.0
+          "x": 305.0,
+          "y": 560.0
         },
         "params": {
           "logicWidth": 4,
@@ -200,7 +200,7 @@
         "name": "Splitter#3",
         "pos": {
           "x": 285.0,
-          "y": 635.0
+          "y": 505.0
         },
         "params": {
           "logicWidth": 4,
@@ -211,8 +211,8 @@
         "id": "Splitter",
         "name": "Splitter#4",
         "pos": {
-          "x": 32.5,
-          "y": 617.5
+          "x": 20.0,
+          "y": 600.0
         },
         "params": {
           "logicWidth": 4,
@@ -260,7 +260,7 @@
         "name": "WireCrossPoint#4",
         "pos": {
           "x": 49.0,
-          "y": 629.0
+          "y": 519.0
         },
         "params": 4
       },
@@ -269,7 +269,7 @@
         "name": "WireCrossPoint#5",
         "pos": {
           "x": 49.0,
-          "y": 554.0
+          "y": 464.0
         },
         "params": 4
       },
@@ -278,7 +278,7 @@
         "name": "WireCrossPoint#6",
         "pos": {
           "x": 49.0,
-          "y": 449.0
+          "y": 409.0
         },
         "params": 4
       },
@@ -296,7 +296,7 @@
         "name": "WireCrossPoint#8",
         "pos": {
           "x": 109.0,
-          "y": 449.0
+          "y": 409.0
         },
         "params": 4
       },
@@ -305,7 +305,7 @@
         "name": "WireCrossPoint#9",
         "pos": {
           "x": 109.0,
-          "y": 554.0
+          "y": 464.0
         },
         "params": 4
       },
@@ -314,7 +314,7 @@
         "name": "WireCrossPoint#10",
         "pos": {
           "x": 109.0,
-          "y": 659.0
+          "y": 519.0
         },
         "params": 4
       },
@@ -346,31 +346,31 @@
         "id": "andor414",
         "name": "andor414#0",
         "pos": {
-          "x": 235.0,
-          "y": 415.0
+          "x": 240.0,
+          "y": 410.0
         }
       },
       {
         "id": "andor414",
         "name": "andor414#1",
         "pos": {
-          "x": 235.0,
-          "y": 520.0
+          "x": 240.0,
+          "y": 465.0
         }
       },
       {
         "id": "andor414",
         "name": "andor414#2",
         "pos": {
-          "x": 235.0,
-          "y": 625.0
+          "x": 240.0,
+          "y": 515.0
         }
       },
       {
         "id": "andor414",
         "name": "andor414#3",
         "pos": {
-          "x": 135.0,
+          "x": 140.0,
           "y": 385.0
         }
       },
@@ -378,16 +378,16 @@
         "id": "andor414",
         "name": "andor414#4",
         "pos": {
-          "x": 135.0,
-          "y": 490.0
+          "x": 140.0,
+          "y": 440.0
         }
       },
       {
         "id": "andor414",
         "name": "andor414#5",
         "pos": {
-          "x": 135.0,
-          "y": 595.0
+          "x": 140.0,
+          "y": 495.0
         }
       },
       {
@@ -419,7 +419,7 @@
         "name": "dlatch4#1",
         "pos": {
           "x": 55.0,
-          "y": 435.0
+          "y": 395.0
         }
       },
       {
@@ -427,7 +427,7 @@
         "name": "dlatch4#2",
         "pos": {
           "x": 55.0,
-          "y": 540.0
+          "y": 450.0
         }
       },
       {
@@ -435,7 +435,7 @@
         "name": "dlatch4#3",
         "pos": {
           "x": 55.0,
-          "y": 645.0
+          "y": 505.0
         }
       }
     ],
@@ -678,7 +678,7 @@
           },
           {
             "x": 25.0,
-            "y": 470.0
+            "y": 430.0
           }
         ]
       },
@@ -699,7 +699,7 @@
           },
           {
             "x": 20.0,
-            "y": 575.0
+            "y": 485.0
           }
         ]
       },
@@ -720,7 +720,7 @@
           },
           {
             "x": 15.0,
-            "y": 680.0
+            "y": 540.0
           }
         ]
       },
@@ -782,7 +782,12 @@
           "pinName": ""
         },
         "name": "unnamedWire#21",
-        "path": []
+        "path": [
+          {
+            "x": 50.0,
+            "y": 615.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -794,12 +799,7 @@
           "pinName": "D"
         },
         "name": "unnamedWire#22",
-        "path": [
-          {
-            "x": 50.0,
-            "y": 660.0
-          }
-        ]
+        "path": []
       },
       {
         "pin1": {
@@ -939,7 +939,7 @@
         "path": [
           {
             "x": 110.0,
-            "y": 690.0
+            "y": 540.0
           }
         ]
       },
@@ -981,7 +981,7 @@
           },
           {
             "x": 205.0,
-            "y": 500.0
+            "y": 445.0
           }
         ]
       },
@@ -1002,7 +1002,7 @@
           },
           {
             "x": 200.0,
-            "y": 605.0
+            "y": 500.0
           }
         ]
       },
@@ -1023,7 +1023,7 @@
           },
           {
             "x": 195.0,
-            "y": 710.0
+            "y": 550.0
           }
         ]
       },
@@ -1057,7 +1057,7 @@
         "path": [
           {
             "x": 125.0,
-            "y": 470.0
+            "y": 420.0
           }
         ]
       },
@@ -1074,7 +1074,7 @@
         "path": [
           {
             "x": 120.0,
-            "y": 575.0
+            "y": 475.0
           }
         ]
       },
@@ -1091,7 +1091,7 @@
         "path": [
           {
             "x": 115.0,
-            "y": 680.0
+            "y": 530.0
           }
         ]
       },
@@ -1144,12 +1144,12 @@
             "y": 380.0
           },
           {
-            "x": 130.0,
+            "x": 135.0,
             "y": 380.0
           },
           {
-            "x": 130.0,
-            "y": 410.0
+            "x": 135.0,
+            "y": 390.0
           }
         ]
       },
@@ -1178,7 +1178,7 @@
         "path": [
           {
             "x": 110.0,
-            "y": 480.0
+            "y": 435.0
           }
         ]
       },
@@ -1207,19 +1207,19 @@
         "path": [
           {
             "x": 175.0,
-            "y": 410.0
+            "y": 390.0
           },
           {
             "x": 175.0,
-            "y": 485.0
+            "y": 430.0
           },
           {
-            "x": 130.0,
-            "y": 485.0
+            "x": 135.0,
+            "y": 430.0
           },
           {
-            "x": 130.0,
-            "y": 515.0
+            "x": 135.0,
+            "y": 445.0
           }
         ]
       },
@@ -1236,19 +1236,19 @@
         "path": [
           {
             "x": 175.0,
-            "y": 515.0
+            "y": 445.0
           },
           {
             "x": 175.0,
-            "y": 590.0
+            "y": 485.0
           },
           {
-            "x": 130.0,
-            "y": 590.0
+            "x": 135.0,
+            "y": 485.0
           },
           {
-            "x": 130.0,
-            "y": 620.0
+            "x": 135.0,
+            "y": 500.0
           }
         ]
       },
@@ -1265,11 +1265,11 @@
         "path": [
           {
             "x": 175.0,
-            "y": 620.0
+            "y": 500.0
           },
           {
             "x": 175.0,
-            "y": 720.0
+            "y": 575.0
           }
         ]
       },
@@ -1286,7 +1286,7 @@
         "path": [
           {
             "x": 335.0,
-            "y": 735.0
+            "y": 590.0
           },
           {
             "x": 335.0,
@@ -1307,7 +1307,7 @@
         "path": [
           {
             "x": 110.0,
-            "y": 585.0
+            "y": 490.0
           }
         ]
       },
@@ -1328,15 +1328,15 @@
           },
           {
             "x": 275.0,
-            "y": 410.0
+            "y": 405.0
           },
           {
-            "x": 230.0,
-            "y": 410.0
+            "x": 235.0,
+            "y": 405.0
           },
           {
-            "x": 230.0,
-            "y": 440.0
+            "x": 235.0,
+            "y": 415.0
           }
         ]
       },
@@ -1353,19 +1353,19 @@
         "path": [
           {
             "x": 275.0,
-            "y": 440.0
+            "y": 415.0
           },
           {
             "x": 275.0,
-            "y": 515.0
+            "y": 460.0
           },
           {
-            "x": 230.0,
-            "y": 515.0
+            "x": 235.0,
+            "y": 460.0
           },
           {
-            "x": 230.0,
-            "y": 545.0
+            "x": 235.0,
+            "y": 470.0
           }
         ]
       },
@@ -1382,19 +1382,19 @@
         "path": [
           {
             "x": 275.0,
-            "y": 545.0
+            "y": 470.0
           },
           {
             "x": 275.0,
-            "y": 620.0
+            "y": 510.0
           },
           {
-            "x": 230.0,
-            "y": 620.0
+            "x": 235.0,
+            "y": 510.0
           },
           {
-            "x": 230.0,
-            "y": 650.0
+            "x": 235.0,
+            "y": 520.0
           }
         ]
       },
@@ -1423,7 +1423,7 @@
         "path": [
           {
             "x": 315.0,
-            "y": 665.0
+            "y": 535.0
           },
           {
             "x": 317.5,
@@ -1448,7 +1448,7 @@
           },
           {
             "x": 310.0,
-            "y": 655.0
+            "y": 525.0
           }
         ]
       },
@@ -1465,7 +1465,7 @@
         "path": [
           {
             "x": 305.0,
-            "y": 645.0
+            "y": 515.0
           },
           {
             "x": 307.5,
@@ -1490,7 +1490,7 @@
           },
           {
             "x": 300.0,
-            "y": 635.0
+            "y": 505.0
           }
         ]
       },
@@ -1511,7 +1511,7 @@
           },
           {
             "x": 330.0,
-            "y": 725.0
+            "y": 580.0
           }
         ]
       },
@@ -1528,7 +1528,7 @@
         "path": [
           {
             "x": 325.0,
-            "y": 715.0
+            "y": 570.0
           },
           {
             "x": 325.0,
@@ -1553,7 +1553,7 @@
           },
           {
             "x": 320.0,
-            "y": 705.0
+            "y": 560.0
           }
         ]
       },