X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.ui.am2900%2Fcomponents%2FGUIdlatch.json;h=69562cea08eabe5fc4426e8f78cb18c54afd6fc2;hb=5ece0acf049bf9af2933f513fe0206565681f622;hp=4b393472be9d73c43a18cbe3369f6a8a41873b95;hpb=05f3deb7ee3a0b7162c75e1963be9a739618e3df;p=Mograsim.git

diff --git a/net.mograsim.logic.ui.am2900/components/GUIdlatch.json b/net.mograsim.logic.ui.am2900/components/GUIdlatch.json
index 4b393472..69562cea 100644
--- a/net.mograsim.logic.ui.am2900/components/GUIdlatch.json
+++ b/net.mograsim.logic.ui.am2900/components/GUIdlatch.json
@@ -39,20 +39,13 @@ mograsim version: 0.1.3
   "submodel": {
     "innerScale": 0.4,
     "subComps": [
-      {
-        "pos": {
-          "x": 10.0,
-          "y": 2.5
-        },
-        "id": "GUINandGate",
-        "params": 1
-      },
       {
         "pos": {
           "x": 15.0,
           "y": 27.5
         },
         "id": "GUINandGate",
+        "name": "GUINandGate#1",
         "params": 1
       },
       {
@@ -60,14 +53,16 @@ mograsim version: 0.1.3
           "x": 45.0,
           "y": 7.5
         },
-        "id": "GUI_rsLatch"
+        "id": "GUI_rsLatch",
+        "name": "GUI_rsLatch#0"
       },
       {
         "pos": {
-          "x": 4.0,
-          "y": 36.5
+          "x": 10.0,
+          "y": 2.5
         },
-        "id": "WireCrossPoint",
+        "id": "GUINandGate",
+        "name": "GUINandGate#0",
         "params": 1
       },
       {
@@ -76,38 +71,48 @@ mograsim version: 0.1.3
           "y": 11.5
         },
         "id": "WireCrossPoint",
+        "name": "WireCrossPoint#1",
+        "params": 1
+      },
+      {
+        "pos": {
+          "x": 4.0,
+          "y": 36.5
+        },
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#0",
         "params": 1
       }
     ],
     "innerWires": [
       {
         "pin1": {
-          "compId": 0,
+          "compName": "_submodelinterface",
           "pinName": "D"
         },
         "pin2": {
-          "compId": 1,
+          "compName": "GUINandGate#0",
           "pinName": "A"
         }
       },
       {
         "pin1": {
-          "compId": 0,
+          "compName": "_submodelinterface",
           "pinName": "E"
         },
         "pin2": {
-          "compId": 4,
+          "compName": "WireCrossPoint#0",
           "pinName": ""
         },
         "path": []
       },
       {
         "pin1": {
-          "compId": 4,
+          "compName": "WireCrossPoint#0",
           "pinName": ""
         },
         "pin2": {
-          "compId": 1,
+          "compName": "GUINandGate#0",
           "pinName": "B"
         },
         "path": [
@@ -119,11 +124,11 @@ mograsim version: 0.1.3
       },
       {
         "pin1": {
-          "compId": 4,
+          "compName": "WireCrossPoint#0",
           "pinName": ""
         },
         "pin2": {
-          "compId": 2,
+          "compName": "GUINandGate#1",
           "pinName": "B"
         },
         "path": [
@@ -135,22 +140,22 @@ mograsim version: 0.1.3
       },
       {
         "pin1": {
-          "compId": 1,
+          "compName": "GUINandGate#0",
           "pinName": "Y"
         },
         "pin2": {
-          "compId": 5,
+          "compName": "WireCrossPoint#1",
           "pinName": ""
         },
         "path": []
       },
       {
         "pin1": {
-          "compId": 5,
+          "compName": "WireCrossPoint#1",
           "pinName": ""
         },
         "pin2": {
-          "compId": 2,
+          "compName": "GUINandGate#1",
           "pinName": "A"
         },
         "path": [
@@ -170,22 +175,22 @@ mograsim version: 0.1.3
       },
       {
         "pin1": {
-          "compId": 5,
+          "compName": "WireCrossPoint#1",
           "pinName": ""
         },
         "pin2": {
-          "compId": 3,
+          "compName": "GUI_rsLatch#0",
           "pinName": "_S"
         },
         "path": []
       },
       {
         "pin1": {
-          "compId": 2,
+          "compName": "GUINandGate#1",
           "pinName": "Y"
         },
         "pin2": {
-          "compId": 3,
+          "compName": "GUI_rsLatch#0",
           "pinName": "_R"
         },
         "path": [
@@ -201,22 +206,22 @@ mograsim version: 0.1.3
       },
       {
         "pin1": {
-          "compId": 3,
+          "compName": "GUI_rsLatch#0",
           "pinName": "Q"
         },
         "pin2": {
-          "compId": 0,
+          "compName": "_submodelinterface",
           "pinName": "Q"
         },
         "path": []
       },
       {
         "pin1": {
-          "compId": 3,
+          "compName": "GUI_rsLatch#0",
           "pinName": "_Q"
         },
         "pin2": {
-          "compId": 0,
+          "compName": "_submodelinterface",
           "pinName": "_Q"
         }
       }