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=a575c5cedf1a96e0bed6ca492561ddc4ec876b90;hpb=a47c9b1f38bbb6d2f5a3c482f3b09d1f42270401;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 a575c5ce..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,43 +62,55 @@ 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#1",
+        "name": "GUINandGate#0",
         "pos": {
           "x": 15.0,
-          "y": 50.0
+          "y": 10.0
         },
         "params": 1
       },
       {
-        "id": "GUInand3",
-        "name": "GUInand3#0",
+        "id": "GUINandGate",
+        "name": "GUINandGate#1",
         "pos": {
-          "x": 55.0,
-          "y": 10.0
-        }
+          "x": 15.0,
+          "y": 50.0
+        },
+        "params": 1
       },
       {
         "id": "GUINandGate",
-        "name": "GUINandGate#0",
+        "name": "GUINandGate#2",
         "pos": {
-          "x": 15.0,
-          "y": 10.0
+          "x": 55.0,
+          "y": 45.0
         },
         "params": 1
       },
@@ -116,10 +125,10 @@ mograsim version: 0.1.3
       },
       {
         "id": "GUINandGate",
-        "name": "GUINandGate#2",
+        "name": "GUINandGate#4",
         "pos": {
-          "x": 55.0,
-          "y": 45.0
+          "x": 100.0,
+          "y": 50.0
         },
         "params": 1
       },
@@ -131,30 +140,38 @@ mograsim version: 0.1.3
           "y": 135.0
         }
       },
+      {
+        "id": "GUInand3",
+        "name": "GUInand3#0",
+        "pos": {
+          "x": 55.0,
+          "y": 10.0
+        }
+      },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#1",
+        "name": "WireCrossPoint#0",
         "pos": {
           "x": 4.0,
-          "y": 24.0
+          "y": 19.0
         },
         "params": 1
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#0",
+        "name": "WireCrossPoint#1",
         "pos": {
           "x": 4.0,
-          "y": 19.0
+          "y": 24.0
         },
         "params": 1
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#3",
+        "name": "WireCrossPoint#10",
         "pos": {
-          "x": 9.0,
-          "y": 59.0
+          "x": 39.0,
+          "y": 34.0
         },
         "params": 1
       },
@@ -169,10 +186,10 @@ mograsim version: 0.1.3
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#5",
+        "name": "WireCrossPoint#3",
         "pos": {
           "x": 9.0,
-          "y": 64.0
+          "y": 59.0
         },
         "params": 1
       },
@@ -187,10 +204,10 @@ mograsim version: 0.1.3
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#7",
+        "name": "WireCrossPoint#5",
         "pos": {
-          "x": 49.0,
-          "y": 99.0
+          "x": 9.0,
+          "y": 64.0
         },
         "params": 1
       },
@@ -205,10 +222,10 @@ mograsim version: 0.1.3
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#9",
+        "name": "WireCrossPoint#7",
         "pos": {
-          "x": 39.0,
-          "y": 19.0
+          "x": 49.0,
+          "y": 99.0
         },
         "params": 1
       },
@@ -223,34 +240,78 @@ mograsim version: 0.1.3
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#10",
+        "name": "WireCrossPoint#9",
         "pos": {
           "x": 39.0,
-          "y": 34.0
+          "y": 19.0
         },
         "params": 1
+      }
+    ],
+    "wires": [
+      {
+        "pin1": {
+          "compName": "_submodelinterface",
+          "pinName": "I5"
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
+        },
+        "name": "unnamedWire#0",
+        "path": []
       },
       {
-        "id": "GUINandGate",
-        "name": "GUINandGate#4",
-        "pos": {
-          "x": 100.0,
-          "y": 50.0
+        "pin1": {
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
         },
-        "params": 1
-      }
-    ],
-    "innerWires": [
+        "pin2": {
+          "compName": "GUINandGate#0",
+          "pinName": "A"
+        },
+        "name": "unnamedWire#1",
+        "path": [
+          {
+            "x": 5.0,
+            "y": 15.0
+          }
+        ]
+      },
       {
         "pin1": {
-          "compName": "WireCrossPoint#6",
+          "compName": "WireCrossPoint#4",
           "pinName": ""
         },
         "pin2": {
-          "compName": "GUINandGate#3",
+          "compName": "GUINandGate#1",
+          "pinName": "A"
+        },
+        "name": "unnamedWire#10",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#3",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#5",
+          "pinName": ""
+        },
+        "name": "unnamedWire#11",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#5",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "GUINandGate#1",
           "pinName": "B"
         },
