X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model.editor%2Fcomponents%2FGUIor4.json;h=9b6e1bf9e7f1596536af52722aa72b4bcb094019;hb=148a58630b38b30d4d24a21e3f55c357f5b4d0bc;hp=d4bcd579318762b08eea4c1a88fa77dfeedf091a;hpb=a393b0a2a9899707af54c9ee77a01f28ac967bd1;p=Mograsim.git

diff --git a/net.mograsim.logic.model.editor/components/GUIor4.json b/net.mograsim.logic.model.editor/components/GUIor4.json
index d4bcd579..9b6e1bf9 100644
--- a/net.mograsim.logic.model.editor/components/GUIor4.json
+++ b/net.mograsim.logic.model.editor/components/GUIor4.json
@@ -1,4 +1,3 @@
-mograsim version: 0.1.3
 {
   "width": 35.0,
   "height": 40.0,
@@ -9,7 +8,8 @@ mograsim version: 0.1.3
         "y": 5.0
       },
       "name": "A1",
-      "logicWidth": 1
+      "logicWidth": 1,
+      "usage": "INPUT"
     },
     {
       "location": {
@@ -17,7 +17,8 @@ mograsim version: 0.1.3
         "y": 15.0
       },
       "name": "A2",
-      "logicWidth": 1
+      "logicWidth": 1,
+      "usage": "INPUT"
     },
     {
       "location": {
@@ -25,7 +26,8 @@ mograsim version: 0.1.3
         "y": 25.0
       },
       "name": "A3",
-      "logicWidth": 1
+      "logicWidth": 1,
+      "usage": "INPUT"
     },
     {
       "location": {
@@ -33,7 +35,8 @@ mograsim version: 0.1.3
         "y": 35.0
       },
       "name": "A4",
-      "logicWidth": 1
+      "logicWidth": 1,
+      "usage": "INPUT"
     },
     {
       "location": {
@@ -41,149 +44,150 @@ mograsim version: 0.1.3
         "y": 5.0
       },
       "name": "Y",
-      "logicWidth": 1
+      "logicWidth": 1,
+      "usage": "OUTPUT"
     }
   ],
