X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model.editor%2Fcomponents%2FGUIor_4.json;h=232a77f80742f8a3044f4e9a6019c1762b2670ee;hb=148a58630b38b30d4d24a21e3f55c357f5b4d0bc;hp=ed484c98a37eead8cf4a9ba5ae93ac4b03ddd0e4;hpb=7d79c13e0d6979b212b24ed21845f9178f01249a;p=Mograsim.git

diff --git a/net.mograsim.logic.model.editor/components/GUIor_4.json b/net.mograsim.logic.model.editor/components/GUIor_4.json
index ed484c98..232a77f8 100644
--- a/net.mograsim.logic.model.editor/components/GUIor_4.json
+++ b/net.mograsim.logic.model.editor/components/GUIor_4.json
@@ -1,4 +1,3 @@
-mograsim version: 0.1.3
 {
   "width": 35.0,
   "height": 80.0,
@@ -9,55 +8,71 @@ mograsim version: 0.1.3
         "y": 5.0
       },
       "name": "A1",
-      "logicWidth": 1
+      "logicWidth": 1,
+      "usage": "INPUT"
     },
     {
       "location": {
         "x": 0.0,
-        "y": 55.0
+        "y": 15.0
       },
-      "name": "B2",
-      "logicWidth": 1
+      "name": "A2",
+      "logicWidth": 1,
+      "usage": "INPUT"
     },
     {
       "location": {
         "x": 0.0,
-        "y": 15.0
+        "y": 25.0
       },
-      "name": "A2",
-      "logicWidth": 1
+      "name": "A3",
+      "logicWidth": 1,
+      "usage": "INPUT"
     },
     {
       "location": {
         "x": 0.0,
-        "y": 65.0
+        "y": 35.0
       },
-      "name": "B3",
-      "logicWidth": 1
+      "name": "A4",
+      "logicWidth": 1,
+      "usage": "INPUT"
     },
     {
       "location": {
         "x": 0.0,
-        "y": 25.0
+        "y": 45.0
       },
-      "name": "A3",
-      "logicWidth": 1
+      "name": "B1",
+      "logicWidth": 1,
+      "usage": "INPUT"
     },
     {
       "location": {
         "x": 0.0,
-        "y": 75.0
+        "y": 55.0
       },
-      "name": "B4",
-      "logicWidth": 1
+      "name": "B2",
+      "logicWidth": 1,
+      "usage": "INPUT"
     },
     {
       "location": {
         "x": 0.0,
-        "y": 35.0
+        "y": 65.0
       },
-      "name": "A4",
-      "logicWidth": 1
+      "name": "B3",
+      "logicWidth": 1,
+      "usage": "INPUT"
+    },
+    {
+      "location": {
+        "x": 0.0,
+        "y": 75.0
+      },
+      "name": "B4",
+      "logicWidth": 1,
+      "usage": "INPUT"
     },
     {
       "location": {
@@ -65,7 +80,8 @@ mograsim version: 0.1.3
         "y": 5.0
       },
       "name": "Y1",
-      "logicWidth": 1
+      "logicWidth": 1,
+      "usage": "OUTPUT"
     },
     {
       "location": {
@@ -73,7 +89,8 @@ mograsim version: 0.1.3
         "y": 15.0
       },
       "name": "Y2",
-      "logicWidth": 1
+      "logicWidth": 1,
+      "usage": "OUTPUT"
     },
     {
       "location": {
@@ -81,7 +98,8 @@ mograsim version: 0.1.3
         "y": 25.0
       },
       "name": "Y3",
-      "logicWidth": 1
+      "logicWidth": 1,
+      "usage": "OUTPUT"
     },
     {
       "location": {
@@ -89,29 +107,13 @@ mograsim version: 0.1.3
         "y": 35.0
       },
       "name": "Y4",
-      "logicWidth": 1
-    },
-    {
-      "location": {
-        "x": 0.0,
-        "y": 45.0
-      },
-      "name": "B1",
-      "logicWidth": 1
+      "logicWidth": 1,
+      "usage": "OUTPUT"
     }
   ],
