From e6f4de251f8b3c6746f9cea89bc768321f359b01 Mon Sep 17 00:00:00 2001
From: ypc <15051963820@163.com>
Date: Mon, 6 Jul 2026 17:52:25 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20Reclose=5Flogic.json=20=E5=AE=8C?=
 =?UTF-8?q?=E5=96=84=E5=9D=90=E6=A0=87=20+=20=E7=A7=BB=E9=99=A4saddr?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

每个节点(信号/门)均携带 x,y 坐标，信号对象保持 no 标识
---
 test/config/PLC/Reclose_logic.json | 63 ++++++++++++++++++++++--------
 1 file changed, 46 insertions(+), 17 deletions(-)

diff --git a/test/config/PLC/Reclose_logic.json b/test/config/PLC/Reclose_logic.json
index 4c90ece..c3f1a31 100644
--- a/test/config/PLC/Reclose_logic.json
+++ b/test/config/PLC/Reclose_logic.json
@@ -10,19 +10,24 @@
       "logic": {
         "type": "OR",
         "id": 0,
+        "x": -346,
+        "y": 141,
         "from": [
           {
             "no": 59,
-            "saddr": "self_ptl.st.55"
+            "x": -676,
+            "y": 69
           },
           {
             "no": 60,
-            "saddr": "self_ptl.st.56"
+            "x": -674,
+            "y": 183
           }
         ],
         "to": {
           "no": 1361,
-          "saddr": "plc.st.out.1"
+          "x": -17,
+          "y": 137
         }
       }
     },
@@ -31,15 +36,19 @@
       "logic": {
         "type": "NOT",
         "id": 0,
+        "x": -345,
+        "y": 296,
         "from": [
           {
             "no": 61,
-            "saddr": "self_ptl.st.57"
+            "x": -669,
+            "y": 298
           }
         ],
         "to": {
           "no": 1362,
-          "saddr": "plc.st.out.2"
+          "x": -10,
+          "y": 294
         }
       }
     },
@@ -48,73 +57,93 @@
       "logic": {
         "type": "NOT",
         "id": 1,
+        "x": 591,
+        "y": 971,
         "gates_in": {
           "type": "OR",
           "id": 1,
+          "x": 288,
+          "y": 890,
           "from": [
             {
               "no": 71,
-              "saddr": "self_ptl.st.67"
+              "x": -7,
+              "y": 964
             }
           ],
           "gates_in": {
             "type": "AND",
             "id": 1,
+            "x": -43,
+            "y": 803,
             "from": [
               {
                 "no": 70,
-                "saddr": "self_ptl.st.66"
+                "x": -323,
+                "y": 858
               }
             ],
             "gates_in": {
               "type": "AND",
               "id": 0,
+              "x": -346,
+              "y": 595,
               "from": [
                 {
                   "no": 66,
-                  "saddr": "self_ptl.st.62"
+                  "x": -668,
+                  "y": 414
                 },
                 {
                   "no": 67,
-                  "saddr": "self_ptl.st.63"
+                  "x": -667,
+                  "y": 532
                 },
                 {
                   "no": 68,
-                  "saddr": "self_ptl.st.64"
+                  "x": -669,
+                  "y": 650
                 },
                 {
                   "no": 69,
-                  "saddr": "self_ptl.st.65"
+                  "x": -672,
+                  "y": 767
                 }
               ],
               "to": [
                 {
                   "no": 1363,
-                  "saddr": "plc.st.out.3"
+                  "x": -12,
+                  "y": 488
                 },
                 {
                   "no": 1364,
-                  "saddr": "plc.st.out.4"
+                  "x": -13,
+                  "y": 592
                 },
                 {
                   "no": 1365,
-                  "saddr": "plc.st.out.5"
+                  "x": -11,
+                  "y": 696
                 }
               ]
             },
             "to": {
               "no": 1366,
-              "saddr": "plc.st.out.6"
+              "x": 314,
+              "y": 769
             }
           },
           "to": {
             "no": 1367,
-            "saddr": "plc.st.out.7"
+            "x": 621,
+            "y": 853
           }
         },
         "to": {
           "no": 1368,
-          "saddr": "plc.st.out.8"
+          "x": 892,
+          "y": 970
         }
       }
     }