X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model.editor%2Fcomponents%2Fam2904%2FGUIAm2904TestLogic.json;h=3acca4f7e5efac2669592ca1341e27c8cf839fdb;hb=148a58630b38b30d4d24a21e3f55c357f5b4d0bc;hp=5b35584fe289ce8c632ce413153e77ff06e540de;hpb=4c9a2240352c246c76a056687a2d68208137b667;p=Mograsim.git

diff --git a/net.mograsim.logic.model.editor/components/am2904/GUIAm2904TestLogic.json b/net.mograsim.logic.model.editor/components/am2904/GUIAm2904TestLogic.json
index 5b35584f..3acca4f7 100644
--- a/net.mograsim.logic.model.editor/components/am2904/GUIAm2904TestLogic.json
+++ b/net.mograsim.logic.model.editor/components/am2904/GUIAm2904TestLogic.json
@@ -1,63 +1,69 @@
-mograsim version: 0.1.3
 {
   "width": 60.0,
   "height": 90.0,
   "interfacePins": [
     {
       "location": {
-        "x": 60.0,
-        "y": 60.0
+        "x": 0.0,
+        "y": 50.0
       },
-      "name": "Y101",
-      "logicWidth": 1
+      "name": "I",
+      "logicWidth": 4,
+      "usage": "INPUT"
     },
     {
       "location": {
         "x": 60.0,
-        "y": 20.0
+        "y": 10.0
       },
-      "name": "Y001",
-      "logicWidth": 1
+      "name": "Y000",
+      "logicWidth": 1,
+      "usage": "OUTPUT"
     },
     {
       "location": {
         "x": 60.0,
-        "y": 50.0
+        "y": 20.0
       },
-      "name": "Y100",
-      "logicWidth": 1
+      "name": "Y001",
+      "logicWidth": 1,
+      "usage": "OUTPUT"
     },
     {
       "location": {
         "x": 60.0,
-        "y": 80.0
+        "y": 30.0
       },
-      "name": "Y111",
-      "logicWidth": 1
+      "name": "Y010",
+      "logicWidth": 1,
+      "usage": "OUTPUT"
     },
     {
       "location": {
-        "x": 0.0,
-        "y": 50.0
+        "x": 60.0,
+        "y": 40.0
       },
-      "name": "I",
-      "logicWidth": 4
+      "name": "Y011",
+      "logicWidth": 1,
+      "usage": "OUTPUT"
     },
     {
       "location": {
         "x": 60.0,
-        "y": 40.0
+        "y": 50.0
       },
-      "name": "Y011",
-      "logicWidth": 1
+      "name": "Y100",
+      "logicWidth": 1,
+      "usage": "OUTPUT"
     },
     {
       "location": {
         "x": 60.0,
-        "y": 10.0
+        "y": 60.0
       },
-      "name": "Y000",
-      "logicWidth": 1
+      "name": "Y101",
+      "logicWidth": 1,
+      "usage": "OUTPUT"
     },
     {
       "location": {
@@ -65,20 +71,39 @@ mograsim version: 0.1.3
         "y": 70.0
       },
       "name": "Y110",
-      "logicWidth": 1
+      "logicWidth": 1,
+      "usage": "OUTPUT"
     },
     {
       "location": {
         "x": 60.0,
-        "y": 30.0
+        "y": 80.0
       },
-      "name": "Y010",
-      "logicWidth": 1
+      "name": "Y111",
+      "logicWidth": 1,
+      "usage": "OUTPUT"
     }
   ],
+  "innerScale": 0.4,
   "submodel": {
-    "innerScale": 0.4,
-    "subComps": [
+    "components": [
+      {
+        "id": "GUIxor",
+        "name": "DeserializedSubmodelComponent#0",
+        "pos": {
+          "x": 40.0,
+          "y": 20.0
+        }
+      },
+      {
+        "id": "GUINandGate",
+        "name": "GUINandGate#0",
+        "pos": {
+          "x": 85.0,
+          "y": 20.0
+        },
+        "params": 1
+      },
       {
         "id": "GUINandGate",
         "name": "GUINandGate#1",
@@ -90,10 +115,10 @@ mograsim version: 0.1.3
       },
       {
         "id": "GUINandGate",
-        "name": "GUINandGate#0",
+        "name": "GUINandGate#2",
         "pos": {
-          "x": 85.0,
-          "y": 20.0
+          "x": 120.0,
+          "y": 15.0
         },
         "params": 1
       },
@@ -108,22 +133,31 @@ mograsim version: 0.1.3
       },
       {
         "id": "GUINandGate",
-        "name": "GUINandGate#2",
+        "name": "GUINandGate#4",
         "pos": {
-          "x": 120.0,
-          "y": 15.0
+          "x": 80.0,
+          "y": 115.0
         },
         "params": 1
       },
       {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#1",
+        "id": "GUINandGate",
+        "name": "GUINandGate#5",
         "pos": {
-          "x": 34.0,
-          "y": 99.0
+          "x": 80.0,
+          "y": 165.0
         },
         "params": 1
       },
+      {
+        "id": "GUISplitter",
+        "name": "GUISplitter#0",
+        "pos": {
+          "x": 5.0,
+          "y": 110.0
+        },
+        "params": 4
+      },
       {
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#0",
@@ -134,20 +168,20 @@ mograsim version: 0.1.3
         "params": 1
       },
       {
-        "id": "GUISplitter",
-        "name": "GUISplitter#0",
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#1",
         "pos": {
-          "x": 5.0,
-          "y": 110.0
+          "x": 34.0,
+          "y": 99.0
         },
-        "params": 4
+        "params": 1
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#3",
+        "name": "WireCrossPoint#10",
         "pos": {
-          "x": 79.0,
-          "y": 24.0
+          "x": 39.0,
+          "y": 109.0
         },
         "params": 1
       },
@@ -162,10 +196,10 @@ mograsim version: 0.1.3
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#5",
+        "name": "WireCrossPoint#3",
         "pos": {
-          "x": 24.0,
-          "y": 119.0
+          "x": 79.0,
+          "y": 24.0
         },
         "params": 1
       },
@@ -180,10 +214,10 @@ mograsim version: 0.1.3
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#7",
+        "name": "WireCrossPoint#5",
         "pos": {
-          "x": 74.0,
-          "y": 59.0
+          "x": 24.0,
+          "y": 119.0
         },
         "params": 1
       },
@@ -198,10 +232,10 @@ mograsim version: 0.1.3
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#9",
+        "name": "WireCrossPoint#7",
         "pos": {
-          "x": 24.0,
-          "y": 149.0
+          "x": 74.0,
+          "y": 59.0
         },
         "params": 1
       },
