@mlightcad/cad-simple-viewer 1.6.1 → 1.6.2

package/lib/command/measure/entity/AcApMeasureArcEntity.d.ts

@@ -1,14 +1,19 @@
-import type { AcDbDatabase } from '@mlightcad/data-model';
+import { type AcDbDatabase } from '@mlightcad/data-model';
 import { type AcApMeasurementStyle } from '../../../util';
 import type { AcTrView2d } from '../../../view';
 import type { AcApMeasurementRecord } from '../AcApMeasurementTypes';
 import { type AcApMeasureCircleGeom } from './AcApMeasureDrawUtil';
 import { AcApMeasureEntity, type AcApMeasureEntityOptions, type AcApMeasureWorldDrawResult } from './AcApMeasureEntity';
+type Point2 = {
+    x: number;
+    y: number;
+};
 /**
  * Arc-length measurement overlay entity.
  *
- * Renders a canvas stroke of the shorter arc between two points on a circle,
- * HTML dots at the endpoints, and a length badge at the arc midpoint.
+ * Renders a canvas stroke of the measured arc (the sweep that contains
+ * {@link through} when present, otherwise the shorter arc), HTML dots at
+ * the control points, and a length badge at the arc midpoint.
  * Redraws the arc on view changes.
  */
 export declare class AcApMeasureArcEntity extends AcApMeasureEntity {
@@ -16,6 +21,8 @@ export declare class AcApMeasureArcEntity extends AcApMeasureEntity {
     private readonly geom;
     /** Arc start point in world XY. */
     private readonly start;
+    /** Optional point on the measured sweep (distinguishes major vs minor arc). */
+    private readonly through;
     /** Arc end point in world XY. */
     private readonly end;
     /**
@@ -25,14 +32,13 @@ export declare class AcApMeasureArcEntity extends AcApMeasureEntity {
      * @param start - Arc start point in world XY
      * @param end - Arc end point in world XY
      * @param options - Shared id, layout, and style options
+     * @param through - Point on the measured sweep; omit for legacy short-arc records
      */
-    constructor(geom: AcApMeasureCircleGeom, start: {
-        x: number;
-        y: number;
-    }, end: {
-        x: number;
-        y: number;
-    }, options: AcApMeasureEntityOptions);
+    constructor(geom: AcApMeasureCircleGeom, start: Point2, end: Point2, options: AcApMeasureEntityOptions, through?: Point2);
+    /**
+     * Reconstructs the measured sweep from stored control points.
+     */
+    private resolveMeasuredArc;
     /**
      * Factory that builds an arc entity from circle geometry, endpoints, and style.
      *
@@ -40,23 +46,18 @@ export declare class AcApMeasureArcEntity extends AcApMeasureEntity {
      * @param start - Arc start point in world XY
      * @param end - Arc end point in world XY
      * @param style - Measurement visual style
-     * @param options - Optional id and layout overrides
+     * @param options - Optional id, layout, and through-point overrides
      * @returns New {@link AcApMeasureArcEntity}
      */
-    static create(geom: AcApMeasureCircleGeom, start: {
-        x: number;
-        y: number;
-    }, end: {
-        x: number;
-        y: number;
-    }, style: AcApMeasurementStyle, options?: {
+    static create(geom: AcApMeasureCircleGeom, start: Point2, end: Point2, style: AcApMeasurementStyle, options?: {
         id?: string;
         layoutId?: string;
+        through?: Point2;
     }): AcApMeasureArcEntity;
     /**
-     * Primary anchor for the measurement (midpoint of the shorter arc).
+     * Primary anchor for the measurement (midpoint of the measured sweep).
      *
-     * @returns World point on the shorter arc between {@link start} and {@link end}
+     * @returns World point on the arc between {@link start} and {@link end}
      */
     primaryPoint(): {
         x: number;
@@ -67,11 +68,11 @@ export declare class AcApMeasureArcEntity extends AcApMeasureEntity {
      * Serializes this arc measurement to a store/sidecar record.
      *
      * @param layoutId - Optional layout BTR id written onto the record
-     * @returns Record with `type: 'arc'` and center/radius/start/end geometry
+     * @returns Record with `type: 'arc'` and center/radius/start/through/end geometry
      */
     toRecord(layoutId?: string): AcApMeasurementRecord;
     /**
-     * Draws the arc canvas stroke, endpoint dots, length badge, and extras.
+     * Draws the arc canvas stroke, control-point dots, length badge, and extras.
      *
      * Registers a `viewChanged` listener to repaint the arc; dispose extras
      * remove the listener.
@@ -82,4 +83,5 @@ export declare class AcApMeasureArcEntity extends AcApMeasureEntity {
      */
     protected subWorldDrawWithDb(view: AcTrView2d, db: AcDbDatabase): AcApMeasureWorldDrawResult;
 }
+export {};
 //# sourceMappingURL=AcApMeasureArcEntity.d.ts.map

package/lib/command/measure/entity/AcApMeasureArcEntity.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AcApMeasureArcEntity.d.ts","sourceRoot":"","sources":["../../../../src/command/measure/entity/AcApMeasureArcEntity.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAA;AAOzD,OAAO,EAEL,KAAK,oBAAoB,EACD,MAAM,eAAe,CAAA;AAC/C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAM/C,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAA;AACpE,OAAO,EACL,KAAK,qBAAqB,EAI3B,MAAM,uBAAuB,CAAA;AAC9B,OAAO,EACL,iBAAiB,EACjB,KAAK,wBAAwB,EAC7B,KAAK,0BAA0B,EAChC,MAAM,qBAAqB,CAAA;AAE5B;;;;;;GAMG;AACH,qBAAa,oBAAqB,SAAQ,iBAAiB;IACzD,0DAA0D;IAC1D,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAuB;IAC5C,mCAAmC;IACnC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAA0B;IAChD,iCAAiC;IACjC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAA0B;IAE9C;;;;;;;OAOG;gBAED,IAAI,EAAE,qBAAqB,EAC3B,KAAK,EAAE;QAAE,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAA;KAAE,EAC/B,GAAG,EAAE;QAAE,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAA;KAAE,EAC7B,OAAO,EAAE,wBAAwB;IAQnC;;;;;;;;;OASG;IACH,MAAM,CAAC,MAAM,CACX,IAAI,EAAE,qBAAqB,EAC3B,KAAK,EAAE;QAAE,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAA;KAAE,EAC/B,GAAG,EAAE;QAAE,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAA;KAAE,EAC7B,KAAK,EAAE,oBAAoB,EAC3B,OAAO,CAAC,EAAE;QAAE,EAAE,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,GAC3C,oBAAoB;IAQvB;;;;OAIG;IACM,YAAY;;;;;IAIrB;;;;;OAKG;IACH,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,qBAAqB;IAgBlD;;;;;;;;;OASG;IACH,SAAS,CAAC,kBAAkB,CAC1B,IAAI,EAAE,UAAU,EAChB,EAAE,EAAE,YAAY,GACf,0BAA0B;CAkE9B"}
+{"version":3,"file":"AcApMeasureArcEntity.d.ts","sourceRoot":"","sources":["../../../../src/command/measure/entity/AcApMeasureArcEntity.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAiB,MAAM,uBAAuB,CAAA;AAOxE,OAAO,EAEL,KAAK,oBAAoB,EAE1B,MAAM,eAAe,CAAA;AACtB,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAG/C,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAA;AACpE,OAAO,EACL,KAAK,qBAAqB,EAE3B,MAAM,uBAAuB,CAAA;AAC9B,OAAO,EACL,iBAAiB,EACjB,KAAK,wBAAwB,EAC7B,KAAK,0BAA0B,EAChC,MAAM,qBAAqB,CAAA;AAE5B,KAAK,MAAM,GAAG;IAAE,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAA;CAAE,CAAA;AAEtC;;;;;;;GAOG;AACH,qBAAa,oBAAqB,SAAQ,iBAAiB;IACzD,0DAA0D;IAC1D,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAuB;IAC5C,mCAAmC;IACnC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAQ;IAC9B,+EAA+E;IAC/E,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAoB;IAC5C,iCAAiC;IACjC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAQ;IAE5B;;;;;;;;OAQG;gBAED,IAAI,EAAE,qBAAqB,EAC3B,KAAK,EAAE,MAAM,EACb,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,wBAAwB,EACjC,OAAO,CAAC,EAAE,MAAM;IASlB;;OAEG;IACH,OAAO,CAAC,kBAAkB;IAc1B;;;;;;;;;OASG;IACH,MAAM,CAAC,MAAM,CACX,IAAI,EAAE,qBAAqB,EAC3B,KAAK,EAAE,MAAM,EACb,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,oBAAoB,EAC3B,OAAO,CAAC,EAAE;QAAE,EAAE,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,GAC7D,oBAAoB;IAcvB;;;;OAIG;IACM,YAAY;;;;;IAOrB;;;;;OAKG;IACH,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,qBAAqB;IAmBlD;;;;;;;;;OASG;IACH,SAAS,CAAC,kBAAkB,CAC1B,IAAI,EAAE,UAAU,EAChB,EAAE,EAAE,YAAY,GACf,0BAA0B;CA6E9B"}

package/lib/command/measure/entity/AcApMeasureArcEntity.js

@@ -13,17 +13,55 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+var __read = (this && this.__read) || function (o, n) {
+    var m = typeof Symbol === "function" && o[Symbol.iterator];
+    if (!m) return o;
+    var i = m.call(o), r, ar = [], e;
+    try {
+        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+    }
+    catch (error) { e = { error: error }; }
+    finally {
+        try {
+            if (r && !r.done && (m = i["return"])) m.call(i);
+        }
+        finally { if (e) throw e.error; }
+    }
+    return ar;
+};
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
+import { AcGeCircArc2d } from '@mlightcad/data-model';
 import { AcTrHtmlBadge, AcTrHtmlCanvasOverlay, AcTrHtmlDot } from '@mlightcad/three-renderer';
 import { acapMeasurementCanvasLineWidth, formatMeasurementLength } from '../../../util';
 import { serializeMeasurementStyle } from '../AcApMeasurementSidecar';
 import { getMeasurementStyle, MEASUREMENT_LAYER } from '../AcApMeasurementStore';
-import { drawMeasureArcOnCanvas, measureShortArcLength, measureShortArcMid } from './AcApMeasureDrawUtil';
+import { drawMeasureArcOnCanvas } from './AcApMeasureDrawUtil';
 import { AcApMeasureEntity } from './AcApMeasureEntity';
 /**
  * Arc-length measurement overlay entity.
  *
- * Renders a canvas stroke of the shorter arc between two points on a circle,
- * HTML dots at the endpoints, and a length badge at the arc midpoint.
+ * Renders a canvas stroke of the measured arc (the sweep that contains
+ * {@link through} when present, otherwise the shorter arc), HTML dots at
+ * the control points, and a length badge at the arc midpoint.
  * Redraws the arc on view changes.
  */
 var AcApMeasureArcEntity = /** @class */ (function (_super) {
@@ -35,15 +73,29 @@ var AcApMeasureArcEntity = /** @class */ (function (_super) {
      * @param start - Arc start point in world XY
      * @param end - Arc end point in world XY
      * @param options - Shared id, layout, and style options
+     * @param through - Point on the measured sweep; omit for legacy short-arc records
      */
-    function AcApMeasureArcEntity(geom, start, end, options) {
+    function AcApMeasureArcEntity(geom, start, end, options, through) {
         var _a;
         var _this = _super.call(this, (_a = options.id) !== null && _a !== void 0 ? _a : "arc-".concat(Date.now()), options.layoutId, options.style) || this;
         _this.geom = geom;
         _this.start = start;
         _this.end = end;
+        _this.through = through;
         return _this;
     }
+    /**
+     * Reconstructs the measured sweep from stored control points.
+     */
+    AcApMeasureArcEntity.prototype.resolveMeasuredArc = function () {
+        if (this.through) {
+            return AcGeCircArc2d.tryCreateByThreePoints(this.start, this.through, this.end);
+        }
+        return AcGeCircArc2d.tryCreateShorterArc(this.start, this.end, {
+            x: this.geom.cx,
+            y: this.geom.cy
+        });
+    };
     /**
      * Factory that builds an arc entity from circle geometry, endpoints, and style.
      *
@@ -51,7 +103,7 @@ var AcApMeasureArcEntity = /** @class */ (function (_super) {
      * @param start - Arc start point in world XY
      * @param end - Arc end point in world XY
      * @param style - Measurement visual style
-     * @param options - Optional id and layout overrides
+     * @param options - Optional id, layout, and through-point overrides
      * @returns New {@link AcApMeasureArcEntity}
      */
     AcApMeasureArcEntity.create = function (geom, start, end, style, options) {
@@ -59,21 +111,25 @@ var AcApMeasureArcEntity = /** @class */ (function (_super) {
             style: style,
             id: options === null || options === void 0 ? void 0 : options.id,
             layoutId: options === null || options === void 0 ? void 0 : options.layoutId
-        });
+        }, options === null || options === void 0 ? void 0 : options.through);
     };
     /**
-     * Primary anchor for the measurement (midpoint of the shorter arc).
+     * Primary anchor for the measurement (midpoint of the measured sweep).
      *
-     * @returns World point on the shorter arc between {@link start} and {@link end}
+     * @returns World point on the arc between {@link start} and {@link end}
      */
     AcApMeasureArcEntity.prototype.primaryPoint = function () {
-        return measureShortArcMid(this.start, this.end, this.geom);
+        var _a;
+        var mid = (_a = this.resolveMeasuredArc()) === null || _a === void 0 ? void 0 : _a.midPoint;
+        return mid
+            ? { x: mid.x, y: mid.y, z: 0 }
+            : { x: this.start.x, y: this.start.y, z: 0 };
     };
     /**
      * Serializes this arc measurement to a store/sidecar record.
      *
      * @param layoutId - Optional layout BTR id written onto the record
-     * @returns Record with `type: 'arc'` and center/radius/start/end geometry
+     * @returns Record with `type: 'arc'` and center/radius/start/through/end geometry
      */
     AcApMeasureArcEntity.prototype.toRecord = function (layoutId) {
         return {
@@ -81,17 +137,13 @@ var AcApMeasureArcEntity = /** @class */ (function (_super) {
             type: 'arc',
             layoutId: layoutId,
             style: serializeMeasurementStyle(this.style),
-            geometry: {
-                type: 'arc',
-                center: { x: this.geom.cx, y: this.geom.cy },
-                radius: this.geom.r,
-                start: { x: this.start.x, y: this.start.y },
-                end: { x: this.end.x, y: this.end.y }
-            }
+            geometry: __assign({ type: 'arc', center: { x: this.geom.cx, y: this.geom.cy }, radius: this.geom.r, start: { x: this.start.x, y: this.start.y }, end: { x: this.end.x, y: this.end.y } }, (this.through
+                ? { through: { x: this.through.x, y: this.through.y } }
+                : {}))
         };
     };
     /**
-     * Draws the arc canvas stroke, endpoint dots, length badge, and extras.
+     * Draws the arc canvas stroke, control-point dots, length badge, and extras.
      *
      * Registers a `viewChanged` listener to repaint the arc; dispose extras
      * remove the listener.
@@ -101,10 +153,12 @@ var AcApMeasureArcEntity = /** @class */ (function (_super) {
      * @returns World-draw result including redraw/dispose hooks
      */
     AcApMeasureArcEntity.prototype.subWorldDrawWithDb = function (view, db) {
+        var _a;
         var _this = this;
+        var _b, _c;
         var color = this.style.color;
-        var arcLen = measureShortArcLength(this.start, this.end, this.geom);
-        var mid = measureShortArcMid(this.start, this.end, this.geom);
+        var arcLen = (_c = (_b = this.resolveMeasuredArc()) === null || _b === void 0 ? void 0 : _b.length) !== null && _c !== void 0 ? _c : 0;
+        var mid = this.primaryPoint();
         var layoutId = this.resolveLayoutId(view);
         var persistOverlay = new AcTrHtmlCanvasOverlay({
             id: "arc-canvas-".concat(this.entityId),
@@ -114,31 +168,40 @@ var AcApMeasureArcEntity = /** @class */ (function (_super) {
         });
         var paintArc = function (paintStyle) {
             if (paintStyle === void 0) { paintStyle = _this.style; }
-            return drawMeasureArcOnCanvas(persistOverlay.canvas, view, _this.geom, _this.start, _this.end, paintStyle.color, acapMeasurementCanvasLineWidth(paintStyle.lineWeight));
+            return drawMeasureArcOnCanvas(persistOverlay.canvas, view, _this.geom, _this.start, _this.end, paintStyle.color, acapMeasurementCanvasLineWidth(paintStyle.lineWeight), _this.through);
         };
         paintArc();
         var redrawPersist = function () { var _a; return paintArc((_a = getMeasurementStyle(_this.entityId)) !== null && _a !== void 0 ? _a : _this.style); };
         view.events.viewChanged.addEventListener(redrawPersist);
-        var group = this.createGroup(view)
-            .add(new AcTrHtmlDot({
-            id: "".concat(this.entityId, "-dot1"),
-            color: color,
-            worldPosition: this.start,
-            layer: MEASUREMENT_LAYER
-        }), new AcTrHtmlDot({
-            id: "".concat(this.entityId, "-dot2"),
-            color: color,
-            worldPosition: this.end,
-            layer: MEASUREMENT_LAYER
-        }), new AcTrHtmlBadge({
-            id: "".concat(this.entityId, "-badge"),
-            color: color,
-            text: formatMeasurementLength(db, arcLen),
-            worldPosition: mid,
-            layer: MEASUREMENT_LAYER,
-            fontSize: this.style.fontSize
-        }))
-            .addCanvas(persistOverlay);
+        var group = (_a = this.createGroup(view))
+            .add.apply(_a, __spreadArray(__spreadArray([new AcTrHtmlDot({
+                id: "".concat(this.entityId, "-dot1"),
+                color: color,
+                worldPosition: this.start,
+                layer: MEASUREMENT_LAYER
+            })], __read((this.through
+            ? [
+                new AcTrHtmlDot({
+                    id: "".concat(this.entityId, "-dot-through"),
+                    color: color,
+                    worldPosition: this.through,
+                    layer: MEASUREMENT_LAYER
+                })
+            ]
+            : [])), false), [new AcTrHtmlDot({
+                id: "".concat(this.entityId, "-dot2"),
+                color: color,
+                worldPosition: this.end,
+                layer: MEASUREMENT_LAYER
+            }),
+            new AcTrHtmlBadge({
+                id: "".concat(this.entityId, "-badge"),
+                color: color,
+                text: formatMeasurementLength(db, arcLen),
+                worldPosition: mid,
+                layer: MEASUREMENT_LAYER,
+                fontSize: this.style.fontSize
+            })], false)).addCanvas(persistOverlay);
         return {
             group: group,
             entityIds: [],

package/lib/command/measure/entity/AcApMeasureArcEntity.js.map

@@ -1 +1 @@
-{"version":3,"file":"AcApMeasureArcEntity.js","sourceRoot":"","sources":["../../../../src/command/measure/entity/AcApMeasureArcEntity.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"AcApMeasureArcEntity.js","sourceRoot":"","sources":["../../../../src/command/measure/entity/AcApMeasureArcEntity.ts"],"names":[],"mappings":"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"}

package/lib/command/measure/entity/AcApMeasureDrawUtil.d.ts

@@ -1,5 +1,16 @@
-import type { AcCmColor } from '@mlightcad/data-model';
+import { type AcCmColor } from '@mlightcad/data-model';
 import type { AcEdBaseView } from '../../../editor';
+/**
+ * Circle geometry in world XY used by arc-length measurement overlays.
+ */
+export interface AcApMeasureCircleGeom {
+    /** Circle center X in world coordinates. */
+    cx: number;
+    /** Circle center Y in world coordinates. */
+    cy: number;
+    /** Circle radius in world units. */
+    r: number;
+}
 /**
  * Two-dimensional point in world or screen space (XY only).
  */
@@ -50,53 +61,39 @@ export declare function drawMeasureAngleArcOnCanvas(canvas: HTMLCanvasElement, v
  */
 export declare function drawMeasureAreaOnCanvas(canvas: HTMLCanvasElement, view: AcEdBaseView, points: Point2[], color: AcCmColor, lineWidth?: number): void;
 /**
- * Circle geometry in world XY used by arc-length measurements.
+ * Strokes a circular arc onto an already-prepared measure overlay context.
+ *
+ * When `through` is given, the sweep that contains it is drawn (including
+ * major arcs over 180 degrees). Otherwise the shorter screen-space arc is
+ * used so legacy sidecar records without a through point keep their previous
+ * look.
+ *
+ * @param ctx - Overlay context in CSS pixels
+ * @param view - View for world-to-screen conversion
+ * @param g - Circle center and radius in world coordinates
+ * @param start - Arc start in world coordinates
+ * @param end - Arc end in world coordinates
+ * @param color - Stroke color
+ * @param lineWidth - Stroke width in CSS pixels
+ * @param through - Optional point on the measured sweep
  */
-export interface AcApMeasureCircleGeom {
-    /** Circle center X in world coordinates. */
-    cx: number;
-    /** Circle center Y in world coordinates. */
-    cy: number;
-    /** Circle radius in world units. */
-    r: number;
-}
+export declare function strokeMeasureArcOnContext(ctx: CanvasRenderingContext2D, view: AcEdBaseView, g: AcApMeasureCircleGeom, start: Point2, end: Point2, color: AcCmColor, lineWidth: number, through?: Point2): void;
 /**
- * Strokes the shorter arc between two points on a circle onto a measure canvas.
+ * Strokes an arc between two points on a circle onto a measure canvas.
  *
- * Screen radius is taken from the distance of `p1` to the projected center so
- * the stroke tracks the circle under the current view transform.
+ * Screen radius is taken from the distance of `start` to the projected center
+ * so the stroke tracks the circle under the current view transform.
  *
  * @param canvas - Overlay canvas to paint
  * @param view - View for world-to-screen conversion and canvas sizing
  * @param g - Circle center and radius in world coordinates
- * @param p1 - Arc start point in world coordinates (on or near the circle)
- * @param p2 - Arc end point in world coordinates (on or near the circle)
+ * @param start - Arc start point in world coordinates (on or near the circle)
+ * @param end - Arc end point in world coordinates (on or near the circle)
  * @param color - Stroke color
  * @param lineWidth - Stroke width in CSS pixels (default `4`)
+ * @param through - Optional point on the measured sweep (major vs minor arc)
  */
-export declare function drawMeasureArcOnCanvas(canvas: HTMLCanvasElement, view: AcEdBaseView, g: AcApMeasureCircleGeom, p1: Point2, p2: Point2, color: AcCmColor, lineWidth?: number): void;
-/**
- * Computes the shorter arc length between two points on a circle.
- *
- * @param p1 - First point in world coordinates
- * @param p2 - Second point in world coordinates
- * @param g - Circle center and radius
- * @returns Arc length along the shorter sector (`min(span, 2π − span) × r`)
- */
-export declare function measureShortArcLength(p1: Point2, p2: Point2, g: AcApMeasureCircleGeom): number;
-/**
- * Finds the midpoint of the shorter arc between two points on a circle.
- *
- * @param p1 - Arc start in world coordinates
- * @param p2 - Arc end in world coordinates
- * @param g - Circle center and radius
- * @returns Midpoint on the shorter arc with `z: 0`
- */
-export declare function measureShortArcMid(p1: Point2, p2: Point2, g: AcApMeasureCircleGeom): {
-    x: number;
-    y: number;
-    z: number;
-};
+export declare function drawMeasureArcOnCanvas(canvas: HTMLCanvasElement, view: AcEdBaseView, g: AcApMeasureCircleGeom, start: Point2, end: Point2, color: AcCmColor, lineWidth?: number, through?: Point2): void;
 /**
  * Computes polygon area using the shoelace formula.
  *

package/lib/command/measure/entity/AcApMeasureDrawUtil.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AcApMeasureDrawUtil.d.ts","sourceRoot":"","sources":["../../../../src/command/measure/entity/AcApMeasureDrawUtil.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAA;AAEtD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAA;AAGnD;;GAEG;AACH,KAAK,MAAM,GAAG;IACZ,oBAAoB;IACpB,CAAC,EAAE,MAAM,CAAA;IACT,oBAAoB;IACpB,CAAC,EAAE,MAAM,CAAA;CACV,CAAA;AAkDD;;;;;;;;;GASG;AACH,wBAAgB,0BAA0B,CACxC,MAAM,EAAE,iBAAiB,EACzB,IAAI,EAAE,YAAY,EAClB,EAAE,EAAE,MAAM,EACV,EAAE,EAAE,MAAM,EACV,KAAK,EAAE,SAAS,EAChB,SAAS,SAAI,GACZ,IAAI,CAaN;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,2BAA2B,CACzC,MAAM,EAAE,iBAAiB,EACzB,IAAI,EAAE,YAAY,EAClB,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,SAAS,EAChB,SAAS,SAAI,GACZ,IAAI,CA8BN;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,iBAAiB,EACzB,IAAI,EAAE,YAAY,EAClB,MAAM,EAAE,MAAM,EAAE,EAChB,KAAK,EAAE,SAAS,EAChB,SAAS,SAAM,GACd,IAAI,CAmBN;AAED;;GAEG;AACH,MAAM,WAAW,qBAAqB;IACpC,4CAA4C;IAC5C,EAAE,EAAE,MAAM,CAAA;IACV,4CAA4C;IAC5C,EAAE,EAAE,MAAM,CAAA;IACV,oCAAoC;IACpC,CAAC,EAAE,MAAM,CAAA;CACV;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,iBAAiB,EACzB,IAAI,EAAE,YAAY,EAClB,CAAC,EAAE,qBAAqB,EACxB,EAAE,EAAE,MAAM,EACV,EAAE,EAAE,MAAM,EACV,KAAK,EAAE,SAAS,EAChB,SAAS,SAAI,GACZ,IAAI,CAqBN;AAED;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,CACnC,EAAE,EAAE,MAAM,EACV,EAAE,EAAE,MAAM,EACV,CAAC,EAAE,qBAAqB,GACvB,MAAM,CAKR;AAED;;;;;;;GAOG;AACH,wBAAgB,kBAAkB,CAChC,EAAE,EAAE,MAAM,EACV,EAAE,EAAE,MAAM,EACV,CAAC,EAAE,qBAAqB,GACvB;IAAE,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAA;CAAE,CAOrC;AAED;;;;;GAKG;AACH,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,MAAM,CASzD;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG;IAAE,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAA;CAAE,CAIvE;AAED;;;;;;;;;GASG;AACH,wBAAgB,eAAe,CAC7B,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,GACX,MAAM,CASR"}
+{"version":3,"file":"AcApMeasureDrawUtil.d.ts","sourceRoot":"","sources":["../../../../src/command/measure/entity/AcApMeasureDrawUtil.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,SAAS,EAGf,MAAM,uBAAuB,CAAA;AAE9B,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAA;AAGnD;;GAEG;AACH,MAAM,WAAW,qBAAqB;IACpC,4CAA4C;IAC5C,EAAE,EAAE,MAAM,CAAA;IACV,4CAA4C;IAC5C,EAAE,EAAE,MAAM,CAAA;IACV,oCAAoC;IACpC,CAAC,EAAE,MAAM,CAAA;CACV;AAED;;GAEG;AACH,KAAK,MAAM,GAAG;IACZ,oBAAoB;IACpB,CAAC,EAAE,MAAM,CAAA;IACT,oBAAoB;IACpB,CAAC,EAAE,MAAM,CAAA;CACV,CAAA;AAyCD;;;;;;;;;GASG;AACH,wBAAgB,0BAA0B,CACxC,MAAM,EAAE,iBAAiB,EACzB,IAAI,EAAE,YAAY,EAClB,EAAE,EAAE,MAAM,EACV,EAAE,EAAE,MAAM,EACV,KAAK,EAAE,SAAS,EAChB,SAAS,SAAI,GACZ,IAAI,CAaN;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,2BAA2B,CACzC,MAAM,EAAE,iBAAiB,EACzB,IAAI,EAAE,YAAY,EAClB,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,SAAS,EAChB,SAAS,SAAI,GACZ,IAAI,CA+BN;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,iBAAiB,EACzB,IAAI,EAAE,YAAY,EAClB,MAAM,EAAE,MAAM,EAAE,EAChB,KAAK,EAAE,SAAS,EAChB,SAAS,SAAM,GACd,IAAI,CAmBN;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,yBAAyB,CACvC,GAAG,EAAE,wBAAwB,EAC7B,IAAI,EAAE,YAAY,EAClB,CAAC,EAAE,qBAAqB,EACxB,KAAK,EAAE,MAAM,EACb,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,SAAS,EAChB,SAAS,EAAE,MAAM,EACjB,OAAO,CAAC,EAAE,MAAM,GACf,IAAI,CAqBN;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,iBAAiB,EACzB,IAAI,EAAE,YAAY,EAClB,CAAC,EAAE,qBAAqB,EACxB,KAAK,EAAE,MAAM,EACb,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,SAAS,EAChB,SAAS,SAAI,EACb,OAAO,CAAC,EAAE,MAAM,GACf,IAAI,CAcN;AAED;;;;;GAKG;AACH,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,MAAM,CASzD;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG;IAAE,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAA;CAAE,CAIvE;AAED;;;;;;;;;GASG;AACH,wBAAgB,eAAe,CAC7B,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,GACX,MAAM,CASR"}

package/lib/command/measure/entity/AcApMeasureDrawUtil.js

@@ -1,3 +1,4 @@
+import { AcGeCircArc2d, AcGeMathUtil } from '@mlightcad/data-model';
 import { acapColorToCssAlpha, acapCssColor } from '../../../util';
 /**
  * Sizes and clears a measure overlay canvas to match the view viewport.
@@ -32,15 +33,6 @@ function prepareMeasureCanvas(canvas, view) {
     ctx.scale(dpr, dpr);
     return { ctx: ctx, dpr: dpr };
 }
-/**
- * Normalizes an angle in radians to the half-open interval `[0, 2π)`.
- *
- * @param a - Angle in radians (any real value)
- * @returns Equivalent angle in `[0, 2π)`
- */
-var normaliseAngle = function (a) {
-    return ((a % (2 * Math.PI)) + 2 * Math.PI) % (2 * Math.PI);
-};
 /**
  * Strokes a single world-space segment onto a measure overlay canvas.
  *
@@ -104,7 +96,7 @@ export function drawMeasureAngleArcOnCanvas(canvas, view, vertex, arm1, arm2, co
     var arcR = Math.max(Math.min(len1, len2) * 0.3, 15);
     var startAngle = Math.atan2(sa1.y - sv.y, sa1.x - sv.x);
     var endAngle = Math.atan2(sa2.y - sv.y, sa2.x - sv.x);
-    var antiClockwise = normaliseAngle(endAngle - startAngle) > Math.PI;
+    var antiClockwise = AcGeMathUtil.normalizeAngle(endAngle - startAngle) > Math.PI;
     ctx.beginPath();
     ctx.arc(sv.x, sv.y, arcR, startAngle, endAngle, antiClockwise);
     ctx.stroke();
@@ -144,68 +136,65 @@ export function drawMeasureAreaOnCanvas(canvas, view, points, color, lineWidth)
     ctx.restore();
 }
 /**
- * Strokes the shorter arc between two points on a circle onto a measure canvas.
+ * Strokes a circular arc onto an already-prepared measure overlay context.
  *
- * Screen radius is taken from the distance of `p1` to the projected center so
- * the stroke tracks the circle under the current view transform.
+ * When `through` is given, the sweep that contains it is drawn (including
+ * major arcs over 180 degrees). Otherwise the shorter screen-space arc is
+ * used so legacy sidecar records without a through point keep their previous
+ * look.
  *
- * @param canvas - Overlay canvas to paint
- * @param view - View for world-to-screen conversion and canvas sizing
+ * @param ctx - Overlay context in CSS pixels
+ * @param view - View for world-to-screen conversion
  * @param g - Circle center and radius in world coordinates
- * @param p1 - Arc start point in world coordinates (on or near the circle)
- * @param p2 - Arc end point in world coordinates (on or near the circle)
+ * @param start - Arc start in world coordinates
+ * @param end - Arc end in world coordinates
  * @param color - Stroke color
- * @param lineWidth - Stroke width in CSS pixels (default `4`)
+ * @param lineWidth - Stroke width in CSS pixels
+ * @param through - Optional point on the measured sweep
  */
-export function drawMeasureArcOnCanvas(canvas, view, g, p1, p2, color, lineWidth) {
-    if (lineWidth === void 0) { lineWidth = 4; }
-    var prepared = prepareMeasureCanvas(canvas, view);
-    if (!prepared)
-        return;
-    var ctx = prepared.ctx;
+export function strokeMeasureArcOnContext(ctx, view, g, start, end, color, lineWidth, through) {
     var sc = view.worldToScreen({ x: g.cx, y: g.cy });
-    var ss = view.worldToScreen(p1);
-    var se = view.worldToScreen(p2);
+    var ss = view.worldToScreen(start);
+    var se = view.worldToScreen(end);
     var screenR = Math.hypot(ss.x - sc.x, ss.y - sc.y);
+    if (!(screenR > 0))
+        return;
     var sa = Math.atan2(ss.y - sc.y, ss.x - sc.x);
     var ea = Math.atan2(se.y - sc.y, se.x - sc.x);
-    var cwSpan = normaliseAngle(ea - sa);
-    var antiClockwise = cwSpan > Math.PI;
+    var measured = through
+        ? AcGeCircArc2d.tryCreateByThreePoints(start, through, end)
+        : undefined;
+    var antiClockwise = measured
+        ? !measured.clockwise
+        : AcGeMathUtil.normalizeAngle(ea - sa) > Math.PI;
     ctx.beginPath();
     ctx.arc(sc.x, sc.y, screenR, sa, ea, antiClockwise);
     ctx.strokeStyle = acapCssColor(color);
     ctx.lineWidth = lineWidth;
     ctx.stroke();
-    ctx.restore();
 }
 /**
- * Computes the shorter arc length between two points on a circle.
+ * Strokes an arc between two points on a circle onto a measure canvas.
  *
- * @param p1 - First point in world coordinates
- * @param p2 - Second point in world coordinates
- * @param g - Circle center and radius
- * @returns Arc length along the shorter sector (`min(span, 2π − span) × r`)
- */
-export function measureShortArcLength(p1, p2, g) {
-    var a1 = Math.atan2(p1.y - g.cy, p1.x - g.cx);
-    var a2 = Math.atan2(p2.y - g.cy, p2.x - g.cx);
-    var span = normaliseAngle(a2 - a1);
-    return Math.min(span, 2 * Math.PI - span) * g.r;
-}
-/**
- * Finds the midpoint of the shorter arc between two points on a circle.
+ * Screen radius is taken from the distance of `start` to the projected center
+ * so the stroke tracks the circle under the current view transform.
  *
- * @param p1 - Arc start in world coordinates
- * @param p2 - Arc end in world coordinates
- * @param g - Circle center and radius
- * @returns Midpoint on the shorter arc with `z: 0`
+ * @param canvas - Overlay canvas to paint
+ * @param view - View for world-to-screen conversion and canvas sizing
+ * @param g - Circle center and radius in world coordinates
+ * @param start - Arc start point in world coordinates (on or near the circle)
+ * @param end - Arc end point in world coordinates (on or near the circle)
+ * @param color - Stroke color
+ * @param lineWidth - Stroke width in CSS pixels (default `4`)
+ * @param through - Optional point on the measured sweep (major vs minor arc)
  */
-export function measureShortArcMid(p1, p2, g) {
-    var a1 = Math.atan2(p1.y - g.cy, p1.x - g.cx);
-    var a2 = Math.atan2(p2.y - g.cy, p2.x - g.cx);
-    var ccwSpan = normaliseAngle(a2 - a1);
-    var mid = ccwSpan <= Math.PI ? a1 + ccwSpan / 2 : a1 - (2 * Math.PI - ccwSpan) / 2;
-    return { x: g.cx + g.r * Math.cos(mid), y: g.cy + g.r * Math.sin(mid), z: 0 };
+export function drawMeasureArcOnCanvas(canvas, view, g, start, end, color, lineWidth, through) {
+    if (lineWidth === void 0) { lineWidth = 4; }
+    var prepared = prepareMeasureCanvas(canvas, view);
+    if (!prepared)
+        return;
+    strokeMeasureArcOnContext(prepared.ctx, view, g, start, end, color, lineWidth, through);
+    prepared.ctx.restore();
 }
 /**
  * Computes polygon area using the shoelace formula.