X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model.editor%2Fcomponents%2FGUImux3.json;h=3058d7a86fa7fb9ba4949be8bdeb52abd0cddd57;hb=1372abe81775e52cc52b715139cf13097a481b49;hp=69181cdee803b70e409976679893849c629dcd44;hpb=f37f1f93f2c1ceb780f1c7ecab888bcb8f4f8b89;p=Mograsim.git

diff --git a/net.mograsim.logic.model.editor/components/GUImux3.json b/net.mograsim.logic.model.editor/components/GUImux3.json
index 69181cde..3058d7a8 100644
--- a/net.mograsim.logic.model.editor/components/GUImux3.json
+++ b/net.mograsim.logic.model.editor/components/GUImux3.json
@@ -1,4 +1,3 @@
-mograsim version: 0.1.3
 {
   "width": 80.0,
   "height": 120.0,
@@ -9,23 +8,17 @@ mograsim version: 0.1.3
         "y": 40.0
       },
       "name": "I000",
-      "logicWidth": 1
+      "logicWidth": 1,
+      "usage": "INPUT"
     },
     {
       "location": {
         "x": 0.0,
-        "y": 70.0
-      },
-      "name": "I011",
-      "logicWidth": 1
-    },
-    {
-      "location": {
-        "x": 0.0,
-        "y": 100.0
+        "y": 50.0
       },
-      "name": "I110",
-      "logicWidth": 1
+      "name": "I001",
+      "logicWidth": 1,
+      "usage": "INPUT"
     },
     {
       "location": {
@@ -33,15 +26,17 @@ mograsim version: 0.1.3
         "y": 60.0
       },
       "name": "I010",
-      "logicWidth": 1
+      "logicWidth": 1,
+      "usage": "INPUT"
     },
     {
       "location": {
         "x": 0.0,
-        "y": 90.0
+        "y": 70.0
       },
-      "name": "I101",
-      "logicWidth": 1
+      "name": "I011",
+      "logicWidth": 1,
+      "usage": "INPUT"
     },
     {
       "location": {
@@ -49,31 +44,35 @@ mograsim version: 0.1.3
         "y": 80.0
       },
       "name": "I100",
-      "logicWidth": 1
+      "logicWidth": 1,
+      "usage": "INPUT"
     },
     {
       "location": {
         "x": 0.0,
-        "y": 110.0
+        "y": 90.0
       },
-      "name": "I111",
-      "logicWidth": 1
+      "name": "I101",
+      "logicWidth": 1,
+      "usage": "INPUT"
     },
     {
       "location": {
-        "x": 80.0,
-        "y": 10.0
+        "x": 0.0,
+        "y": 100.0
       },
-      "name": "Y",
-      "logicWidth": 1
+      "name": "I110",
+      "logicWidth": 1,
+      "usage": "INPUT"
     },
     {
       "location": {
         "x": 0.0,
-        "y": 50.0
+        "y": 110.0
       },
-      "name": "I001",
-      "logicWidth": 1
+      "name": "I111",
+      "logicWidth": 1,
+      "usage": "INPUT"
     },
     {
       "location": {
@@ -81,7 +80,8 @@ mograsim version: 0.1.3
         "y": 10.0
       },
       "name": "S0",
-      "logicWidth": 1
+      "logicWidth": 1,
+      "usage": "INPUT"
     },
     {
       "location": {
@@ -89,7 +89,8 @@ mograsim version: 0.1.3
         "y": 20.0
       },
       "name": "S1",
-      "logicWidth": 1
+      "logicWidth": 1,
+      "usage": "INPUT"
     },
     {
       "location": {
@@ -97,30 +98,22 @@ mograsim version: 0.1.3
         "y": 30.0
       },
       "name": "S2",
-      "logicWidth": 1
+      "logicWidth": 1,
+      "usage": "INPUT"
+    },
+    {
+      "location": {
+        "x": 80.0,
+        "y": 10.0
+      },
+      "name": "Y",
+      "logicWidth": 1,
+      "usage": "OUTPUT"
     }
   ],