-        "name": "unnamedWire#14",
+        "name": "unnamedWire#12",
         "path": []
       },
       {
@@ -267,20 +328,15 @@ mograsim version: 0.1.3
       },
       {
         "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "I3"
+          "compName": "WireCrossPoint#6",
+          "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#7",
-          "pinName": ""
+          "compName": "GUINandGate#3",
+          "pinName": "B"
         },
-        "name": "unnamedWire#16",
-        "path": [
-          {
-            "x": 50.0,
-            "y": 100.0
-          }
-        ]
+        "name": "unnamedWire#14",
+        "path": []
       },
       {
         "pin1": {
@@ -309,15 +365,20 @@ mograsim version: 0.1.3
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#7",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "I3"
         },
         "pin2": {
-          "compName": "WireCrossPoint#8",
+          "compName": "WireCrossPoint#7",
           "pinName": ""
         },
-        "name": "unnamedWire#18",
-        "path": []
+        "name": "unnamedWire#16",
+        "path": [
+          {
+            "x": 50.0,
+            "y": 100.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -336,6 +397,18 @@ mograsim version: 0.1.3
           }
         ]
       },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#7",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#8",
+          "pinName": ""
+        },
+        "name": "unnamedWire#18",
+        "path": []
+      },
       {
         "pin1": {
           "compName": "WireCrossPoint#8",
@@ -355,14 +428,14 @@ mograsim version: 0.1.3
       },
       {
         "pin1": {
-          "compName": "GUINandGate#0",
-          "pinName": "Y"
+          "compName": "WireCrossPoint#0",
+          "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#9",
+          "compName": "WireCrossPoint#1",
           "pinName": ""
         },
-        "name": "unnamedWire#21",
+        "name": "unnamedWire#2",
         "path": []
       },
       {
@@ -379,14 +452,14 @@ mograsim version: 0.1.3
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#9",
-          "pinName": ""
+          "compName": "GUINandGate#0",
+          "pinName": "Y"
         },
         "pin2": {
-          "compName": "WireCrossPoint#10",
+          "compName": "WireCrossPoint#9",
           "pinName": ""
         },
-        "name": "unnamedWire#23",
+        "name": "unnamedWire#21",
         "path": []
       },
       {
@@ -416,20 +489,15 @@ mograsim version: 0.1.3
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#10",
+          "compName": "WireCrossPoint#9",
           "pinName": ""
         },
         "pin2": {
-          "compName": "GUIand#0",
-          "pinName": "B"
+          "compName": "WireCrossPoint#10",
+          "pinName": ""
         },
-        "name": "unnamedWire#25",
-        "path": [
-          {
-            "x": 40.0,
-            "y": 150.0
-          }
-        ]
+        "name": "unnamedWire#23",
+        "path": []
       },
       {
         "pin1": {
@@ -445,14 +513,20 @@ mograsim version: 0.1.3
       },
       {
         "pin1": {
-          "compName": "GUInand3#0",
-          "pinName": "Y"
+          "compName": "WireCrossPoint#10",
+          "pinName": ""
         },
         "pin2": {
-          "compName": "GUINandGate#4",
-          "pinName": "A"
+          "compName": "GUIand#0",
+          "pinName": "B"
         },
-        "name": "unnamedWire#27"
+        "name": "unnamedWire#25",
+        "path": [
+          {
+            "x": 40.0,
+            "y": 150.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -468,14 +542,14 @@ mograsim version: 0.1.3
       },
       {
         "pin1": {
-          "compName": "GUINandGate#3",
+          "compName": "GUInand3#0",
           "pinName": "Y"
         },
         "pin2": {
-          "compName": "GUIand#0",
+          "compName": "GUINandGate#4",
           "pinName": "A"
         },
-        "name": "unnamedWire#29"
+        "name": "unnamedWire#27"
       },
       {
         "pin1": {
@@ -490,109 +564,61 @@ mograsim version: 0.1.3
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#4",
-          "pinName": ""
+          "compName": "GUINandGate#3",
+          "pinName": "Y"
         },
         "pin2": {
-          "compName": "GUInand3#0",
+          "compName": "GUIand#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
-          }
-        ]
+        "name": "unnamedWire#29"
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#3",
+          "compName": "WireCrossPoint#1",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#4",
-          "pinName": ""
+          "compName": "GUINandGate#0",
+          "pinName": "B"
         },
-        "name": "unnamedWire#8",
+        "name": "unnamedWire#3",
         "path": []
       },
       {
         "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "I4"
+          "compName": "GUINandGate#4",
+          "pinName": "Y"
         },
         "pin2": {
-          "compName": "WireCrossPoint#3",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "L"
         },
-        "name": "unnamedWire#7",
+        "name": "unnamedWire#30",
         "path": []
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#2",
-          "pinName": ""
+          "compName": "GUIand#0",
+          "pinName": "Y"
         },
         "pin2": {
           "compName": "_submodelinterface",
-          "pinName": "FN"
+          "pinName": "SBE"
         },
