draftwright 0.4.14__tar.gz → 0.4.15__tar.gz

{draftwright-0.4.14 → draftwright-0.4.15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: draftwright
-Version: 0.4.14
+Version: 0.4.15
 Summary: Automated technical-drawing generation for build123d
 Project-URL: Homepage, https://github.com/pzfreo/draftwright
 Project-URL: Repository, https://github.com/pzfreo/draftwright

{draftwright-0.4.14 → draftwright-0.4.15}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "draftwright"
-version = "0.4.14"
+version = "0.4.15"
 description = "Automated technical-drawing generation for build123d"
 readme = "README.md"
 license = { file = "LICENSE" }

{draftwright-0.4.14 → draftwright-0.4.15}/src/draftwright/annotations/_common.py

@@ -1471,6 +1471,7 @@ def prevent_dimension_label_ink(
     page=None,
     immutable=(),
     obstacles=(),
+    perpendicular_step=None,
 ):
     """Choose small along-line label offsets for a just-built dimension batch.
 
@@ -1493,6 +1494,9 @@ def prevent_dimension_label_ink(
     neighbour's.  If the bounded choices cannot improve the batch, the natural deterministic
     placement survives and the normal ``annotation_ink_overlap`` lint remains explicit
     evidence of the infeasible fallback.  Names in *immutable* are never shifted (pins win).
+    When ``perpendicular_step`` is supplied, a conflicting dimension may also move one
+    established stacking tier away from the view. This is the generic fallback for a chain
+    whose line-work cannot be cleared by moving labels along their measured spans.
     Fixed *obstacles* do not make an existing contact this local batch's responsibility, but
     no selected move may introduce a new label contact with one.
 
@@ -1645,6 +1649,7 @@ def prevent_dimension_label_ink(
         conflicts = _conflicts(batch)
         fixed_conflicts = sum(conflict[0] == "fixed" for conflict in conflicts)
         offsets = []
+        tier_offsets = []
         for (_name, dim), info, natural in zip(batch, infos, natural_centres, strict=True):
             label = _box(dim)
             offsets.append(
@@ -1652,9 +1657,18 @@ def prevent_dimension_label_ink(
                 if info is None or natural is None or label is None
                 else abs((label[info[0]] + label[info[0] + 2]) / 2.0 - natural)
             )
+        for (_name, dim), (_original_name, original_dim) in zip(batch, original, strict=True):
+            spec = getattr(dim, "_dw_spec", None)
+            original_spec = getattr(original_dim, "_dw_spec", None)
+            tier_offsets.append(
+                0.0
+                if spec is None or original_spec is None
+                else abs(float(spec.distance) - float(original_spec.distance))
+            )
         return (
             fixed_conflicts,
             len(conflicts),
+            sum(value > 1e-9 for value in tier_offsets),
             round(sum(offsets), 9),
             round(max(offsets, default=0.0), 9),
             tuple(round(value, 9) for value in offsets),
@@ -1665,10 +1679,10 @@ def prevent_dimension_label_ink(
     if not conflicts:
         return current  # overwhelmingly common path: no extra Dimension construction
 
-    cache: dict[tuple[int, float], Any] = {}
+    cache: dict[tuple[int, float, float], Any] = {}
 
-    def _rebuild(index, centre):
-        key = (index, round(centre, 6))
+    def _rebuild(index, centre, distance_delta=0.0):
+        key = (index, round(centre, 6), round(distance_delta, 6))
         if key in cache:
             return cache[key]
         name, dim = original[index]
@@ -1682,7 +1696,14 @@ def prevent_dimension_label_ink(
         kwargs["label_offset_x"] = (
             kwargs.get("label_offset_x", 0.0) + (centre - natural) * direction
         )
-        rebuilt = _dim(spec.p1, spec.p2, spec.side, spec.distance, spec.draft, **kwargs)
+        rebuilt = _dim(
+            spec.p1,
+            spec.p2,
+            spec.side,
+            spec.distance + distance_delta,
+            spec.draft,
+            **kwargs,
+        )
         # The producer attaches semantic evidence before the corridor commits the
         # survivor. Rebuilding only the rendered Dimension must not erase that evidence:
         # hole-table escalation and coverage lint read these riders from the final object.
@@ -1765,13 +1786,30 @@ def prevent_dimension_label_ink(
             name, _dim_obj = original[index]
             if name in immutable or infos[index] is None:
                 continue
-            for centre in _centres_for(index, current):
-                trial = list(current)
-                trial[index] = (name, _rebuild(index, centre))
-                objective, trial_conflicts = _objective(trial)
-                key = (objective, index, round(centre, 9))
-                if objective < current_objective and (best is None or key < best[0]):
-                    best = (key, trial, objective, trial_conflicts)
+            distances = (0.0,) if perpendicular_step is None else (0.0, perpendicular_step)
+            for distance_delta in distances:
+                for centre in _centres_for(index, current):
+                    rebuilt = _rebuild(index, centre, distance_delta)
+                    if page is not None:
+                        box = _anno_box(rebuilt)
+                        if box is not None and not (
+                            page[0] <= box[0]
+                            and box[2] <= page[2]
+                            and page[1] <= box[1]
+                            and box[3] <= page[3]
+                        ):
+                            continue
+                    trial = list(current)
+                    trial[index] = (name, rebuilt)
+                    objective, trial_conflicts = _objective(trial)
+                    key = (
+                        objective,
+                        index,
+                        round(distance_delta, 9),
+                        round(centre, 9),
+                    )
+                    if objective < current_objective and (best is None or key < best[0]):
+                        best = (key, trial, objective, trial_conflicts)
         if best is None:
             break
         _key, current, current_objective, conflicts = best

{draftwright-0.4.14 → draftwright-0.4.15}/src/draftwright/annotations/from_model.py

@@ -3592,6 +3592,7 @@ def _draw_step_chain(
         for seg in segs
     ]
     mean_v = sum(vals) / len(vals)
+    tier_step = draft.font_size + 2 * draft.pad_around_text
     if (
         allow_collapse
         and all(seg.label is None for seg in segs)
@@ -3610,7 +3611,6 @@ def _draw_step_chain(
         typ_name = f"{name_prefix}_typ" if start == 0 else f"{name_prefix}_typ{start}"
         candidates = [(typ_name, dim, _step_measurements(segs))]
     else:
-        tier_step = draft.font_size + 2 * draft.pad_around_text
         tiers = [0] * len(segs)
         if horizontal:
             cw = [
@@ -3699,6 +3699,7 @@ def _draw_step_chain(
             [(name, dim) for name, dim, _measurements in candidates],
             page=page,
             obstacles=strip_obstacles(dwg, view=view, crossable=CROSSABLE_TYPES),
+            perpendicular_step=tier_step if horizontal else None,
         )
     ]
 
@@ -4599,7 +4600,7 @@ def _global_axis_centerline(first, second):
 
 def render_rotational(dwg, plan, a, *, ctx) -> int:
     """Rotational furniture from the IR `RotationalFeature` (#237): the OD dim (above
-    the front view), the rotation-axis centrelines (front + side), and the concentric
+    the profile view), rotation-axis centrelines on planned profile projections, and concentric
     bore leaders stacked to the left of the front view. Returns the count placed.
 
     The OD/bore dimensions consume only approved compiled entries. Suppressed entries