+  "innerScale": 0.4,
   "submodel": {
-    "innerScale": 0.4,
-    "subComps": [
-      {
-        "id": "GUINandGate",
-        "name": "GUINandGate#1",
-        "pos": {
-          "x": 15.0,
-          "y": 27.5
-        },
-        "params": 1
-      },
+    "components": [
       {
         "id": "GUINandGate",
         "name": "GUINandGate#0",
@@ -123,18 +125,18 @@ mograsim version: 0.1.3
       },
       {
         "id": "GUINandGate",
-        "name": "GUINandGate#3",
+        "name": "GUINandGate#1",
         "pos": {
           "x": 15.0,
-          "y": 77.5
+          "y": 27.5
         },
         "params": 1
       },
       {
         "id": "GUINandGate",
-        "name": "GUINandGate#2",
+        "name": "GUINandGate#10",
         "pos": {
-          "x": 15.0,
+          "x": 65.0,
           "y": 52.5
         },
         "params": 1
@@ -150,64 +152,64 @@ mograsim version: 0.1.3
       },
       {
         "id": "GUINandGate",
-        "name": "GUINandGate#10",
+        "name": "GUINandGate#2",
         "pos": {
-          "x": 65.0,
+          "x": 15.0,
           "y": 52.5
         },
         "params": 1
       },
       {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#1",
+        "id": "GUINandGate",
+        "name": "GUINandGate#3",
         "pos": {
-          "x": 6.5,
-          "y": 36.5
+          "x": 15.0,
+          "y": 77.5
         },
         "params": 1
       },
       {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#0",
+        "id": "GUINandGate",
+        "name": "GUINandGate#4",
         "pos": {
-          "x": 6.5,
-          "y": 11.5
+          "x": 15.0,
+          "y": 102.5
         },
         "params": 1
       },
       {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#3",
+        "id": "GUINandGate",
+        "name": "GUINandGate#5",
         "pos": {
-          "x": 6.5,
-          "y": 86.5
+          "x": 15.0,
+          "y": 127.5
         },
         "params": 1
       },
       {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#2",
+        "id": "GUINandGate",
+        "name": "GUINandGate#6",
         "pos": {
-          "x": 6.5,
-          "y": 61.5
+          "x": 15.0,
+          "y": 152.5
         },
         "params": 1
       },
       {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#5",
+        "id": "GUINandGate",
+        "name": "GUINandGate#7",
         "pos": {
-          "x": 6.5,
-          "y": 136.5
+          "x": 15.0,
+          "y": 177.5
         },
         "params": 1
       },
       {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#4",
+        "id": "GUINandGate",
+        "name": "GUINandGate#8",
         "pos": {
-          "x": 6.5,
-          "y": 111.5
+          "x": 65.0,
+          "y": 2.5
         },
         "params": 1
       },
@@ -222,83 +224,133 @@ mograsim version: 0.1.3
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#7",
+        "name": "WireCrossPoint#0",
         "pos": {
           "x": 6.5,
-          "y": 186.5
+          "y": 11.5
         },
         "params": 1
       },
       {
-        "id": "GUINandGate",
-        "name": "GUINandGate#8",
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#1",
         "pos": {
-          "x": 65.0,
-          "y": 2.5
+          "x": 6.5,
+          "y": 36.5
         },
         "params": 1
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#6",
+        "name": "WireCrossPoint#2",
         "pos": {
           "x": 6.5,
-          "y": 161.5
+          "y": 61.5
         },
         "params": 1
       },
       {
-        "id": "GUINandGate",
-        "name": "GUINandGate#5",
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#3",
         "pos": {
-          "x": 15.0,
-          "y": 127.5
+          "x": 6.5,
+          "y": 86.5
         },
         "params": 1
       },
       {
-        "id": "GUINandGate",
-        "name": "GUINandGate#4",
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#4",
         "pos": {
-          "x": 15.0,
-          "y": 102.5
+          "x": 6.5,
+          "y": 111.5
         },
         "params": 1
       },
       {
-        "id": "GUINandGate",
-        "name": "GUINandGate#7",
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#5",
         "pos": {
-          "x": 15.0,
-          "y": 177.5
+          "x": 6.5,
+          "y": 136.5
         },
         "params": 1
       },
       {
-        "id": "GUINandGate",
-        "name": "GUINandGate#6",
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#6",
         "pos": {
-          "x": 15.0,
-          "y": 152.5
+          "x": 6.5,
+          "y": 161.5
+        },
+        "params": 1
+      },
+      {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#7",
+        "pos": {
+          "x": 6.5,
+          "y": 186.5
         },
         "params": 1
       }
     ],
-    "innerWires": [
+    "wires": [
       {
         "pin1": {
-          "compName": "WireCrossPoint#3",
+          "compName": "_submodelinterface",
+          "pinName": "A1"
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
+        },
+        "name": "unnamedWire#0",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "A2"
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
+        },
+        "name": "unnamedWire#1",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#1",
           "pinName": ""
         },
         "pin2": {
-          "compName": "GUINandGate#3",
+          "compName": "GUINandGate#1",
           "pinName": "A"
         },
-        "name": "unnamedWire#14",
+        "name": "unnamedWire#10",
         "path": [
           {
             "x": 7.5,
-            "y": 82.5
+            "y": 32.5
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "GUINandGate#1",
+          "pinName": "B"
+        },
+        "name": "unnamedWire#11",
+        "path": [
+          {
+            "x": 7.5,
+            "y": 42.5
           }
         ]
       },
@@ -309,42 +361,47 @@ mograsim version: 0.1.3
         },
         "pin2": {
           "compName": "GUINandGate#2",
-          "pinName": "B"
+          "pinName": "A"
         },
-        "name": "unnamedWire#13",
+        "name": "unnamedWire#12",
         "path": [
           {
             "x": 7.5,
-            "y": 67.5
+            "y": 57.5
           }
         ]
       },
       {
         "pin1": {
-          "compName": "GUINandGate#11",
-          "pinName": "Y"
+          "compName": "WireCrossPoint#2",
+          "pinName": ""
         },
         "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "Y4"
+          "compName": "GUINandGate#2",
+          "pinName": "B"
         },
