X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model.editor%2Fcomponents%2FGUIsel2_4.json;h=a9234a2ec3e140608e59d94973206981bb82fb4f;hb=148a58630b38b30d4d24a21e3f55c357f5b4d0bc;hp=099fb5fe927a0a19367e9c5247b9d3edb33c2199;hpb=f9eeb6f0746ed17665fdeafefb5b7e11afd22278;p=Mograsim.git

diff --git a/net.mograsim.logic.model.editor/components/GUIsel2_4.json b/net.mograsim.logic.model.editor/components/GUIsel2_4.json
index 099fb5fe..a9234a2e 100644
--- a/net.mograsim.logic.model.editor/components/GUIsel2_4.json
+++ b/net.mograsim.logic.model.editor/components/GUIsel2_4.json
@@ -1,4 +1,3 @@
-mograsim version: 0.1.3
 {
   "width": 35.0,
   "height": 100.0,
@@ -6,50 +5,56 @@ mograsim version: 0.1.3
     {
       "location": {
         "x": 0.0,
-        "y": 5.0
+        "y": 25.0
       },
-      "name": "SA",
-      "logicWidth": 1
+      "name": "A1",
+      "logicWidth": 1,
+      "usage": "INPUT"
     },
     {
       "location": {
         "x": 0.0,
-        "y": 15.0
+        "y": 35.0
       },
-      "name": "SB",
-      "logicWidth": 1
+      "name": "A2",
+      "logicWidth": 1,
+      "usage": "INPUT"
     },
     {
       "location": {
         "x": 0.0,
-        "y": 65.0
+        "y": 45.0
       },
-      "name": "B1",
-      "logicWidth": 1
+      "name": "A3",
+      "logicWidth": 1,
+      "usage": "INPUT"
     },
     {
       "location": {
         "x": 0.0,
-        "y": 25.0
+        "y": 55.0
       },
-      "name": "A1",
-      "logicWidth": 1
+      "name": "A4",
+      "logicWidth": 1,
+      "usage": "INPUT"
     },
     {
       "location": {
         "x": 0.0,
-        "y": 75.0
+        "y": 65.0
       },
-      "name": "B2",
-      "logicWidth": 1
+      "name": "B1",
+      "logicWidth": 1,
+      "usage": "INPUT"
     },
     {
       "location": {
         "x": 0.0,
-        "y": 35.0
+        "y": 75.0
       },
-      "name": "A2",
-      "logicWidth": 1
+      "name": "B2",
+      "logicWidth": 1,
+      "usage": "INPUT"
     },
     {
       "location": {
@@ -57,31 +62,35 @@ mograsim version: 0.1.3
         "y": 85.0
       },
       "name": "B3",
-      "logicWidth": 1
+      "logicWidth": 1,
+      "usage": "INPUT"
     },
     {
       "location": {
         "x": 0.0,
-        "y": 45.0
+        "y": 95.0
       },
-      "name": "A3",
-      "logicWidth": 1
+      "name": "B4",
+      "logicWidth": 1,
+      "usage": "INPUT"
     },
     {
       "location": {
         "x": 0.0,
-        "y": 95.0
+        "y": 5.0
       },
-      "name": "B4",
-      "logicWidth": 1
+      "name": "SA",
+      "logicWidth": 1,
+      "usage": "INPUT"
     },
     {
       "location": {
         "x": 0.0,
-        "y": 55.0
+        "y": 15.0
       },
-      "name": "A4",
-      "logicWidth": 1
+      "name": "SB",
+      "logicWidth": 1,
+      "usage": "INPUT"
     },
     {
       "location": {
@@ -89,7 +98,8 @@ mograsim version: 0.1.3
         "y": 5.0
       },
       "name": "Y1",
-      "logicWidth": 1
+      "logicWidth": 1,
+      "usage": "OUTPUT"
     },
     {
       "location": {
@@ -97,7 +107,8 @@ mograsim version: 0.1.3
         "y": 15.0
       },
       "name": "Y2",
-      "logicWidth": 1
+      "logicWidth": 1,
+      "usage": "OUTPUT"
     },
     {
       "location": {
@@ -105,7 +116,8 @@ mograsim version: 0.1.3
         "y": 25.0
       },
       "name": "Y3",
-      "logicWidth": 1
+      "logicWidth": 1,
+      "usage": "OUTPUT"
     },
     {
       "location": {
@@ -113,176 +125,177 @@ mograsim version: 0.1.3
         "y": 35.0
       },
       "name": "Y4",
-      "logicWidth": 1
+      "logicWidth": 1,
+      "usage": "OUTPUT"
     }
   ],
