archgraph-layout 1.0.1__tar.gz → 2.0.0__tar.gz

{archgraph_layout-1.0.1/archgraph_layout.egg-info → archgraph_layout-2.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: archgraph-layout
-Version: 1.0.1
+Version: 2.0.0
 Summary: Hierarchical architecture diagrams from XML with floorplanning and orthogonal routing
 Author: Ellie Hartung
 License-Expression: MIT
@@ -96,7 +96,7 @@ XML ──► parse/expand ──► size blocks ──► auto-cluster huge lev
     ──► hierarchical floorplanning (bottom-up, several passes)
     ──► detailed QP placement + edge alignment (bottom-up, then top-down)
     ──► port sides (router-chosen) ──► orthogonal routing ──► congestion-driven spacing
-    ──► nudging ──► labels ──► SVG / HTML / JSON / PNG
+    ──► nudging ──► SVG / HTML / JSON / PNG
 ```
 
 **Floorplanning (placement).** Each subsystem level is a floorplanning problem over
@@ -151,8 +151,8 @@ the border of a subsystem that contains neither end is almost forbidden. Specifi
   painted over a hop. Crossings closer together than one hop share a single flat bridge.
   Each hop bumps to the side where the crossed wire has room (clear of its arrowheads,
   corners and neighbouring parallel wires). A crossing right next to a corner of the
-  horizontal wire hops sideways on the vertical wire instead. Bit-width markers and edge
-  labels keep clear of crossings.
+  horizontal wire hops sideways on the vertical wire instead. Bit-width markers
+  keep clear of crossings.
 
 ---
 

{archgraph_layout-1.0.1 → archgraph_layout-2.0.0}/README.md

@@ -71,7 +71,7 @@ XML ──► parse/expand ──► size blocks ──► auto-cluster huge lev
     ──► hierarchical floorplanning (bottom-up, several passes)
     ──► detailed QP placement + edge alignment (bottom-up, then top-down)
     ──► port sides (router-chosen) ──► orthogonal routing ──► congestion-driven spacing
-    ──► nudging ──► labels ──► SVG / HTML / JSON / PNG
+    ──► nudging ──► SVG / HTML / JSON / PNG
 ```
 
 **Floorplanning (placement).** Each subsystem level is a floorplanning problem over
@@ -126,8 +126,8 @@ the border of a subsystem that contains neither end is almost forbidden. Specifi
   painted over a hop. Crossings closer together than one hop share a single flat bridge.
   Each hop bumps to the side where the crossed wire has room (clear of its arrowheads,
   corners and neighbouring parallel wires). A crossing right next to a corner of the
-  horizontal wire hops sideways on the vertical wire instead. Bit-width markers and edge
-  labels keep clear of crossings.
+  horizontal wire hops sideways on the vertical wire instead. Bit-width markers
+  keep clear of crossings.
 
 ---
 

{archgraph_layout-1.0.1 → archgraph_layout-2.0.0}/archgraph/__init__.py

@@ -23,7 +23,7 @@ from .progress import report
 from .placement import engine as _engine  # noqa: E402
 from . import routing as _routing  # noqa: E402
 
-__version__ = "1.0.1"
+__version__ = "2.0.0"
 __all__ = ["load", "loads", "layout", "route", "build", "to_svg", "to_html", "to_json", "to_png", "save",
            "ArchGraphError", "Graph", "__version__"]
 
@@ -45,7 +45,7 @@ def layout(g: Graph) -> Graph:
 
 
 def route(g: Graph) -> Graph:
-    """Route all connections and buses, nudge them apart and place labels."""
+    """Route all connections and buses and nudge them apart."""
     _routing.route(g)
     from .geometry import Rect
     rects = [e.rect for e in g.root.iter_descendants()]

{archgraph_layout-1.0.1 → archgraph_layout-2.0.0}/archgraph/model.py

@@ -53,7 +53,6 @@ class Settings:
     junction_dots: bool = True
     shadows: bool = True
     background_grid: bool = False
-    edge_labels: bool = True
     default_shape: str = "box"
     bundle_parallel: bool = False      # merge parallel edges between the same endpoints
     margin: float = 24.0               # outer margin of the drawing
@@ -184,6 +183,7 @@ class Node(Element):
     min_h: Optional[float] = None
     virtual: bool = False              # internal helper node (not drawn)
     is_note: bool = False
+    layout_direction: str = "LR"       # inherited flow used by shape geometry
 
     kind = "node"
 
@@ -246,9 +246,6 @@ class Edge:
     id: str
     src: Endpoint
     dst: Endpoint
-    label: str = ""
-    src_label: str = ""
-    dst_label: str = ""
     classes: List[str] = field(default_factory=list)
     attrs: Dict[str, str] = field(default_factory=dict)
     style: Dict[str, Any] = field(default_factory=dict)
@@ -267,9 +264,6 @@ class Edge:
     line: Optional[int] = None
     # results
     points: List[Point] = field(default_factory=list)
-    label_pos: Optional[Tuple[float, float, float, float]] = None   # x, y, w, h (centre)
-    src_label_pos: Optional[Tuple[float, float]] = None
-    dst_label_pos: Optional[Tuple[float, float]] = None
     routed: bool = False
     uid: int = field(default_factory=lambda: next(_counter))
 
@@ -286,14 +280,12 @@ class Edge:
 @dataclass(eq=False, repr=False)
 class BusTap:
     endpoint: Endpoint
-    label: str = ""
     direction: Optional[str] = None
 
 
 @dataclass(eq=False, repr=False)
 class Bus:
     id: str
-    label: str = ""
     taps: List[BusTap] = field(default_factory=list)
     classes: List[str] = field(default_factory=list)
     attrs: Dict[str, str] = field(default_factory=dict)
@@ -305,7 +297,6 @@ class Bus:
     # results
     segments: List[Tuple[Point, Point]] = field(default_factory=list)
     junctions: List[Point] = field(default_factory=list)
-    label_pos: Optional[Tuple[float, float, float, float]] = None
     routed: bool = False
     uid: int = field(default_factory=lambda: next(_counter))
 

{archgraph_layout-1.0.1 → archgraph_layout-2.0.0}/archgraph/parser.py

@@ -1086,25 +1086,28 @@ class Builder:
             e.ports[pid] = p
         return Endpoint(element=e, port=p, ref=ref)
 
-    EDGE_ATTRS = {"from", "to", "src", "dst", "source", "target", "label", "src-label", "tail-label",
-                  "dst-label", "head-label", "class", "dir", "directed", "arrowhead", "arrowtail", "weight",
+    EDGE_ATTRS = {"from", "to", "src", "dst", "source", "target", "class", "dir", "directed", "arrowhead", "arrowtail", "weight",
                   "minlen", "constraint", "layout", "straight", "bits", "width-bits", "bus-width", "net",
                   "tooltip", "id", "nodes", "path", "priority", "lanes"}
 
+    def _connection_attrs(self, el: ET.Element, attrs: Dict[str, Any]) -> Dict[str, Any]:
+        """Ignore retired connection labels while still accepting older XML files."""
+        retired = {"label", "src-label", "tail-label", "dst-label", "head-label"}
+        if retired.intersection(attrs) or el.find("label") is not None or (el.text or "").strip():
+            self.graph.warn(f"{_loc(el)}: connection labels are no longer supported; ignored")
+        return {k: v for k, v in attrs.items() if k not in retired}
+
     def _make_edges(self, el: ET.Element, extra: Dict[str, Any], sub: Subsystem):
         g = self.graph
         attrs = {k: v for k, v in el.attrib.items() if not k.startswith("__")}
         attrs.update({k: v for k, v in extra.items() if not k.startswith("__")})
+        attrs = self._connection_attrs(el, attrs)
         where = _loc(el)
         srcs = _split_refs(attrs.get("from") or attrs.get("src") or attrs.get("source"))
         dsts = _split_refs(attrs.get("to") or attrs.get("dst") or attrs.get("target"))
         if not srcs or not dsts:
             self.errors.append(f"{where}: <{el.tag}> needs from= and to=")
             return
-        label = attrs.get("label")
-        if label is None:
-            lab_el = el.find("label")
-            label = (lab_el.text or "").strip() if lab_el is not None else (el.text or "").strip()
         classes = _split_refs(attrs.get("class"))
         raw_style = {}
         for k, v in attrs.items():
@@ -1127,11 +1130,9 @@ class Builder:
                 de = self._endpoint(d, where, eid, "d")
                 if se is None or de is None:
                     continue
-                e = Edge(id=eid, src=se, dst=de, label=label or "", classes=list(classes), style=dict(style),
+                e = Edge(id=eid, src=se, dst=de, classes=list(classes), style=dict(style),
                          line=_line(el))
                 e.attrs = attrs
-                e.src_label = attrs.get("src-label", attrs.get("tail-label", ""))
-                e.dst_label = attrs.get("dst-label", attrs.get("head-label", ""))
                 dirv = (attrs.get("dir") or "").lower()
                 if attrs.get("directed") is not None:
                     e.directed = st.parse_bool(attrs.get("directed"), True)
@@ -1165,36 +1166,38 @@ class Builder:
         g = self.graph
         where = _loc(el)
         bid = el.get("id") or f"bus{len(g.buses) + 1}"
-        bus = Bus(id=bid, label=el.get("label", bid), line=_line(el))
+        attrs = self._connection_attrs(el, el.attrib)
+        bus = Bus(id=bid, line=_line(el))
         bus.classes = _split_refs(el.get("class"))
         bus.bits = el.get("bits", el.get("width-bits", ""))
         bus.orientation = el.get("orientation", "auto")
         bus.tooltip = el.get("tooltip", "")
-        raw = {k: v for k, v in el.attrib.items()
-               if k not in ("id", "label", "class", "bits", "orientation", "taps", "tooltip", "width-bits")
+        raw = {k: v for k, v in attrs.items()
+               if k not in ("id", "class", "bits", "orientation", "taps", "tooltip", "width-bits")
                and not k.startswith("__")}
         if "style" in raw and raw["style"].lower() not in st.DASH_PATTERNS:
             raw.update(st.parse_css_style(raw.pop("style")))
         bus.style = st.normalize_style(raw)
         k = 0
-        tap_specs: List[Tuple[str, str, Optional[str], Optional[int]]] = []
+        tap_specs: List[Tuple[str, Optional[str], Optional[int]]] = []
         for t in _split_refs(el.get("taps")):
-            tap_specs.append((t, "", None, _line(el)))
+            tap_specs.append((t, None, _line(el)))
         for c in el:
             if c.tag in ("tap", "member", "endpoint", "connect", "pin"):
+                self._connection_attrs(c, c.attrib)
                 ref = c.get("node") or c.get("ref") or c.get("to") or c.get("id")
                 if not ref:
                     self.errors.append(f"{_loc(c)}: <tap> needs node=")
                     continue
                 if c.get("port") and ":" not in ref:
                     ref = f"{ref}:{c.get('port')}"
-                tap_specs.append((ref, c.get("label", ""), c.get("dir", c.get("direction")), _line(c)))
-        for ref, lab, d, ln in tap_specs:
+                tap_specs.append((ref, c.get("dir", c.get("direction")), _line(c)))
+        for ref, d, ln in tap_specs:
             ep = self._endpoint(ref, f"{_loc(el)}" if ln is None else f"{os.path.basename(el.get(FILE, ''))}:{ln}",
                                 f"bus~{bid}~{k}", "t")
             k += 1
             if ep is not None:
-                bus.taps.append(BusTap(endpoint=ep, label=lab, direction=d))
+                bus.taps.append(BusTap(endpoint=ep, direction=d))
         if len(bus.taps) < 2:
             self.errors.append(f"{where}: bus '{bid}' needs at least two taps")
             return
@@ -1355,11 +1358,6 @@ def _bundle_parallel(g: Graph):
             continue
         first = es[0]
         first.multiplicity = sum(x.multiplicity for x in es)
-        labels = [x.label for x in es if x.label]
-        if labels:
-            uniq = list(dict.fromkeys(labels))
-            first.label = ", ".join(uniq[:3]) + (" …" if len(uniq) > 3 else "")
-        first.label = (first.label + "  " if first.label else "") + f"×{first.multiplicity}"
         for x in es[1:]:
             dropped.add(x)
             for ep in (x.src, x.dst):
@@ -1435,8 +1433,6 @@ def _apply_styles(g: Graph):
         base.update(e.style)
         if "color" in base and "stroke" not in e.style:
             base["stroke"] = base["color"]
-        if "label-color" not in cls and "label-color" not in e.style and "color" in (cls.keys() | e.style.keys()):
-            base["label-color"] = st.mix(base["color"], theme["text"], 0.35)
         if "stroke-width-scale" in e.style:
             base["stroke-width"] = base.get("stroke-width", 1.3) * e.style["stroke-width-scale"]
         for raw in [st.class_raw(e.classes, g.classes, "edge")]:

{archgraph_layout-1.0.1 → archgraph_layout-2.0.0}/archgraph/placement/hierarchy.py

@@ -23,7 +23,7 @@ from ..geometry import E, N, OPPOSITE, S, W, Rect, parse_side, side_of_point
 from ..model import Bus, Edge, Element, Graph, Hint, Node, Port, Subsystem
 from ..progress import activity, report
 from ..portlabels import port_content_padding
-from ..textmetrics import LABEL_CLEARANCE, label_box_size, text_block_size
+from ..textmetrics import text_block_size
 from .detail import LevelQP, QPEdge, QPHint, QPItem, QPTerminal, solve_level
 from .floorplan import (FPEdge, FPHint, FPItem, FPProblem, FPState, FPTerminal, FPVariant, Floorplanner)
 from .graphalgo import fiedler_order, partition_items
@@ -418,36 +418,13 @@ class HierarchicalPlacer:
         for le in ledges:
             self._classify(le)
         self.auto_pad = self._auto_padding()
-        self.label_margins, self.label_padding = self._label_spacing()
         self.deadline = (time.time() + self.s.time_budget) if self.s.time_budget > 0 else None
 
-    def _label_spacing(self):
-        """Reserve channels for text before floorplanning, including draft layouts."""
-        margins, padding = {}, {}
-        for le in self.ledges:
-            source = le.source
-            if not isinstance(source, (Edge, Bus)) or not source.label:
-                continue
-            if isinstance(source, Edge) and not self.s.edge_labels:
-                continue
-            w, h = label_box_size(source.label, source.style, self.s.font_family, bus=isinstance(source, Bus))
-            need = max(w, h) + 2 * LABEL_CLEARANCE
-            scope = le.scope
-            children = [scope.child_containing(el) for el in (le.a, le.b) if el is not scope]
-            for child in children:
-                if child is not None:
-                    key = (scope.uid, child.uid)
-                    margins[key] = max(margins.get(key, 0.0), need / 2)
-            if le.a is scope or le.b is scope:
-                padding[scope.uid] = max(padding.get(scope.uid, 0.0), need)
-        return margins, padding
-
     def _text_margin(self, sub, child):
-        margin = self.label_margins.get((sub.uid, child.uid), 0.0)
         if isinstance(child, Subsystem) and child.visible:
             bands = port_content_padding(estimate_port_sides(child, flow_of(child, self.s)), self.s)
-            margin += max(bands.values())
-        return margin
+            return max(bands.values())
+        return 0.0
 
     def _auto_padding(self) -> Dict[int, float]:
         """Extra inner padding for subsystems that many wires leave: every wire needs a straight
@@ -567,8 +544,7 @@ class HierarchicalPlacer:
                         self.margin_bonus[(x.uid, c.uid)] = role_max[role]
 
     def _pad(self, sub: Subsystem) -> float:
-        return max(subsystem_padding(sub, self.s) + self.auto_pad.get(sub.uid, 0.0),
-                   self.label_padding.get(sub.uid, 0.0)) + self.pad_bonus.get(sub.uid, 0.0)
+        return subsystem_padding(sub, self.s) + self.auto_pad.get(sub.uid, 0.0) + self.pad_bonus.get(sub.uid, 0.0)
 
     # ------------------------------------------------------------------------------------
     def node_variant(self, n: Node) -> FPVariant:
@@ -907,7 +883,8 @@ class HierarchicalPlacer:
         box_w = cw + 2 * pad
         box_h = ch + 2 * pad + header
         if not is_root and sub.visible and sub.label:
-            lw, _ = text_block_size(sub.label, float(sub.style.get("font-size", 12.5)), True,
+            bold = str(sub.style.get("font-weight", "700")) in ("bold", "600", "700", "800", "900")
+            lw, _ = text_block_size(sub.label, float(sub.style.get("font-size", s.font_size+.5)), bold,
                                     sub.style.get("font-family", s.font_family))
             lw += 2 * pad + 8
             if box_w < lw: