X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model.editor%2Fcomponents%2FGUIdemux2.json;h=7e28bfd7e81093e117fd01043e88d18d30e5ccd7;hb=148a58630b38b30d4d24a21e3f55c357f5b4d0bc;hp=29440a25fc48042794ebebf12604043b7a5149b5;hpb=052c4f704ea286f8db1db3a7b055c9447369c0c2;p=Mograsim.git

diff --git a/net.mograsim.logic.model.editor/components/GUIdemux2.json b/net.mograsim.logic.model.editor/components/GUIdemux2.json
index 29440a25..7e28bfd7 100644
--- a/net.mograsim.logic.model.editor/components/GUIdemux2.json
+++ b/net.mograsim.logic.model.editor/components/GUIdemux2.json
@@ -1,31 +1,33 @@
-mograsim version: 0.1.3
 {
   "width": 35.0,
   "height": 40.0,
   "interfacePins": [
     {
       "location": {
-        "x": 35.0,
+        "x": 0.0,
         "y": 5.0
       },
-      "name": "Y00",
-      "logicWidth": 1
+      "name": "S0",
+      "logicWidth": 1,
+      "usage": "INPUT"
     },
     {
       "location": {
-        "x": 35.0,
-        "y": 35.0
+        "x": 0.0,
+        "y": 15.0
       },
-      "name": "Y11",
-      "logicWidth": 1
+      "name": "S1",
+      "logicWidth": 1,
+      "usage": "INPUT"
     },
     {
       "location": {
         "x": 35.0,
-        "y": 25.0
+        "y": 5.0
       },
-      "name": "Y10",
-      "logicWidth": 1
+      "name": "Y00",
+      "logicWidth": 1,
+      "usage": "OUTPUT"
     },
     {
       "location": {
@@ -33,152 +35,155 @@ mograsim version: 0.1.3
         "y": 15.0
       },
       "name": "Y01",
-      "logicWidth": 1
+      "logicWidth": 1,
+      "usage": "OUTPUT"
     },
     {
       "location": {
-        "x": 0.0,
-        "y": 5.0
+        "x": 35.0,
+        "y": 25.0
       },
-      "name": "S0",
-      "logicWidth": 1
+      "name": "Y10",
+      "logicWidth": 1,
+      "usage": "OUTPUT"
     },
     {
       "location": {
-        "x": 0.0,
-        "y": 15.0
+        "x": 35.0,
+        "y": 35.0
       },
-      "name": "S1",
-      "logicWidth": 1
+      "name": "Y11",
+      "logicWidth": 1,
+      "usage": "OUTPUT"
     }
   ],
+  "innerScale": 0.4,
   "submodel": {
-    "innerScale": 0.4,
-    "subComps": [
+    "components": [
       {
+        "id": "GUINandGate",
+        "name": "GUINandGate#0",
         "pos": {
           "x": 10.0,
-          "y": 27.5
+          "y": 2.5
         },
-        "id": "GUINandGate",
-        "name": "GUINandGate#1",
         "params": 1
       },
       {
+        "id": "GUINandGate",
+        "name": "GUINandGate#1",
         "pos": {
           "x": 10.0,
-          "y": 2.5
+          "y": 27.5
         },
-        "id": "GUINandGate",
-        "name": "GUINandGate#0",
         "params": 1
       },
       {
+        "id": "GUIand",
+        "name": "GUIand#0",
         "pos": {
           "x": 40.0,
           "y": 2.5
-        },
-        "id": "GUIand",
-        "name": "GUIand#0"
+        }
       },
       {
+        "id": "GUIand",
+        "name": "GUIand#1",
         "pos": {
           "x": 40.0,
-          "y": 52.5
-        },
-        "id": "GUIand",
-        "name": "GUIand#2"
+          "y": 27.5
+        }
       },
       {
+        "id": "GUIand",
+        "name": "GUIand#2",
         "pos": {
           "x": 40.0,
-          "y": 27.5
-        },
-        "id": "GUIand",
-        "name": "GUIand#1"
+          "y": 52.5
+        }
       },
       {
+        "id": "GUIand",
+        "name": "GUIand#3",
         "pos": {
           "x": 40.0,
           "y": 77.5
-        },
-        "id": "GUIand",
-        "name": "GUIand#3"
+        }
       },
       {
-        "pos": {
-          "x": 6.5,
-          "y": 16.5
-        },
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#1",
-        "params": 1
-      },
-      {
+        "name": "WireCrossPoint#0",
         "pos": {
           "x": 6.5,
           "y": 11.5
         },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#0",
         "params": 1
       },
       {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#1",
         "pos": {
-          "x": 4.0,
-          "y": 36.5
+          "x": 6.5,
+          "y": 16.5
         },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#3",
         "params": 1
       },
       {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#2",
         "pos": {
           "x": 36.5,
           "y": 61.5
         },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#2",
         "params": 1
       },
       {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#3",
         "pos": {
-          "x": 31.5,
-          "y": 66.5
+          "x": 4.0,
+          "y": 36.5
         },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#5",
         "params": 1
       },
       {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#4",
         "pos": {
           "x": 4.0,
           "y": 41.5
         },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#4",
         "params": 1
       },
       {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#5",
         "pos": {
-          "x": 34.0,
-          "y": 36.5
+          "x": 31.5,
+          "y": 66.5
         },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#7",
         "params": 1
       },
       {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#6",
         "pos": {
           "x": 31.5,
           "y": 11.5
         },
+        "params": 1
+      },
+      {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#6",
+        "name": "WireCrossPoint#7",
+        "pos": {
+          "x": 34.0,
+          "y": 36.5
+        },
         "params": 1
       }
     ],
