X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model.editor%2Fcomponents%2Fam2901%2FGUIAm2901ALUFuncDecode.json;h=92d2200e9ac794c5669dd65c0786dad5575af13b;hb=148a58630b38b30d4d24a21e3f55c357f5b4d0bc;hp=b9c44929673f52d63ad8ebe4ede02d4bb637f19f;hpb=052c4f704ea286f8db1db3a7b055c9447369c0c2;p=Mograsim.git

diff --git a/net.mograsim.logic.model.editor/components/am2901/GUIAm2901ALUFuncDecode.json b/net.mograsim.logic.model.editor/components/am2901/GUIAm2901ALUFuncDecode.json
index b9c44929..92d2200e 100644
--- a/net.mograsim.logic.model.editor/components/am2901/GUIAm2901ALUFuncDecode.json
+++ b/net.mograsim.logic.model.editor/components/am2901/GUIAm2901ALUFuncDecode.json
@@ -1,4 +1,3 @@
-mograsim version: 0.1.3
 {
   "width": 35.0,
   "height": 60.0,
@@ -6,10 +5,11 @@ mograsim version: 0.1.3
     {
       "location": {
         "x": 35.0,
-        "y": 35.0
+        "y": 5.0
       },
-      "name": "SBE",
-      "logicWidth": 1
+      "name": "CinE",
+      "logicWidth": 1,
+      "usage": "OUTPUT"
     },
     {
       "location": {
@@ -17,7 +17,8 @@ mograsim version: 0.1.3
         "y": 45.0
       },
       "name": "FN",
-      "logicWidth": 1
+      "logicWidth": 1,
+      "usage": "OUTPUT"
     },
     {
       "location": {
@@ -25,7 +26,8 @@ mograsim version: 0.1.3
         "y": 25.0
       },
       "name": "I3",
-      "logicWidth": 1
+      "logicWidth": 1,
+      "usage": "INPUT"
     },
     {
       "location": {
@@ -33,15 +35,8 @@ mograsim version: 0.1.3
         "y": 15.0
       },
       "name": "I4",
-      "logicWidth": 1
-    },
-    {
-      "location": {
-        "x": 35.0,
-        "y": 25.0
-      },
-      "name": "SN",
-      "logicWidth": 1
+      "logicWidth": 1,
+      "usage": "INPUT"
     },
     {
       "location": {
@@ -49,7 +44,8 @@ mograsim version: 0.1.3
         "y": 5.0
       },
       "name": "I5",
-      "logicWidth": 1
+      "logicWidth": 1,
+      "usage": "INPUT"
     },
     {
       "location": {
@@ -57,7 +53,8 @@ mograsim version: 0.1.3
         "y": 15.0
       },
       "name": "L",
-      "logicWidth": 1
+      "logicWidth": 1,
+      "usage": "OUTPUT"
     },
     {
       "location": {
@@ -65,182 +62,193 @@ mograsim version: 0.1.3
         "y": 55.0
       },
       "name": "RN",
-      "logicWidth": 1
+      "logicWidth": 1,
+      "usage": "OUTPUT"
     },
     {
       "location": {
         "x": 35.0,
-        "y": 5.0
+        "y": 35.0
       },
-      "name": "CinE",
-      "logicWidth": 1
+      "name": "SBE",
+      "logicWidth": 1,
+      "usage": "OUTPUT"
+    },
+    {
+      "location": {
+        "x": 35.0,
+        "y": 25.0
+      },
+      "name": "SN",
+      "logicWidth": 1,
+      "usage": "OUTPUT"
     }
   ],
