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=1693ebfa27c9e1540400bebd6c32c29aa5ce212a;hpb=a47c9b1f38bbb6d2f5a3c482f3b09d1f42270401;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 1693ebfa..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,12 +125,22 @@ 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": [
+      {
+        "id": "GUINandGate",
+        "name": "GUINandGate#0",
+        "pos": {
+          "x": 20.0,
+          "y": 2.5
+        },
+        "params": 1
+      },
       {
         "id": "GUINandGate",
         "name": "GUINandGate#1",
@@ -130,10 +152,28 @@ mograsim version: 0.1.3
       },
       {
         "id": "GUINandGate",
-        "name": "GUINandGate#0",
+        "name": "GUINandGate#10",
+        "pos": {
+          "x": 65.0,
+          "y": 52.5
+        },
+        "params": 1
+      },
+      {
+        "id": "GUINandGate",
+        "name": "GUINandGate#11",
+        "pos": {
+          "x": 65.0,
+          "y": 77.5
+        },
+        "params": 1
+      },
+      {
+        "id": "GUINandGate",
+        "name": "GUINandGate#2",
         "pos": {
           "x": 20.0,
-          "y": 2.5
+          "y": 102.5
         },
         "params": 1
       },
@@ -148,37 +188,55 @@ mograsim version: 0.1.3
       },
       {
         "id": "GUINandGate",
-        "name": "GUINandGate#2",
+        "name": "GUINandGate#4",
         "pos": {
           "x": 20.0,
-          "y": 102.5
+          "y": 27.5
         },
         "params": 1
       },
       {
         "id": "GUINandGate",
-        "name": "GUINandGate#11",
+        "name": "GUINandGate#5",
         "pos": {
-          "x": 65.0,
+          "x": 20.0,
           "y": 77.5
         },
         "params": 1
       },
       {
         "id": "GUINandGate",
-        "name": "GUINandGate#10",
+        "name": "GUINandGate#6",
+        "pos": {
+          "x": 20.0,
+          "y": 127.5
+        },
+        "params": 1
+      },
+      {
+        "id": "GUINandGate",
+        "name": "GUINandGate#7",
+        "pos": {
+          "x": 20.0,
+          "y": 177.5
+        },
+        "params": 1
+      },
+      {
+        "id": "GUINandGate",
+        "name": "GUINandGate#8",
         "pos": {
           "x": 65.0,
-          "y": 52.5
+          "y": 2.5
         },
         "params": 1
       },
       {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#1",
+        "id": "GUINandGate",
+        "name": "GUINandGate#9",
         "pos": {
-          "x": 6.5,
-          "y": 66.5
+          "x": 65.0,
+          "y": 27.5
         },
         "params": 1
       },
@@ -193,10 +251,10 @@ mograsim version: 0.1.3
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#3",
+        "name": "WireCrossPoint#1",
         "pos": {
-          "x": 4.0,
-          "y": 41.5
+          "x": 6.5,
+          "y": 66.5
         },
         "params": 1
       },
@@ -211,10 +269,10 @@ mograsim version: 0.1.3
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#5",
+        "name": "WireCrossPoint#3",
         "pos": {
           "x": 4.0,
-          "y": 141.5
+          "y": 41.5
         },
         "params": 1
       },