+  "innerScale": 0.2,
   "submodel": {
-    "innerScale": 0.2,
-    "subComps": [
+    "components": [
       {
+        "id": "GUINandGate",
+        "name": "GUINandGate#0",
         "pos": {
           "x": 20.0,
-          "y": 65.0
+          "y": 15.0
         },
-        "id": "GUINandGate",
-        "name": "GUINandGate#1",
         "params": 1
       },
       {
+        "id": "GUINandGate",
+        "name": "GUINandGate#1",
         "pos": {
           "x": 20.0,
-          "y": 15.0
+          "y": 65.0
         },
-        "id": "GUINandGate",
-        "name": "GUINandGate#0",
         "params": 1
       },
       {
+        "id": "GUINandGate",
+        "name": "GUINandGate#2",
         "pos": {
           "x": 20.0,
-          "y": 165.0
+          "y": 115.0
         },
-        "id": "GUINandGate",
-        "name": "GUINandGate#3",
         "params": 1
       },
       {
+        "id": "GUINandGate",
+        "name": "GUINandGate#3",
         "pos": {
           "x": 20.0,
-          "y": 115.0
+          "y": 165.0
         },
-        "id": "GUINandGate",
-        "name": "GUINandGate#2",
         "params": 1
       },
       {
+        "id": "GUINandGate",
+        "name": "GUINandGate#4",
         "pos": {
-          "x": 14.0,
-          "y": 74.0
+          "x": 50.0,
+          "y": 40.0
         },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#1",
         "params": 1
       },
       {
+        "id": "GUINandGate",
+        "name": "GUINandGate#5",
         "pos": {
-          "x": 14.0,
-          "y": 24.0
+          "x": 50.0,
+          "y": 140.0
         },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#0",
         "params": 1
       },
       {
+        "id": "GUINandGate",
+        "name": "GUINandGate#6",
         "pos": {
-          "x": 14.0,
-          "y": 174.0
+          "x": 110.0,
+          "y": 40.0
         },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#3",
         "params": 1
       },
       {
+        "id": "GUINandGate",
+        "name": "GUINandGate#7",
         "pos": {
-          "x": 14.0,
-          "y": 124.0
+          "x": 110.0,
+          "y": 140.0
         },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#2",
         "params": 1
       },
       {
+        "id": "GUINandGate",
+        "name": "GUINandGate#8",
         "pos": {
-          "x": 104.0,
-          "y": 149.0
+          "x": 140.0,
+          "y": 90.0
         },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#5",
         "params": 1
       },
       {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#0",
         "pos": {
-          "x": 104.0,
-          "y": 49.0
+          "x": 14.0,
+          "y": 24.0
         },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#4",
         "params": 1
       },
       {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#1",
         "pos": {
-          "x": 140.0,
-          "y": 90.0
+          "x": 14.0,
+          "y": 74.0
         },
-        "id": "GUINandGate",
-        "name": "GUINandGate#8",
         "params": 1
       },
       {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#2",
         "pos": {
-          "x": 50.0,
-          "y": 140.0
+          "x": 14.0,
+          "y": 124.0
         },
-        "id": "GUINandGate",
-        "name": "GUINandGate#5",
         "params": 1
       },
       {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#3",
         "pos": {
-          "x": 50.0,
-          "y": 40.0
+          "x": 14.0,
+          "y": 174.0
         },
-        "id": "GUINandGate",
-        "name": "GUINandGate#4",
         "params": 1
       },
       {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#4",
         "pos": {
-          "x": 110.0,
-          "y": 140.0
+          "x": 104.0,
+          "y": 49.0
         },
-        "id": "GUINandGate",
-        "name": "GUINandGate#7",
         "params": 1
       },
       {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#5",
         "pos": {
-          "x": 110.0,
-          "y": 40.0
+          "x": 104.0,
+          "y": 149.0
         },
-        "id": "GUINandGate",
-        "name": "GUINandGate#6",
         "params": 1
       }
     ],
-    "innerWires": [
+    "wires": [
       {
         "pin1": {
           "compName": "_submodelinterface",
@@ -193,6 +197,7 @@ mograsim version: 0.1.3
           "compName": "WireCrossPoint#0",
           "pinName": ""
         },
+        "name": "unnamedWire#0",
         "path": []
       },
       {
@@ -204,126 +209,9 @@ mograsim version: 0.1.3
           "compName": "WireCrossPoint#1",
           "pinName": ""
         },
+        "name": "unnamedWire#1",
         "path": []
       },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "A3"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
-        },
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "A4"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#3",
-          "pinName": ""
-        },
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "GUINandGate#0",
-          "pinName": "A"
-        },
-        "path": [
-          {
-            "x": 15.0,
-            "y": 20.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "GUINandGate#1",
-          "pinName": "A"
-        },
-        "path": [
-          {
-            "x": 15.0,
-            "y": 70.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "GUINandGate#2",
-          "pinName": "A"
-        },
-        "path": [
-          {
-            "x": 15.0,
-            "y": 120.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#3",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "GUINandGate#3",
-          "pinName": "A"
-        },
-        "path": [
-          {
-            "x": 15.0,
-            "y": 170.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "GUINandGate#0",
-          "pinName": "B"
-        },
-        "path": [
-          {
-            "x": 15.0,
-            "y": 30.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "GUINandGate#1",
-          "pinName": "B"
-        },
-        "path": [
-          {
-            "x": 15.0,
-            "y": 80.0
-          }
-        ]
-      },
       {
         "pin1": {
           "compName": "WireCrossPoint#2",
@@ -333,6 +221,7 @@ mograsim version: 0.1.3
           "compName": "GUINandGate#2",
           "pinName": "B"
         },
+        "name": "unnamedWire#10",
         "path": [
           {
             "x": 15.0,
@@ -349,6 +238,7 @@ mograsim version: 0.1.3
           "compName": "GUINandGate#3",
           "pinName": "B"
         },
+        "name": "unnamedWire#11",
         "path": [
           {
             "x": 15.0,
@@ -364,7 +254,8 @@ mograsim version: 0.1.3
         "pin2": {
           "compName": "GUINandGate#4",
           "pinName": "A"
-        }
+        },
+        "name": "unnamedWire#12"
       },
       {
         "pin1": {
@@ -374,7 +265,8 @@ mograsim version: 0.1.3
         "pin2": {
           "compName": "GUINandGate#4",
           "pinName": "B"
-        }
+        },
+        "name": "unnamedWire#13"
       },
       {
         "pin1": {
@@ -384,7 +276,8 @@ mograsim version: 0.1.3
         "pin2": {
           "compName": "GUINandGate#5",
           "pinName": "A"
-        }
+        },
+        "name": "unnamedWire#14"
       },
       {
         "pin1": {
@@ -394,7 +287,8 @@ mograsim version: 0.1.3
         "pin2": {
           "compName": "GUINandGate#5",
           "pinName": "B"
-        }
+        },
+        "name": "unnamedWire#15"
       },
       {
         "pin1": {
@@ -405,6 +299,7 @@ mograsim version: 0.1.3
           "compName": "WireCrossPoint#4",
           "pinName": ""
         },
+        "name": "unnamedWire#16",
         "path": []
       },
       {
@@ -416,6 +311,7 @@ mograsim version: 0.1.3
           "compName": "WireCrossPoint#5",
           "pinName": ""
         },
+        "name": "unnamedWire#17",
         "path": []
       },
       {
@@ -427,6 +323,7 @@ mograsim version: 0.1.3
           "compName": "GUINandGate#6",
           "pinName": "A"
         },
+        "name": "unnamedWire#18",
         "path": [
           {
             "x": 105.0,
@@ -443,6 +340,7 @@ mograsim version: 0.1.3
           "compName": "GUINandGate#6",
           "pinName": "B"
         },
+        "name": "unnamedWire#19",
         "path": [
           {
             "x": 105.0,
@@ -450,6 +348,18 @@ mograsim version: 0.1.3
           }
         ]
       },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "A3"
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#2",
+          "pinName": ""
+        },
+        "name": "unnamedWire#2",
+        "path": []
+      },
       {
         "pin1": {
           "compName": "WireCrossPoint#5",
@@ -459,6 +369,7 @@ mograsim version: 0.1.3
           "compName": "GUINandGate#7",
           "pinName": "A"
         },
+        "name": "unnamedWire#20",
         "path": [
           {
             "x": 105.0,
@@ -475,6 +386,7 @@ mograsim version: 0.1.3
           "compName": "GUINandGate#7",
           "pinName": "B"
         },
+        "name": "unnamedWire#21",
         "path": [
           {
             "x": 105.0,
@@ -490,7 +402,8 @@ mograsim version: 0.1.3
         "pin2": {
           "compName": "GUINandGate#8",
           "pinName": "A"
-        }
+        },
+        "name": "unnamedWire#22"
       },
       {
         "pin1": {
@@ -500,7 +413,8 @@ mograsim version: 0.1.3
         "pin2": {
           "compName": "GUINandGate#8",
           "pinName": "B"
-        }
+        },
+        "name": "unnamedWire#23"
       },
       {
         "pin1": {
@@ -510,16 +424,135 @@ mograsim version: 0.1.3
         "pin2": {
           "compName": "_submodelinterface",
           "pinName": "Y"
-        }
+        },
+        "name": "unnamedWire#24"
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "A4"
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#3",
+          "pinName": ""
+        },
+        "name": "unnamedWire#3",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "GUINandGate#0",
+          "pinName": "A"
+        },
+        "name": "unnamedWire#4",
+        "path": [
+          {
+            "x": 15.0,
+            "y": 20.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "GUINandGate#1",
+          "pinName": "A"
+        },
+        "name": "unnamedWire#5",
+        "path": [
+          {
+            "x": 15.0,
+            "y": 70.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#2",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "GUINandGate#2",
+          "pinName": "A"
+        },
+        "name": "unnamedWire#6",
+        "path": [
+          {
+            "x": 15.0,
+            "y": 120.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#3",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "GUINandGate#3",
+          "pinName": "A"
+        },
+        "name": "unnamedWire#7",
+        "path": [
+          {
+            "x": 15.0,
+            "y": 170.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "GUINandGate#0",
+          "pinName": "B"
+        },
+        "name": "unnamedWire#8",
+        "path": [
+          {
+            "x": 15.0,
+            "y": 30.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "GUINandGate#1",
+          "pinName": "B"
+        },
+        "name": "unnamedWire#9",
+        "path": [
+          {
+            "x": 15.0,
+            "y": 80.0
+          }
+        ]
       }
-    ]
+    ],
+    "version": "0.1.1"
   },
-  "symbolRendererSnippetID": "SimpleRectangularLikeSymbolRenderer",
+  "symbolRendererSnippetID": "simpleRectangularLike",
   "symbolRendererParams": {
     "centerText": "GUIor4",
-    "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