-        "name": "unnamedWire#35",
-        "path": []
+        "name": "unnamedWire#13",
+        "path": [
+          {
+            "x": 7.5,
+            "y": 67.5
+          }
+        ]
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#4",
+          "compName": "WireCrossPoint#3",
           "pinName": ""
         },
         "pin2": {
-          "compName": "GUINandGate#4",
+          "compName": "GUINandGate#3",
           "pinName": "A"
         },
-        "name": "unnamedWire#16",
+        "name": "unnamedWire#14",
         "path": [
           {
             "x": 7.5,
-            "y": 107.5
+            "y": 82.5
           }
         ]
       },
@@ -367,18 +424,18 @@ mograsim version: 0.1.3
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#5",
+          "compName": "WireCrossPoint#4",
           "pinName": ""
         },
         "pin2": {
-          "compName": "GUINandGate#5",
+          "compName": "GUINandGate#4",
           "pinName": "A"
         },
-        "name": "unnamedWire#18",
+        "name": "unnamedWire#16",
         "path": [
           {
             "x": 7.5,
-            "y": 132.5
+            "y": 107.5
           }
         ]
       },
@@ -406,33 +463,45 @@ mograsim version: 0.1.3
         },
         "pin2": {
           "compName": "GUINandGate#5",
-          "pinName": "B"
+          "pinName": "A"
         },
-        "name": "unnamedWire#19",
+        "name": "unnamedWire#18",
         "path": [
           {
             "x": 7.5,
-            "y": 142.5
+            "y": 132.5
           }
         ]
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#6",
+          "compName": "WireCrossPoint#5",
           "pinName": ""
         },
         "pin2": {
-          "compName": "GUINandGate#6",
+          "compName": "GUINandGate#5",
           "pinName": "B"
         },
-        "name": "unnamedWire#21",
+        "name": "unnamedWire#19",
         "path": [
           {
             "x": 7.5,
-            "y": 167.5
+            "y": 142.5
           }
         ]
       },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "A3"
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#2",
+          "pinName": ""
+        },
+        "name": "unnamedWire#2",
+        "path": []
+      },
       {
         "pin1": {
           "compName": "WireCrossPoint#6",
@@ -452,18 +521,18 @@ mograsim version: 0.1.3
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#7",
+          "compName": "WireCrossPoint#6",
           "pinName": ""
         },
         "pin2": {
-          "compName": "GUINandGate#7",
+          "compName": "GUINandGate#6",
           "pinName": "B"
         },
-        "name": "unnamedWire#23",
+        "name": "unnamedWire#21",
         "path": [
           {
             "x": 7.5,
-            "y": 192.5
+            "y": 167.5
           }
         ]
       },