@@ -228,71 +286,90 @@ mograsim version: 0.1.3
         "params": 1
       },
       {
-        "id": "GUINandGate",
-        "name": "GUINandGate#9",
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#5",
         "pos": {
-          "x": 65.0,
-          "y": 27.5
+          "x": 4.0,
+          "y": 141.5
         },
         "params": 1
-      },
+      }
+    ],
+    "wires": [
       {
-        "id": "GUINandGate",
-        "name": "GUINandGate#8",
-        "pos": {
-          "x": 65.0,
-          "y": 2.5
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "A1"
         },
-        "params": 1
-      },
-      {
-        "id": "GUINandGate",
-        "name": "GUINandGate#5",
-        "pos": {
-          "x": 20.0,
-          "y": 77.5
+        "pin2": {
+          "compName": "GUINandGate#0",
+          "pinName": "A"
         },
-        "params": 1
+        "name": "unnamedWire#0",
+        "path": [
+          {
+            "x": 15.0,
+            "y": 62.5
+          },
+          {
+            "x": 15.0,
+            "y": 7.5
+          }
+        ]
       },
       {
-        "id": "GUINandGate",
-        "name": "GUINandGate#4",
-        "pos": {
-          "x": 20.0,
-          "y": 27.5
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "A2"
         },
-        "params": 1
+        "pin2": {
+          "compName": "GUINandGate#1",
+          "pinName": "A"
+        },
+        "name": "unnamedWire#1",
+        "path": [
+          {
+            "x": 17.5,
+            "y": 87.5
+          },
+          {
+            "x": 17.5,
+            "y": 57.5
+          }
+        ]
       },
       {
-        "id": "GUINandGate",
-        "name": "GUINandGate#7",
-        "pos": {
-          "x": 20.0,
-          "y": 177.5
+        "pin1": {
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
         },
-        "params": 1
+        "pin2": {
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
+        },
+        "name": "unnamedWire#10"
       },
       {
-        "id": "GUINandGate",
-        "name": "GUINandGate#6",
-        "pos": {
-          "x": 20.0,
-          "y": 127.5
+        "pin1": {
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
         },
-        "params": 1
-      }
-    ],
-    "innerWires": [
+        "pin2": {
+          "compName": "GUINandGate#0",
+          "pinName": "B"
+        },
+        "name": "unnamedWire#11"
+      },
       {
         "pin1": {
-          "compName": "WireCrossPoint#2",
+          "compName": "WireCrossPoint#1",
           "pinName": ""
         },
         "pin2": {
-          "compName": "GUINandGate#2",
-          "pinName": "B"
+          "compName": "WireCrossPoint#2",
+          "pinName": ""
         },
-        "name": "unnamedWire#14"
+        "name": "unnamedWire#12"
       },
       {
         "pin1": {
@@ -307,14 +384,14 @@ mograsim version: 0.1.3
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#3",
+          "compName": "WireCrossPoint#2",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#4",
-          "pinName": ""
+          "compName": "GUINandGate#2",
+          "pinName": "B"
         },
-        "name": "unnamedWire#16"
+        "name": "unnamedWire#14"
       },
       {
         "pin1": {
@@ -335,14 +412,14 @@ mograsim version: 0.1.3
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#4",
+          "compName": "WireCrossPoint#3",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#5",
+          "compName": "WireCrossPoint#4",
           "pinName": ""
         },
-        "name": "unnamedWire#18"
+        "name": "unnamedWire#16"
       },
       {
         "pin1": {
@@ -361,32 +438,47 @@ mograsim version: 0.1.3
           "pinName": ""
         },
         "pin2": {
-          "compName": "GUINandGate#5",
-          "pinName": "B"
+          "compName": "WireCrossPoint#5",
+          "pinName": ""
         },
-        "name": "unnamedWire#19"
+        "name": "unnamedWire#18"
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#5",
+          "compName": "WireCrossPoint#4",
           "pinName": ""
         },
         "pin2": {
-          "compName": "GUINandGate#7",
+          "compName": "GUINandGate#5",
           "pinName": "B"
         },
-        "name": "unnamedWire#21",
-        "path": [
-          {
-            "x": 5.0,
-            "y": 192.5
-          }
-        ]
+        "name": "unnamedWire#19"
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#5",
-          "pinName": ""
+          "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": {
+          "compName": "WireCrossPoint#5",
+          "pinName": ""
         },
         "pin2": {
           "compName": "GUINandGate#6",
@@ -396,22 +488,18 @@ mograsim version: 0.1.3
       },
       {
         "pin1": {
-          "compName": "GUINandGate#4",
-          "pinName": "Y"
+          "compName": "WireCrossPoint#5",
+          "pinName": ""
         },
         "pin2": {
-          "compName": "GUINandGate#8",
+          "compName": "GUINandGate#7",
           "pinName": "B"
         },
-        "name": "unnamedWire#23",
+        "name": "unnamedWire#21",
         "path": [
           {
-            "x": 45.0,
-            "y": 37.5
-          },
-          {
-            "x": 45.0,
-            "y": 17.5
+            "x": 5.0,
+            "y": 192.5
           }
         ]
       },
@@ -438,22 +526,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#25",
+        "name": "unnamedWire#23",
         "path": [
           {
-            "x": 50.0,
-            "y": 87.5
+            "x": 45.0,
+            "y": 37.5
           },
           {
-            "x": 50.0,
-            "y": 42.5
+            "x": 45.0,
+            "y": 17.5
           }
         ]
       },
@@ -480,22 +568,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#27",
+        "name": "unnamedWire#25",
         "path": [
           {
-            "x": 55.0,
-            "y": 137.5
+            "x": 50.0,
+            "y": 87.5
           },
           {
-            "x": 55.0,
-            "y": 67.5
+            "x": 50.0,
+            "y": 42.5
           }
         ]
       },
@@ -522,22 +610,22 @@ mograsim version: 0.1.3
       },
       {
         "pin1": {
-          "compName": "GUINandGate#7",
+          "compName": "GUINandGate#6",
           "pinName": "Y"
         },
         "pin2": {
-          "compName": "GUINandGate#11",
+          "compName": "GUINandGate#10",
           "pinName": "B"
         },
-        "name": "unnamedWire#29",
+        "name": "unnamedWire#27",
         "path": [
           {
-            "x": 60.0,
-            "y": 187.5
+            "x": 55.0,
+            "y": 137.5
           },
           {
-            "x": 60.0,
-            "y": 92.5
+            "x": 55.0,
+            "y": 67.5
           }
         ]
       },
