X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.ui.am2900%2Fcomponents%2FGUIor4.json;h=d4bcd579318762b08eea4c1a88fa77dfeedf091a;hb=5ece0acf049bf9af2933f513fe0206565681f622;hp=53da78d0f9b0531f68f83f506581484d0df5f23a;hpb=70d9098dd01dfe29142a4184438175d5a013bb5b;p=Mograsim.git

diff --git a/net.mograsim.logic.ui.am2900/components/GUIor4.json b/net.mograsim.logic.ui.am2900/components/GUIor4.json
index 53da78d0..d4bcd579 100644
--- a/net.mograsim.logic.ui.am2900/components/GUIor4.json
+++ b/net.mograsim.logic.ui.am2900/components/GUIor4.json
@@ -1,7 +1,5 @@
-mograsim version: 0.1.2
+mograsim version: 0.1.3
 {
-  "type": "SimpleRectangularSubmodelComponent",
-  "name": "GUIor4",
   "width": 35.0,
   "height": 40.0,
   "interfacePins": [
@@ -46,212 +44,197 @@ mograsim version: 0.1.2
       "logicWidth": 1
     }
   ],
-  "composition": {
+  "submodel": {
     "innerScale": 0.2,
     "subComps": [
       {
         "pos": {
           "x": 20.0,
-          "y": 15.0
+          "y": 65.0
         },
-        "name": "GUINandGate",
-        "params": {
-          "logicWidth": 1
-        }
+        "id": "GUINandGate",
+        "name": "GUINandGate#1",
+        "params": 1
       },
       {
         "pos": {
           "x": 20.0,
-          "y": 65.0
+          "y": 15.0
         },
-        "name": "GUINandGate",
-        "params": {
-          "logicWidth": 1
-        }
+        "id": "GUINandGate",
+        "name": "GUINandGate#0",
+        "params": 1
       },
       {
         "pos": {
           "x": 20.0,
-          "y": 115.0
+          "y": 165.0
         },
-        "name": "GUINandGate",
-        "params": {
-          "logicWidth": 1
-        }
+        "id": "GUINandGate",
+        "name": "GUINandGate#3",
+        "params": 1
       },
       {
         "pos": {
           "x": 20.0,
-          "y": 165.0
+          "y": 115.0
         },
-        "name": "GUINandGate",
-        "params": {
-          "logicWidth": 1
-        }
+        "id": "GUINandGate",
+        "name": "GUINandGate#2",
+        "params": 1
       },
       {
         "pos": {
-          "x": 50.0,
-          "y": 40.0
+          "x": 14.0,
+          "y": 74.0
         },
-        "name": "GUINandGate",
-        "params": {
-          "logicWidth": 1
-        }
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#1",
+        "params": 1
       },
       {
         "pos": {
-          "x": 50.0,
-          "y": 140.0
+          "x": 14.0,
+          "y": 24.0
         },
-        "name": "GUINandGate",
-        "params": {
-          "logicWidth": 1
-        }
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#0",
+        "params": 1
       },
       {
         "pos": {
-          "x": 110.0,
-          "y": 40.0
+          "x": 14.0,
+          "y": 174.0
         },
-        "name": "GUINandGate",
-        "params": {
-          "logicWidth": 1
-        }
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#3",
+        "params": 1
       },
       {
         "pos": {
-          "x": 110.0,
-          "y": 140.0
+          "x": 14.0,
+          "y": 124.0
         },
-        "name": "GUINandGate",
-        "params": {
-          "logicWidth": 1
-        }
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#2",
+        "params": 1
       },
       {
         "pos": {
-          "x": 140.0,
-          "y": 90.0
+          "x": 104.0,
+          "y": 149.0
         },
-        "name": "GUINandGate",
-        "params": {
-          "logicWidth": 1
-        }
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#5",
+        "params": 1
       },
       {
         "pos": {
-          "x": 14.0,
-          "y": 24.0
+          "x": 104.0,
+          "y": 49.0
         },
-        "name": "WireCrossPoint",
-        "params": {
-          "logicWidth": 1
-        }
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#4",
+        "params": 1
       },
       {
         "pos": {
-          "x": 14.0,
-          "y": 74.0
+          "x": 140.0,
+          "y": 90.0
         },
-        "name": "WireCrossPoint",
-        "params": {
-          "logicWidth": 1
-        }
+        "id": "GUINandGate",
+        "name": "GUINandGate#8",
+        "params": 1
       },
       {
         "pos": {
-          "x": 14.0,
-          "y": 124.0
+          "x": 50.0,
+          "y": 140.0
         },
-        "name": "WireCrossPoint",
-        "params": {
-          "logicWidth": 1
-        }
+        "id": "GUINandGate",
+        "name": "GUINandGate#5",
+        "params": 1
       },
       {
         "pos": {
-          "x": 14.0,
-          "y": 174.0
+          "x": 50.0,
+          "y": 40.0
         },
-        "name": "WireCrossPoint",
-        "params": {
-          "logicWidth": 1
-        }
+        "id": "GUINandGate",
+        "name": "GUINandGate#4",
+        "params": 1
       },
       {
         "pos": {
-          "x": 104.0,
-          "y": 49.0
+          "x": 110.0,
+          "y": 140.0
         },
-        "name": "WireCrossPoint",
-        "params": {
-          "logicWidth": 1
-        }
+        "id": "GUINandGate",
+        "name": "GUINandGate#7",
+        "params": 1
       },
       {
         "pos": {
-          "x": 104.0,
-          "y": 149.0
+          "x": 110.0,
+          "y": 40.0
         },
-        "name": "WireCrossPoint",
-        "params": {
-          "logicWidth": 1
-        }
+        "id": "GUINandGate",
+        "name": "GUINandGate#6",
+        "params": 1
       }
     ],
     "innerWires": [
       {
         "pin1": {
-          "compId": 0,
+          "compName": "_submodelinterface",
           "pinName": "A1"
         },
         "pin2": {
-          "compId": 10,
+          "compName": "WireCrossPoint#0",
           "pinName": ""
         },
         "path": []
       },
       {
         "pin1": {
-          "compId": 0,
+          "compName": "_submodelinterface",
           "pinName": "A2"
         },
         "pin2": {
-          "compId": 11,
+          "compName": "WireCrossPoint#1",
           "pinName": ""
         },
         "path": []
       },
       {
         "pin1": {
-          "compId": 0,
+          "compName": "_submodelinterface",
           "pinName": "A3"
         },
         "pin2": {
-          "compId": 12,
+          "compName": "WireCrossPoint#2",
           "pinName": ""
         },
         "path": []
       },
       {
         "pin1": {
-          "compId": 0,
+          "compName": "_submodelinterface",
           "pinName": "A4"
         },
         "pin2": {
-          "compId": 13,
+          "compName": "WireCrossPoint#3",
           "pinName": ""
         },
         "path": []
       },
       {
         "pin1": {
-          "compId": 10,
+          "compName": "WireCrossPoint#0",
           "pinName": ""
         },
         "pin2": {
-          "compId": 1,
+          "compName": "GUINandGate#0",
           "pinName": "A"
         },
         "path": [
@@ -263,11 +246,11 @@ mograsim version: 0.1.2
       },
       {
         "pin1": {
-          "compId": 11,
+          "compName": "WireCrossPoint#1",
           "pinName": ""
         },
         "pin2": {
-          "compId": 2,
+          "compName": "GUINandGate#1",
           "pinName": "A"
         },
         "path": [
@@ -279,11 +262,11 @@ mograsim version: 0.1.2
       },
       {
         "pin1": {
-          "compId": 12,
+          "compName": "WireCrossPoint#2",
           "pinName": ""
         },
         "pin2": {
-          "compId": 3,
+          "compName": "GUINandGate#2",
           "pinName": "A"
         },
         "path": [
@@ -295,11 +278,11 @@ mograsim version: 0.1.2
       },
       {
         "pin1": {
-          "compId": 13,
+          "compName": "WireCrossPoint#3",
           "pinName": ""
         },
         "pin2": {
-          "compId": 4,
+          "compName": "GUINandGate#3",
           "pinName": "A"
         },
         "path": [
@@ -311,11 +294,11 @@ mograsim version: 0.1.2
       },
       {
         "pin1": {
-          "compId": 10,
+          "compName": "WireCrossPoint#0",
           "pinName": ""
         },
         "pin2": {
-          "compId": 1,
+          "compName": "GUINandGate#0",
           "pinName": "B"
         },
         "path": [
@@ -327,11 +310,11 @@ mograsim version: 0.1.2
       },
       {
         "pin1": {
-          "compId": 11,
+          "compName": "WireCrossPoint#1",
           "pinName": ""
         },
         "pin2": {
-          "compId": 2,
+          "compName": "GUINandGate#1",
           "pinName": "B"
         },
         "path": [
@@ -343,11 +326,11 @@ mograsim version: 0.1.2
       },
       {
         "pin1": {
-          "compId": 12,
+          "compName": "WireCrossPoint#2",
           "pinName": ""
         },
         "pin2": {
-          "compId": 3,
+          "compName": "GUINandGate#2",
           "pinName": "B"
         },
         "path": [
@@ -359,11 +342,11 @@ mograsim version: 0.1.2
       },
       {
         "pin1": {
-          "compId": 13,
+          "compName": "WireCrossPoint#3",
           "pinName": ""
         },
         "pin2": {
-          "compId": 4,
+          "compName": "GUINandGate#3",
           "pinName": "B"
         },
         "path": [
@@ -375,73 +358,73 @@ mograsim version: 0.1.2
       },
       {
         "pin1": {
-          "compId": 1,
+          "compName": "GUINandGate#0",
           "pinName": "Y"
         },
         "pin2": {
-          "compId": 5,
+          "compName": "GUINandGate#4",
           "pinName": "A"
         }
       },
       {
         "pin1": {
-          "compId": 2,
+          "compName": "GUINandGate#1",
           "pinName": "Y"
         },
         "pin2": {
-          "compId": 5,
+          "compName": "GUINandGate#4",
           "pinName": "B"
         }
       },
       {
         "pin1": {
-          "compId": 3,
+          "compName": "GUINandGate#2",
           "pinName": "Y"
         },
         "pin2": {
-          "compId": 6,
+          "compName": "GUINandGate#5",
           "pinName": "A"
         }
       },
       {
         "pin1": {
-          "compId": 4,
+          "compName": "GUINandGate#3",
           "pinName": "Y"
         },
         "pin2": {
-          "compId": 6,
+          "compName": "GUINandGate#5",
           "pinName": "B"
         }
       },
       {
         "pin1": {
-          "compId": 5,
+          "compName": "GUINandGate#4",
           "pinName": "Y"
         },
         "pin2": {
-          "compId": 14,
+          "compName": "WireCrossPoint#4",
           "pinName": ""
         },
         "path": []
       },
       {
         "pin1": {
-          "compId": 6,
+          "compName": "GUINandGate#5",
           "pinName": "Y"
         },
         "pin2": {
-          "compId": 15,
+          "compName": "WireCrossPoint#5",
           "pinName": ""
         },
         "path": []
       },
       {
         "pin1": {
-          "compId": 14,
+          "compName": "WireCrossPoint#4",
           "pinName": ""
         },
         "pin2": {
-          "compId": 7,
+          "compName": "GUINandGate#6",
           "pinName": "A"
         },
         "path": [
@@ -453,11 +436,11 @@ mograsim version: 0.1.2
       },
       {
         "pin1": {
-          "compId": 14,
+          "compName": "WireCrossPoint#4",
           "pinName": ""
         },
         "pin2": {
-          "compId": 7,
+          "compName": "GUINandGate#6",
           "pinName": "B"
         },
         "path": [
@@ -469,11 +452,11 @@ mograsim version: 0.1.2
       },
       {
         "pin1": {
-          "compId": 15,
+          "compName": "WireCrossPoint#5",
           "pinName": ""
         },
         "pin2": {
-          "compId": 8,
+          "compName": "GUINandGate#7",
           "pinName": "A"
         },
         "path": [
@@ -485,11 +468,11 @@ mograsim version: 0.1.2
       },
       {
         "pin1": {
-          "compId": 15,
+          "compName": "WireCrossPoint#5",
           "pinName": ""
         },
         "pin2": {
-          "compId": 8,
+          "compName": "GUINandGate#7",
           "pinName": "B"
         },
         "path": [
@@ -501,47 +484,42 @@ mograsim version: 0.1.2
       },
       {
         "pin1": {
-          "compId": 7,
+          "compName": "GUINandGate#6",
           "pinName": "Y"
         },
         "pin2": {
-          "compId": 9,
+          "compName": "GUINandGate#8",
           "pinName": "A"
         }
       },
       {
         "pin1": {
-          "compId": 8,
+          "compName": "GUINandGate#7",
           "pinName": "Y"
         },
         "pin2": {
-          "compId": 9,
+          "compName": "GUINandGate#8",
           "pinName": "B"
         }
       },
       {
         "pin1": {
-          "compId": 9,
+          "compName": "GUINandGate#8",
           "pinName": "Y"
         },
         "pin2": {
-          "compId": 0,
+          "compName": "_submodelinterface",
           "pinName": "Y"
         }
       }
     ]
   },
-  "specialized": {
-    "input_count": [
-      "A1",
-      "A2",
-      "A3",
-      "A4"
-    ],
-    "label": "GUIor4",
-    "logic_width": 1,
-    "output_count": [
-      "Y"
-    ]
+  "symbolRendererSnippetID": "SimpleRectangularLikeSymbolRenderer",
+  "symbolRendererParams": {
+    "centerText": "GUIor4",
+    "horizontalComponentCenter": 17.5,
+    "centerTextHeight": 5.0,
+    "pinLabelHeight": 3.5,
+    "pinLabelMargin": 0.5
   }
 }
\ No newline at end of file