@mlightcad/cad-simple-viewer 1.6.3 → 1.7.1

package/lib/util/AcApMeasurementUnits.js

@@ -9,11 +9,84 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
+import { AcDbLinearUnits } from '@mlightcad/data-model';
+/** Sentinel length unit meaning "follow the drawing units" (no conversion). */
+export var MEASUREMENT_LENGTH_UNIT_FOLLOW_DRAWING = -1;
+/** AutoCAD INSUNITS code → scale factor expressed in millimeters. */
+var ACAD_UNIT_TO_MM = {
+    0: 1,
+    1: 25.4,
+    2: 304.8,
+    3: 1609344,
+    4: 1,
+    5: 10,
+    6: 1000,
+    7: 1000000,
+    8: 0.0000254,
+    9: 0.0254,
+    10: 914.4,
+    11: 0.0000001,
+    12: 0.000001,
+    13: 0.001,
+    14: 100,
+    15: 10000,
+    16: 100000,
+    17: 1000000000000,
+    18: 149597870700000,
+    19: 9.4607304725808e18,
+    20: 3.085677581491367e19,
+    21: 304.80060960121926,
+    22: 25.400050800101603,
+    23: 914.4018288036576,
+    24: 1609347.2186944375
+};
+/** Short Latin suffixes shown after converted measurement lengths. */
+var ACAD_UNIT_SYMBOLS = {
+    1: 'in',
+    2: 'ft',
+    4: 'mm',
+    5: 'cm',
+    6: 'm',
+    7: 'km',
+    10: 'yd'
+};
+function acapUnitToMm(unit) {
+    var _a;
+    if (!Number.isFinite(unit))
+        return 1;
+    return (_a = ACAD_UNIT_TO_MM[Math.trunc(unit)]) !== null && _a !== void 0 ? _a : 1;
+}
+/** Scale a value expressed in `fromUnit` so it is expressed in `toUnit`. */
+export function convertLengthValue(value, fromUnit, toUnit) {
+    var toMm = acapUnitToMm(toUnit);
+    if (toMm === 0)
+        return value;
+    return value * (acapUnitToMm(fromUnit) / toMm);
+}
+/** Scale an area expressed in `fromUnit` so it is expressed in `toUnit`. */
+export function convertAreaValue(value, fromUnit, toUnit) {
+    var factor = convertLengthValue(1, fromUnit, toUnit);
+    return value * factor * factor;
+}
+/** Short symbol for a length-unit code, or empty when unknown / follow-drawing. */
+export function measurementLengthUnitSymbol(unit) {
+    var _a;
+    return (_a = ACAD_UNIT_SYMBOLS[Math.trunc(unit)]) !== null && _a !== void 0 ? _a : '';
+}
 /** Display flags for length / area / coordinate measurement labels. */
 export var MEASUREMENT_LENGTH_FORMAT_OPTIONS = {
     showUnits: true,
     showApproximate: true
 };