+  "innerScale": 0.25,
   "submodel": {
-    "innerScale": 0.25,
-    "subComps": [
+    "components": [
       {
+        "id": "GUINandGate",
+        "name": "GUINandGate#0",
         "pos": {
           "x": 15.0,
-          "y": 50.0
+          "y": 10.0
         },
-        "id": "GUINandGate",
-        "name": "GUINandGate#1",
         "params": 1
       },
       {
+        "id": "GUINandGate",
+        "name": "GUINandGate#1",
         "pos": {
-          "x": 55.0,
-          "y": 10.0
+          "x": 15.0,
+          "y": 50.0
         },
-        "id": "GUInand3",
-        "name": "GUInand3#0"
+        "params": 1
       },
       {
+        "id": "GUINandGate",
+        "name": "GUINandGate#2",
         "pos": {
-          "x": 15.0,
-          "y": 10.0
+          "x": 55.0,
+          "y": 45.0
         },
-        "id": "GUINandGate",
-        "name": "GUINandGate#0",
         "params": 1
       },
       {
+        "id": "GUINandGate",
+        "name": "GUINandGate#3",
         "pos": {
           "x": 55.0,
           "y": 70.0
         },
-        "id": "GUINandGate",
-        "name": "GUINandGate#3",
         "params": 1
       },
       {
+        "id": "GUINandGate",
+        "name": "GUINandGate#4",
         "pos": {
-          "x": 55.0,
-          "y": 45.0
+          "x": 100.0,
+          "y": 50.0
         },
-        "id": "GUINandGate",
-        "name": "GUINandGate#2",
         "params": 1
       },
       {
+        "id": "GUIand",
+        "name": "GUIand#0",
         "pos": {
           "x": 100.0,
           "y": 135.0
-        },
-        "id": "GUIand",
-        "name": "GUIand#0"
+        }
       },
       {
+        "id": "GUInand3",
+        "name": "GUInand3#0",
+        "pos": {
+          "x": 55.0,
+          "y": 10.0
+        }
+      },
+      {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#0",
         "pos": {
           "x": 4.0,
-          "y": 24.0
+          "y": 19.0
         },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#1",
         "params": 1
       },
       {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#1",
         "pos": {
           "x": 4.0,
-          "y": 19.0
+          "y": 24.0
         },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#0",
         "params": 1
       },
       {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#10",
         "pos": {
-          "x": 9.0,
-          "y": 59.0
+          "x": 39.0,
+          "y": 34.0
         },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#3",
         "params": 1
       },
       {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#2",
         "pos": {
           "x": 4.0,
           "y": 44.0
         },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#2",
         "params": 1
       },
       {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#3",
         "pos": {
           "x": 9.0,
-          "y": 64.0
+          "y": 59.0
         },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#5",
         "params": 1
       },
       {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#4",
         "pos": {
           "x": 9.0,
           "y": 54.0
         },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#4",
         "params": 1
       },
       {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#5",
         "pos": {
-          "x": 49.0,
-          "y": 99.0
+          "x": 9.0,
+          "y": 64.0
         },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#7",
         "params": 1
       },
       {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#6",
         "pos": {
           "x": 9.0,
           "y": 84.0
         },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#6",
         "params": 1
       },
       {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#7",
         "pos": {
-          "x": 39.0,
-          "y": 19.0
+          "x": 49.0,
+          "y": 99.0
         },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#9",
         "params": 1
       },
       {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#8",
         "pos": {
           "x": 49.0,
           "y": 74.0
         },
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#8",
         "params": 1
       },
       {
-        "pos": {
-          "x": 39.0,
-          "y": 34.0
-        },
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#10",
-        "params": 1
-      },
-      {
+        "name": "WireCrossPoint#9",
         "pos": {
-          "x": 100.0,
-          "y": 50.0
+          "x": 39.0,
+          "y": 19.0
         },
-        "id": "GUINandGate",
-        "name": "GUINandGate#4",
         "params": 1
       }
     ],
-    "innerWires": [
+    "wires": [
       {
         "pin1": {
           "compName": "_submodelinterface",
@@ -250,6 +258,7 @@ mograsim version: 0.1.3
           "compName": "WireCrossPoint#0",
           "pinName": ""
         },
+        "name": "unnamedWire#0",
         "path": []
       },
       {
@@ -261,6 +270,7 @@ mograsim version: 0.1.3
           "compName": "GUINandGate#0",
           "pinName": "A"
         },
+        "name": "unnamedWire#1",
         "path": [
           {
             "x": 5.0,
@@ -268,121 +278,6 @@ mograsim version: 0.1.3
           }
         ]
       },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#0",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
-        },
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "GUINandGate#0",
-          "pinName": "B"
-        },
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
-        },
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "GUINandGate#2",
-          "pinName": "A"
-        },
-        "path": [
-          {
-            "x": 45.0,
-            "y": 45.0
-          },
-          {
-            "x": 45.0,
-            "y": 50.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "FN"
-        },
-        "path": [
-          {
-            "x": 5.0,
-            "y": 180.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "I4"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#3",
-          "pinName": ""
-        },
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#3",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#4",
-          "pinName": ""
-        },
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#4",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "GUInand3#0",
-          "pinName": "A"
-        },
-        "path": [
-          {
-            "x": 10.0,
-            "y": 40.0
-          },
-          {
-            "x": 45.0,
-            "y": 40.0
-          },
-          {
-            "x": 45.0,
-            "y": 15.0
-          }
-        ]
-      },
       {
         "pin1": {
           "compName": "WireCrossPoint#4",
@@ -392,6 +287,7 @@ mograsim version: 0.1.3
           "compName": "GUINandGate#1",
           "pinName": "A"
         },
+        "name": "unnamedWire#10",
         "path": []
       },
       {
@@ -403,6 +299,7 @@ mograsim version: 0.1.3
           "compName": "WireCrossPoint#5",
           "pinName": ""
         },