@@ -564,107 +652,43 @@ mograsim version: 0.1.3
       },
       {
         "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "SB"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#3",
-          "pinName": ""
-        },
-        "name": "unnamedWire#9"
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "SA"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
-        },
-        "name": "unnamedWire#8"
-      },
-      {
-        "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": "B3"
+          "pinName": "Y"
         },
         "pin2": {
-          "compName": "GUINandGate#6",
-          "pinName": "A"
+          "compName": "GUINandGate#11",
+          "pinName": "B"
         },
-        "name": "unnamedWire#6",
+        "name": "unnamedWire#29",
         "path": [
           {
-            "x": 15.0,
-            "y": 212.5
+            "x": 60.0,
+            "y": 187.5
           },
           {
-            "x": 15.0,
-            "y": 132.5
+            "x": 60.0,
+            "y": 92.5
           }
         ]
       },
       {
         "pin1": {
           "compName": "_submodelinterface",
-          "pinName": "A2"
+          "pinName": "A4"
         },
         "pin2": {
-          "compName": "GUINandGate#1",
+          "compName": "GUINandGate#3",
           "pinName": "A"
         },
-        "name": "unnamedWire#1",
+        "name": "unnamedWire#3",
         "path": [
           {
             "x": 17.5,
-            "y": 87.5
+            "y": 137.5
           },
           {
             "x": 17.5,
-            "y": 57.5
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "A1"
-        },
-        "pin2": {
-          "compName": "GUINandGate#0",
-          "pinName": "A"
-        },
-        "name": "unnamedWire#0",
-        "path": [
-          {
-            "x": 15.0,
-            "y": 62.5
-          },
-          {
-            "x": 15.0,
-            "y": 7.5
+            "y": 157.5
           }
         ]
       },
@@ -682,46 +706,38 @@ mograsim version: 0.1.3
       },
       {
         "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "B2"
+          "compName": "GUINandGate#9",
+          "pinName": "Y"
         },
         "pin2": {
-          "compName": "GUINandGate#5",
-          "pinName": "A"
+          "compName": "_submodelinterface",
+          "pinName": "Y2"
         },