+  "innerScale": 0.4,
   "submodel": {
-    "innerScale": 0.4,
-    "subComps": [
-      {
-        "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint",
-        "name": "WireCrossPoint#1",
-        "pos": {
-          "x": 24.0,
-          "y": 94.0
-        },
-        "params": 1
-      },
-      {
-        "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint",
-        "name": "WireCrossPoint#0",
-        "pos": {
-          "x": 19.0,
-          "y": 104.0
-        },
-        "params": 1
-      },
+    "components": [
       {
         "id": "GUImux2",
         "name": "DeserializedSubmodelComponent#0",
@@ -129,6 +122,14 @@ mograsim version: 0.1.3
           "y": 185.0
         }
       },
+      {
+        "id": "GUImux1",
+        "name": "DeserializedSubmodelComponent#2",
+        "pos": {
+          "x": 125.0,
+          "y": 20.0
+        }
+      },
       {
         "id": "GUImux2",
         "name": "DeserializedSubmodelComponent#3",
@@ -138,36 +139,113 @@ mograsim version: 0.1.3
         }
       },
       {
-        "id": "GUImux1",
-        "name": "DeserializedSubmodelComponent#2",
+        "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint",
+        "name": "WireCrossPoint#0",
         "pos": {
-          "x": 125.0,
-          "y": 20.0
-        }
+          "x": 19.0,
+          "y": 104.0
+        },
+        "params": 1
+      },
+      {
+        "id": "class:net.mograsim.logic.model.model.wires.WireCrossPoint",
+        "name": "WireCrossPoint#1",
+        "pos": {
+          "x": 24.0,
+          "y": 94.0
+        },
+        "params": 1
       }
     ],
-    "innerWires": [
+    "wires": [
       {
         "pin1": {
           "compName": "_submodelinterface",
-          "pinName": "I111"
+          "pinName": "S0"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
+        },
+        "name": "unnamedWire#0",
+        "path": [
+          {
+            "x": 25.0,
+            "y": 25.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "_submodelinterface",
+          "pinName": "S1"
+        },
+        "name": "unnamedWire#1",
+        "path": [
+          {
+            "x": 20.0,
+            "y": 50.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "DeserializedSubmodelComponent#3",
           "pinName": "I11"
         },
-        "name": "unnamedWire#14",
+        "pin2": {
+          "compName": "_submodelinterface",
+          "pinName": "I011"
+        },
+        "name": "unnamedWire#10",
         "path": [
           {
             "x": 15.0,
-            "y": 275.0
+            "y": 145.0
           },
           {
             "x": 15.0,
-            "y": 245.0
+            "y": 175.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "DeserializedSubmodelComponent#0",
+          "pinName": "I00"
+        },
+        "pin2": {
+          "compName": "_submodelinterface",
+          "pinName": "I100"
+        },
+        "name": "unnamedWire#11",
+        "path": [
+          {
+            "x": 10.0,
+            "y": 215.0
+          },
+          {
+            "x": 10.0,
+            "y": 200.0
           }
         ]
       },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "I101"
+        },
+        "pin2": {
+          "compName": "DeserializedSubmodelComponent#0",
+          "pinName": "I01"
+        },
+        "name": "unnamedWire#12",
+        "path": []
+      },
       {
         "pin1": {
           "compName": "DeserializedSubmodelComponent#0",
@@ -191,22 +269,22 @@ mograsim version: 0.1.3
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#3",
-          "pinName": "Y"
+          "compName": "_submodelinterface",
+          "pinName": "I111"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#2",
-          "pinName": "I0"
+          "compName": "DeserializedSubmodelComponent#0",
+          "pinName": "I11"
         },
-        "name": "unnamedWire#16",
+        "name": "unnamedWire#14",
         "path": [
           {
-            "x": 110.0,
-            "y": 95.0
+            "x": 15.0,
+            "y": 275.0
           },
           {
-            "x": 110.0,
-            "y": 35.0
+            "x": 15.0,
+            "y": 245.0
           }
         ]
       },
@@ -233,89 +311,56 @@ mograsim version: 0.1.3
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#2",
-          "pinName": "S0"
-        },
-        "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "S2"
-        },
-        "name": "unnamedWire#17",
-        "path": [
-          {
-            "x": 70.0,
-            "y": 25.0
-          },
-          {
-            "x": 70.0,
-            "y": 75.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "I010"
+          "compName": "DeserializedSubmodelComponent#3",
+          "pinName": "Y"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#3",
-          "pinName": "I10"
+          "compName": "DeserializedSubmodelComponent#2",
+          "pinName": "I0"
         },
-        "name": "unnamedWire#9",
+        "name": "unnamedWire#16",
         "path": [
           {
-            "x": 10.0,
-            "y": 150.0
+            "x": 110.0,
+            "y": 95.0
           },
           {
-            "x": 10.0,
-            "y": 135.0
+            "x": 110.0,
+            "y": 35.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#3",
-          "pinName": "I01"
+          "compName": "DeserializedSubmodelComponent#2",
+          "pinName": "S0"
         },
         "pin2": {
           "compName": "_submodelinterface",
-          "pinName": "I001"
-        },
-        "name": "unnamedWire#8",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "I000"
-        },
-        "pin2": {
-          "compName": "DeserializedSubmodelComponent#3",
-          "pinName": "I00"
+          "pinName": "S2"
         },
-        "name": "unnamedWire#7",
+        "name": "unnamedWire#17",
         "path": [
           {
-            "x": 10.0,
-            "y": 100.0
+            "x": 70.0,
+            "y": 25.0
           },
           {
-            "x": 10.0,
-            "y": 115.0
+            "x": 70.0,
+            "y": 75.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#2",
-          "pinName": "Y"
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
         },
         "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "Y"
+          "compName": "DeserializedSubmodelComponent#3",
+          "pinName": "S0"
         },
-        "name": "unnamedWire#6",
+        "name": "unnamedWire#2",
         "path": []
       },
       {
@@ -324,31 +369,26 @@ mograsim version: 0.1.3
           "pinName": ""
         },
         "pin2": {
-          "compName": "_submodelinterface",
+          "compName": "DeserializedSubmodelComponent#3",
           "pinName": "S1"
         },
-        "name": "unnamedWire#1",
-        "path": [
-          {
-            "x": 20.0,
-            "y": 50.0
-          }
-        ]
+        "name": "unnamedWire#3",
+        "path": []
       },
       {
         "pin1": {
-          "compName": "_submodelinterface",
+          "compName": "DeserializedSubmodelComponent#0",
           "pinName": "S0"
         },
         "pin2": {
           "compName": "WireCrossPoint#1",
           "pinName": ""
         },
-        "name": "unnamedWire#0",
+        "name": "unnamedWire#4",
         "path": [
           {
             "x": 25.0,
-            "y": 25.0
+            "y": 195.0
           }
         ]
       },