+        "name": "unnamedWire#11",
         "path": []
       },
       {
@@ -414,6 +311,7 @@ mograsim version: 0.1.3
           "compName": "GUINandGate#1",
           "pinName": "B"
         },
+        "name": "unnamedWire#12",
         "path": []
       },
       {
@@ -425,6 +323,7 @@ mograsim version: 0.1.3
           "compName": "WireCrossPoint#6",
           "pinName": ""
         },
+        "name": "unnamedWire#13",
         "path": []
       },
       {
@@ -436,6 +335,7 @@ mograsim version: 0.1.3
           "compName": "GUINandGate#3",
           "pinName": "B"
         },
+        "name": "unnamedWire#14",
         "path": []
       },
       {
@@ -447,6 +347,7 @@ mograsim version: 0.1.3
           "compName": "_submodelinterface",
           "pinName": "SN"
         },
+        "name": "unnamedWire#15",
         "path": [
           {
             "x": 10.0,
@@ -471,6 +372,7 @@ mograsim version: 0.1.3
           "compName": "WireCrossPoint#7",
           "pinName": ""
         },
+        "name": "unnamedWire#16",
         "path": [
           {
             "x": 50.0,
@@ -487,6 +389,7 @@ mograsim version: 0.1.3
           "compName": "_submodelinterface",
           "pinName": "RN"
         },
+        "name": "unnamedWire#17",
         "path": [
           {
             "x": 50.0,
@@ -503,6 +406,7 @@ mograsim version: 0.1.3
           "compName": "WireCrossPoint#8",
           "pinName": ""
         },
+        "name": "unnamedWire#18",
         "path": []
       },
       {
@@ -514,6 +418,7 @@ mograsim version: 0.1.3
           "compName": "GUInand3#0",
           "pinName": "B"
         },
+        "name": "unnamedWire#19",
         "path": [
           {
             "x": 50.0,
@@ -521,6 +426,18 @@ mograsim version: 0.1.3
           }
         ]
       },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
+        },
+        "name": "unnamedWire#2",
+        "path": []
+      },
       {
         "pin1": {
           "compName": "WireCrossPoint#8",
@@ -530,6 +447,7 @@ mograsim version: 0.1.3
           "compName": "GUINandGate#3",
           "pinName": "A"
         },
+        "name": "unnamedWire#20",
         "path": []
       },
       {
@@ -541,6 +459,7 @@ mograsim version: 0.1.3
           "compName": "WireCrossPoint#9",
           "pinName": ""
         },