+  "innerScale": 0.4,
   "submodel": {
-    "innerScale": 0.4,
-    "subComps": [
+    "components": [
       {
-        "pos": {
-          "x": 20.0,
-          "y": 52.5
-        },
         "id": "GUINandGate",
-        "name": "GUINandGate#1",
-        "params": 1
-      },
-      {
+        "name": "GUINandGate#0",
         "pos": {
           "x": 20.0,
           "y": 2.5
         },
-        "id": "GUINandGate",
-        "name": "GUINandGate#0",
         "params": 1
       },
       {
+        "id": "GUINandGate",
+        "name": "GUINandGate#1",
         "pos": {
           "x": 20.0,
-          "y": 152.5
+          "y": 52.5
         },
-        "id": "GUINandGate",
-        "name": "GUINandGate#3",
         "params": 1
       },
       {
+        "id": "GUINandGate",
+        "name": "GUINandGate#10",
         "pos": {
-          "x": 20.0,
-          "y": 102.5
+          "x": 65.0,
+          "y": 52.5
         },
-        "id": "GUINandGate",
-        "name": "GUINandGate#2",
         "params": 1
       },
       {
+        "id": "GUINandGate",
+        "name": "GUINandGate#11",
         "pos": {
           "x": 65.0,
           "y": 77.5
         },
-        "id": "GUINandGate",
-        "name": "GUINandGate#11",
         "params": 1
       },
       {
+        "id": "GUINandGate",
+        "name": "GUINandGate#2",
         "pos": {
-          "x": 65.0,
-          "y": 52.5
+          "x": 20.0,
+          "y": 102.5
         },
-        "id": "GUINandGate",
-        "name": "GUINandGate#10",
         "params": 1
       },
       {
+        "id": "GUINandGate",
+        "name": "GUINandGate#3",
         "pos": {
-          "x": 6.5,
-          "y": 66.5
+          "x": 20.0,
+          "y": 152.5
         },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#1",
         "params": 1
       },
       {
+        "id": "GUINandGate",
+        "name": "GUINandGate#4",
         "pos": {
-          "x": 6.5,
-          "y": 16.5
+          "x": 20.0,
+          "y": 27.5
         },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#0",
         "params": 1
       },
       {
+        "id": "GUINandGate",
+        "name": "GUINandGate#5",
         "pos": {
-          "x": 4.0,
-          "y": 41.5
+          "x": 20.0,
+          "y": 77.5
         },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#3",
         "params": 1
       },
       {
+        "id": "GUINandGate",
+        "name": "GUINandGate#6",
         "pos": {
-          "x": 6.5,
-          "y": 116.5
+          "x": 20.0,
+          "y": 127.5
         },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#2",
         "params": 1
       },
       {
+        "id": "GUINandGate",
+        "name": "GUINandGate#7",
         "pos": {
-          "x": 4.0,
-          "y": 141.5
+          "x": 20.0,
+          "y": 177.5
         },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#5",
         "params": 1
       },
       {
+        "id": "GUINandGate",
+        "name": "GUINandGate#8",
         "pos": {
-          "x": 4.0,
-          "y": 91.5
+          "x": 65.0,
+          "y": 2.5
         },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#4",
         "params": 1
       },
       {
+        "id": "GUINandGate",
+        "name": "GUINandGate#9",
         "pos": {
           "x": 65.0,
           "y": 27.5
         },
-        "id": "GUINandGate",
-        "name": "GUINandGate#9",
         "params": 1
       },
       {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#0",
         "pos": {
-          "x": 65.0,
-          "y": 2.5
+          "x": 6.5,
+          "y": 16.5
         },
-        "id": "GUINandGate",
-        "name": "GUINandGate#8",
         "params": 1
       },
       {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#1",
         "pos": {
-          "x": 20.0,
-          "y": 77.5
+          "x": 6.5,
+          "y": 66.5
         },
-        "id": "GUINandGate",
-        "name": "GUINandGate#5",
         "params": 1
       },
       {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#2",
         "pos": {
-          "x": 20.0,
-          "y": 27.5
+          "x": 6.5,
+          "y": 116.5
         },
-        "id": "GUINandGate",
-        "name": "GUINandGate#4",
         "params": 1
       },
       {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#3",
         "pos": {
-          "x": 20.0,
-          "y": 177.5
+          "x": 4.0,
+          "y": 41.5
         },
-        "id": "GUINandGate",
-        "name": "GUINandGate#7",
         "params": 1
       },
       {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#4",
         "pos": {
-          "x": 20.0,
-          "y": 127.5
+          "x": 4.0,
+          "y": 91.5
+        },
+        "params": 1
+      },
+      {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#5",
+        "pos": {
+          "x": 4.0,
+          "y": 141.5
         },
-        "id": "GUINandGate",
-        "name": "GUINandGate#6",
         "params": 1
       }
     ],
-    "innerWires": [
+    "wires": [
       {
         "pin1": {
           "compName": "_submodelinterface",
@@ -292,6 +305,7 @@ mograsim version: 0.1.3
           "compName": "GUINandGate#0",
           "pinName": "A"
         },
+        "name": "unnamedWire#0",
         "path": [
           {
             "x": 15.0,
@@ -312,6 +326,7 @@ mograsim version: 0.1.3
           "compName": "GUINandGate#1",
           "pinName": "A"
         },
+        "name": "unnamedWire#1",
         "path": [
           {
             "x": 17.5,
@@ -323,146 +338,6 @@ mograsim version: 0.1.3
           }
         ]
       },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "A3"
-        },
-        "pin2": {
-          "compName": "GUINandGate#2",
-          "pinName": "A"
-        },
-        "path": [
-          {
-            "x": 17.5,
-            "y": 112.5
-          },
-          {
-            "x": 17.5,
-            "y": 107.5
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "A4"
-        },
-        "pin2": {
-          "compName": "GUINandGate#3",
-          "pinName": "A"
-        },
-        "path": [
-          {
-            "x": 17.5,
-            "y": 137.5
-          },
-          {
-            "x": 17.5,
-            "y": 157.5
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "B1"
-        },
-        "pin2": {
-          "compName": "GUINandGate#4",
-          "pinName": "A"
-        },
-        "path": [
-          {
-            "x": 10.0,
-            "y": 162.5
-          },
-          {
-            "x": 10.0,
-            "y": 32.5
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "B2"
-        },
-        "pin2": {
-          "compName": "GUINandGate#5",
-          "pinName": "A"
-        },
-        "path": [
-          {
-            "x": 12.5,
-            "y": 187.5
-          },
-          {
-            "x": 12.5,
-            "y": 82.5
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "B3"
-        },
-        "pin2": {
-          "compName": "GUINandGate#6",
-          "pinName": "A"
-        },
-        "path": [
-          {
-            "x": 15.0,
-            "y": 212.5
-          },
-          {
-            "x": 15.0,
-            "y": 132.5
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "B4"
-        },
-        "pin2": {
-          "compName": "GUINandGate#7",
-          "pinName": "A"
-        },
-        "path": [
-          {
-            "x": 10.0,
-            "y": 237.5
-          },
-          {
-            "x": 10.0,
-            "y": 182.5
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "SA"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
-        }
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "SB"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#3",
-          "pinName": ""
-        }
-      },
       {
         "pin1": {
           "compName": "WireCrossPoint#0",
@@ -471,7 +346,8 @@ mograsim version: 0.1.3
         "pin2": {
           "compName": "WireCrossPoint#1",
           "pinName": ""
-        }
+        },
+        "name": "unnamedWire#10"
       },
       {
         "pin1": {
@@ -481,7 +357,8 @@ mograsim version: 0.1.3
         "pin2": {
           "compName": "GUINandGate#0",
           "pinName": "B"
-        }
+        },
+        "name": "unnamedWire#11"
       },
       {
         "pin1": {
@@ -491,7 +368,8 @@ mograsim version: 0.1.3
         "pin2": {
           "compName": "WireCrossPoint#2",
           "pinName": ""
-        }
+        },
+        "name": "unnamedWire#12"
       },
       {
         "pin1": {
@@ -501,7 +379,8 @@ mograsim version: 0.1.3
         "pin2": {
           "compName": "GUINandGate#1",
           "pinName": "B"
-        }
+        },
+        "name": "unnamedWire#13"
       },
       {
         "pin1": {
@@ -511,7 +390,8 @@ mograsim version: 0.1.3
         "pin2": {
           "compName": "GUINandGate#2",
           "pinName": "B"
-        }
+        },
+        "name": "unnamedWire#14"
       },
       {
         "pin1": {
@@ -522,6 +402,7 @@ mograsim version: 0.1.3
           "compName": "GUINandGate#3",
           "pinName": "B"
         },
+        "name": "unnamedWire#15",
         "path": [
           {
             "x": 7.5,
@@ -537,7 +418,8 @@ mograsim version: 0.1.3
         "pin2": {
           "compName": "WireCrossPoint#4",
           "pinName": ""
-        }
+        },
+        "name": "unnamedWire#16"
       },
       {
         "pin1": {
@@ -547,7 +429,8 @@ mograsim version: 0.1.3
         "pin2": {
           "compName": "GUINandGate#4",
           "pinName": "B"
-        }
+        },
+        "name": "unnamedWire#17"
       },
       {
         "pin1": {
@@ -557,7 +440,8 @@ mograsim version: 0.1.3
         "pin2": {
           "compName": "WireCrossPoint#5",
           "pinName": ""
-        }
+        },
+        "name": "unnamedWire#18"
       },
       {
         "pin1": {
@@ -567,7 +451,29 @@ mograsim version: 0.1.3
         "pin2": {
           "compName": "GUINandGate#5",
           "pinName": "B"
-        }
+        },
+        "name": "unnamedWire#19"
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "A3"
+        },
+        "pin2": {
+          "compName": "GUINandGate#2",
+          "pinName": "A"
+        },
+        "name": "unnamedWire#2",
+        "path": [
+          {
+            "x": 17.5,
+            "y": 112.5
+          },
+          {
+            "x": 17.5,
+            "y": 107.5
+          }
+        ]
       },
       {
         "pin1": {
@@ -577,7 +483,8 @@ mograsim version: 0.1.3
         "pin2": {
           "compName": "GUINandGate#6",
           "pinName": "B"
-        }
+        },
+        "name": "unnamedWire#20"
       },
       {
         "pin1": {
@@ -588,6 +495,7 @@ mograsim version: 0.1.3
           "compName": "GUINandGate#7",
           "pinName": "B"
         },
+        "name": "unnamedWire#21",
         "path": [
           {
             "x": 5.0,
@@ -604,6 +512,7 @@ mograsim version: 0.1.3
           "compName": "GUINandGate#8",
           "pinName": "A"
         },
+        "name": "unnamedWire#22",
         "path": [
           {
             "x": 42.5,
@@ -624,6 +533,7 @@ mograsim version: 0.1.3
           "compName": "GUINandGate#8",
           "pinName": "B"
         },
+        "name": "unnamedWire#23",
         "path": [
           {
             "x": 45.0,
@@ -644,6 +554,7 @@ mograsim version: 0.1.3
           "compName": "GUINandGate#9",
           "pinName": "A"
         },
+        "name": "unnamedWire#24",
         "path": [
           {
             "x": 47.5,
@@ -664,6 +575,7 @@ mograsim version: 0.1.3
           "compName": "GUINandGate#9",
           "pinName": "B"
         },
+        "name": "unnamedWire#25",
         "path": [
           {
             "x": 50.0,
@@ -684,6 +596,7 @@ mograsim version: 0.1.3
           "compName": "GUINandGate#10",
           "pinName": "A"
         },
+        "name": "unnamedWire#26",
         "path": [
           {
             "x": 52.5,
@@ -704,6 +617,7 @@ mograsim version: 0.1.3
           "compName": "GUINandGate#10",
           "pinName": "B"
         },
+        "name": "unnamedWire#27",
         "path": [
           {
             "x": 55.0,
@@ -724,6 +638,7 @@ mograsim version: 0.1.3
           "compName": "GUINandGate#11",
           "pinName": "A"
         },
+        "name": "unnamedWire#28",
         "path": [
           {
             "x": 57.5,
@@ -744,6 +659,7 @@ mograsim version: 0.1.3
           "compName": "GUINandGate#11",
           "pinName": "B"
         },
+        "name": "unnamedWire#29",
         "path": [
           {
             "x": 60.0,
@@ -755,6 +671,27 @@ mograsim version: 0.1.3
           }
         ]
       },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "A4"
+        },
+        "pin2": {
+          "compName": "GUINandGate#3",
+          "pinName": "A"
+        },
+        "name": "unnamedWire#3",
+        "path": [
+          {
+            "x": 17.5,
+            "y": 137.5
+          },
+          {
+            "x": 17.5,
+            "y": 157.5
+          }
+        ]
+      },
       {
         "pin1": {
           "compName": "GUINandGate#8",
@@ -764,6 +701,7 @@ mograsim version: 0.1.3
           "compName": "_submodelinterface",
           "pinName": "Y1"
         },
+        "name": "unnamedWire#30",
         "path": []
       },
       {
@@ -775,6 +713,7 @@ mograsim version: 0.1.3
           "compName": "_submodelinterface",
           "pinName": "Y2"
         },
+        "name": "unnamedWire#31",
         "path": []
       },
       {
@@ -786,6 +725,7 @@ mograsim version: 0.1.3
           "compName": "_submodelinterface",
           "pinName": "Y3"
         },
+        "name": "unnamedWire#32",
         "path": []
       },
       {
@@ -797,9 +737,117 @@ mograsim version: 0.1.3
           "compName": "_submodelinterface",
           "pinName": "Y4"
         },
+        "name": "unnamedWire#33",
         "path": []
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "B1"
+        },
+        "pin2": {
+          "compName": "GUINandGate#4",
+          "pinName": "A"
+        },
+        "name": "unnamedWire#4",
+        "path": [
+          {
+            "x": 10.0,
+            "y": 162.5
+          },
+          {
+            "x": 10.0,
+            "y": 32.5
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "B2"
+        },
+        "pin2": {
+          "compName": "GUINandGate#5",
+          "pinName": "A"
+        },
+        "name": "unnamedWire#5",
+        "path": [
+          {
+            "x": 12.5,
+            "y": 187.5
+          },
+          {
+            "x": 12.5,
+            "y": 82.5
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "B3"
+        },
+        "pin2": {
+          "compName": "GUINandGate#6",
+          "pinName": "A"
+        },
+        "name": "unnamedWire#6",
+        "path": [
+          {
+            "x": 15.0,
+            "y": 212.5
+          },
+          {
+            "x": 15.0,
+            "y": 132.5
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "B4"
+        },
+        "pin2": {
+          "compName": "GUINandGate#7",
+          "pinName": "A"
+        },
+        "name": "unnamedWire#7",
+        "path": [
+          {
+            "x": 10.0,
+            "y": 237.5
+          },
+          {
+            "x": 10.0,
+            "y": 182.5
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "SA"
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
+        },
+        "name": "unnamedWire#8"
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "SB"
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#3",
+          "pinName": ""
+        },
+        "name": "unnamedWire#9"
       }
-    ]
+    ],
+    "version": "0.1.1"
   },
   "symbolRendererSnippetID": "simpleRectangularLike",
   "symbolRendererParams": {
@@ -808,5 +856,8 @@ mograsim version: 0.1.3
     "horizontalComponentCenter": 17.5,
     "pinLabelHeight": 3.5,
     "pinLabelMargin": 0.5
-  }
+  },
+  "outlineRendererSnippetID": "default",
+  "highLevelStateHandlerSnippetID": "default",
+  "version": "0.1.5"
 }
\ No newline at end of file