-    "innerWires": [
+    "wires": [
       {
         "pin1": {
           "compName": "_submodelinterface",
@@ -188,6 +193,7 @@ mograsim version: 0.1.3
           "compName": "WireCrossPoint#0",
           "pinName": ""
         },
+        "name": "unnamedWire#0",
         "path": []
       },
       {
@@ -199,120 +205,9 @@ mograsim version: 0.1.3
           "compName": "WireCrossPoint#3",
           "pinName": ""
         },
+        "name": "unnamedWire#1",
         "path": []
       },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "GUINandGate#0",
-          "pinName": "A"
-        },
-        "path": [
-          {
-            "x": 7.5,
-            "y": 7.5
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#3",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "GUINandGate#1",
-          "pinName": "A"
-        },
-        "path": [
-          {
-            "x": 5.0,
-            "y": 32.5
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
-        },
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#3",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#4",
-          "pinName": ""
-        },
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "GUINandGate#0",
-          "pinName": "B"
-        },
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#4",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "GUINandGate#1",
-          "pinName": "B"
-        },
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
-        },
-        "path": [
-          {
-            "x": 7.5,
-            "y": 62.5
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#4",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#5",
-          "pinName": ""
-        },
-        "path": [
-          {
-            "x": 5.0,
-            "y": 67.5
-          },
-          {
-            "x": 32.5,
-            "y": 67.5
-          }
-        ]
-      },
       {
         "pin1": {
           "compName": "GUINandGate#0",
@@ -322,6 +217,7 @@ mograsim version: 0.1.3
           "compName": "WireCrossPoint#6",
           "pinName": ""
         },
+        "name": "unnamedWire#10",
         "path": []
       },
       {
@@ -333,6 +229,7 @@ mograsim version: 0.1.3
           "compName": "WireCrossPoint#7",
           "pinName": ""
         },
+        "name": "unnamedWire#11",
         "path": []
       },
       {
@@ -344,6 +241,7 @@ mograsim version: 0.1.3
           "compName": "GUIand#0",
           "pinName": "A"
         },
