update

tree.py

@@ -61,75 +61,68 @@ def generate_tree(input_file, output_file, root_id=None):
         "arrowsize": "1.2"
     }
 
+    couple_style = {
+        "style": "dashed",
+        "color": "#FF69B4",
+        "penwidth": "2.5",
+        "dir": "none"
+    }
+
     os.makedirs("temp_avatars", exist_ok=True)
 
-    # Traitement de tous les membres
+    # 1. Création de tous les nœuds
     for user_id, info in data["members"].items():
         original_avatar = f"avatars/{user_id}.png"
         combined_avatar = f"temp_avatars/combined_{user_id}.png"
 
         if os.path.exists(original_avatar):
-            create_avatar_with_name(
-                user_id,
-                info["name"],
-                original_avatar,
-                combined_avatar
-            )
-            G.add_node(
-                user_id,
-                image=combined_avatar,
-                **node_style
-            )
+            create_avatar_with_name(user_id, info["name"], original_avatar, combined_avatar)
+            G.add_node(user_id, image=combined_avatar, **node_style)
         else:
-            G.add_node(
-                user_id,
-                label=info["name"],
-                **{**node_style, "fontcolor": "white"}
-            )
+            G.add_node(user_id, label=info["name"], **{**node_style, "fontcolor": "white"})
 
-    # Nouveau : Dictionnaire pour forcer les rangs des couples
-    forced_ranks = {}
+    # 2. Identification des niveaux
+    top_level = set()
+    
+    # Ajout des racines explicites
+    if root_id:
+        top_level.add(root_id)
+    else:
+        for root in data.get("roots", []):
+            top_level.add(root)
+    
+    # Ajout des couples sans parents
+    for couple in data.get("couples", []):
+        if all(m in data["members"] and not data["members"][m].get("parents") for m in couple):
+            top_level.update(couple)
 
-    # Traitement des couples
+    # 3. Création des sous-graphes hiérarchiques
+    if top_level:
+        G.add_subgraph(top_level, name="rank_top", rank="same")
+
+    # Niveau des enfants directs
+    children_level = set()
+    for user_id, info in data["members"].items():
+        parents = info.get("parents", [])
+        if any(p["id"] in top_level for p in parents):
+            children_level.add(user_id)
+    
+    if children_level:
+        G.add_subgraph(children_level, name="rank_children", rank="same")
+
+    # 4. Gestion des couples
     for couple in data.get("couples", []):
         if all(m in data["members"] for m in couple):
             member1, member2 = couple
             
-            # Style spécial pour les liens de couple
-            G.add_edge(member1, member2,
-                      style="dashed",
-                      color="#FF69B4",
-                      penwidth="2.5",
-                      dir="none")
+            # Lien conjugal
+            G.add_edge(member1, member2, **couple_style)
             
-            # Force les partenaires au même rang
-            partner_group = f"couple_{min(couple)}_{max(couple)}"
-            G.add_subgraph(couple, name=partner_group, rank="same")
-            forced_ranks[member1] = partner_group
-            forced_ranks[member2] = partner_group
+            # Alignement forcé pour les couples racines
+            if member1 in top_level and member2 in top_level:
+                G.add_subgraph(couple, name=f"couple_{member1}_{member2}", rank="same")
 
-    # Organisation hiérarchique améliorée
-    if root_id:
-        roots = [root_id]
-    else:
-        roots = data.get("roots", [k for k,v in data["members"].items() if not v.get("parents")])
-
-    # Nouvelle approche pour les niveaux
-    levels = {}
-    for user_id in data["members"]:
-        gen = data["members"][user_id].get("generation", 
-                 len(data["members"][user_id].get("parents", [])))
-        if gen not in levels:
-            levels[gen] = []
-        levels[gen].append(user_id)
-
-    # Création des sous-graphes par niveau
-    for level, members in levels.items():
-        filtered_members = [m for m in members if m not in forced_ranks]
-        if filtered_members:
-            G.add_subgraph(filtered_members, name=f"rank{level}", rank="same")
-
-    # Connexions parent-enfant
+    # 5. Liens parent-enfant
     for user_id, info in data["members"].items():
         for parent in info.get("parents", []):
             if parent["id"] in data["members"]: