X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model.am2900%2Fcomponents%2FGUIsel3_4.json;h=5951bdc55938168f310852ee464c5a5378796e85;hb=b9a28b4d657716f65a276535a717bb8edb2190a4;hp=1cae789a02558e6cdfbaad8614b9756f896a7e6e;hpb=47ea68ed5c444dd14864412639f6a6fd60ab8a0f;p=Mograsim.git

diff --git a/net.mograsim.logic.model.am2900/components/GUIsel3_4.json b/net.mograsim.logic.model.am2900/components/GUIsel3_4.json
index 1cae789a..5951bdc5 100644
--- a/net.mograsim.logic.model.am2900/components/GUIsel3_4.json
+++ b/net.mograsim.logic.model.am2900/components/GUIsel3_4.json
@@ -1,4 +1,3 @@
-mograsim version: 0.1.3
 {
   "width": 35.0,
   "height": 150.0,
@@ -6,90 +5,101 @@ mograsim version: 0.1.3
     {
       "location": {
         "x": 0.0,
-        "y": 5.0
+        "y": 35.0
       },
-      "name": "SA",
-      "logicWidth": 1
+      "name": "A1",
+      "logicWidth": 1,
+      "usage": "INPUT"
     },
     {
       "location": {
         "x": 0.0,
-        "y": 115.0
+        "y": 45.0
       },
-      "name": "C1",
-      "logicWidth": 1
+      "name": "A2",
+      "logicWidth": 1,
+      "usage": "INPUT"
     },
     {
       "location": {
         "x": 0.0,
-        "y": 15.0
+        "y": 55.0
       },
-      "name": "SB",
-      "logicWidth": 1
+      "name": "A3",
+      "logicWidth": 1,
+      "usage": "INPUT"
     },
     {
       "location": {
         "x": 0.0,
-        "y": 75.0
+        "y": 65.0
       },
-      "name": "B1",
-      "logicWidth": 1
+      "name": "A4",
+      "logicWidth": 1,
+      "usage": "INPUT"
     },
     {
       "location": {
         "x": 0.0,
-        "y": 125.0
+        "y": 75.0
       },
-      "name": "C2",
-      "logicWidth": 1
+      "name": "B1",
+      "logicWidth": 1,
+      "usage": "INPUT"
     },
     {
       "location": {
         "x": 0.0,
-        "y": 25.0
+        "y": 85.0
       },
-      "name": "SC",
-      "logicWidth": 1
+      "name": "B2",
+      "logicWidth": 1,
+      "usage": "INPUT"
     },
     {
       "location": {
         "x": 0.0,
-        "y": 35.0
+        "y": 95.0
       },
-      "name": "A1",
-      "logicWidth": 1
+      "name": "B3",
+      "logicWidth": 1,
+      "usage": "INPUT"
     },
     {
       "location": {
         "x": 0.0,
-        "y": 85.0
+        "y": 105.0
       },
-      "name": "B2",
-      "logicWidth": 1
+      "name": "B4",
+      "logicWidth": 1,
+      "usage": "INPUT"
     },
     {
       "location": {
         "x": 0.0,
-        "y": 135.0
+        "y": 115.0
       },
-      "name": "C3",
-      "logicWidth": 1
+      "name": "C1",
+      "logicWidth": 1,
+      "usage": "INPUT"
     },
     {
       "location": {
         "x": 0.0,
-        "y": 45.0
+        "y": 125.0
       },
-      "name": "A2",
-      "logicWidth": 1
+      "name": "C2",
+      "logicWidth": 1,
+      "usage": "INPUT"
     },
     {
       "location": {
         "x": 0.0,
-        "y": 95.0
+        "y": 135.0
       },
-      "name": "B3",
-      "logicWidth": 1
+      "name": "C3",
+      "logicWidth": 1,
+      "usage": "INPUT"
     },
     {
       "location": {
@@ -97,31 +107,35 @@ mograsim version: 0.1.3
         "y": 145.0
       },
       "name": "C4",
-      "logicWidth": 1
+      "logicWidth": 1,
+      "usage": "INPUT"
     },
     {
       "location": {
         "x": 0.0,
-        "y": 55.0
+        "y": 5.0
       },
-      "name": "A3",
-      "logicWidth": 1
+      "name": "SA",
+      "logicWidth": 1,
+      "usage": "INPUT"
     },
     {
       "location": {
         "x": 0.0,
-        "y": 105.0
+        "y": 15.0
       },
-      "name": "B4",
-      "logicWidth": 1
+      "name": "SB",
+      "logicWidth": 1,
+      "usage": "INPUT"
     },
     {
       "location": {
         "x": 0.0,
-        "y": 65.0
+        "y": 25.0
       },
-      "name": "A4",
-      "logicWidth": 1
+      "name": "SC",
+      "logicWidth": 1,
+      "usage": "INPUT"
     },
     {
       "location": {
@@ -129,7 +143,8 @@ mograsim version: 0.1.3
         "y": 5.0
       },
       "name": "Y1",
-      "logicWidth": 1
+      "logicWidth": 1,
+      "usage": "OUTPUT"
     },
     {
       "location": {
@@ -137,7 +152,8 @@ mograsim version: 0.1.3
         "y": 15.0
       },
       "name": "Y2",
-      "logicWidth": 1
+      "logicWidth": 1,
+      "usage": "OUTPUT"
     },
     {
       "location": {
@@ -145,7 +161,8 @@ mograsim version: 0.1.3
         "y": 25.0
       },
       "name": "Y3",
-      "logicWidth": 1
+      "logicWidth": 1,
+      "usage": "OUTPUT"
     },
     {
       "location": {
@@ -153,129 +170,130 @@ mograsim version: 0.1.3
         "y": 35.0
       },
       "name": "Y4",
-      "logicWidth": 1
+      "logicWidth": 1,
+      "usage": "OUTPUT"
     }
   ],