@@ -215,60 +249,92 @@ mograsim version: 0.1.3
         "params": 1
       },
       {
-        "id": "GUINandGate",
-        "name": "GUINandGate#5",
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#9",
         "pos": {
-          "x": 80.0,
-          "y": 165.0
+          "x": 24.0,
+          "y": 149.0
         },
         "params": 1
-      },
+      }
+    ],
+    "wires": [
       {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#10",
-        "pos": {
-          "x": 39.0,
-          "y": 109.0
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "I"
         },
-        "params": 1
+        "pin2": {
+          "compName": "GUISplitter#0",
+          "pinName": "I"
+        },
+        "name": "unnamedWire#0",
+        "path": []
       },
       {
-        "id": "GUIxor",
-        "name": "DeserializedSubmodelComponent#0",
-        "pos": {
-          "x": 40.0,
-          "y": 20.0
-        }
+        "pin1": {
+          "compName": "WireCrossPoint#5",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "GUISplitter#0",
+          "pinName": "O2"
+        },
+        "name": "unnamedWire#1",
+        "path": []
       },
       {
-        "id": "GUINandGate",
-        "name": "GUINandGate#4",
-        "pos": {
-          "x": 80.0,
-          "y": 115.0
+        "pin1": {
+          "compName": "GUINandGate#2",
+          "pinName": "A"
         },
-        "params": 1
-      }
-    ],
-    "innerWires": [
+        "pin2": {
+          "compName": "GUINandGate#0",
+          "pinName": "Y"
+        },
+        "name": "unnamedWire#10",
+        "path": [
+          {
+            "x": 110.0,
+            "y": 20.0
+          },
+          {
+            "x": 110.0,
+            "y": 30.0
+          }
+        ]
+      },
       {
         "pin1": {
-          "compName": "WireCrossPoint#7",
+          "compName": "WireCrossPoint#4",
           "pinName": ""
         },
         "pin2": {
-          "compName": "GUINandGate#2",
-          "pinName": "B"
+          "compName": "WireCrossPoint#6",
+          "pinName": ""
         },
-        "name": "unnamedWire#14",
+        "name": "unnamedWire#11",
         "path": [
           {
-            "x": 115.0,
-            "y": 60.0
-          },
+            "x": 20.0,
+            "y": 65.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#6",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "GUINandGate#1",
+          "pinName": "A"
+        },
+        "name": "unnamedWire#12",
+        "path": [
           {
-            "x": 115.0,
-            "y": 30.0
+            "x": 40.0,
+            "y": 55.0
           }
         ]
       },
@@ -286,15 +352,24 @@ mograsim version: 0.1.3
       },
       {
         "pin1": {
-          "compName": "GUINandGate#2",
-          "pinName": "Y"
+          "compName": "WireCrossPoint#7",
+          "pinName": ""
         },
         "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "Y000"
+          "compName": "GUINandGate#2",
+          "pinName": "B"
         },