+/**
+ * Display flags for a length already rescaled to another physical unit. The
+ * formatter must not add the drawing suffix — the target unit symbol is
+ * appended by the caller.
+ */
+var MEASUREMENT_CONVERTED_LENGTH_FORMAT_OPTIONS = {
+    showUnits: false,
+    showApproximate: true
+};
 /** Display flags for included-angle measurement labels. */
 export var MEASUREMENT_ANGLE_FORMAT_OPTIONS = {
     showUnits: true,
@@ -33,12 +106,13 @@ function asUnitHeader(db) {
  * control, otherwise the current drawing units.
  */
 export function getEffectiveMeasurementUnits(db) {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e;
     return {
         lunits: (_a = measurementUnitOverride.lunits) !== null && _a !== void 0 ? _a : db.lunits,
         luprec: (_b = measurementUnitOverride.luprec) !== null && _b !== void 0 ? _b : db.luprec,
         aunits: (_c = measurementUnitOverride.aunits) !== null && _c !== void 0 ? _c : db.aunits,
-        auprec: (_d = measurementUnitOverride.auprec) !== null && _d !== void 0 ? _d : db.auprec
+        auprec: (_d = measurementUnitOverride.auprec) !== null && _d !== void 0 ? _d : db.auprec,
+        lengthUnit: (_e = measurementUnitOverride.lengthUnit) !== null && _e !== void 0 ? _e : MEASUREMENT_LENGTH_UNIT_FOLLOW_DRAWING
     };
 }
 /** Fields the user has overridden on the Measurement ribbon unit panels. */
@@ -58,6 +132,8 @@ export function setMeasurementUnitOverride(patch) {
         measurementUnitOverride.aunits = patch.aunits;
     if (patch.auprec != null)
         measurementUnitOverride.auprec = patch.auprec;
+    if (patch.lengthUnit != null)
+        measurementUnitOverride.lengthUnit = patch.lengthUnit;
 }
 /** Clear session measurement unit overrides (document open / tests). */
 export function resetMeasurementUnitOverride() {
@@ -75,14 +151,24 @@ function hasEffectiveUnitOverride(db) {
         units.aunits !== db.aunits ||
         units.auprec !== db.auprec);
 }
+/** LUNITS values that assume drawing INSUNITS, not arbitrary physical units. */
+function isDrawingNativeLengthFormat(lunits) {
+    return (lunits === AcDbLinearUnits.Architectural ||
+        lunits === AcDbLinearUnits.Engineering);
+}
 /**
  * Run `fn` with the formatter reading effective measurement units.
  * Drawing system variables are not changed.
  */
-function withMeasurementFormatContext(db, fn) {
-    if (!hasEffectiveUnitOverride(db))
-        return fn();
+function withMeasurementFormatContext(db, fn, formatPatch) {
     var units = getEffectiveMeasurementUnits(db);
+    var lunitsForFormat = (formatPatch === null || formatPatch === void 0 ? void 0 : formatPatch.forceDecimalLength) &&
+        isDrawingNativeLengthFormat(units.lunits)
+        ? AcDbLinearUnits.Decimal
+        : units.lunits;
+    var needsPatch = hasEffectiveUnitOverride(db) || lunitsForFormat !== units.lunits;
+    if (!needsPatch)
+        return fn();
     var header = asUnitHeader(db);
     var prev = {
         lunits: header._lunits,
@@ -90,7 +176,7 @@ function withMeasurementFormatContext(db, fn) {
         aunits: header._aunits,
         auprec: header._auprec
     };
-    header._lunits = units.lunits;
+    header._lunits = lunitsForFormat;
     header._luprec = units.luprec;
     header._aunits = units.aunits;
     header._auprec = units.auprec;
@@ -104,12 +190,60 @@ function withMeasurementFormatContext(db, fn) {
         header._auprec = prev.auprec;
     }
 }
+/** Format a linear value without applying a physical-unit conversion. */
+function formatMeasurementLengthRaw(db, value, options, formatPatch) {
+    if (options === void 0) { options = MEASUREMENT_LENGTH_FORMAT_OPTIONS; }
+    return withMeasurementFormatContext(db, function () { return db.formatter.formatLength(value, options); }, formatPatch);
+}
+/** Merge caller flags with converted-length defaults (units suffix always off). */
+function convertedLengthFormatOptions(options) {
+    return __assign(__assign(__assign({}, MEASUREMENT_CONVERTED_LENGTH_FORMAT_OPTIONS), options), { showUnits: false });
+}
+/**
+ * Length unit code to convert measurement values to, or `undefined` when labels
+ * should stay in drawing units (no override selected, the override equals the
+ * drawing's INSUNITS, INSUNITS is undefined, or the follow-drawing sentinel is
+ * active).
+ */
+function convertedLengthUnit(db) {
+    var _a;
+    var fromUnit = (_a = db.insunits) !== null && _a !== void 0 ? _a : 0;
+    if (fromUnit === 0)
+        return undefined;
+    var target = measurementUnitOverride.lengthUnit;
+    if (target == null ||
+        target === fromUnit ||
+        target === MEASUREMENT_LENGTH_UNIT_FOLLOW_DRAWING)
+        return undefined;
+    return target;
+}
 /** Format a linear distance using effective measurement units. */
 export function formatMeasurementLength(db, value, options) {
+    var _a;
     if (options === void 0) { options = MEASUREMENT_LENGTH_FORMAT_OPTIONS; }
-    return withMeasurementFormatContext(db, function () {
-        return db.formatter.formatLength(value, options);
-    });
+    var target = convertedLengthUnit(db);
+    if (target == null) {
+        return formatMeasurementLengthRaw(db, value, options);
+    }
+    var fromUnit = (_a = db.insunits) !== null && _a !== void 0 ? _a : 0;
+    var scaled = convertLengthValue(value, fromUnit, target);
+    var text = formatMeasurementLengthRaw(db, scaled, convertedLengthFormatOptions(options), { forceDecimalLength: true });
+    var symbol = measurementLengthUnitSymbol(target);
+    return symbol ? "".concat(text, " ").concat(symbol) : text;
+}
+/** Format an area using effective measurement units (length unit squared). */
+export function formatMeasurementArea(db, value, options) {
+    var _a;
+    if (options === void 0) { options = MEASUREMENT_LENGTH_FORMAT_OPTIONS; }
+    var target = convertedLengthUnit(db);
+    if (target == null) {
+        return "".concat(formatMeasurementLengthRaw(db, value, options), "\u00B2");
+    }
+    var fromUnit = (_a = db.insunits) !== null && _a !== void 0 ? _a : 0;
+    var scaled = convertAreaValue(value, fromUnit, target);
+    var text = formatMeasurementLengthRaw(db, scaled, convertedLengthFormatOptions(options), { forceDecimalLength: true });
+    var symbol = measurementLengthUnitSymbol(target);
+    return symbol ? "".concat(text, " ").concat(symbol, "\u00B2") : "".concat(text, "\u00B2");
 }
 /** Format an angle in radians using effective measurement units. */
 export function formatMeasurementAngle(db, radians, options) {
@@ -124,7 +258,7 @@ export function formatMeasurementValue(db, value) {
         case 'length':
             return formatMeasurementLength(db, value.value);
         case 'area':
-            return "".concat(formatMeasurementLength(db, value.value), "\u00B2");
+            return formatMeasurementArea(db, value.value);
         case 'angle':
             return formatMeasurementAngle(db, value.radians);
         case 'coordinate': {

package/lib/util/AcApMeasurementUnits.js.map

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

package/lib/util/AcApMeasurementUtil.d.ts

@@ -1,41 +1,62 @@
 import { AcCmColor, AcDbDatabase, AcGiLineWeight } from '@mlightcad/data-model';
+/**
+ * Overlay line weight meaning "no CAD lineweight" (hairline).
+ *
+ * Drawn as 1 CSS pixel and not scaled with zoom.
+ */
+export declare const OVERLAY_HAIRLINE_LINE_WEIGHT: AcGiLineWeight;
 /** Factory default CAD line weight for measurement geometry. */
-export declare const MEASUREMENT_LINE_WEIGHT = AcGiLineWeight.LineWeight070;
+export declare const MEASUREMENT_LINE_WEIGHT: AcGiLineWeight;
 /** Factory default screen font size (CSS px) for measurement badges. */
 export declare const MEASUREMENT_FONT_SIZE = 13;
+/** Authoring mode for measurement / markup text height. */
+export type AcApTextHeightMode = 'adaptive' | 'custom';
 /** Visual style stored on a committed measurement group. */
 export interface AcApMeasurementStyle {
     color: AcCmColor;
     lineWeight: AcGiLineWeight;
     fontSize: number;
+    /** Authoring mode; omitted means adaptive (legacy). */
+    textHeightMode?: AcApTextHeightMode;
+    /** World-space text height when {@link textHeightMode} is `'custom'`. */
+    textHeightWcs?: number;
 }
 /** Returns the current measurement overlay color (session override or MEASUREMENTCOLOR). */
 export declare function acapGetMeasurementColor(db: AcDbDatabase): AcCmColor;
-/** Current line weight used when drawing measurements. */
-export declare function acapGetMeasurementLineWeight(): AcGiLineWeight;
 /** Current font size (CSS px) used when drawing measurement badges. */
 export declare function acapGetMeasurementFontSize(): number;
 /** Update the session measurement draw color (affects current/future measurements). */
 export declare function acapSetMeasurementDrawColor(color: AcCmColor): void;
-/** Update the session measurement draw line weight. */
-export declare function acapSetMeasurementDrawLineWeight(weight: AcGiLineWeight): void;
 /** Update the session measurement draw font size (CSS px). */
 export declare function acapSetMeasurementDrawFontSize(size: number): void;
+/** Current measurement text-height authoring mode. */
+export declare function acapGetMeasurementTextHeightMode(): AcApTextHeightMode;
+/** Custom WCS text height for the measurement draw session, if any. */
+export declare function acapGetMeasurementCustomTextHeightWcs(): number | undefined;
+/**
+ * Sets adaptive (screen) or custom (WCS) text height for new measurements.
+ *
+ * @param mode - Authoring mode.
+ * @param value - Font size px when adaptive; WCS height when custom.
+ */
+export declare function acapSetMeasurementTextHeight(mode: AcApTextHeightMode, value: number): void;
 /** Restore factory session measurement draw style (tests / document reset). */
 export declare function acapResetMeasurementDrawStyle(): void;
-/** Build a style object from the current measurement draw color / line weight / font size. */
+/** Build a style object from the current measurement draw color / font size. */
 export declare function acapGetCurrentMeasurementStyle(db: AcDbDatabase): AcApMeasurementStyle;
 /** Clone a measurement style (color is cloned). */
 export declare function acapCloneMeasurementStyle(style: AcApMeasurementStyle): AcApMeasurementStyle;
 /**
  * Map a CAD line weight to a canvas stroke width in CSS pixels.
- * {@link AcGiLineWeight.LineWeight070} (70) ≈ 2.5px, matching the previous
- * area-measurement default.
+ *
+ * Hairline ({@link OVERLAY_HAIRLINE_LINE_WEIGHT}) returns `0` so overlay
+ * painters can keep a 1px screen stroke that does not scale with zoom.
+ * {@link AcGiLineWeight.LineWeight070} (70) ≈ 2.5px.
  */
 export declare function acapMeasurementCanvasLineWidth(weight: AcGiLineWeight): number;
 /** Converts an AcCmColor to a CSS rgba() string. */
 export declare function acapColorToCssAlpha(c: AcCmColor, alpha: number): string;
-/** Returns the CSS color string for a measurement color, with fallback. */
+/** Converts an AcCmColor to a CSS hex color string for overlays / sidecars. */
 export declare function acapCssColor(c: AcCmColor): string;
 /** Parse a CSS color string back into AcCmColor (best-effort). */
 export declare function acapCssToMeasurementColor(css: string): AcCmColor;

package/lib/util/AcApMeasurementUtil.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AcApMeasurementUtil.d.ts","sourceRoot":"","sources":["../../src/util/AcApMeasurementUtil.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,EACT,YAAY,EAGZ,cAAc,EACf,MAAM,uBAAuB,CAAA;AAI9B,gEAAgE;AAChE,eAAO,MAAM,uBAAuB,+BAA+B,CAAA;AAEnE,wEAAwE;AACxE,eAAO,MAAM,qBAAqB,KAAK,CAAA;AAWvC,4DAA4D;AAC5D,MAAM,WAAW,oBAAoB;IACnC,KAAK,EAAE,SAAS,CAAA;IAChB,UAAU,EAAE,cAAc,CAAA;IAC1B,QAAQ,EAAE,MAAM,CAAA;CACjB;AAED,4FAA4F;AAC5F,wBAAgB,uBAAuB,CAAC,EAAE,EAAE,YAAY,GAAG,SAAS,CAMnE;AAED,0DAA0D;AAC1D,wBAAgB,4BAA4B,IAAI,cAAc,CAE7D;AAED,uEAAuE;AACvE,wBAAgB,0BAA0B,IAAI,MAAM,CAEnD;AAED,uFAAuF;AACvF,wBAAgB,2BAA2B,CAAC,KAAK,EAAE,SAAS,GAAG,IAAI,CAElE;AAED,uDAAuD;AACvD,wBAAgB,gCAAgC,CAAC,MAAM,EAAE,cAAc,GAAG,IAAI,CAG7E;AAED,8DAA8D;AAC9D,wBAAgB,8BAA8B,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAGjE;AAED,+EAA+E;AAC/E,wBAAgB,6BAA6B,IAAI,IAAI,CAIpD;AAED,8FAA8F;AAC9F,wBAAgB,8BAA8B,CAC5C,EAAE,EAAE,YAAY,GACf,oBAAoB,CAMtB;AAED,mDAAmD;AACnD,wBAAgB,yBAAyB,CACvC,KAAK,EAAE,oBAAoB,GAC1B,oBAAoB,CAMtB;AAED;;;;GAIG;AACH,wBAAgB,8BAA8B,CAAC,MAAM,EAAE,cAAc,GAAG,MAAM,CAI7E;AAED,oDAAoD;AACpD,wBAAgB,mBAAmB,CAAC,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAEvE;AAED,2EAA2E;AAC3E,wBAAgB,YAAY,CAAC,CAAC,EAAE,SAAS,GAAG,MAAM,CAEjD;AAED,kEAAkE;AAClE,wBAAgB,yBAAyB,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,CAUhE"}
+{"version":3,"file":"AcApMeasurementUtil.d.ts","sourceRoot":"","sources":["../../src/util/AcApMeasurementUtil.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,EACT,YAAY,EAGZ,cAAc,EACf,MAAM,uBAAuB,CAAA;AAI9B;;;;GAIG;AACH,eAAO,MAAM,4BAA4B,EAAQ,cAAc,CAAA;AAE/D,gEAAgE;AAChE,eAAO,MAAM,uBAAuB,gBAA+B,CAAA;AAEnE,wEAAwE;AACxE,eAAO,MAAM,qBAAqB,KAAK,CAAA;AAEvC,2DAA2D;AAC3D,MAAM,MAAM,kBAAkB,GAAG,UAAU,GAAG,QAAQ,CAAA;AActD,4DAA4D;AAC5D,MAAM,WAAW,oBAAoB;IACnC,KAAK,EAAE,SAAS,CAAA;IAChB,UAAU,EAAE,cAAc,CAAA;IAC1B,QAAQ,EAAE,MAAM,CAAA;IAChB,uDAAuD;IACvD,cAAc,CAAC,EAAE,kBAAkB,CAAA;IACnC,yEAAyE;IACzE,aAAa,CAAC,EAAE,MAAM,CAAA;CACvB;AAED,4FAA4F;AAC5F,wBAAgB,uBAAuB,CAAC,EAAE,EAAE,YAAY,GAAG,SAAS,CAMnE;AAED,uEAAuE;AACvE,wBAAgB,0BAA0B,IAAI,MAAM,CAEnD;AAED,uFAAuF;AACvF,wBAAgB,2BAA2B,CAAC,KAAK,EAAE,SAAS,GAAG,IAAI,CAElE;AAED,8DAA8D;AAC9D,wBAAgB,8BAA8B,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAKjE;AAED,sDAAsD;AACtD,wBAAgB,gCAAgC,IAAI,kBAAkB,CAErE;AAED,uEAAuE;AACvE,wBAAgB,qCAAqC,IAAI,MAAM,GAAG,SAAS,CAE1E;AAED;;;;;GAKG;AACH,wBAAgB,4BAA4B,CAC1C,IAAI,EAAE,kBAAkB,EACxB,KAAK,EAAE,MAAM,GACZ,IAAI,CASN;AAED,+EAA+E;AAC/E,wBAAgB,6BAA6B,IAAI,IAAI,CAKpD;AAED,gFAAgF;AAChF,wBAAgB,8BAA8B,CAC5C,EAAE,EAAE,YAAY,GACf,oBAAoB,CAYtB;AAED,mDAAmD;AACnD,wBAAgB,yBAAyB,CACvC,KAAK,EAAE,oBAAoB,GAC1B,oBAAoB,CAQtB;AAED;;;;;;GAMG;AACH,wBAAgB,8BAA8B,CAAC,MAAM,EAAE,cAAc,GAAG,MAAM,CAI7E;AAED,oDAAoD;AACpD,wBAAgB,mBAAmB,CAAC,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAEvE;AAED,+EAA+E;AAC/E,wBAAgB,YAAY,CAAC,CAAC,EAAE,SAAS,GAAG,MAAM,CAEjD;AAED,kEAAkE;AAClE,wBAAgB,yBAAyB,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,CAEhE"}

package/lib/util/AcApMeasurementUtil.js

@@ -1,25 +1,40 @@
-import { AcCmColor, AcDbSystemVariables, AcDbSysVarManager, AcGiLineWeight } from '@mlightcad/data-model';
-import { preferExactAciColor } from './AcApCssColor';
+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);
+};
+import { AcDbSystemVariables, AcDbSysVarManager } from '@mlightcad/data-model';
+import { acCmColorToCssHex, parseCssToAcCmColor } from './AcApCssColor';
+/**
+ * Overlay line weight meaning "no CAD lineweight" (hairline).
+ *
+ * Drawn as 1 CSS pixel and not scaled with zoom.
+ */
+export var OVERLAY_HAIRLINE_LINE_WEIGHT = 0;
 /** Factory default CAD line weight for measurement geometry. */
-export var MEASUREMENT_LINE_WEIGHT = AcGiLineWeight.LineWeight070;
+export var MEASUREMENT_LINE_WEIGHT = OVERLAY_HAIRLINE_LINE_WEIGHT;
 /** Factory default screen font size (CSS px) for measurement badges. */
 export var MEASUREMENT_FONT_SIZE = 13;
 /** Session draw color for newly created measurements (undefined = use sysvar). */
 var measurementDrawColor;
-/** Session draw line weight for newly created measurements. */
-var measurementDrawLineWeight = MEASUREMENT_LINE_WEIGHT;
 /** Session draw font size for newly created measurement badges. */
 var measurementDrawFontSize = MEASUREMENT_FONT_SIZE;
+/** Session text-height authoring mode. */
+var measurementTextHeightMode = 'adaptive';
+/** Session custom WCS text height when mode is `'custom'`. */
+var measurementCustomTextHeightWcs;
 /** Returns the current measurement overlay color (session override or MEASUREMENTCOLOR). */
 export function acapGetMeasurementColor(db) {
     if (measurementDrawColor)
         return measurementDrawColor.clone();
     return AcDbSysVarManager.instance().getVar(AcDbSystemVariables.MEASUREMENTCOLOR, db);
 }
-/** Current line weight used when drawing measurements. */
-export function acapGetMeasurementLineWeight() {
-    return measurementDrawLineWeight;
-}
 /** Current font size (CSS px) used when drawing measurement badges. */
 export function acapGetMeasurementFontSize() {
     return measurementDrawFontSize;
@@ -28,72 +43,87 @@ export function acapGetMeasurementFontSize() {
 export function acapSetMeasurementDrawColor(color) {
     measurementDrawColor = color.clone();
 }
-/** Update the session measurement draw line weight. */
-export function acapSetMeasurementDrawLineWeight(weight) {
-    if (!(weight > 0))
-        return;
-    measurementDrawLineWeight = weight;
-}
 /** Update the session measurement draw font size (CSS px). */
 export function acapSetMeasurementDrawFontSize(size) {
     if (!Number.isFinite(size) || size <= 0)
         return;
     measurementDrawFontSize = size;
+    measurementTextHeightMode = 'adaptive';
+    measurementCustomTextHeightWcs = undefined;
+}
+/** Current measurement text-height authoring mode. */
+export function acapGetMeasurementTextHeightMode() {
+    return measurementTextHeightMode;
+}
+/** Custom WCS text height for the measurement draw session, if any. */
+export function acapGetMeasurementCustomTextHeightWcs() {
+    return measurementCustomTextHeightWcs;
+}
+/**
+ * Sets adaptive (screen) or custom (WCS) text height for new measurements.
+ *
+ * @param mode - Authoring mode.
+ * @param value - Font size px when adaptive; WCS height when custom.
+ */
+export function acapSetMeasurementTextHeight(mode, value) {
+    if (!Number.isFinite(value) || value <= 0)
+        return;
+    measurementTextHeightMode = mode;
+    if (mode === 'adaptive') {
+        measurementDrawFontSize = value;
+        measurementCustomTextHeightWcs = undefined;
+        return;
+    }
+    measurementCustomTextHeightWcs = value;
 }
 /** Restore factory session measurement draw style (tests / document reset). */
 export function acapResetMeasurementDrawStyle() {
     measurementDrawColor = undefined;
-    measurementDrawLineWeight = MEASUREMENT_LINE_WEIGHT;
     measurementDrawFontSize = MEASUREMENT_FONT_SIZE;
+    measurementTextHeightMode = 'adaptive';
+    measurementCustomTextHeightWcs = undefined;
 }
-/** Build a style object from the current measurement draw color / line weight / font size. */
+/** Build a style object from the current measurement draw color / font size. */
 export function acapGetCurrentMeasurementStyle(db) {
-    return {
-        color: acapGetMeasurementColor(db),
-        lineWeight: acapGetMeasurementLineWeight(),
-        fontSize: acapGetMeasurementFontSize()
-    };
+    return __assign({ color: acapGetMeasurementColor(db), lineWeight: MEASUREMENT_LINE_WEIGHT, fontSize: acapGetMeasurementFontSize(), textHeightMode: measurementTextHeightMode }, (measurementTextHeightMode === 'custom' &&
+        measurementCustomTextHeightWcs != null &&
+        measurementCustomTextHeightWcs > 0
+        ? { textHeightWcs: measurementCustomTextHeightWcs }
+        : {}));
 }
 /** Clone a measurement style (color is cloned). */
 export function acapCloneMeasurementStyle(style) {
     return {
         color: style.color.clone(),
         lineWeight: style.lineWeight,
-        fontSize: style.fontSize
+        fontSize: style.fontSize,
+        textHeightMode: style.textHeightMode,
+        textHeightWcs: style.textHeightWcs
     };
 }
 /**
  * Map a CAD line weight to a canvas stroke width in CSS pixels.
- * {@link AcGiLineWeight.LineWeight070} (70) ≈ 2.5px, matching the previous
- * area-measurement default.
+ *
+ * Hairline ({@link OVERLAY_HAIRLINE_LINE_WEIGHT}) returns `0` so overlay
+ * painters can keep a 1px screen stroke that does not scale with zoom.
+ * {@link AcGiLineWeight.LineWeight070} (70) ≈ 2.5px.
  */
 export function acapMeasurementCanvasLineWidth(weight) {
     var n = Number(weight);
     if (!Number.isFinite(n) || n <= 0)
-        return 2;
+        return 0;
     return Math.max(1, n / 28);
 }
 /** Converts an AcCmColor to a CSS rgba() string. */
 export function acapColorToCssAlpha(c, alpha) {
     return "rgba(".concat(c.red, ", ").concat(c.green, ", ").concat(c.blue, ", ").concat(alpha, ")");
 }
-/** Returns the CSS color string for a measurement color, with fallback. */
+/** Converts an AcCmColor to a CSS hex color string for overlays / sidecars. */
 export function acapCssColor(c) {
-    var _a;
-    return (_a = c.cssColor) !== null && _a !== void 0 ? _a : "rgb(".concat(c.red, ", ").concat(c.green, ", ").concat(c.blue, ")");
+    return acCmColorToCssHex(c);
 }
 /** Parse a CSS color string back into AcCmColor (best-effort). */
 export function acapCssToMeasurementColor(css) {
-    var fromString = AcCmColor.fromString(css);
-    if (fromString)
-        return preferExactAciColor(fromString);
-    try {
-        return preferExactAciColor(new AcCmColor().setRGBFromCss(css));
-    }
-    catch (_a) {
-        var fallback = new AcCmColor();
-        fallback.setRGB(123, 135, 148);
-        return fallback;
-    }
+    return parseCssToAcCmColor(css, [123, 135, 148]);
 }
 //# sourceMappingURL=AcApMeasurementUtil.js.map

package/lib/util/AcApMeasurementUtil.js.map

@@ -1 +1 @@
-{"version":3,"file":"AcApMeasurementUtil.js","sourceRoot":"","sources":["../../src/util/AcApMeasurementUtil.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,EAET,mBAAmB,EACnB,iBAAiB,EACjB,cAAc,EACf,MAAM,uBAAuB,CAAA;AAE9B,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAA;AAEpD,gEAAgE;AAChE,MAAM,CAAC,IAAM,uBAAuB,GAAG,cAAc,CAAC,aAAa,CAAA;AAEnE,wEAAwE;AACxE,MAAM,CAAC,IAAM,qBAAqB,GAAG,EAAE,CAAA;AAEvC,kFAAkF;AAClF,IAAI,oBAA2C,CAAA;AAE/C,+DAA+D;AAC/D,IAAI,yBAAyB,GAAmB,uBAAuB,CAAA;AAEvE,mEAAmE;AACnE,IAAI,uBAAuB,GAAG,qBAAqB,CAAA;AASnD,4FAA4F;AAC5F,MAAM,UAAU,uBAAuB,CAAC,EAAgB;IACtD,IAAI,oBAAoB;QAAE,OAAO,oBAAoB,CAAC,KAAK,EAAE,CAAA;IAC7D,OAAO,iBAAiB,CAAC,QAAQ,EAAE,CAAC,MAAM,CACxC,mBAAmB,CAAC,gBAAgB,EACpC,EAAE,CACU,CAAA;AAChB,CAAC;AAED,0DAA0D;AAC1D,MAAM,UAAU,4BAA4B;IAC1C,OAAO,yBAAyB,CAAA;AAClC,CAAC;AAED,uEAAuE;AACvE,MAAM,UAAU,0BAA0B;IACxC,OAAO,uBAAuB,CAAA;AAChC,CAAC;AAED,uFAAuF;AACvF,MAAM,UAAU,2BAA2B,CAAC,KAAgB;IAC1D,oBAAoB,GAAG,KAAK,CAAC,KAAK,EAAE,CAAA;AACtC,CAAC;AAED,uDAAuD;AACvD,MAAM,UAAU,gCAAgC,CAAC,MAAsB;IACrE,IAAI,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;QAAE,OAAM;IACzB,yBAAyB,GAAG,MAAM,CAAA;AACpC,CAAC;AAED,8DAA8D;AAC9D,MAAM,UAAU,8BAA8B,CAAC,IAAY;IACzD,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC;QAAE,OAAM;IAC/C,uBAAuB,GAAG,IAAI,CAAA;AAChC,CAAC;AAED,+EAA+E;AAC/E,MAAM,UAAU,6BAA6B;IAC3C,oBAAoB,GAAG,SAAS,CAAA;IAChC,yBAAyB,GAAG,uBAAuB,CAAA;IACnD,uBAAuB,GAAG,qBAAqB,CAAA;AACjD,CAAC;AAED,8FAA8F;AAC9F,MAAM,UAAU,8BAA8B,CAC5C,EAAgB;IAEhB,OAAO;QACL,KAAK,EAAE,uBAAuB,CAAC,EAAE,CAAC;QAClC,UAAU,EAAE,4BAA4B,EAAE;QAC1C,QAAQ,EAAE,0BAA0B,EAAE;KACvC,CAAA;AACH,CAAC;AAED,mDAAmD;AACnD,MAAM,UAAU,yBAAyB,CACvC,KAA2B;IAE3B,OAAO;QACL,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE;QAC1B,UAAU,EAAE,KAAK,CAAC,UAAU;QAC5B,QAAQ,EAAE,KAAK,CAAC,QAAQ;KACzB,CAAA;AACH,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,8BAA8B,CAAC,MAAsB;IACnE,IAAM,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,CAAA;IACxB,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;QAAE,OAAO,CAAC,CAAA;IAC3C,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,CAAA;AAC5B,CAAC;AAED,oDAAoD;AACpD,MAAM,UAAU,mBAAmB,CAAC,CAAY,EAAE,KAAa;IAC7D,OAAO,eAAQ,CAAC,CAAC,GAAG,eAAK,CAAC,CAAC,KAAK,eAAK,CAAC,CAAC,IAAI,eAAK,KAAK,MAAG,CAAA;AAC1D,CAAC;AAED,2EAA2E;AAC3E,MAAM,UAAU,YAAY,CAAC,CAAY;;IACvC,OAAO,MAAA,CAAC,CAAC,QAAQ,mCAAI,cAAO,CAAC,CAAC,GAAG,eAAK,CAAC,CAAC,KAAK,eAAK,CAAC,CAAC,IAAI,MAAG,CAAA;AAC7D,CAAC;AAED,kEAAkE;AAClE,MAAM,UAAU,yBAAyB,CAAC,GAAW;IACnD,IAAM,UAAU,GAAG,SAAS,CAAC,UAAU,CAAC,GAAG,CAAC,CAAA;IAC5C,IAAI,UAAU;QAAE,OAAO,mBAAmB,CAAC,UAAU,CAAC,CAAA;IACtD,IAAI,CAAC;QACH,OAAO,mBAAmB,CAAC,IAAI,SAAS,EAAE,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAA;IAChE,CAAC;IAAC,WAAM,CAAC;QACP,IAAM,QAAQ,GAAG,IAAI,SAAS,EAAE,CAAA;QAChC,QAAQ,CAAC,MAAM,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAA;QAC9B,OAAO,QAAQ,CAAA;IACjB,CAAC;AACH,CAAC"}
+{"version":3,"file":"AcApMeasurementUtil.js","sourceRoot":"","sources":["../../src/util/AcApMeasurementUtil.ts"],"names":[],"mappings":"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"}

package/lib/util/AcApOpenFileErrorMessage.d.ts

@@ -0,0 +1,25 @@
+import type { AcDbOpenDatabaseErrorCode } from '@mlightcad/data-model';
+import type { AcEdEvents } from '../editor/global/eventBus';
+export type AcApOpenFileErrorParams = AcEdEvents['failed-to-open-file'];
+type TranslateFn = (key: string, params?: Record<string, string>) => string;
+/**
+ * Resolves a user-facing open-file failure message from structured error metadata.
+ *
+ * Maps {@link AcDbOpenDatabaseErrorCode} values (including license failures) to
+ * localized `main.message.*` strings.
+ */
+export declare function acapResolveOpenFileErrorMessage(t: TranslateFn, params: AcApOpenFileErrorParams): string;
+/**
+ * Resolves a short notification title for an open-file failure.
+ */
+export declare function acapResolveOpenFileErrorTitle(t: TranslateFn, errorCode?: AcDbOpenDatabaseErrorCode): string;
+/**
+ * Resolves a localized open-file failure message using {@link AcApI18n}.
+ */
+export declare function acapFormatOpenFileErrorMessage(params: AcApOpenFileErrorParams): string;
+/**
+ * Resolves a localized open-file failure title using {@link AcApI18n}.
+ */
+export declare function acapFormatOpenFileErrorTitle(errorCode?: AcDbOpenDatabaseErrorCode): string;
+export {};
+//# sourceMappingURL=AcApOpenFileErrorMessage.d.ts.map

package/lib/util/AcApOpenFileErrorMessage.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"AcApOpenFileErrorMessage.d.ts","sourceRoot":"","sources":["../../src/util/AcApOpenFileErrorMessage.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,uBAAuB,CAAA;AAEtE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAA;AAG3D,MAAM,MAAM,uBAAuB,GAAG,UAAU,CAAC,qBAAqB,CAAC,CAAA;AAEvE,KAAK,WAAW,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,KAAK,MAAM,CAAA;AA2B3E;;;;;GAKG;AACH,wBAAgB,+BAA+B,CAC7C,CAAC,EAAE,WAAW,EACd,MAAM,EAAE,uBAAuB,GAC9B,MAAM,CAyBR;AAED;;GAEG;AACH,wBAAgB,6BAA6B,CAC3C,CAAC,EAAE,WAAW,EACd,SAAS,CAAC,EAAE,yBAAyB,GACpC,MAAM,CAeR;AAED;;GAEG;AACH,wBAAgB,8BAA8B,CAC5C,MAAM,EAAE,uBAAuB,GAC9B,MAAM,CAER;AAED;;GAEG;AACH,wBAAgB,4BAA4B,CAC1C,SAAS,CAAC,EAAE,yBAAyB,GACpC,MAAM,CAER"}