+        "name": "unnamedWire#21",
         "path": []
       },
       {
@@ -552,6 +471,7 @@ mograsim version: 0.1.3
           "compName": "_submodelinterface",
           "pinName": "CinE"
         },
+        "name": "unnamedWire#22",
         "path": [
           {
             "x": 40.0,
@@ -576,6 +496,7 @@ mograsim version: 0.1.3
           "compName": "WireCrossPoint#10",
           "pinName": ""
         },
+        "name": "unnamedWire#23",
         "path": []
       },
       {
@@ -587,6 +508,7 @@ mograsim version: 0.1.3
           "compName": "GUInand3#0",
           "pinName": "C"
         },
+        "name": "unnamedWire#24",
         "path": []
       },
       {
@@ -598,6 +520,7 @@ mograsim version: 0.1.3
           "compName": "GUIand#0",
           "pinName": "B"
         },
+        "name": "unnamedWire#25",
         "path": [
           {
             "x": 40.0,
@@ -614,6 +537,7 @@ mograsim version: 0.1.3
           "compName": "GUINandGate#2",
           "pinName": "B"
         },
+        "name": "unnamedWire#26",
         "path": []
       },
       {
@@ -624,7 +548,8 @@ mograsim version: 0.1.3
         "pin2": {
           "compName": "GUINandGate#4",
           "pinName": "A"
-        }
+        },
+        "name": "unnamedWire#27"
       },
       {
         "pin1": {
@@ -634,7 +559,8 @@ mograsim version: 0.1.3
         "pin2": {
           "compName": "GUINandGate#4",
           "pinName": "B"
-        }
+        },
+        "name": "unnamedWire#28"
       },
       {
         "pin1": {
@@ -644,7 +570,20 @@ mograsim version: 0.1.3
         "pin2": {
           "compName": "GUIand#0",
           "pinName": "A"
-        }
+        },
+        "name": "unnamedWire#29"
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "GUINandGate#0",
+          "pinName": "B"
+        },
+        "name": "unnamedWire#3",
+        "path": []
       },
       {
         "pin1": {
@@ -655,6 +594,7 @@ mograsim version: 0.1.3
           "compName": "_submodelinterface",
           "pinName": "L"
         },
+        "name": "unnamedWire#30",
         "path": []
       },
       {
@@ -666,9 +606,110 @@ mograsim version: 0.1.3
           "compName": "_submodelinterface",
           "pinName": "SBE"
         },
+        "name": "unnamedWire#31",
         "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#1",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#2",
+          "pinName": ""
+        },
+        "name": "unnamedWire#4",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#2",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "GUINandGate#2",
+          "pinName": "A"
+        },
+        "name": "unnamedWire#5",
+        "path": [
+          {
+            "x": 45.0,
+            "y": 45.0
+          },
+          {
+            "x": 45.0,
+            "y": 50.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#2",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "_submodelinterface",
+          "pinName": "FN"
+        },
+        "name": "unnamedWire#6",
+        "path": [
+          {
+            "x": 5.0,
+            "y": 180.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "I4"
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#3",
+          "pinName": ""
+        },
+        "name": "unnamedWire#7",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#3",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#4",
+          "pinName": ""
+        },
+        "name": "unnamedWire#8",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#4",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "GUInand3#0",
+          "pinName": "A"
+        },
+        "name": "unnamedWire#9",
+        "path": [
+          {
+            "x": 10.0,
+            "y": 40.0
+          },
+          {
+            "x": 45.0,
+            "y": 40.0
+          },
+          {
+            "x": 45.0,
+            "y": 15.0
+          }
+        ]
       }
-    ]
+    ],
+    "version": "0.1.1"
   },
   "symbolRendererSnippetID": "simpleRectangularLike",
   "symbolRendererParams": {
@@ -677,5 +718,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