-        "name": "unnamedWire#5",
-        "path": [
-          {
-            "x": 12.5,
-            "y": 187.5
-          },
-          {
-            "x": 12.5,
-            "y": 82.5
-          }
-        ]
+        "name": "unnamedWire#31",
+        "path": []
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
+          "compName": "GUINandGate#10",
+          "pinName": "Y"
         },
         "pin2": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "Y3"
         },
-        "name": "unnamedWire#10"
+        "name": "unnamedWire#32",
+        "path": []
       },
       {
         "pin1": {
-          "compName": "GUINandGate#10",
+          "compName": "GUINandGate#11",
           "pinName": "Y"
         },
         "pin2": {
           "compName": "_submodelinterface",
-          "pinName": "Y3"
+          "pinName": "Y4"
         },
-        "name": "unnamedWire#32",
+        "name": "unnamedWire#33",
         "path": []
       },
       {
@@ -745,97 +761,95 @@ mograsim version: 0.1.3
           }
         ]
       },
-      {
-        "pin1": {
-          "compName": "GUINandGate#9",
-          "pinName": "Y"
-        },
-        "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "Y2"
-        },
-        "name": "unnamedWire#31",
-        "path": []
-      },
       {
         "pin1": {
           "compName": "_submodelinterface",
-          "pinName": "A4"
+          "pinName": "B2"
         },
         "pin2": {
-          "compName": "GUINandGate#3",
+          "compName": "GUINandGate#5",
           "pinName": "A"
         },
-        "name": "unnamedWire#3",
+        "name": "unnamedWire#5",
         "path": [
           {
-            "x": 17.5,
-            "y": 137.5
+            "x": 12.5,
+            "y": 187.5
           },
           {
-            "x": 17.5,
-            "y": 157.5
+            "x": 12.5,
+            "y": 82.5
           }
         ]
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "B3"
         },
         "pin2": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
+          "compName": "GUINandGate#6",
+          "pinName": "A"
         },
-        "name": "unnamedWire#12"
+        "name": "unnamedWire#6",
+        "path": [
+          {
+            "x": 15.0,
+            "y": 212.5
+          },
+          {
+            "x": 15.0,
+            "y": 132.5
+          }
+        ]
       },
       {
         "pin1": {
           "compName": "_submodelinterface",
-          "pinName": "A3"
+          "pinName": "B4"
         },
         "pin2": {
-          "compName": "GUINandGate#2",
+          "compName": "GUINandGate#7",
           "pinName": "A"
         },
-        "name": "unnamedWire#2",
+        "name": "unnamedWire#7",
         "path": [
           {
-            "x": 17.5,
-            "y": 112.5
+            "x": 10.0,
+            "y": 237.5
           },
           {
-            "x": 17.5,
-            "y": 107.5
+            "x": 10.0,
+            "y": 182.5
           }
         ]
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "SA"
         },
         "pin2": {
-          "compName": "GUINandGate#0",
-          "pinName": "B"
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
         },
-        "name": "unnamedWire#11"
+        "name": "unnamedWire#8"
       },
       {
         "pin1": {
-          "compName": "GUINandGate#11",
-          "pinName": "Y"
+          "compName": "_submodelinterface",
+          "pinName": "SB"
         },
         "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "Y4"
+          "compName": "WireCrossPoint#3",
+          "pinName": ""
         },
-        "name": "unnamedWire#33",
-        "path": []
+        "name": "unnamedWire#9"
       }
-    ]
+    ],
+    "version": "0.1.1"
   },
-  "symbolRendererSnippetID": "class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer",
+  "symbolRendererSnippetID": "simpleRectangularLike",
   "symbolRendererParams": {
     "centerText": "GUIsel2_4",
     "centerTextHeight": 5.0,
@@ -843,5 +857,7 @@ mograsim version: 0.1.3
     "pinLabelHeight": 3.5,
     "pinLabelMargin": 0.5
   },
-  "outlineRendererSnippetID": "class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer"
+  "outlineRendererSnippetID": "default",
+  "highLevelStateHandlerSnippetID": "default",
+  "version": "0.1.5"
 }
\ No newline at end of file