@@ -371,100 +411,72 @@ mograsim version: 0.1.3
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#3",
-          "pinName": "I11"
+          "compName": "DeserializedSubmodelComponent#2",
+          "pinName": "Y"
         },
         "pin2": {
           "compName": "_submodelinterface",
-          "pinName": "I011"
+          "pinName": "Y"
         },
-        "name": "unnamedWire#10",
-        "path": [
-          {
-            "x": 15.0,
-            "y": 145.0
-          },
-          {
-            "x": 15.0,
-            "y": 175.0
-          }
-        ]
+        "name": "unnamedWire#6",
+        "path": []
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#0",
-          "pinName": "S0"
+          "compName": "_submodelinterface",
+          "pinName": "I000"
         },
         "pin2": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
+          "compName": "DeserializedSubmodelComponent#3",
+          "pinName": "I00"
         },
-        "name": "unnamedWire#4",
+        "name": "unnamedWire#7",
         "path": [
           {
-            "x": 25.0,
-            "y": 195.0
+            "x": 10.0,
+            "y": 100.0
+          },
+          {
+            "x": 10.0,
+            "y": 115.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
-        },
-        "pin2": {
           "compName": "DeserializedSubmodelComponent#3",
-          "pinName": "S1"
-        },
-        "name": "unnamedWire#3",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "I101"
-        },
-        "pin2": {
-          "compName": "DeserializedSubmodelComponent#0",
           "pinName": "I01"
         },
-        "name": "unnamedWire#12",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
-        },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#3",
-          "pinName": "S0"
+          "compName": "_submodelinterface",
+          "pinName": "I001"
         },
-        "name": "unnamedWire#2",
+        "name": "unnamedWire#8",
         "path": []
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#0",
-          "pinName": "I00"
+          "compName": "_submodelinterface",
+          "pinName": "I010"
         },
         "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "I100"
+          "compName": "DeserializedSubmodelComponent#3",
+          "pinName": "I10"
         },
-        "name": "unnamedWire#11",
+        "name": "unnamedWire#9",
         "path": [
           {
             "x": 10.0,
-            "y": 215.0
+            "y": 150.0
           },
           {
             "x": 10.0,
-            "y": 200.0
+            "y": 135.0
           }
         ]
       }
-    ]
+    ],
+    "version": "0.1.1"
   },
   "symbolRendererSnippetID": "class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer",
   "symbolRendererParams": {
@@ -475,5 +487,6 @@ mograsim version: 0.1.3
     "pinLabelMargin": 0.5
   },
   "outlineRendererSnippetID": "class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer",
-  "highLevelStateHandlerSnippetID": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.DefaultHighLevelStateHandler"
+  "highLevelStateHandlerSnippetID": "class:net.mograsim.logic.model.snippets.highlevelstatehandlers.DefaultHighLevelStateHandler",
+  "version": "0.1.5"
 }
\ No newline at end of file