X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model.editor%2Fcomponents%2FGUImux2.json;h=b1cf3a626b327f11693920d9fd4aca3599aaf96a;hb=76fdc144f22b60491e61a32860fe2e6881751505;hp=2542ce0a6e78b50ded1b748d22d3963e87e77a92;hpb=29f0c5000b9d7626d7fcd6425cd0acc5a8c33187;p=Mograsim.git

diff --git a/net.mograsim.logic.model.editor/components/GUImux2.json b/net.mograsim.logic.model.editor/components/GUImux2.json
index 2542ce0a..b1cf3a62 100644
--- a/net.mograsim.logic.model.editor/components/GUImux2.json
+++ b/net.mograsim.logic.model.editor/components/GUImux2.json
@@ -1,4 +1,3 @@
-mograsim version: 0.1.3
 {
   "width": 70.0,
   "height": 70.0,
@@ -9,15 +8,17 @@ mograsim version: 0.1.3
         "y": 30.0
       },
       "name": "I00",
-      "logicWidth": 1
+      "logicWidth": 1,
+      "usage": "INPUT"
     },
     {
       "location": {
         "x": 0.0,
-        "y": 60.0
+        "y": 40.0
       },
-      "name": "I11",
-      "logicWidth": 1
+      "name": "I01",
+      "logicWidth": 1,
+      "usage": "INPUT"
     },
     {
       "location": {
@@ -25,23 +26,17 @@ mograsim version: 0.1.3
         "y": 50.0
       },
       "name": "I10",
-      "logicWidth": 1
-    },
-    {
-      "location": {
-        "x": 70.0,
-        "y": 10.0
-      },
-      "name": "Y",
-      "logicWidth": 1
+      "logicWidth": 1,
+      "usage": "INPUT"
     },
     {
       "location": {
         "x": 0.0,
-        "y": 40.0
+        "y": 60.0
       },
-      "name": "I01",
-      "logicWidth": 1
+      "name": "I11",
+      "logicWidth": 1,
+      "usage": "INPUT"
     },
     {
       "location": {
@@ -49,7 +44,8 @@ mograsim version: 0.1.3
         "y": 10.0
       },
       "name": "S0",
-      "logicWidth": 1
+      "logicWidth": 1,
+      "usage": "INPUT"
     },
     {
       "location": {
@@ -57,12 +53,46 @@ mograsim version: 0.1.3
         "y": 20.0
       },
       "name": "S1",
-      "logicWidth": 1
+      "logicWidth": 1,
+      "usage": "INPUT"
+    },
+    {
+      "location": {
+        "x": 70.0,
+        "y": 10.0
+      },
+      "name": "Y",
+      "logicWidth": 1,
+      "usage": "OUTPUT"
     }
   ],
