projects / Mograsim.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 6a9a8d0)
Fixed a Wire overlapping with a component in Am2901
authorFabian Stemmler <stemmler@in.tum.de>
Tue, 10 Sep 2019 16:00:16 +0000 (18:00 +0200)
committerFabian Stemmler <stemmler@in.tum.de>
Tue, 10 Sep 2019 16:00:16 +0000 (18:00 +0200)
net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901.json patch | blob | history

diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901.json
index 1374a06..b74dd6a 100644 (file)
--- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901.json
+++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901.json
@@ -614,7 +614,7 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#30",
         "pos": {
-          "x": 109.0,
+          "x": 104.0,
           "y": 769.0
         },
         "params": 1
@@ -623,7 +623,7 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#31",
         "pos": {
-          "x": 114.0,
+          "x": 109.0,
           "y": 779.0
         },
         "params": 1
@@ -632,7 +632,7 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#32",
         "pos": {
-          "x": 119.0,
+          "x": 114.0,
           "y": 789.0
         },
         "params": 1
@@ -641,7 +641,7 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#33",
         "pos": {
-          "x": 114.0,
+          "x": 109.0,
           "y": 809.0
         },
         "params": 1
@@ -650,7 +650,7 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#34",
         "pos": {
-          "x": 119.0,
+          "x": 114.0,
           "y": 819.0
         },
         "params": 1
@@ -659,7 +659,7 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#35",
         "pos": {
-          "x": 124.0,
+          "x": 119.0,
           "y": 829.0
         },
         "params": 1
@@ -668,7 +668,7 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#36",
         "pos": {
-          "x": 109.0,
+          "x": 104.0,
           "y": 799.0
         },
         "params": 1
@@ -677,7 +677,7 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#37",
         "pos": {
-          "x": 114.0,
+          "x": 109.0,
           "y": 839.0
         },
         "params": 1
@@ -686,7 +686,7 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#38",
         "pos": {
-          "x": 119.0,
+          "x": 114.0,
           "y": 849.0
         },
         "params": 1
@@ -695,7 +695,7 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#39",
         "pos": {
-          "x": 124.0,
+          "x": 119.0,
           "y": 859.0
         },
         "params": 1
@@ -704,7 +704,7 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#4",
         "pos": {
-          "x": 139.0,
+          "x": 134.0,
           "y": 729.0
         },
         "params": 1
@@ -722,7 +722,7 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#41",
         "pos": {
-          "x": 104.0,
+          "x": 99.0,
           "y": 964.0
         },
         "params": 1
@@ -731,7 +731,7 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#42",
         "pos": {
-          "x": 104.0,
+          "x": 99.0,
           "y": 764.0
         },
         "params": 1
@@ -740,7 +740,7 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#44",
         "pos": {
-          "x": 129.0,
+          "x": 124.0,
           "y": 889.0
         },
         "params": 1
@@ -758,7 +758,7 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#46",
         "pos": {
-          "x": 139.0,
+          "x": 134.0,
           "y": 894.0
         },
         "params": 1
@@ -785,7 +785,7 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#5",
         "pos": {
-          "x": 134.0,
+          "x": 129.0,
           "y": 739.0
         },
         "params": 1
@@ -794,7 +794,7 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#6",
         "pos": {
-          "x": 129.0,
+          "x": 124.0,
           "y": 749.0
         },
         "params": 1
@@ -886,7 +886,7 @@
         "id": "sel3_4",
         "name": "sel3_4#0",
         "pos": {
-          "x": 150.0,
+          "x": 145.0,
           "y": 725.0
         }
       },
@@ -1213,8 +1213,8 @@
         "name": "unnamedWire#114",
         "path": [
           {
-            "x": 111.0,
-            "y": 506.0
+            "x": 105.0,
+            "y": 505.0
           }
         ]
       },
@@ -1230,8 +1230,8 @@
         "name": "unnamedWire#115",
         "path": [
           {
-            "x": 116.0,
-            "y": 511.0
+            "x": 110.0,
+            "y": 510.0
           }
         ]
       },
@@ -1247,8 +1247,8 @@
         "name": "unnamedWire#116",
         "path": [
           {
-            "x": 121.0,
-            "y": 516.0
+            "x": 115.0,
+            "y": 515.0
           }
         ]
       },
@@ -1264,7 +1264,7 @@
         "name": "unnamedWire#117",
         "path": [
           {
-            "x": 105.0,
+            "x": 100.0,
             "y": 960.0
           }
         ]
@@ -1358,8 +1358,8 @@
         "name": "unnamedWire#123",
         "path": [
           {
-            "x": 126.0,
-            "y": 521.0
+            "x": 120.0,
+            "y": 520.0
           }
         ]
       },
