GUIWires now have names

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

diff --git a/net.mograsim.logic.model.am2900/components/GUIxor.json b/net.mograsim.logic.model.am2900/components/GUIxor.json
index d4e28ed..a010047 100644 (file)
--- a/net.mograsim.logic.model.am2900/components/GUIxor.json
+++ b/net.mograsim.logic.model.am2900/components/GUIxor.json
@@ -32,91 +32,97 @@ mograsim version: 0.1.3
     "innerScale": 0.4,
     "subComps": [
       {
+        "id": "GUINandGate",
+        "name": "GUINandGate#1",
         "pos": {
           "x": 35.0,
           "y": 2.5
         },
-        "id": "GUINandGate",
-        "name": "GUINandGate#1",
         "params": 1
       },
       {
+        "id": "GUINandGate",
+        "name": "GUINandGate#0",
         "pos": {
           "x": 7.5,
           "y": 15.0
         },
-        "id": "GUINandGate",
-        "name": "GUINandGate#0",
         "params": 1
       },
       {
+        "id": "GUINandGate",
+        "name": "GUINandGate#3",
         "pos": {
           "x": 62.5,
           "y": 15.0
         },
-        "id": "GUINandGate",
-        "name": "GUINandGate#3",
         "params": 1
       },
       {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#1",
         "pos": {
           "x": 4.0,
           "y": 36.5
         },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#1",
         "params": 1
       },
       {
+        "id": "GUINandGate",
+        "name": "GUINandGate#2",
         "pos": {
           "x": 35.0,
           "y": 27.5
         },
-        "id": "GUINandGate",
-        "name": "GUINandGate#2",
         "params": 1
       },
       {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#0",
         "pos": {
           "x": 4.0,
           "y": 11.5
         },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#0",
         "params": 1
       },
       {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#2",
         "pos": {
           "x": 29.0,
           "y": 24.0
         },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#2",
         "params": 1
       }
     ],
     "innerWires": [
       {
         "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "A"
+          "compName": "GUINandGate#1",
+          "pinName": "Y"
         },
         "pin2": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
+          "compName": "GUINandGate#3",
+          "pinName": "A"
         },
-        "path": []
+        "name": "unnamedWire#9"
       },
       {
         "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "B"
-        },
-        "pin2": {
           "compName": "WireCrossPoint#1",
           "pinName": ""
         },
-        "path": []
+        "pin2": {
+          "compName": "GUINandGate#2",
+          "pinName": "B"
+        },
+        "name": "unnamedWire#8",
+        "path": [
+          {
+            "x": 5.0,
+            "y": 42.5
+          }
+        ]
       },
       {
         "pin1": {
@@ -124,41 +130,57 @@ mograsim version: 0.1.3
           "pinName": ""
         },
         "pin2": {
-          "compName": "GUINandGate#0",
+          "compName": "GUINandGate#1",
           "pinName": "A"
         },
+        "name": "unnamedWire#7",
         "path": [
           {
             "x": 5.0,
-            "y": 20.0
+            "y": 7.5
           }
         ]
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#1",
+          "compName": "WireCrossPoint#2",
           "pinName": ""
         },
         "pin2": {
-          "compName": "GUINandGate#0",
-          "pinName": "B"
+          "compName": "GUINandGate#2",
+          "pinName": "A"
         },
+        "name": "unnamedWire#6",
         "path": [
           {
-            "x": 5.0,
-            "y": 30.0
+            "x": 30.0,
+            "y": 32.5
           }
         ]
       },
       {
         "pin1": {
-          "compName": "GUINandGate#0",
-          "pinName": "Y"
+          "compName": "_submodelinterface",
+          "pinName": "B"
         },
         "pin2": {
-          "compName": "WireCrossPoint#2",
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
+        },
+        "name": "unnamedWire#1",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "A"
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#0",
           "pinName": ""
-        }
+        },
+        "name": "unnamedWire#0",
+        "path": []
       },
       {
         "pin1": {
@@ -169,6 +191,7 @@ mograsim version: 0.1.3
           "compName": "GUINandGate#1",
           "pinName": "B"
         },
+        "name": "unnamedWire#5",
         "path": [
           {
             "x": 30.0,
@@ -178,35 +201,25 @@ mograsim version: 0.1.3
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
+          "compName": "GUINandGate#2",
+          "pinName": "Y"
         },
         "pin2": {
-          "compName": "GUINandGate#2",
-          "pinName": "A"
+          "compName": "GUINandGate#3",
+          "pinName": "B"
         },
-        "path": [
-          {
-            "x": 30.0,
-            "y": 32.5
-          }
-        ]
+        "name": "unnamedWire#10"
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
+          "compName": "GUINandGate#0",
+          "pinName": "Y"
         },
         "pin2": {
-          "compName": "GUINandGate#1",
-          "pinName": "A"
+          "compName": "WireCrossPoint#2",
+          "pinName": ""
         },
-        "path": [
-          {
-            "x": 5.0,
-            "y": 7.5
-          }
-        ]
+        "name": "unnamedWire#4"
       },
       {
         "pin1": {
@@ -214,35 +227,33 @@ mograsim version: 0.1.3
           "pinName": ""
         },
         "pin2": {
-          "compName": "GUINandGate#2",
+          "compName": "GUINandGate#0",
           "pinName": "B"
         },
+        "name": "unnamedWire#3",
         "path": [
           {
             "x": 5.0,
-            "y": 42.5
+            "y": 30.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "GUINandGate#1",
-          "pinName": "Y"
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
         },
         "pin2": {
-          "compName": "GUINandGate#3",
+          "compName": "GUINandGate#0",
           "pinName": "A"
-        }
-      },
-      {
-        "pin1": {
-          "compName": "GUINandGate#2",
-          "pinName": "Y"
         },
-        "pin2": {
-          "compName": "GUINandGate#3",
-          "pinName": "B"
-        }
+        "name": "unnamedWire#2",
+        "path": [
+          {
+            "x": 5.0,
+            "y": 20.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -252,7 +263,8 @@ mograsim version: 0.1.3
         "pin2": {
           "compName": "_submodelinterface",
           "pinName": "Y"
-        }
+        },
+        "name": "unnamedWire#11"
       }
     ]
   },