+  "innerScale": 0.4,
   "submodel": {
-    "innerScale": 0.4,
-    "subComps": [
+    "components": [
+      {
+        "id": "GUIsel1",
+        "name": "DeserializedSubmodelComponent#0",
+        "pos": {
+          "x": 60.0,
+          "y": 35.0
+        }
+      },
+      {
+        "id": "GUIsel1",
+        "name": "DeserializedSubmodelComponent#1",
+        "pos": {
+          "x": 60.0,
+          "y": 100.0
+        }
+      },
+      {
+        "id": "GUImux1",
+        "name": "DeserializedSubmodelComponent#2",
+        "pos": {
+          "x": 115.0,
+          "y": 20.0
+        }
+      },
       {
         "id": "GUINandGate",
         "name": "GUINandGate#0",
@@ -72,6 +102,15 @@ mograsim version: 0.1.3
         },
         "params": 1
       },
+      {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#0",
+        "pos": {
+          "x": 24.0,
+          "y": 24.0
+        },
+        "params": 1
+      },
       {
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#1",
@@ -83,10 +122,10 @@ mograsim version: 0.1.3
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#0",
+        "name": "WireCrossPoint#2",
         "pos": {
           "x": 24.0,
-          "y": 24.0
+          "y": 49.0
         },
         "params": 1
       },
@@ -98,52 +137,72 @@ mograsim version: 0.1.3
           "y": 39.0
         },
         "params": 1
-      },
+      }
+    ],
+    "wires": [
       {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#2",
-        "pos": {
-          "x": 24.0,
-          "y": 49.0
+        "pin1": {
+          "compName": "GUINandGate#0",
+          "pinName": "A"
         },
-        "params": 1
+        "pin2": {
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
+        },
+        "name": "unnamedWire#0",
+        "path": [
+          {
+            "x": 25.0,
+            "y": 20.0
+          }
+        ]
       },
       {
-        "id": "GUIsel1",
-        "name": "DeserializedSubmodelComponent#1",
-        "pos": {
-          "x": 60.0,
-          "y": 100.0
-        }
+        "pin1": {
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "GUINandGate#0",
+          "pinName": "B"
+        },
+        "name": "unnamedWire#1",
+        "path": []
       },
       {
-        "id": "GUIsel1",
-        "name": "DeserializedSubmodelComponent#0",
-        "pos": {
-          "x": 60.0,
-          "y": 35.0
-        }
+        "pin1": {
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
+        },
+        "name": "unnamedWire#10",
+        "path": []
       },
-      {
-        "id": "GUImux1",
-        "name": "DeserializedSubmodelComponent#2",
-        "pos": {
-          "x": 115.0,
-          "y": 20.0
-        }
-      }
-    ],
-    "innerWires": [
       {
         "pin1": {
+          "compName": "WireCrossPoint#2",
+          "pinName": ""
+        },
+        "pin2": {
           "compName": "DeserializedSubmodelComponent#0",
-          "pinName": "S1"
+          "pinName": "S2"
+        },
+        "name": "unnamedWire#11",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#2",
+          "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#3",
+          "compName": "WireCrossPoint#1",
           "pinName": ""
         },
-        "name": "unnamedWire#14",
+        "name": "unnamedWire#12",
         "path": []
       },
       {
@@ -160,20 +219,15 @@ mograsim version: 0.1.3
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
+          "compName": "DeserializedSubmodelComponent#0",
+          "pinName": "S1"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#1",
-          "pinName": "S2"
+          "compName": "WireCrossPoint#3",
+          "pinName": ""
         },
-        "name": "unnamedWire#16",
-        "path": [
-          {
-            "x": 25.0,
-            "y": 115.0
-          }
-        ]
+        "name": "unnamedWire#14",
+        "path": []
       },
       {
         "pin1": {
@@ -194,133 +248,92 @@ mograsim version: 0.1.3
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#3",
+          "compName": "WireCrossPoint#2",
           "pinName": ""
         },
         "pin2": {
           "compName": "DeserializedSubmodelComponent#1",
-          "pinName": "S1"
+          "pinName": "S2"
         },
-        "name": "unnamedWire#17",
+        "name": "unnamedWire#16",
         "path": [
           {
-            "x": 55.0,
-            "y": 105.0
+            "x": 25.0,
+            "y": 115.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "S1"
+          "compName": "WireCrossPoint#3",
+          "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#2",
-          "pinName": "S0"
+          "compName": "DeserializedSubmodelComponent#1",
+          "pinName": "S1"
         },
-        "name": "unnamedWire#9",
+        "name": "unnamedWire#17",
         "path": [
           {
-            "x": 15.0,
-            "y": 50.0
-          },
-          {
-            "x": 15.0,
-            "y": 10.0
-          },
-          {
-            "x": 85.0,
-            "y": 10.0
-          },
-          {
-            "x": 85.0,
-            "y": 25.0
+            "x": 55.0,
+            "y": 105.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#1",
-          "pinName": "Y"
+          "compName": "_submodelinterface",
+          "pinName": "I00"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#2",
+          "compName": "DeserializedSubmodelComponent#0",
           "pinName": "I1"
         },
-        "name": "unnamedWire#8",
+        "name": "unnamedWire#2",
         "path": [
           {
-            "x": 105.0,
-            "y": 105.0
+            "x": 35.0,
+            "y": 75.0
           },
           {
-            "x": 105.0,
-            "y": 45.0
+            "x": 35.0,
+            "y": 60.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#0",
-          "pinName": "Y"
+          "compName": "_submodelinterface",
+          "pinName": "I01"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#2",
-          "pinName": "I0"
+          "compName": "DeserializedSubmodelComponent#0",
+          "pinName": "I2"
         },
-        "name": "unnamedWire#7",
+        "name": "unnamedWire#3",
         "path": [
           {
-            "x": 105.0,
-            "y": 40.0
+            "x": 40.0,
+            "y": 100.0
           },
           {
-            "x": 105.0,
-            "y": 35.0
+            "x": 40.0,
+            "y": 70.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#2",
-          "pinName": "Y"
-        },
-        "pin2": {
           "compName": "_submodelinterface",
-          "pinName": "Y"
-        },
-        "name": "unnamedWire#6",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
+          "pinName": "I10"
         },
         "pin2": {
-          "compName": "GUINandGate#0",
-          "pinName": "B"
+          "compName": "DeserializedSubmodelComponent#1",
+          "pinName": "I1"
         },
-        "name": "unnamedWire#1",
+        "name": "unnamedWire#4",
         "path": []
       },
-      {
-        "pin1": {
-          "compName": "GUINandGate#0",
-          "pinName": "A"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
-        },
-        "name": "unnamedWire#0",
-        "path": [
-          {
-            "x": 25.0,
-            "y": 20.0
-          }
-        ]
-      },
       {
         "pin1": {
           "compName": "_submodelinterface",
@@ -344,95 +357,89 @@ mograsim version: 0.1.3
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
+          "compName": "DeserializedSubmodelComponent#2",
+          "pinName": "Y"
         },
         "pin2": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
-        },
-        "name": "unnamedWire#10",
-        "path": []
-      },
-      {
-        "pin1": {
           "compName": "_submodelinterface",
-          "pinName": "I10"
-        },
-        "pin2": {
-          "compName": "DeserializedSubmodelComponent#1",
-          "pinName": "I1"
+          "pinName": "Y"
         },
-        "name": "unnamedWire#4",
+        "name": "unnamedWire#6",
         "path": []
       },
       {
         "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "I01"
+          "compName": "DeserializedSubmodelComponent#0",
+          "pinName": "Y"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#0",
-          "pinName": "I2"
+          "compName": "DeserializedSubmodelComponent#2",
+          "pinName": "I0"
         },
-        "name": "unnamedWire#3",
+        "name": "unnamedWire#7",
         "path": [
           {
-            "x": 40.0,
-            "y": 100.0
+            "x": 105.0,
+            "y": 40.0
           },
           {
-            "x": 40.0,
-            "y": 70.0
+            "x": 105.0,
+            "y": 35.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
-        },
-        "name": "unnamedWire#12",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "I00"
+          "compName": "DeserializedSubmodelComponent#1",
+          "pinName": "Y"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "DeserializedSubmodelComponent#2",
           "pinName": "I1"
         },
-        "name": "unnamedWire#2",
+        "name": "unnamedWire#8",
         "path": [
           {
-            "x": 35.0,
-            "y": 75.0
+            "x": 105.0,
+            "y": 105.0
           },
           {
-            "x": 35.0,
-            "y": 60.0
+            "x": 105.0,
+            "y": 45.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "S1"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#0",
-          "pinName": "S2"
+          "compName": "DeserializedSubmodelComponent#2",
+          "pinName": "S0"
         },
-        "name": "unnamedWire#11",
-        "path": []
+        "name": "unnamedWire#9",
+        "path": [
+          {
+            "x": 15.0,
+            "y": 50.0
+          },
+          {
+            "x": 15.0,
+            "y": 10.0
+          },
+          {
+            "x": 85.0,
+            "y": 10.0
+          },
+          {
+            "x": 85.0,
+            "y": 25.0
+          }
+        ]
       }
-    ]
+    ],
+    "version": "0.1.1"
   },
   "symbolRendererSnippetID": "simpleRectangularLike",
   "symbolRendererParams": {
@@ -443,5 +450,6 @@ mograsim version: 0.1.3
     "pinLabelMargin": 0.5
   },
   "outlineRendererSnippetID": "default",
-  "highLevelStateHandlerSnippetID": "default"
+  "highLevelStateHandlerSnippetID": "default",
+  "version": "0.1.5"
 }
\ No newline at end of file