X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.ui.am2900%2Fcomponents%2FGUIand41.json;h=973a4c9dfe2737cb07d754d2977914223012f16e;hb=5ece0acf049bf9af2933f513fe0206565681f622;hp=7b2757c910c4d84b692f6b0ff1a7dadb8e833df6;hpb=70d9098dd01dfe29142a4184438175d5a013bb5b;p=Mograsim.git

diff --git a/net.mograsim.logic.ui.am2900/components/GUIand41.json b/net.mograsim.logic.ui.am2900/components/GUIand41.json
index 7b2757c9..973a4c9d 100644
--- a/net.mograsim.logic.ui.am2900/components/GUIand41.json
+++ b/net.mograsim.logic.ui.am2900/components/GUIand41.json
@@ -1,7 +1,5 @@
-mograsim version: 0.1.2
+mograsim version: 0.1.3
 {
-  "type": "SimpleRectangularSubmodelComponent",
-  "name": "GUIand41",
   "width": 35.0,
   "height": 50.0,
   "interfacePins": [
@@ -78,124 +76,121 @@ mograsim version: 0.1.2
       "logicWidth": 1
     }
   ],
-  "composition": {
+  "submodel": {
     "innerScale": 0.4,
     "subComps": [
       {
         "pos": {
-          "x": 30.0,
-          "y": 7.5
+          "x": 24.0,
+          "y": 71.5
         },
-        "name": "GUIand",
-        "params": {}
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#1",
+        "params": 1
       },
       {
         "pos": {
-          "x": 30.0,
-          "y": 32.5
+          "x": 24.0,
+          "y": 46.5
         },
-        "name": "GUIand",
-        "params": {}
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#0",
+        "params": 1
       },
       {
         "pos": {
-          "x": 30.0,
-          "y": 57.5
+          "x": 24.0,
+          "y": 96.5
         },
-        "name": "GUIand",
-        "params": {}
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#2",
+        "params": 1
       },
       {
         "pos": {
           "x": 30.0,
-          "y": 82.5
+          "y": 7.5
         },
-        "name": "GUIand",
-        "params": {}
+        "id": "GUIand",
+        "name": "GUIand#0"
       },
       {
         "pos": {
-          "x": 24.0,
-          "y": 46.5
+          "x": 30.0,
+          "y": 57.5
         },
-        "name": "WireCrossPoint",
-        "params": {
-          "logicWidth": 1
-        }
+        "id": "GUIand",
+        "name": "GUIand#2"
       },
       {
         "pos": {
-          "x": 24.0,
-          "y": 71.5
+          "x": 30.0,
+          "y": 32.5
         },
-        "name": "WireCrossPoint",
-        "params": {
-          "logicWidth": 1
-        }
+        "id": "GUIand",
+        "name": "GUIand#1"
       },
       {
         "pos": {
-          "x": 24.0,
-          "y": 96.5
+          "x": 30.0,
+          "y": 82.5
         },
-        "name": "WireCrossPoint",
-        "params": {
-          "logicWidth": 1
-        }
+        "id": "GUIand",
+        "name": "GUIand#3"
       }
     ],
     "innerWires": [
       {
         "pin1": {
-          "compId": 0,
+          "compName": "_submodelinterface",
           "pinName": "A1"
         },
         "pin2": {
-          "compId": 1,
+          "compName": "GUIand#0",
           "pinName": "A"
         },
         "path": []
       },
       {
         "pin1": {
-          "compId": 0,
+          "compName": "_submodelinterface",
           "pinName": "A2"
         },
         "pin2": {
-          "compId": 2,
+          "compName": "GUIand#1",
           "pinName": "A"
         },
         "path": []
       },
       {
         "pin1": {
-          "compId": 0,
+          "compName": "_submodelinterface",
           "pinName": "A3"
         },
         "pin2": {
-          "compId": 3,
+          "compName": "GUIand#2",
           "pinName": "A"
         },
         "path": []
       },
       {
         "pin1": {
-          "compId": 0,
+          "compName": "_submodelinterface",
           "pinName": "A4"
         },
         "pin2": {
-          "compId": 4,
+          "compName": "GUIand#3",
           "pinName": "A"
         },
         "path": []
       },
       {
         "pin1": {
-          "compId": 0,
+          "compName": "_submodelinterface",
           "pinName": "B"
         },
         "pin2": {
-          "compId": 7,
+          "compName": "WireCrossPoint#2",
           "pinName": ""
         },
         "path": [
@@ -207,66 +202,66 @@ mograsim version: 0.1.2
       },
       {
         "pin1": {
-          "compId": 7,
+          "compName": "WireCrossPoint#2",
           "pinName": ""
         },
         "pin2": {
-          "compId": 4,
+          "compName": "GUIand#3",
           "pinName": "B"
         },
         "path": []
       },
       {
         "pin1": {
-          "compId": 7,
+          "compName": "WireCrossPoint#2",
           "pinName": ""
         },
         "pin2": {
-          "compId": 6,
+          "compName": "WireCrossPoint#1",
           "pinName": ""
         },
         "path": []
       },
       {
         "pin1": {
-          "compId": 6,
+          "compName": "WireCrossPoint#1",
           "pinName": ""
         },
         "pin2": {
-          "compId": 3,
+          "compName": "GUIand#2",
           "pinName": "B"
         },
         "path": []
       },
       {
         "pin1": {
-          "compId": 6,
+          "compName": "WireCrossPoint#1",
           "pinName": ""
         },
         "pin2": {
-          "compId": 5,
+          "compName": "WireCrossPoint#0",
           "pinName": ""
         },
         "path": []
       },
       {
         "pin1": {
-          "compId": 5,
+          "compName": "WireCrossPoint#0",
           "pinName": ""
         },
         "pin2": {
-          "compId": 2,
+          "compName": "GUIand#1",
           "pinName": "B"
         },
         "path": []
       },
       {
         "pin1": {
-          "compId": 5,
+          "compName": "WireCrossPoint#0",
           "pinName": ""
         },
         "pin2": {
-          "compId": 1,
+          "compName": "GUIand#0",
           "pinName": "B"
         },
         "path": [
@@ -278,65 +273,56 @@ mograsim version: 0.1.2
       },
       {
         "pin1": {
-          "compId": 1,
+          "compName": "GUIand#0",
           "pinName": "Y"
         },
         "pin2": {
-          "compId": 0,
+          "compName": "_submodelinterface",
           "pinName": "Y1"
         },
         "path": []
       },
       {
         "pin1": {
-          "compId": 2,
+          "compName": "GUIand#1",
           "pinName": "Y"
         },
         "pin2": {
-          "compId": 0,
+          "compName": "_submodelinterface",
           "pinName": "Y2"
         },
         "path": []
       },
       {
         "pin1": {
-          "compId": 3,
+          "compName": "GUIand#2",
           "pinName": "Y"
         },
         "pin2": {
-          "compId": 0,
+          "compName": "_submodelinterface",
           "pinName": "Y3"
         },
         "path": []
       },
       {
         "pin1": {
-          "compId": 4,
+          "compName": "GUIand#3",
           "pinName": "Y"
         },
         "pin2": {
-          "compId": 0,
+          "compName": "_submodelinterface",
           "pinName": "Y4"
         },
         "path": []
       }
     ]
   },
-  "specialized": {
-    "input_count": [
-      "A1",
-      "A2",
-      "A3",
-      "A4",
-      "B"
-    ],
-    "label": "GUIand41",
-    "logic_width": 1,
-    "output_count": [
-      "Y1",
-      "Y2",
-      "Y3",
-      "Y4"
-    ]
+  "symbolRendererSnippetID": "SimpleRectangularLikeSymbolRenderer",
+  "symbolRendererParams": {
+    "centerText": "GUIand41",
+    "horizontalComponentCenter": 17.5,
+    "centerTextHeight": 5.0,
+    "pinLabelHeight": 3.5,
+    "pinLabelMargin": 0.5
   }
 }
\ No newline at end of file