@@ -486,22 +555,18 @@ mograsim version: 0.1.3
       },
       {
         "pin1": {
-          "compName": "GUINandGate#4",
-          "pinName": "Y"
+          "compName": "WireCrossPoint#7",
+          "pinName": ""
         },
         "pin2": {
-          "compName": "GUINandGate#8",
+          "compName": "GUINandGate#7",
           "pinName": "B"
         },
-        "name": "unnamedWire#25",
+        "name": "unnamedWire#23",
         "path": [
           {
-            "x": 45.0,
-            "y": 112.5
-          },
-          {
-            "x": 45.0,
-            "y": 17.5
+            "x": 7.5,
+            "y": 192.5
           }
         ]
       },
@@ -528,22 +593,22 @@ mograsim version: 0.1.3
       },
       {
         "pin1": {
-          "compName": "GUINandGate#5",
+          "compName": "GUINandGate#4",
           "pinName": "Y"
         },
         "pin2": {
-          "compName": "GUINandGate#9",
+          "compName": "GUINandGate#8",
           "pinName": "B"
         },
-        "name": "unnamedWire#27",
+        "name": "unnamedWire#25",
         "path": [
           {
-            "x": 50.0,
-            "y": 137.5
+            "x": 45.0,
+            "y": 112.5
           },
           {
-            "x": 50.0,
-            "y": 42.5
+            "x": 45.0,
+            "y": 17.5
           }
         ]
       },
@@ -570,22 +635,22 @@ mograsim version: 0.1.3
       },
       {
         "pin1": {
-          "compName": "GUINandGate#6",
+          "compName": "GUINandGate#5",
           "pinName": "Y"
         },
         "pin2": {
-          "compName": "GUINandGate#10",
+          "compName": "GUINandGate#9",
           "pinName": "B"
         },
-        "name": "unnamedWire#29",
+        "name": "unnamedWire#27",
         "path": [
           {
-            "x": 55.0,
-            "y": 162.5
+            "x": 50.0,
+            "y": 137.5
           },
           {
-            "x": 55.0,
-            "y": 67.5
+            "x": 50.0,
+            "y": 42.5
           }
         ]
       },
@@ -612,84 +677,35 @@ mograsim version: 0.1.3
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
+          "compName": "GUINandGate#6",
+          "pinName": "Y"
         },
         "pin2": {
-          "compName": "GUINandGate#0",
+          "compName": "GUINandGate#10",
           "pinName": "B"
         },
-        "name": "unnamedWire#9",
+        "name": "unnamedWire#29",
         "path": [
           {
-            "x": 7.5,
-            "y": 17.5
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "GUINandGate#0",
-          "pinName": "A"
-        },
-        "name": "unnamedWire#8",
-        "path": [
+            "x": 55.0,
+            "y": 162.5
+          },
           {
-            "x": 7.5,
-            "y": 7.5
+            "x": 55.0,
+            "y": 67.5
           }
         ]
       },
       {
         "pin1": {
           "compName": "_submodelinterface",
-          "pinName": "B4"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#7",
-          "pinName": ""
-        },
-        "name": "unnamedWire#7",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "B3"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#6",
-          "pinName": ""
-        },
-        "name": "unnamedWire#6",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "A2"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
-        },
-        "name": "unnamedWire#1",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "A1"
+          "pinName": "A4"
         },
         "pin2": {
-          "compName": "WireCrossPoint#0",
+          "compName": "WireCrossPoint#3",
           "pinName": ""
         },
-        "name": "unnamedWire#0",
+        "name": "unnamedWire#3",
         "path": []
       },
       {
@@ -715,30 +731,22 @@ mograsim version: 0.1.3
       },
       {
         "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "B2"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#5",
-          "pinName": ""
-        },
-        "name": "unnamedWire#5",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
+          "compName": "GUINandGate#7",
+          "pinName": "Y"
         },
         "pin2": {
-          "compName": "GUINandGate#1",
-          "pinName": "A"
+          "compName": "GUINandGate#11",
+          "pinName": "B"
         },
-        "name": "unnamedWire#10",
+        "name": "unnamedWire#31",
         "path": [
           {
-            "x": 7.5,
-            "y": 32.5
+            "x": 60.0,
+            "y": 187.5
+          },
+          {
+            "x": 60.0,
+            "y": 92.5
           }
         ]
       },
