From b7f71fb29f17ac3d4b736f84bca6fd5e29715fa0 Mon Sep 17 00:00:00 2001
From: codeboss <2422523675@qq.com>
Date: Thu, 1 Aug 2024 10:05:05 +0800
Subject: [PATCH] update

---
 .idea/workspace.xml                           |   1 -
 graph/directed_acyclic_graph/DAGLayout.py     |   8 +++++---
 .../__pycache__/DAGLayout.cpython-312.pyc     | Bin 14233 -> 14327 bytes
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 6ff9221..58cfe2b 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,7 +6,6 @@
   <component name="ChangeListManager">
     <list default="true" id="f609c0f2-cd0d-4eea-87f1-8caf02d3f04f" name="Changes" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/frame/ContentView.py" beforeDir="false" afterPath="$PROJECT_DIR$/frame/ContentView.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/graph/directed_acyclic_graph/DAGLayout.py" beforeDir="false" afterPath="$PROJECT_DIR$/graph/directed_acyclic_graph/DAGLayout.py" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
diff --git a/graph/directed_acyclic_graph/DAGLayout.py b/graph/directed_acyclic_graph/DAGLayout.py
index a3fca1c..9cafcb5 100644
--- a/graph/directed_acyclic_graph/DAGLayout.py
+++ b/graph/directed_acyclic_graph/DAGLayout.py
@@ -1,5 +1,6 @@
 from graph.DataType import Point, Arrow
 from typing import List, Dict, Tuple
+from math import floor,ceil
 
 
 class DAGLayerHelper:
@@ -241,9 +242,10 @@ class DAGGraph:
         if len(target_nodes_within_layer) == 0:
             return
 
+        # 初始化节点排序
         if layer_index == 0:
             for idx in range(0, len(target_nodes_within_layer)):
-                target_nodes_within_layer[idx].sort_number = idx
+                target_nodes_within_layer[idx].sort_number = idx + 1
                 pass
             pass
 
@@ -262,9 +264,9 @@ class DAGGraph:
             # 整理节点排序
             target_nodes_within_layer.sort(key=compare_item)
             for idx in range(0, len(target_nodes_within_layer)):
-                target_nodes_within_layer[idx].sort_number = idx
+                target_item = target_nodes_within_layer[idx]
+                target_item.sort_number = idx + 1
                 pass
-
             pass
 
         self.__graph_layer_nodes_sort(layer_index + 1, nodes)
diff --git a/graph/directed_acyclic_graph/__pycache__/DAGLayout.cpython-312.pyc b/graph/directed_acyclic_graph/__pycache__/DAGLayout.cpython-312.pyc
index dbea7a6898353595d2327f6513729a30091507b5..656664453214911bf81c578a1a80175190128e2d 100644
GIT binary patch
delta 2987
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
F{{UnRb;bYy

delta 2859
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
WO81mZL%$HDcYBMMx;Ic8=JXFuDMnlX