-        "name": "unnamedWire#16",
-        "path": []
+        "name": "unnamedWire#14",
+        "path": [
+          {
+            "x": 115.0,
+            "y": 60.0
+          },
+          {
+            "x": 115.0,
+            "y": 30.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -315,14 +390,14 @@ mograsim version: 0.1.3
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#5",
-          "pinName": ""
+          "compName": "GUINandGate#2",
+          "pinName": "Y"
         },
         "pin2": {
-          "compName": "WireCrossPoint#9",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "Y000"
         },
-        "name": "unnamedWire#18",
+        "name": "unnamedWire#16",
         "path": []
       },
       {
@@ -344,32 +419,27 @@ mograsim version: 0.1.3
       },
       {
         "pin1": {
-          "compName": "GUISplitter#0",
-          "pinName": "O1"
+          "compName": "WireCrossPoint#5",
+          "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#5",
+          "compName": "WireCrossPoint#9",
           "pinName": ""
         },
-        "name": "unnamedWire#19",
+        "name": "unnamedWire#18",
         "path": []
       },
       {
         "pin1": {
           "compName": "GUISplitter#0",
-          "pinName": "O0"
+          "pinName": "O1"
         },
         "pin2": {
-          "compName": "WireCrossPoint#4",
+          "compName": "WireCrossPoint#0",
           "pinName": ""
         },
-        "name": "unnamedWire#21",
-        "path": [
-          {
-            "x": 20.0,
-            "y": 110.0
-          }
-        ]
+        "name": "unnamedWire#2",
+        "path": []
       },
       {
         "pin1": {
@@ -385,15 +455,20 @@ mograsim version: 0.1.3
       },
       {
         "pin1": {
-          "compName": "GUINandGate#4",
-          "pinName": "Y"
+          "compName": "GUISplitter#0",
+          "pinName": "O0"
         },
         "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "Y100"
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
         },
-        "name": "unnamedWire#23",
-        "path": []
+        "name": "unnamedWire#21",
+        "path": [
+          {
+            "x": 35.0,
+            "y": 140.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -409,14 +484,14 @@ mograsim version: 0.1.3
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#7",
-          "pinName": ""
+          "compName": "GUINandGate#4",
+          "pinName": "Y"
         },
         "pin2": {
-          "compName": "WireCrossPoint#8",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "Y100"
         },
-        "name": "unnamedWire#25",
+        "name": "unnamedWire#23",
         "path": []
       },
       {
@@ -442,14 +517,14 @@ mograsim version: 0.1.3
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#10",
+          "compName": "WireCrossPoint#7",
           "pinName": ""
         },
         "pin2": {
-          "compName": "GUINandGate#3",
-          "pinName": "A"
+          "compName": "WireCrossPoint#8",
+          "pinName": ""
         },
-        "name": "unnamedWire#27",
+        "name": "unnamedWire#25",
         "path": []
       },
       {
@@ -466,14 +541,14 @@ mograsim version: 0.1.3
       },
       {
         "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "Y110"
+          "compName": "WireCrossPoint#10",
+          "pinName": ""
         },
         "pin2": {
-          "compName": "GUINandGate#5",
-          "pinName": "Y"
+          "compName": "GUINandGate#3",
+          "pinName": "A"
         },
-        "name": "unnamedWire#29",
+        "name": "unnamedWire#27",
         "path": []
       },
       {
@@ -490,75 +565,32 @@ mograsim version: 0.1.3
       },
       {
         "pin1": {
-          "compName": "GUINandGate#1",
-          "pinName": "Y"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#7",
-          "pinName": ""
-        },
-        "name": "unnamedWire#9",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#3",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
-        },
-        "name": "unnamedWire#8",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "GUINandGate#0",
-          "pinName": "B"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
-        },
-        "name": "unnamedWire#7",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#3",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "Y110"
         },
         "pin2": {
-          "compName": "GUINandGate#0",
-          "pinName": "A"
+          "compName": "GUINandGate#5",
+          "pinName": "Y"
         },
-        "name": "unnamedWire#6",
+        "name": "unnamedWire#29",
         "path": []
       },
       {
         "pin1": {
-          "compName": "GUISplitter#0",
-          "pinName": "O2"
-        },
-        "pin2": {
           "compName": "WireCrossPoint#0",
           "pinName": ""
         },
-        "name": "unnamedWire#1",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "I"
-        },
         "pin2": {
-          "compName": "GUISplitter#0",
-          "pinName": "I"
+          "compName": "DeserializedSubmodelComponent#0",
+          "pinName": "A"
         },