@@ -4621,6 +4622,14 @@ def render_rotational(dwg, plan, a, *, ctx) -> int:
         # Planner-fed value + authored tolerance/fit suffix (#754).
         return f"ø{dim.value_text}{_tol_suffix(dim.tolerance, draft)}"
 
+    def _place_axis_centerline(item, name, view):
+        # Automatic view selection may omit one of a turned body's two equivalent profile
+        # projections. Furniture is not a semantic requirement and therefore does not pass
+        # through the dimension planner's missing-view gate; guard it explicitly so it cannot
+        # leave an orphan dashed line at the absent view's former page position (#1262).
+        if view in dwg.views:
+            ctx.place(item, name, view=view)
+
     if axis == "z":
         # Vertical turning axis (the common case): OD across the top of the front
         # (profile) view; axis centrelines vertical on front + side.
@@ -4640,21 +4649,21 @@ def render_rotational(dwg, plan, a, *, ctx) -> int:
                 measurement=od_dim.id,
             )
             n += 1
-        ctx.place(
+        _place_axis_centerline(
             _global_axis_centerline(
                 (FX(a.cx), FZ(a.bb.min.Z) - 5, 0),
                 (FX(a.cx), FZ(a.bb.max.Z) + 5, 0),
             ),
             "centerline_front",
-            view="front",
+            "front",
         )
-        ctx.place(
+        _place_axis_centerline(
             _global_axis_centerline(
                 (SX(a.cy), SZ(a.bb.min.Z) - 5, 0),
                 (SX(a.cy), SZ(a.bb.max.Z) + 5, 0),
             ),
             "centerline_side",
-            view="side",
+            "side",
         )
 
         # Concentric bore leaders to the left of the front view, centred on the axis.
@@ -4738,21 +4747,21 @@ def render_rotational(dwg, plan, a, *, ctx) -> int:
                 measurement=od_dim.id,
             )
             n += 1
-        ctx.place(
+        _place_axis_centerline(
             _global_axis_centerline(
                 (FX(a.bb.min.X) - 5, FZ(a.cz), 0),
                 (FX(a.bb.max.X) + 5, FZ(a.cz), 0),
             ),
             "centerline_front",
-            view="front",
+            "front",
         )
-        ctx.place(
+        _place_axis_centerline(
             _global_axis_centerline(
                 (PX(a.bb.min.X) - 5, PY(a.cy), 0),
                 (PX(a.bb.max.X) + 5, PY(a.cy), 0),
             ),
             "centerline_plan",
-            view="plan",
+            "plan",
         )
     elif axis == "y":
         # Horizontal turning axis along Y (#222): the OD is the Z extent — a vertical
@@ -4774,21 +4783,21 @@ def render_rotational(dwg, plan, a, *, ctx) -> int:
                 measurement=od_dim.id,
             )
             n += 1
-        ctx.place(
+        _place_axis_centerline(
             _global_axis_centerline(
                 (SX(a.bb.min.Y) - 5, SZ(a.cz), 0),
                 (SX(a.bb.max.Y) + 5, SZ(a.cz), 0),
             ),
             "centerline_side",
-            view="side",
+            "side",
         )
-        ctx.place(
+        _place_axis_centerline(
             _global_axis_centerline(
                 (PX(a.cx), PY(a.bb.min.Y) - 5, 0),
                 (PX(a.cx), PY(a.bb.max.Y) + 5, 0),
             ),
             "centerline_plan",
-            view="plan",
+            "plan",
         )
     return n
 
@@ -4813,6 +4822,8 @@ def render_local_turned_centerlines(dwg, a, *, ctx) -> int:
 
     def _place(item, name, view):
         nonlocal placed
+        if view not in dwg.views:
+            return
         if ctx.registry.named(name) is not None:
             return
         ctx.place(item, name, view=view)