@@ -1540,7 +1540,7 @@
         "name": "unnamedWire#136",
         "path": [
           {
-            "x": 110.0,
+            "x": 105.0,
             "y": 1000.0
           }
         ]
@@ -1557,7 +1557,7 @@
         "name": "unnamedWire#137",
         "path": [
           {
-            "x": 115.0,
+            "x": 110.0,
             "y": 1010.0
           }
         ]
@@ -1574,7 +1574,7 @@
         "name": "unnamedWire#138",
         "path": [
           {
-            "x": 120.0,
+            "x": 115.0,
             "y": 1020.0
           }
         ]
@@ -1591,7 +1591,7 @@
         "name": "unnamedWire#139",
         "path": [
           {
-            "x": 125.0,
+            "x": 120.0,
             "y": 1030.0
           }
         ]
@@ -1629,11 +1629,11 @@
         "name": "unnamedWire#140",
         "path": [
           {
-            "x": 190.0,
+            "x": 195.0,
             "y": 730.0
           },
           {
-            "x": 190.0,
+            "x": 195.0,
             "y": 265.0
           }
         ]
@@ -1650,11 +1650,11 @@
         "name": "unnamedWire#141",
         "path": [
           {
-            "x": 195.0,
+            "x": 200.0,
             "y": 740.0
           },
           {
-            "x": 195.0,
+            "x": 200.0,
             "y": 275.0
           }
         ]
@@ -1671,11 +1671,11 @@
         "name": "unnamedWire#142",
         "path": [
           {
-            "x": 200.0,
+            "x": 205.0,
             "y": 750.0
           },
           {
-            "x": 200.0,
+            "x": 205.0,
             "y": 285.0
           }
         ]
@@ -1692,11 +1692,11 @@
         "name": "unnamedWire#143",
         "path": [
           {
-            "x": 205.0,
+            "x": 210.0,
             "y": 760.0
           },
           {
-            "x": 205.0,
+            "x": 210.0,
             "y": 295.0
           }
         ]
@@ -2014,7 +2014,7 @@
         "name": "unnamedWire#158",
         "path": [
           {
-            "x": 105.0,
+            "x": 100.0,
             "y": 1115.0
           },
           {
@@ -2068,7 +2068,7 @@
         "name": "unnamedWire#160",
         "path": [
           {
-            "x": 105.0,
+            "x": 100.0,
             "y": 760.0
           }
         ]
@@ -2085,7 +2085,7 @@
         "name": "unnamedWire#161",
         "path": [
           {
-            "x": 105.0,
+            "x": 100.0,
             "y": 885.0
           },
           {
@@ -2329,7 +2329,7 @@
             "y": 240.0
           },
           {
-            "x": 140.0,
+            "x": 135.0,
             "y": 240.0
           }
         ]
@@ -2354,7 +2354,7 @@
             "y": 235.0
           },
           {
-            "x": 135.0,
+            "x": 130.0,
             "y": 235.0
           }
         ]
@@ -2408,7 +2408,7 @@
             "y": 230.0
           },
           {
-            "x": 130.0,
+            "x": 125.0,
             "y": 230.0
           }
         ]
@@ -2461,7 +2461,7 @@
         "name": "unnamedWire#24",
         "path": [
           {
-            "x": 140.0,
+            "x": 135.0,
             "y": 930.0
           }
         ]
@@ -2478,7 +2478,7 @@
         "name": "unnamedWire#25",
         "path": [
           {
-            "x": 135.0,
+            "x": 130.0,
             "y": 940.0
           }
         ]
@@ -2495,7 +2495,7 @@
         "name": "unnamedWire#26",
         "path": [
           {
-            "x": 130.0,
+            "x": 125.0,
             "y": 950.0
           }
         ]
@@ -3908,7 +3908,7 @@
         "name": "unnamedWire#90",
         "path": [
           {
-            "x": 616.0,
+            "x": 615.0,
             "y": 665.0
           },
           {
@@ -3937,7 +3937,7 @@
         "name": "unnamedWire#91",
         "path": [
           {
-            "x": 611.0,
+            "x": 610.0,
             "y": 675.0
           },
           {
@@ -3970,7 +3970,7 @@
             "y": 625.0
           },
           {
-            "x": 636.0,
+            "x": 635.0,
             "y": 530.0
           }
         ]
@@ -4036,19 +4036,19 @@
             "y": 795.0
           },
           {
-            "x": 190.0,
+            "x": 195.0,
             "y": 795.0
           },
           {
-            "x": 190.0,
+            "x": 195.0,
             "y": 880.0
           },
           {
-            "x": 145.0,
+            "x": 140.0,
             "y": 880.0
           },
           {
-            "x": 145.0,
+            "x": 140.0,
             "y": 870.0
           }
         ]
Mirror of https://github.com/Mograsim-Team/Mograsim