-        "name": "unnamedWire#6",
-        "path": [
-          {
-            "x": 5.0,
-            "y": 180.0
-          }
-        ]
+        "name": "unnamedWire#31",
+        "path": []
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#0",
+          "compName": "WireCrossPoint#1",
           "pinName": ""
         },
         "pin2": {
-          "compName": "GUINandGate#0",
-          "pinName": "A"
-        },
-        "name": "unnamedWire#1",
-        "path": [
-          {
-            "x": 5.0,
-            "y": 15.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "I5"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#0",
+          "compName": "WireCrossPoint#2",
           "pinName": ""
         },
-        "name": "unnamedWire#0",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "GUINandGate#4",
-          "pinName": "Y"
-        },
-        "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "L"
-        },
-        "name": "unnamedWire#30",
+        "name": "unnamedWire#4",
         "path": []
       },
       {
@@ -618,91 +644,74 @@ mograsim version: 0.1.3
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#4",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "GUINandGate#1",
-          "pinName": "A"
-        },
-        "name": "unnamedWire#10",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
-        },
-        "pin2": {
           "compName": "WireCrossPoint#2",
           "pinName": ""
         },
-        "name": "unnamedWire#4",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "GUIand#0",
-          "pinName": "Y"
-        },
         "pin2": {
           "compName": "_submodelinterface",
-          "pinName": "SBE"
+          "pinName": "FN"
         },
-        "name": "unnamedWire#31",
-        "path": []
+        "name": "unnamedWire#6",
+        "path": [
+          {
+            "x": 5.0,
+            "y": 180.0
+          }
+        ]
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#1",
-          "pinName": ""
+          "compName": "_submodelinterface",
+          "pinName": "I4"
         },
         "pin2": {
-          "compName": "GUINandGate#0",
-          "pinName": "B"
-        },
-        "name": "unnamedWire#3",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#5",
+          "compName": "WireCrossPoint#3",
           "pinName": ""
         },
-        "pin2": {
-          "compName": "GUINandGate#1",
-          "pinName": "B"
-        },
-        "name": "unnamedWire#12",
+        "name": "unnamedWire#7",
         "path": []
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#0",
+          "compName": "WireCrossPoint#3",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#1",
+          "compName": "WireCrossPoint#4",
           "pinName": ""
         },
-        "name": "unnamedWire#2",
+        "name": "unnamedWire#8",
         "path": []
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#3",
+          "compName": "WireCrossPoint#4",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#5",
-          "pinName": ""
+          "compName": "GUInand3#0",
+          "pinName": "A"
         },
-        "name": "unnamedWire#11",
-        "path": []
+        "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": "class:net.mograsim.logic.model.snippets.symbolrenderers.SimpleRectangularLikeSymbolRenderer",
+  "symbolRendererSnippetID": "simpleRectangularLike",
   "symbolRendererParams": {
     "centerText": "GUIAm2901ALUFuncDecode",
     "centerTextHeight": 5.0,
@@ -710,5 +719,7 @@ mograsim version: 0.1.3
     "pinLabelHeight": 3.5,
     "pinLabelMargin": 0.5
   },
-  "outlineRendererSnippetID": "class:net.mograsim.logic.model.snippets.outlinerenderers.DefaultOutlineRenderer"
+  "outlineRendererSnippetID": "default",
+  "highLevelStateHandlerSnippetID": "default",
+  "version": "0.1.5"
 }
\ No newline at end of file