-        "name": "unnamedWire#0",
-        "path": []
+        "name": "unnamedWire#3",
+        "path": [
+          {
+            "x": 30.0,
+            "y": 25.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -579,37 +611,21 @@ mograsim version: 0.1.3
       },
       {
         "pin1": {
-          "compName": "GUINandGate#2",
-          "pinName": "A"
+          "compName": "GUINandGate#3",
+          "pinName": "B"
         },
         "pin2": {
-          "compName": "GUINandGate#0",
-          "pinName": "Y"
+          "compName": "WireCrossPoint#10",
+          "pinName": ""
         },
-        "name": "unnamedWire#10",
+        "name": "unnamedWire#31",
         "path": [
           {
-            "x": 110.0,
-            "y": 20.0
-          },
-          {
-            "x": 110.0,
-            "y": 30.0
+            "x": 40.0,
+            "y": 120.0
           }
         ]
       },
-      {
-        "pin1": {
-          "compName": "DeserializedSubmodelComponent#0",
-          "pinName": "Y"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#3",
-          "pinName": ""
-        },
-        "name": "unnamedWire#5",
-        "path": []
-      },
       {
         "pin1": {
           "compName": "WireCrossPoint#9",
@@ -629,124 +645,117 @@ mograsim version: 0.1.3
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "Y111"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#0",
-          "pinName": "B"
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
         },
-        "name": "unnamedWire#4",
+        "name": "unnamedWire#33",
         "path": [
           {
-            "x": 35.0,
-            "y": 35.0
+            "x": 30.0,
+            "y": 200.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "GUINandGate#3",
-          "pinName": "B"
+          "compName": "GUISplitter#0",
+          "pinName": "O3"
         },
         "pin2": {
-          "compName": "WireCrossPoint#10",
+          "compName": "WireCrossPoint#4",
           "pinName": ""
         },
-        "name": "unnamedWire#31",
+        "name": "unnamedWire#34",
         "path": [
           {
-            "x": 40.0,
-            "y": 120.0
+            "x": 20.0,
+            "y": 110.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#0",
+          "compName": "WireCrossPoint#1",
           "pinName": ""
         },
         "pin2": {
           "compName": "DeserializedSubmodelComponent#0",
-          "pinName": "A"
+          "pinName": "B"
         },
-        "name": "unnamedWire#3",
+        "name": "unnamedWire#4",
         "path": [
           {
-            "x": 30.0,
-            "y": 25.0
+            "x": 35.0,
+            "y": 35.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#6",
+          "compName": "DeserializedSubmodelComponent#0",
+          "pinName": "Y"
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#3",
+          "pinName": ""
+        },
+        "name": "unnamedWire#5",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#3",
           "pinName": ""
         },
         "pin2": {
-          "compName": "GUINandGate#1",
+          "compName": "GUINandGate#0",
           "pinName": "A"
         },
-        "name": "unnamedWire#12",
-        "path": [
-          {
-            "x": 40.0,
-            "y": 55.0
-          }
-        ]
+        "name": "unnamedWire#6",
+        "path": []
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
+          "compName": "GUINandGate#0",
+          "pinName": "B"
         },
         "pin2": {
-          "compName": "GUISplitter#0",
-          "pinName": "O3"
+          "compName": "WireCrossPoint#2",
+          "pinName": ""
         },
-        "name": "unnamedWire#2",
-        "path": [
-          {
-            "x": 35.0,
-            "y": 140.0
-          }
-        ]
+        "name": "unnamedWire#7",
+        "path": []
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#4",
+          "compName": "WireCrossPoint#3",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#6",
+          "compName": "WireCrossPoint#2",
           "pinName": ""
         },
-        "name": "unnamedWire#11",
-        "path": [
-          {
-            "x": 20.0,
-            "y": 65.0
-          }
-        ]
+        "name": "unnamedWire#8",
+        "path": []
       },
       {
         "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "Y111"
+          "compName": "GUINandGate#1",
+          "pinName": "Y"
         },
         "pin2": {
-          "compName": "WireCrossPoint#0",
+          "compName": "WireCrossPoint#7",
           "pinName": ""
         },
-        "name": "unnamedWire#33",
-        "path": [
-          {
-            "x": 30.0,
-            "y": 200.0
-          }
-        ]
+        "name": "unnamedWire#9",
+        "path": []
       }
-    ]
+    ],
+    "version": "0.1.1"
   },
   "symbolRendererSnippetID": "simpleRectangularLike",
   "symbolRendererParams": {
@@ -761,5 +770,6 @@ mograsim version: 0.1.3
   "highLevelStateHandlerParams": {
     "subcomponentHighLevelStates": {},
     "atomicHighLevelStates": {}
-  }
+  },
+  "version": "0.1.5"
 }
\ No newline at end of file