@@ -756,120 +764,124 @@ mograsim version: 0.1.3
       },
       {
         "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "B1"
+          "compName": "GUINandGate#9",
+          "pinName": "Y"
         },
         "pin2": {
-          "compName": "WireCrossPoint#4",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "Y2"
         },
-        "name": "unnamedWire#4",
+        "name": "unnamedWire#33",
         "path": []
       },
       {
         "pin1": {
-          "compName": "GUINandGate#7",
+          "compName": "GUINandGate#10",
           "pinName": "Y"
         },
         "pin2": {
+          "compName": "_submodelinterface",
+          "pinName": "Y3"
+        },
+        "name": "unnamedWire#34",
+        "path": []
+      },
+      {
+        "pin1": {
           "compName": "GUINandGate#11",
-          "pinName": "B"
+          "pinName": "Y"
         },
-        "name": "unnamedWire#31",
-        "path": [
-          {
-            "x": 60.0,
-            "y": 187.5
-          },
-          {
-            "x": 60.0,
-            "y": 92.5
-          }
-        ]
+        "pin2": {
+          "compName": "_submodelinterface",
+          "pinName": "Y4"
+        },
+        "name": "unnamedWire#35",
+        "path": []
       },
       {
         "pin1": {
           "compName": "_submodelinterface",
-          "pinName": "A4"
+          "pinName": "B1"
         },
         "pin2": {
-          "compName": "WireCrossPoint#3",
+          "compName": "WireCrossPoint#4",
           "pinName": ""
         },
-        "name": "unnamedWire#3",
+        "name": "unnamedWire#4",
         "path": []
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "B2"
         },
         "pin2": {
-          "compName": "GUINandGate#2",
-          "pinName": "A"
+          "compName": "WireCrossPoint#5",
+          "pinName": ""
         },
-        "name": "unnamedWire#12",
-        "path": [
-          {
-            "x": 7.5,
-            "y": 57.5
-          }
-        ]
+        "name": "unnamedWire#5",
+        "path": []
       },
       {
         "pin1": {
-          "compName": "GUINandGate#10",
-          "pinName": "Y"
+          "compName": "_submodelinterface",
+          "pinName": "B3"
         },
         "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "Y3"
+          "compName": "WireCrossPoint#6",
+          "pinName": ""
         },
-        "name": "unnamedWire#34",
+        "name": "unnamedWire#6",
         "path": []
       },
       {
         "pin1": {
           "compName": "_submodelinterface",
-          "pinName": "A3"
+          "pinName": "B4"
         },
         "pin2": {
-          "compName": "WireCrossPoint#2",
+          "compName": "WireCrossPoint#7",
           "pinName": ""
         },
-        "name": "unnamedWire#2",
+        "name": "unnamedWire#7",
         "path": []
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#1",
+          "compName": "WireCrossPoint#0",
           "pinName": ""
         },
         "pin2": {
-          "compName": "GUINandGate#1",
-          "pinName": "B"
+          "compName": "GUINandGate#0",
+          "pinName": "A"
         },
-        "name": "unnamedWire#11",
+        "name": "unnamedWire#8",
         "path": [
           {
             "x": 7.5,
-            "y": 42.5
+            "y": 7.5
           }
         ]
       },
       {
         "pin1": {
-          "compName": "GUINandGate#9",
-          "pinName": "Y"
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
         },
         "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "Y2"
+          "compName": "GUINandGate#0",
+          "pinName": "B"
         },
-        "name": "unnamedWire#33",
-        "path": []
+        "name": "unnamedWire#9",
+        "path": [
+          {
+            "x": 7.5,
+            "y": 17.5
+          }
+        ]
       }
-    ]
+    ],
+    "version": "0.1.1"
   },
   "symbolRendererSnippetID": "simpleRectangularLike",
   "symbolRendererParams": {
@@ -879,5 +891,7 @@ mograsim version: 0.1.3
     "pinLabelHeight": 3.5,
     "pinLabelMargin": 0.5
   },
-  "outlineRendererSnippetID": "default"
+  "outlineRendererSnippetID": "default",
+  "highLevelStateHandlerSnippetID": "default",
+  "version": "0.1.5"
 }
\ No newline at end of file