+        "name": "unnamedWire#12",
         "path": [
           {
             "x": 32.5,
@@ -360,6 +258,7 @@ mograsim version: 0.1.3
           "compName": "GUIand#0",
           "pinName": "B"
         },
+        "name": "unnamedWire#13",
         "path": [
           {
             "x": 35.0,
@@ -376,6 +275,7 @@ mograsim version: 0.1.3
           "compName": "GUIand#1",
           "pinName": "A"
         },
+        "name": "unnamedWire#14",
         "path": [
           {
             "x": 37.5,
@@ -392,6 +292,7 @@ mograsim version: 0.1.3
           "compName": "GUIand#1",
           "pinName": "B"
         },
+        "name": "unnamedWire#15",
         "path": [
           {
             "x": 35.0,
@@ -408,6 +309,7 @@ mograsim version: 0.1.3
           "compName": "GUIand#2",
           "pinName": "A"
         },
+        "name": "unnamedWire#16",
         "path": [
           {
             "x": 32.5,
@@ -424,6 +326,7 @@ mograsim version: 0.1.3
           "compName": "GUIand#2",
           "pinName": "B"
         },
+        "name": "unnamedWire#17",
         "path": []
       },
       {
@@ -435,6 +338,7 @@ mograsim version: 0.1.3
           "compName": "GUIand#3",
           "pinName": "A"
         },
+        "name": "unnamedWire#18",
         "path": [
           {
             "x": 37.5,
@@ -451,6 +355,7 @@ mograsim version: 0.1.3
           "compName": "GUIand#3",
           "pinName": "B"
         },
+        "name": "unnamedWire#19",
         "path": [
           {
             "x": 32.5,
@@ -458,6 +363,23 @@ mograsim version: 0.1.3
           }
         ]
       },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "GUINandGate#0",
+          "pinName": "A"
+        },
+        "name": "unnamedWire#2",
+        "path": [
+          {
+            "x": 7.5,
+            "y": 7.5
+          }
+        ]
+      },
       {
         "pin1": {
           "compName": "GUIand#0",
@@ -466,7 +388,8 @@ mograsim version: 0.1.3
         "pin2": {
           "compName": "_submodelinterface",
           "pinName": "Y00"
-        }
+        },
+        "name": "unnamedWire#20"
       },
       {
         "pin1": {
@@ -476,7 +399,8 @@ mograsim version: 0.1.3
         "pin2": {
           "compName": "_submodelinterface",
           "pinName": "Y01"
-        }
+        },
+        "name": "unnamedWire#21"
       },
       {
         "pin1": {
@@ -486,7 +410,8 @@ mograsim version: 0.1.3
         "pin2": {
           "compName": "_submodelinterface",
           "pinName": "Y10"
-        }
+        },
+        "name": "unnamedWire#22"
       },
       {
         "pin1": {
@@ -496,9 +421,114 @@ mograsim version: 0.1.3
         "pin2": {
           "compName": "_submodelinterface",
           "pinName": "Y11"
-        }
+        },
+        "name": "unnamedWire#23"
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#3",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "GUINandGate#1",
+          "pinName": "A"
+        },
+        "name": "unnamedWire#3",
+        "path": [
+          {
+            "x": 5.0,
+            "y": 32.5
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
+        },
+        "name": "unnamedWire#4",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#3",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#4",
+          "pinName": ""
+        },
+        "name": "unnamedWire#5",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "GUINandGate#0",
+          "pinName": "B"
+        },
+        "name": "unnamedWire#6",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#4",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "GUINandGate#1",
+          "pinName": "B"
+        },
+        "name": "unnamedWire#7",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#2",
+          "pinName": ""
+        },
+        "name": "unnamedWire#8",
+        "path": [
+          {
+            "x": 7.5,
+            "y": 62.5
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#4",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#5",
+          "pinName": ""
+        },
+        "name": "unnamedWire#9",
+        "path": [
+          {
+            "x": 5.0,
+            "y": 67.5
+          },
+          {
+            "x": 32.5,
+            "y": 67.5
+          }
+        ]
       }
-    ]
+    ],
+    "version": "0.1.1"
   },
   "symbolRendererSnippetID": "simpleRectangularLike",
   "symbolRendererParams": {
@@ -507,5 +537,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