fix(task-17): a rotated sheet's margins turn with it, and a paper-units move is named in changed and warnings
Finding 1: page_setup_list swapped size_mm for plot_rotation 1/3 but reported the margins un-turned, so a 297 x 210 sheet carried its portrait margins ([20, 20, 7.5, 7.5], printable 282 x 170) while ezdxf's Page and _paper_frame plotted [7.5, 7.5, 20, 20] (257 x 195). The mapping now lives once in papers.turned_sheet (cross-checked against Page.from_dxf_layout for all four rotations) and is used by the ezdxf row, _paper_frame and the COM row. page_setup_apply resets plot_rotation to 0; headlessly it now re-writes the turned margins un-turned so the sheet keeps the margins it had (nothing moves, changed says nothing), and on COM, where margins come from the .pc3, the ones that moved show up in changed. Finding 2: both engines forced plot paper units to millimetres with no units field in the row, so an inch-authored ANSI sheet was rescaled 25.4x with ok: True and changed naming only the media. Rows now carry paper_units (mm | inches | pixels, DXF group 72 / AcPlotPaperUnits); resolve_page_setup takes paper_units="mm" (default) | "inches" | None (keep the layout's units, as AutoCAD's own Page Setup does); a move is reported in changed and, with its 25.4x consequence and the way back, in the new warnings list (papers.page_setup_warnings, identical on both engines). Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01FKFStjEFzpGyLq5bMpWxTd
This commit is contained in:
co-authored by
Claude Opus 5
parent
4a6591843f
commit
f2386a9fdd
@@ -16,12 +16,20 @@ class PageSetupContract(ABC):
|
||||
|
||||
Rows: ``{layout, paper, canonical_media_name, size_mm: [w, h],
|
||||
orientation, plot_style, scale, plot_area, device,
|
||||
margins_mm: [top, bottom, left, right], center}``. ``paper`` is the
|
||||
margins_mm: [top, bottom, left, right], paper_units, center}``.
|
||||
``size_mm`` and ``margins_mm`` are the sheet *as plotted*: under
|
||||
``plot_rotation`` 1/3 (AutoCAD's landscape-on-portrait-media
|
||||
convention) both are turned together, through the one mapping the
|
||||
renderer plots by (``papers.turned_sheet``), so the printable area a
|
||||
row implies is the area the same engine plots. ``paper`` is the
|
||||
catalogue name when the size matches one within 0.5 mm, otherwise the
|
||||
media name as stored. ``center`` is a bool for an extents plot and
|
||||
``None`` for a layout plot, where centring is not applicable (AutoCAD
|
||||
greys it out; ActiveX refuses ``CenterPlot = True`` under
|
||||
``acLayout``). Raises ``ValueError`` for an unknown layout.
|
||||
media name as stored. ``paper_units`` (``"mm"`` | ``"inches"`` |
|
||||
``"pixels"``) is what one paper-space unit means at the plot scale;
|
||||
sizes and margins are millimetres whatever it says. ``center`` is a
|
||||
bool for an extents plot and ``None`` for a layout plot, where
|
||||
centring is not applicable (AutoCAD greys it out; ActiveX refuses
|
||||
``CenterPlot = True`` under ``acLayout``). Raises ``ValueError`` for
|
||||
an unknown layout.
|
||||
``Model`` is never listed: model space is plotted through
|
||||
``drawing_export_pdf(layout=None)`` and carries no sheet.
|
||||
"""
|
||||
@@ -33,9 +41,19 @@ class PageSetupContract(ABC):
|
||||
``engineering.standards.papers.resolve_page_setup`` to a layout.
|
||||
|
||||
Returns ``{ok, layout, applied: {...setup}, changed: {key: [old, new]},
|
||||
plot_style_known, viewports_kept}``. ``changed`` is computed from the
|
||||
read-back before and after, so re-applying the same setup reports
|
||||
``{}``. Refuses ``Model``, an unknown layout, and a ``setup`` missing a
|
||||
warnings: [str], plot_style_known, viewports_kept}``. ``changed`` is
|
||||
computed from the read-back before and after (the rows
|
||||
``page_setup_list`` reports), so re-applying the same setup reports
|
||||
``{}``. The write resets ``plot_rotation`` to 0 (orientation rides on
|
||||
the media's width/height); headlessly, with no ``margins_mm`` asked
|
||||
for, the turned margins are re-written un-turned so the sheet keeps
|
||||
the margins it had, and on the live engine (margins come from the
|
||||
.pc3) the ones that moved show in ``changed``. ``setup["paper_units"]``
|
||||
(``"mm"`` default, ``"inches"``, or ``None`` to keep the layout's
|
||||
units as AutoCAD's own Page Setup does) is written when given; a move
|
||||
rescales every paper-space unit by 25.4 at the plot scale and is named
|
||||
in ``changed`` *and* ``warnings`` (``papers.page_setup_warnings``).
|
||||
Refuses ``Model``, an unknown layout, and a ``setup`` missing a
|
||||
resolved key, before anything is written. A write the engine refuses
|
||||
part-way through is unwound (every landed value put back) before the
|
||||
``ValueError`` names the refused property. Never deletes viewports.
|
||||
|
||||
Reference in New Issue
Block a user