+  "innerScale": 0.2,
   "submodel": {
-    "innerScale": 0.2,
-    "subComps": [
+    "components": [
       {
-        "pos": {
-          "x": 50.0,
-          "y": 620.0
-        },
         "id": "GUINandGate",
-        "name": "GUINandGate#1",
-        "params": 1
-      },
-      {
+        "name": "GUINandGate#0",
         "pos": {
           "x": 50.0,
           "y": 570.0
         },
-        "id": "GUINandGate",
-        "name": "GUINandGate#0",
         "params": 1
       },
       {
+        "id": "GUINandGate",
+        "name": "GUINandGate#1",
         "pos": {
           "x": 50.0,
-          "y": 720.0
+          "y": 620.0
         },
-        "id": "GUINandGate",
-        "name": "GUINandGate#3",
         "params": 1
       },
       {
+        "id": "GUINandGate",
+        "name": "GUINandGate#2",
         "pos": {
           "x": 50.0,
           "y": 670.0
         },
-        "id": "GUINandGate",
-        "name": "GUINandGate#2",
         "params": 1
       },
       {
+        "id": "GUINandGate",
+        "name": "GUINandGate#3",
         "pos": {
-          "x": 75.0,
-          "y": 250.0
+          "x": 50.0,
+          "y": 720.0
         },
-        "id": "GUInot4",
-        "name": "GUInot4#0"
+        "params": 1
       },
       {
+        "id": "GUINandGate",
+        "name": "GUINandGate#4",
         "pos": {
-          "x": 29.0,
-          "y": 634.0
+          "x": 152.5,
+          "y": 15.0
         },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#1",
         "params": 1
       },
       {
+        "id": "GUINandGate",
+        "name": "GUINandGate#5",
         "pos": {
-          "x": 29.0,
-          "y": 584.0
+          "x": 152.5,
+          "y": 65.0
         },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#0",
         "params": 1
       },
       {
+        "id": "GUINandGate",
+        "name": "GUINandGate#6",
         "pos": {
-          "x": 29.0,
-          "y": 684.0
+          "x": 152.5,
+          "y": 115.0
         },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#2",
         "params": 1
       },
       {
+        "id": "GUINandGate",
+        "name": "GUINandGate#7",
         "pos": {
           "x": 152.5,
-          "y": 65.0
+          "y": 165.0
         },
-        "id": "GUINandGate",
-        "name": "GUINandGate#5",
         "params": 1
       },
       {
+        "id": "GUInot4",
+        "name": "GUInot4#0",
         "pos": {
-          "x": 35.0,
+          "x": 75.0,
           "y": 250.0
-        },
+        }
+      },
+      {
         "id": "GUIsel2_4",
-        "name": "GUIsel2_4#0"
+        "name": "GUIsel2_4#0",
+        "pos": {
+          "x": 35.0,
+          "y": 250.0
+        }
       },
       {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#0",
         "pos": {
-          "x": 152.5,
-          "y": 15.0
+          "x": 29.0,
+          "y": 584.0
         },
-        "id": "GUINandGate",
-        "name": "GUINandGate#4",
         "params": 1
       },
       {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#1",
         "pos": {
-          "x": 152.5,
-          "y": 165.0
+          "x": 29.0,
+          "y": 634.0
         },
-        "id": "GUINandGate",
-        "name": "GUINandGate#7",
         "params": 1
       },
       {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#2",
         "pos": {
-          "x": 152.5,
-          "y": 115.0
+          "x": 29.0,
+          "y": 684.0
         },
-        "id": "GUINandGate",
-        "name": "GUINandGate#6",
         "params": 1
       }
     ],
-    "innerWires": [
+    "wires": [
       {
         "pin1": {
           "compName": "_submodelinterface",
@@ -285,6 +303,7 @@ mograsim version: 0.1.3
           "compName": "GUIsel2_4#0",
           "pinName": "SA"
         },
+        "name": "unnamedWire#0",
         "path": [
           {
             "x": 25.0,
@@ -305,6 +324,7 @@ mograsim version: 0.1.3
           "compName": "GUIsel2_4#0",
           "pinName": "SB"
         },
+        "name": "unnamedWire#1",
         "path": [
           {
             "x": 20.0,
@@ -316,166 +336,6 @@ mograsim version: 0.1.3
           }
         ]
       },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "A1"
-        },
-        "pin2": {
-          "compName": "GUIsel2_4#0",
-          "pinName": "A1"
-        },
-        "path": [
-          {
-            "x": 15.0,
-            "y": 175.0
-          },
-          {
-            "x": 15.0,
-            "y": 275.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "A2"
-        },
-        "pin2": {
-          "compName": "GUIsel2_4#0",
-          "pinName": "A2"
-        },
-        "path": [
-          {
-            "x": 10.0,
-            "y": 225.0
-          },
-          {
-            "x": 10.0,
-            "y": 285.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "A3"
-        },
-        "pin2": {
-          "compName": "GUIsel2_4#0",
-          "pinName": "A3"
-        },
-        "path": [
-          {
-            "x": 5.0,
-            "y": 275.0
-          },
-          {
-            "x": 5.0,
-            "y": 295.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "A4"
-        },
-        "pin2": {
-          "compName": "GUIsel2_4#0",
-          "pinName": "A4"
-        },
-        "path": [
-          {
-            "x": 5.0,
-            "y": 325.0
-          },
-          {
-            "x": 5.0,
-            "y": 305.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "B1"
-        },
-        "pin2": {
-          "compName": "GUIsel2_4#0",
-          "pinName": "B1"
-        },
-        "path": [
-          {
-            "x": 10.0,
-            "y": 375.0
-          },
-          {
-            "x": 10.0,
-            "y": 315.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "B2"
-        },
-        "pin2": {
-          "compName": "GUIsel2_4#0",
-          "pinName": "B2"
-        },
-        "path": [
-          {
-            "x": 15.0,
-            "y": 425.0
-          },
-          {
-            "x": 15.0,
-            "y": 325.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "B3"
-        },
-        "pin2": {
-          "compName": "GUIsel2_4#0",
-          "pinName": "B3"
-        },
-        "path": [
-          {
-            "x": 20.0,
-            "y": 475.0
-          },
-          {
-            "x": 20.0,
-            "y": 335.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "B4"
-        },
-        "pin2": {
-          "compName": "GUIsel2_4#0",
-          "pinName": "B4"
-        },
-        "path": [
-          {
-            "x": 25.0,
-            "y": 525.0
-          },
-          {
-            "x": 25.0,
-            "y": 345.0
-          }
-        ]
-      },
       {
         "pin1": {
           "compName": "GUIsel2_4#0",
@@ -485,6 +345,7 @@ mograsim version: 0.1.3
           "compName": "GUInot4#0",
           "pinName": "A1"
         },
+        "name": "unnamedWire#10",
         "path": []
       },
       {
@@ -496,6 +357,7 @@ mograsim version: 0.1.3
           "compName": "GUInot4#0",
           "pinName": "A2"
         },
+        "name": "unnamedWire#11",
         "path": []
       },
       {
@@ -507,6 +369,7 @@ mograsim version: 0.1.3
           "compName": "GUInot4#0",
           "pinName": "A3"
         },
+        "name": "unnamedWire#12",
         "path": []
       },
       {
@@ -518,6 +381,7 @@ mograsim version: 0.1.3
           "compName": "GUInot4#0",
           "pinName": "A4"
         },
+        "name": "unnamedWire#13",
         "path": []
       },
       {
@@ -529,6 +393,7 @@ mograsim version: 0.1.3
           "compName": "WireCrossPoint#0",
           "pinName": ""
         },
+        "name": "unnamedWire#14",
         "path": [
           {
             "x": 30.0,
@@ -545,6 +410,7 @@ mograsim version: 0.1.3
           "compName": "GUINandGate#0",
           "pinName": "B"
         },
+        "name": "unnamedWire#15",
         "path": []
       },
       {
@@ -556,6 +422,7 @@ mograsim version: 0.1.3
           "compName": "WireCrossPoint#1",
           "pinName": ""
         },
+        "name": "unnamedWire#16",
         "path": [
           {
             "x": 30.0,
@@ -572,6 +439,7 @@ mograsim version: 0.1.3
           "compName": "GUINandGate#1",
           "pinName": "B"
         },
+        "name": "unnamedWire#17",
         "path": []
       },
       {
@@ -583,6 +451,7 @@ mograsim version: 0.1.3
           "compName": "WireCrossPoint#2",
           "pinName": ""
         },
+        "name": "unnamedWire#18",
         "path": [
           {
             "x": 30.0,
@@ -599,8 +468,30 @@ mograsim version: 0.1.3
           "compName": "GUINandGate#2",
           "pinName": "B"
         },
+        "name": "unnamedWire#19",
         "path": []
       },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "A1"
+        },
+        "pin2": {
+          "compName": "GUIsel2_4#0",
+          "pinName": "A1"
+        },
+        "name": "unnamedWire#2",
+        "path": [
+          {
+            "x": 15.0,
+            "y": 175.0
+          },
+          {
+            "x": 15.0,
+            "y": 275.0
+          }
+        ]
+      },
       {
         "pin1": {
           "compName": "WireCrossPoint#2",
@@ -610,6 +501,7 @@ mograsim version: 0.1.3
           "compName": "GUINandGate#3",
           "pinName": "B"
         },
+        "name": "unnamedWire#20",
         "path": [
           {
             "x": 30.0,
@@ -626,6 +518,7 @@ mograsim version: 0.1.3
           "compName": "GUINandGate#0",
           "pinName": "A"
         },
+        "name": "unnamedWire#21",
         "path": []
       },
       {
@@ -637,6 +530,7 @@ mograsim version: 0.1.3
           "compName": "GUINandGate#1",
           "pinName": "A"
         },
+        "name": "unnamedWire#22",
         "path": []
       },
       {
@@ -648,6 +542,7 @@ mograsim version: 0.1.3
           "compName": "GUINandGate#2",
           "pinName": "A"
         },
+        "name": "unnamedWire#23",
         "path": []
       },
       {
@@ -659,6 +554,7 @@ mograsim version: 0.1.3
           "compName": "GUINandGate#3",
           "pinName": "A"
         },
+        "name": "unnamedWire#24",
         "path": []
       },
       {
@@ -670,6 +566,7 @@ mograsim version: 0.1.3
           "compName": "GUINandGate#4",
           "pinName": "A"
         },
+        "name": "unnamedWire#25",
         "path": [
           {
             "x": 115.0,
@@ -690,6 +587,7 @@ mograsim version: 0.1.3
           "compName": "GUINandGate#5",
           "pinName": "A"
         },
+        "name": "unnamedWire#26",
         "path": [
           {
             "x": 120.0,
@@ -710,6 +608,7 @@ mograsim version: 0.1.3
           "compName": "GUINandGate#6",
           "pinName": "A"
         },
+        "name": "unnamedWire#27",
         "path": [
           {
             "x": 125.0,
@@ -730,6 +629,7 @@ mograsim version: 0.1.3
           "compName": "GUINandGate#7",
           "pinName": "A"
         },
+        "name": "unnamedWire#28",
         "path": [
           {
             "x": 130.0,
@@ -750,6 +650,7 @@ mograsim version: 0.1.3
           "compName": "GUINandGate#4",
           "pinName": "B"
         },
+        "name": "unnamedWire#29",
         "path": [
           {
             "x": 135.0,
@@ -761,6 +662,27 @@ mograsim version: 0.1.3
           }
         ]
       },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "A2"
+        },
+        "pin2": {
+          "compName": "GUIsel2_4#0",
+          "pinName": "A2"
+        },
+        "name": "unnamedWire#3",
+        "path": [
+          {
+            "x": 10.0,
+            "y": 225.0
+          },
+          {
+            "x": 10.0,
+            "y": 285.0
+          }
+        ]
+      },
       {
         "pin1": {
           "compName": "GUINandGate#1",
@@ -770,6 +692,7 @@ mograsim version: 0.1.3
           "compName": "GUINandGate#5",
           "pinName": "B"
         },
+        "name": "unnamedWire#30",
         "path": [
           {
             "x": 140.0,
@@ -790,6 +713,7 @@ mograsim version: 0.1.3
           "compName": "GUINandGate#6",
           "pinName": "B"
         },
+        "name": "unnamedWire#31",
         "path": [
           {
             "x": 145.0,
@@ -810,6 +734,7 @@ mograsim version: 0.1.3
           "compName": "GUINandGate#7",
           "pinName": "B"
         },
+        "name": "unnamedWire#32",
         "path": [
           {
             "x": 150.0,
@@ -830,6 +755,7 @@ mograsim version: 0.1.3
           "compName": "_submodelinterface",
           "pinName": "Y1"
         },
+        "name": "unnamedWire#33",
         "path": []
       },
       {
@@ -841,6 +767,7 @@ mograsim version: 0.1.3
           "compName": "_submodelinterface",
           "pinName": "Y2"
         },
+        "name": "unnamedWire#34",
         "path": []
       },
       {
@@ -852,6 +779,7 @@ mograsim version: 0.1.3
           "compName": "_submodelinterface",
           "pinName": "Y3"
         },
+        "name": "unnamedWire#35",
         "path": []
       },
       {
@@ -863,16 +791,147 @@ mograsim version: 0.1.3
           "compName": "_submodelinterface",
           "pinName": "Y4"
         },
+        "name": "unnamedWire#36",
         "path": []
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "A3"
+        },
+        "pin2": {
+          "compName": "GUIsel2_4#0",
+          "pinName": "A3"
+        },
+        "name": "unnamedWire#4",
+        "path": [
+          {
+            "x": 5.0,
+            "y": 275.0
+          },
+          {
+            "x": 5.0,
+            "y": 295.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "A4"
+        },
+        "pin2": {
+          "compName": "GUIsel2_4#0",
+          "pinName": "A4"
+        },
+        "name": "unnamedWire#5",
+        "path": [
+          {
+            "x": 5.0,
+            "y": 325.0
+          },
+          {
+            "x": 5.0,
+            "y": 305.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "B1"
+        },
+        "pin2": {
+          "compName": "GUIsel2_4#0",
+          "pinName": "B1"
+        },
+        "name": "unnamedWire#6",
+        "path": [
+          {
+            "x": 10.0,
+            "y": 375.0
+          },
+          {
+            "x": 10.0,
+            "y": 315.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "B2"
+        },
+        "pin2": {
+          "compName": "GUIsel2_4#0",
+          "pinName": "B2"
+        },
+        "name": "unnamedWire#7",
+        "path": [
+          {
+            "x": 15.0,
+            "y": 425.0
+          },
+          {
+            "x": 15.0,
+            "y": 325.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "B3"
+        },
+        "pin2": {
+          "compName": "GUIsel2_4#0",
+          "pinName": "B3"
+        },
+        "name": "unnamedWire#8",
+        "path": [
+          {
+            "x": 20.0,
+            "y": 475.0
+          },
+          {
+            "x": 20.0,
+            "y": 335.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "B4"
+        },
+        "pin2": {
+          "compName": "GUIsel2_4#0",
+          "pinName": "B4"
+        },
+        "name": "unnamedWire#9",
+        "path": [
+          {
+            "x": 25.0,
+            "y": 525.0
+          },
+          {
+            "x": 25.0,
+            "y": 345.0
+          }
+        ]
       }
-    ]
+    ],
+    "version": "0.1.1"
   },
-  "symbolRendererSnippetID": "SimpleRectangularLikeSymbolRenderer",
+  "symbolRendererSnippetID": "simpleRectangularLike",
   "symbolRendererParams": {
     "centerText": "GUIsel3_4",
-    "horizontalComponentCenter": 17.5,
     "centerTextHeight": 5.0,
+    "horizontalComponentCenter": 17.5,
     "pinLabelHeight": 3.5,
     "pinLabelMargin": 0.5
-  }
+  },
+  "outlineRendererSnippetID": "default",
+  "highLevelStateHandlerSnippetID": "default",
+  "version": "0.1.5"
 }
\ No newline at end of file