@mlightcad/cad-simple-viewer 1.4.11 → 1.4.13

package/lib/command/AcApEllipseCmd.js

@@ -0,0 +1,583 @@
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        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 __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+import { AcDbEllipse, AcGePoint3d } from '@mlightcad/data-model';
+import { AcApDocManager } from '../app';
+import { AcEdCommand, AcEdOpenMode, AcEdPreviewJig, AcEdPromptAngleOptions, AcEdPromptDoubleOptions, AcEdPromptPointOptions, AcEdPromptStatus, eventBus } from '../editor';
+import { AcApI18n } from '../i18n';
+import { AcApLineJig } from './AcApLineCmd';
+var EPSILON = 1e-9;
+var TAU = Math.PI * 2;
+var POSITIVE_NORMAL = { x: 0, y: 0, z: 1 };
+function distance2d(p1, p2) {
+    return Math.hypot(p2.x - p1.x, p2.y - p1.y);
+}
+function midpoint2d(p1, p2) {
+    return {
+        x: (p1.x + p2.x) / 2,
+        y: (p1.y + p2.y) / 2,
+        z: 0
+    };
+}
+function normalizeVector2d(x, y) {
+    var length = Math.hypot(x, y);
+    if (!Number.isFinite(length) || length <= EPSILON)
+        return undefined;
+    return { x: x / length, y: y / length, z: 0 };
+}
+function perpendicular2d(unit) {
+    return { x: -unit.y, y: unit.x, z: 0 };
+}
+function degToRad(degree) {
+    return (degree * Math.PI) / 180;
+}
+function radToDeg(rad) {
+    return (rad * 180) / Math.PI;
+}
+function axisAngleDeg(axis) {
+    return radToDeg(Math.atan2(axis.y, axis.x));
+}
+/**
+ * Converts a geometric direction angle (from center, relative to major axis)
+ * to ellipse parameter angle used by AcGeEllipseArc3d.
+ *
+ * Ellipse parameterization:
+ *   x = a * cos(t), y = b * sin(t)
+ * Geometric ray angle alpha satisfies:
+ *   tan(alpha) = (b * sin(t)) / (a * cos(t))
+ * so:
+ *   t = atan2(a * sin(alpha), b * cos(alpha))
+ */
+function geometricAngleDegToEllipseParamRad(geometricAngleDeg, majorRadius, minorRadius) {
+    var alpha = degToRad(geometricAngleDeg);
+    return Math.atan2(majorRadius * Math.sin(alpha), minorRadius * Math.cos(alpha));
+}
+function axisUnitFromCenterToPoint(center, point) {
+    return normalizeVector2d(point.x - center.x, point.y - center.y);
+}
+function buildEllipseDefinition(center, firstAxisUnit, firstAxisRadius, secondAxisRadius, startAngle, endAngle) {
+    if (startAngle === void 0) { startAngle = 0; }
+    if (endAngle === void 0) { endAngle = TAU; }
+    if (!Number.isFinite(firstAxisRadius) ||
+        !Number.isFinite(secondAxisRadius) ||
+        firstAxisRadius <= EPSILON ||
+        secondAxisRadius <= EPSILON) {
+        return undefined;
+    }
+    if (firstAxisRadius >= secondAxisRadius) {
+        return {
+            center: { x: center.x, y: center.y, z: 0 },
+            majorAxis: firstAxisUnit,
+            majorRadius: firstAxisRadius,
+            minorRadius: secondAxisRadius,
+            startAngle: startAngle,
+            endAngle: endAngle
+        };
+    }
+    return {
+        center: { x: center.x, y: center.y, z: 0 },
+        majorAxis: perpendicular2d(firstAxisUnit),
+        majorRadius: secondAxisRadius,
+        minorRadius: firstAxisRadius,
+        startAngle: startAngle,
+        endAngle: endAngle
+    };
+}
+function createFallbackEllipse(point) {
+    return new AcDbEllipse(point, POSITIVE_NORMAL, { x: 1, y: 0, z: 0 }, 1e-6, 1e-6, 0, TAU);
+}
+function applyEllipseDefinition(entity, definition) {
+    entity.center = definition.center;
+    entity.normal = POSITIVE_NORMAL;
+    entity.majorAxisRadius = definition.majorRadius;
+    entity.minorAxisRadius = definition.minorRadius;
+    entity.startAngle = definition.startAngle;
+    entity.endAngle = definition.endAngle;
+    var ellipseWithGeo = entity;
+    if (ellipseWithGeo._geo) {
+        ellipseWithGeo._geo.majorAxis = definition.majorAxis;
+    }
+}
+/**
+ * Dynamic point-driven ellipse preview jig.
+ */
+var AcApEllipsePointJig = /** @class */ (function (_super) {
+    __extends(AcApEllipsePointJig, _super);
+    /**
+     * Creates point-driven ellipse preview jig.
+     *
+     * @param view - Active editor view.
+     * @param builder - Cursor point to ellipse definition resolver.
+     * @param fallbackPoint - Fallback point used to create valid initial entity.
+     */
+    function AcApEllipsePointJig(view, builder, fallbackPoint) {
+        var _this = _super.call(this, view) || this;
+        _this._builder = builder;
+        _this._ellipse = createFallbackEllipse(fallbackPoint);
+        return _this;
+    }
+    Object.defineProperty(AcApEllipsePointJig.prototype, "entity", {
+        /**
+         * Gets transient ellipse entity displayed by this jig.
+         */
+        get: function () {
+            return this._ellipse;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    /**
+     * Recomputes preview ellipse from cursor point.
+     *
+     * @param point - Current cursor/input point.
+     */
+    AcApEllipsePointJig.prototype.update = function (point) {
+        var definition = this._builder(point);
+        if (!definition)
+            return;
+        applyEllipseDefinition(this._ellipse, definition);
+    };
+    return AcApEllipsePointJig;
+}(AcEdPreviewJig));
+/**
+ * Dynamic numeric-input ellipse preview jig.
+ */
+var AcApEllipseDistanceJig = /** @class */ (function (_super) {
+    __extends(AcApEllipseDistanceJig, _super);
+    /**
+     * Creates numeric-input ellipse preview jig.
+     *
+     * @param view - Active editor view.
+     * @param builder - Numeric value to ellipse definition resolver.
+     * @param fallbackPoint - Fallback point used to create valid initial entity.
+     */
+    function AcApEllipseDistanceJig(view, builder, fallbackPoint) {
+        var _this = _super.call(this, view) || this;
+        _this._builder = builder;
+        _this._ellipse = createFallbackEllipse(fallbackPoint);
+        return _this;
+    }
+    Object.defineProperty(AcApEllipseDistanceJig.prototype, "entity", {
+        /**
+         * Gets transient ellipse entity displayed by this jig.
+         */
+        get: function () {
+            return this._ellipse;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    /**
+     * Recomputes preview ellipse from numeric input value.
+     *
+     * @param value - Current numeric prompt value.
+     */
+    AcApEllipseDistanceJig.prototype.update = function (value) {
+        var definition = this._builder(value);
+        if (!definition)
+            return;
+        applyEllipseDefinition(this._ellipse, definition);
+    };
+    return AcApEllipseDistanceJig;
+}(AcEdPreviewJig));
+/**
+ * Command to create one ellipse or ellipse arc.
+ */
+var AcApEllipseCmd = /** @class */ (function (_super) {
+    __extends(AcApEllipseCmd, _super);
+    /**
+     * Creates ELLIPSE command instance.
+     */
+    function AcApEllipseCmd() {
+        var _this = _super.call(this) || this;
+        _this.mode = AcEdOpenMode.Write;
+        return _this;
+    }
+    /**
+     * Command entry point.
+     *
+     * Supported branches:
+     * - Axis endpoint workflow
+     * - Center-first workflow
+     * - Arc-prefixed variants for ellipse arc creation
+     *
+     * @param context - Current application/document context.
+     */
+    AcApEllipseCmd.prototype.execute = function (context) {
+        return __awaiter(this, void 0, void 0, function () {
+            var entryPrompt, entryResult, keyword;
+            var _a;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        entryPrompt = new AcEdPromptPointOptions(AcApI18n.t('jig.ellipse.axisEndpointOrOptions'));
+                        this.addKeyword(entryPrompt, 'arc');
+                        this.addKeyword(entryPrompt, 'center');
+                        return [4 /*yield*/, AcApDocManager.instance.editor.getPoint(entryPrompt)];
+                    case 1:
+                        entryResult = _b.sent();
+                        if (!(entryResult.status === AcEdPromptStatus.Keyword)) return [3 /*break*/, 6];
+                        keyword = (_a = entryResult.stringResult) !== null && _a !== void 0 ? _a : '';
+                        if (!(keyword === 'Center')) return [3 /*break*/, 3];
+                        return [4 /*yield*/, this.runCenterFlow(context, false)];
+                    case 2:
+                        _b.sent();
+                        return [3 /*break*/, 5];
+                    case 3:
+                        if (!(keyword === 'Arc')) return [3 /*break*/, 5];
+                        return [4 /*yield*/, this.runArcEntryFlow(context)];
+                    case 4:
+                        _b.sent();
+                        _b.label = 5;
+                    case 5: return [2 /*return*/];
+                    case 6:
+                        if (entryResult.status !== AcEdPromptStatus.OK)
+                            return [2 /*return*/];
+                        return [4 /*yield*/, this.runAxisEndFlow(context, entryResult.value, false)];
+                    case 7:
+                        _b.sent();
+                        return [2 /*return*/];
+                }
+            });
+        });
+    };
+    /**
+     * Adds one localized keyword to a point prompt.
+     *
+     * @param prompt - Target point prompt.
+     * @param key - Keyword i18n key suffix.
+     */
+    AcApEllipseCmd.prototype.addKeyword = function (prompt, key) {
+        prompt.keywords.add(AcApI18n.t("jig.ellipse.keywords.".concat(key, ".display")), AcApI18n.t("jig.ellipse.keywords.".concat(key, ".global")), AcApI18n.t("jig.ellipse.keywords.".concat(key, ".local")));
+    };
+    /**
+     * Appends final ellipse entity to model space.
+     *
+     * @param context - Current application/document context.
+     * @param definition - Ellipse geometric definition to append.
+     */
+    AcApEllipseCmd.prototype.appendEllipse = function (context, definition) {
+        var ellipse = new AcDbEllipse(definition.center, POSITIVE_NORMAL, definition.majorAxis, definition.majorRadius, definition.minorRadius, definition.startAngle, definition.endAngle);
+        context.doc.database.tables.blockTable.modelSpace.appendEntity(ellipse);
+    };
+    /**
+     * Emits one warning message for invalid ellipse input.
+     *
+     * @param key - Invalid-input category key.
+     */
+    AcApEllipseCmd.prototype.warnInvalidInput = function (key) {
+        eventBus.emit('message', {
+            message: AcApI18n.t("jig.ellipse.invalid.".concat(key)),
+            type: 'warning'
+        });
+    };
+    /**
+     * Runs `Arc` entry branch where user can provide axis endpoints or center.
+     *
+     * @param context - Current application/document context.
+     */
+    AcApEllipseCmd.prototype.runArcEntryFlow = function (context) {
+        return __awaiter(this, void 0, void 0, function () {
+            var prompt, result;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        prompt = new AcEdPromptPointOptions(AcApI18n.t('jig.ellipse.arcAxisEndpointOrCenter'));
+                        this.addKeyword(prompt, 'center');
+                        return [4 /*yield*/, AcApDocManager.instance.editor.getPoint(prompt)];
+                    case 1:
+                        result = _a.sent();
+                        if (!(result.status === AcEdPromptStatus.Keyword)) return [3 /*break*/, 4];
+                        if (!(result.stringResult === 'Center')) return [3 /*break*/, 3];
+                        return [4 /*yield*/, this.runCenterFlow(context, true)];
+                    case 2:
+                        _a.sent();
+                        _a.label = 3;
+                    case 3: return [2 /*return*/];
+                    case 4:
+                        if (result.status !== AcEdPromptStatus.OK)
+                            return [2 /*return*/];
+                        return [4 /*yield*/, this.runAxisEndFlow(context, result.value, true)];
+                    case 5:
+                        _a.sent();
+                        return [2 /*return*/];
+                }
+            });
+        });
+    };
+    /**
+     * Runs center-first workflow:
+     * center -> first axis endpoint -> other axis/rotation -> optional arc angles.
+     *
+     * @param context - Current application/document context.
+     * @param arcMode - Whether to continue into arc-angle prompts.
+     */
+    AcApEllipseCmd.prototype.runCenterFlow = function (context, arcMode) {
+        return __awaiter(this, void 0, void 0, function () {
+            var centerPrompt, centerResult, center, axisEndPrompt, axisEndResult, axisUnit, axisRadius, definition;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        centerPrompt = new AcEdPromptPointOptions(AcApI18n.t('jig.ellipse.center'));
+                        return [4 /*yield*/, AcApDocManager.instance.editor.getPoint(centerPrompt)];
+                    case 1:
+                        centerResult = _a.sent();
+                        if (centerResult.status !== AcEdPromptStatus.OK)
+                            return [2 /*return*/];
+                        center = centerResult.value;
+                        axisEndPrompt = new AcEdPromptPointOptions(AcApI18n.t('jig.ellipse.firstAxisEndpoint'));
+                        axisEndPrompt.useDashedLine = true;
+                        axisEndPrompt.useBasePoint = true;
+                        axisEndPrompt.basePoint = new AcGePoint3d(center);
+                        axisEndPrompt.jig = new AcApLineJig(context.view, center);
+                        return [4 /*yield*/, AcApDocManager.instance.editor.getPoint(axisEndPrompt)];
+                    case 2:
+                        axisEndResult = _a.sent();
+                        if (axisEndResult.status !== AcEdPromptStatus.OK)
+                            return [2 /*return*/];
+                        axisUnit = axisUnitFromCenterToPoint(center, axisEndResult.value);
+                        if (!axisUnit) {
+                            this.warnInvalidInput('axis');
+                            return [2 /*return*/];
+                        }
+                        axisRadius = distance2d(center, axisEndResult.value);
+                        return [4 /*yield*/, this.promptOtherAxis(context, center, axisUnit, axisRadius, arcMode)];
+                    case 3:
+                        definition = _a.sent();
+                        if (!definition)
+                            return [2 /*return*/];
+                        this.appendEllipse(context, definition);
+                        return [2 /*return*/];
+                }
+            });
+        });
+    };
+    /**
+     * Runs axis-endpoint workflow:
+     * first axis endpoint -> second axis endpoint -> other axis/rotation.
+     *
+     * @param context - Current application/document context.
+     * @param firstAxisEndpoint - First endpoint of major/minor axis line.
+     * @param arcMode - Whether to continue into arc-angle prompts.
+     */
+    AcApEllipseCmd.prototype.runAxisEndFlow = function (context, firstAxisEndpoint, arcMode) {
+        return __awaiter(this, void 0, void 0, function () {
+            var secondAxisPrompt, secondAxisResult, secondAxisEndpoint, axisVectorX, axisVectorY, axisUnit, center, axisRadius, definition;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        secondAxisPrompt = new AcEdPromptPointOptions(AcApI18n.t('jig.ellipse.secondAxisEndpoint'));
+                        secondAxisPrompt.useDashedLine = true;
+                        secondAxisPrompt.useBasePoint = true;
+                        secondAxisPrompt.basePoint = new AcGePoint3d(firstAxisEndpoint);
+                        secondAxisPrompt.jig = new AcApLineJig(context.view, firstAxisEndpoint);
+                        return [4 /*yield*/, AcApDocManager.instance.editor.getPoint(secondAxisPrompt)];
+                    case 1:
+                        secondAxisResult = _a.sent();
+                        if (secondAxisResult.status !== AcEdPromptStatus.OK)
+                            return [2 /*return*/];
+                        secondAxisEndpoint = secondAxisResult.value;
+                        axisVectorX = secondAxisEndpoint.x - firstAxisEndpoint.x;
+                        axisVectorY = secondAxisEndpoint.y - firstAxisEndpoint.y;
+                        axisUnit = normalizeVector2d(axisVectorX, axisVectorY);
+                        if (!axisUnit) {
+                            this.warnInvalidInput('axis');
+                            return [2 /*return*/];
+                        }
+                        center = midpoint2d(firstAxisEndpoint, secondAxisEndpoint);
+                        axisRadius = distance2d(firstAxisEndpoint, secondAxisEndpoint) / 2;
+                        return [4 /*yield*/, this.promptOtherAxis(context, center, axisUnit, axisRadius, arcMode)];
+                    case 2:
+                        definition = _a.sent();
+                        if (!definition)
+                            return [2 /*return*/];
+                        this.appendEllipse(context, definition);
+                        return [2 /*return*/];
+                }
+            });
+        });
+    };
+    /**
+     * Prompts for the second axis radius by point or rotation angle option.
+     *
+     * In arc mode, this method also continues into arc start/end angle prompts.
+     *
+     * @param context - Current application/document context.
+     * @param center - Ellipse center point.
+     * @param firstAxisUnit - Unit direction of first specified axis.
+     * @param firstAxisRadius - Radius length along first specified axis.
+     * @param arcMode - Whether to return an ellipse arc definition.
+     * @returns Final ellipse definition, or `undefined` on cancel/invalid.
+     */
+    AcApEllipseCmd.prototype.promptOtherAxis = function (context, center, firstAxisUnit, firstAxisRadius, arcMode) {
+        return __awaiter(this, void 0, void 0, function () {
+            var otherAxisPrompt, otherAxisResult, rotationPrompt, rotationResult, secondAxisRadius, definition_1, otherAxisRadius, definition;
+            var _a;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        if (!true) return [3 /*break*/, 6];
+                        otherAxisPrompt = new AcEdPromptPointOptions(AcApI18n.t('jig.ellipse.otherAxisOrRotation'));
+                        this.addKeyword(otherAxisPrompt, 'rotation');
+                        otherAxisPrompt.useDashedLine = true;
+                        otherAxisPrompt.useBasePoint = true;
+                        otherAxisPrompt.basePoint = new AcGePoint3d(center);
+                        otherAxisPrompt.jig = new AcApEllipsePointJig(context.view, function (point) {
+                            var otherAxisRadius = distance2d(center, point);
+                            return buildEllipseDefinition(center, firstAxisUnit, firstAxisRadius, otherAxisRadius);
+                        }, center);
+                        return [4 /*yield*/, AcApDocManager.instance.editor.getPoint(otherAxisPrompt)];
+                    case 1:
+                        otherAxisResult = _b.sent();
+                        if (!(otherAxisResult.status === AcEdPromptStatus.Keyword)) return [3 /*break*/, 4];
+                        if (otherAxisResult.stringResult !== 'Rotation')
+                            return [2 /*return*/, undefined];
+                        rotationPrompt = new AcEdPromptDoubleOptions(AcApI18n.t('jig.ellipse.rotationAngle'));
+                        rotationPrompt.allowNegative = false;
+                        rotationPrompt.allowZero = true;
+                        rotationPrompt.jig = new AcApEllipseDistanceJig(context.view, function (degreeValue) {
+                            var secondAxisRadius = firstAxisRadius * Math.abs(Math.cos(degToRad(degreeValue)));
+                            return buildEllipseDefinition(center, firstAxisUnit, firstAxisRadius, secondAxisRadius);
+                        }, center);
+                        return [4 /*yield*/, AcApDocManager.instance.editor.getDouble(rotationPrompt)];
+                    case 2:
+                        rotationResult = _b.sent();
+                        if (rotationResult.status !== AcEdPromptStatus.OK)
+                            return [2 /*return*/, undefined];
+                        secondAxisRadius = firstAxisRadius *
+                            Math.abs(Math.cos(degToRad((_a = rotationResult.value) !== null && _a !== void 0 ? _a : 0)));
+                        definition_1 = buildEllipseDefinition(center, firstAxisUnit, firstAxisRadius, secondAxisRadius);
+                        if (!definition_1) {
+                            this.warnInvalidInput('rotation');
+                            return [3 /*break*/, 0];
+                        }
+                        if (!arcMode)
+                            return [2 /*return*/, definition_1];
+                        return [4 /*yield*/, this.promptArcAngles(context, definition_1)];
+                    case 3: return [2 /*return*/, _b.sent()];
+                    case 4:
+                        if (otherAxisResult.status !== AcEdPromptStatus.OK)
+                            return [2 /*return*/, undefined];
+                        otherAxisRadius = distance2d(center, otherAxisResult.value);
+                        definition = buildEllipseDefinition(center, firstAxisUnit, firstAxisRadius, otherAxisRadius);
+                        if (!definition) {
+                            this.warnInvalidInput('otherAxis');
+                            return [3 /*break*/, 0];
+                        }
+                        if (!arcMode)
+                            return [2 /*return*/, definition];
+                        return [4 /*yield*/, this.promptArcAngles(context, definition)];
+                    case 5: return [2 /*return*/, _b.sent()];
+                    case 6: return [2 /*return*/];
+                }
+            });
+        });
+    };
+    /**
+     * Prompts start and end angles for ellipse-arc creation.
+     *
+     * @param context - Current application/document context.
+     * @param baseEllipse - Base full-ellipse definition before arc trimming.
+     * @returns Arc ellipse definition, or `undefined` when canceled.
+     */
+    AcApEllipseCmd.prototype.promptArcAngles = function (context, baseEllipse) {
+        return __awaiter(this, void 0, void 0, function () {
+            var majorAxisBaseAngle, startPrompt, startResult, startAngle, endPrompt, endResult;
+            var _a, _b;
+            return __generator(this, function (_c) {
+                switch (_c.label) {
+                    case 0:
+                        majorAxisBaseAngle = axisAngleDeg(baseEllipse.majorAxis);
+                        startPrompt = new AcEdPromptAngleOptions(AcApI18n.t('jig.ellipse.arcStartAngle'));
+                        startPrompt.allowNegative = true;
+                        startPrompt.useBasePoint = true;
+                        startPrompt.useDashedLine = true;
+                        startPrompt.basePoint = new AcGePoint3d(baseEllipse.center);
+                        startPrompt.baseAngle = majorAxisBaseAngle;
+                        startPrompt.jig = new AcApEllipseDistanceJig(context.view, function (degreeValue) { return (__assign(__assign({}, baseEllipse), { startAngle: geometricAngleDegToEllipseParamRad(degreeValue, baseEllipse.majorRadius, baseEllipse.minorRadius), endAngle: TAU })); }, baseEllipse.center);
+                        return [4 /*yield*/, AcApDocManager.instance.editor.getAngle(startPrompt)];
+                    case 1:
+                        startResult = _c.sent();
+                        if (startResult.status !== AcEdPromptStatus.OK)
+                            return [2 /*return*/, undefined];
+                        startAngle = geometricAngleDegToEllipseParamRad((_a = startResult.value) !== null && _a !== void 0 ? _a : 0, baseEllipse.majorRadius, baseEllipse.minorRadius);
+                        endPrompt = new AcEdPromptAngleOptions(AcApI18n.t('jig.ellipse.arcEndAngle'));
+                        endPrompt.allowNegative = true;
+                        endPrompt.useBasePoint = true;
+                        endPrompt.useDashedLine = true;
+                        endPrompt.basePoint = new AcGePoint3d(baseEllipse.center);
+                        endPrompt.baseAngle = majorAxisBaseAngle;
+                        endPrompt.jig = new AcApEllipseDistanceJig(context.view, function (degreeValue) { return (__assign(__assign({}, baseEllipse), { startAngle: startAngle, endAngle: geometricAngleDegToEllipseParamRad(degreeValue, baseEllipse.majorRadius, baseEllipse.minorRadius) })); }, baseEllipse.center);
+                        return [4 /*yield*/, AcApDocManager.instance.editor.getAngle(endPrompt)];
+                    case 2:
+                        endResult = _c.sent();
+                        if (endResult.status !== AcEdPromptStatus.OK)
+                            return [2 /*return*/, undefined];
+                        return [2 /*return*/, __assign(__assign({}, baseEllipse), { startAngle: startAngle, endAngle: geometricAngleDegToEllipseParamRad((_b = endResult.value) !== null && _b !== void 0 ? _b : 0, baseEllipse.majorRadius, baseEllipse.minorRadius) })];
+                }
+            });
+        });
+    };
+    return AcApEllipseCmd;
+}(AcEdCommand));
+export { AcApEllipseCmd };
+//# sourceMappingURL=AcApEllipseCmd.js.map

package/lib/command/AcApEllipseCmd.js.map

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

package/lib/command/AcApEraseCmd.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AcApEraseCmd.d.ts","sourceRoot":"","sources":["../../src/command/AcApEraseCmd.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,WAAW,EAAkB,MAAM,QAAQ,CAAA;AACpE,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAKxC;;GAEG;AACH,qBAAa,YAAa,SAAQ,WAAW;;IAM3C;;;;OAIG;IACG,OAAO,CAAC,OAAO,EAAE,WAAW;CAwBnC"}
+{"version":3,"file":"AcApEraseCmd.d.ts","sourceRoot":"","sources":["../../src/command/AcApEraseCmd.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,WAAW,EAAkB,MAAM,QAAQ,CAAA;AACpE,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAQxC;;GAEG;AACH,qBAAa,YAAa,SAAQ,WAAW;;IAM3C;;;;OAIG;IACG,OAAO,CAAC,OAAO,EAAE,WAAW;CA+BnC"}

package/lib/command/AcApEraseCmd.js

@@ -51,7 +51,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 import { AcApAnnotation, AcApDocManager } from '../app';
 import { AcEdCommand } from '../command';
-import { AcEdPromptSelectionOptions } from '../editor/input/prompt';
+import { AcEdPromptSelectionOptions, AcEdPromptStatus } from '../editor/input/prompt';
 import { AcEdOpenMode } from '../editor/view';
 import { AcApI18n } from '../i18n';
 /**
@@ -71,7 +71,7 @@ var AcApEraseCmd = /** @class */ (function (_super) {
      */
     AcApEraseCmd.prototype.execute = function (context) {
         return __awaiter(this, void 0, void 0, function () {
-            var selectionSet, annotation, ids, message, options, ids;
+            var selectionSet, annotation, ids, message, options, selectionResult, ids;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -89,11 +89,15 @@ var AcApEraseCmd = /** @class */ (function (_super) {
                         options = new AcEdPromptSelectionOptions(message);
                         return [4 /*yield*/, AcApDocManager.instance.editor.getSelection(options)];
                     case 2:
-                        ids = _a.sent();
-                        if (ids && ids.length > 0) {
+                        selectionResult = _a.sent();
+                        if (selectionResult.status === AcEdPromptStatus.OK &&
+                            selectionResult.value &&
+                            selectionResult.value.count > 0) {
+                            ids = selectionResult.value.ids;
                             // If it is in review mode, annotation entities can be deleted only
-                            if (context.doc.openMode == AcEdOpenMode.Review)
-                                ids = annotation.filterAnnotationEntities(selectionSet.ids);
+                            if (context.doc.openMode == AcEdOpenMode.Review) {
+                                ids = annotation.filterAnnotationEntities(ids);
+                            }
                             context.doc.database.tables.blockTable.removeEntity(ids);
                             selectionSet.clear();
                         }

package/lib/command/AcApEraseCmd.js.map

@@ -1 +1 @@
-{"version":3,"file":"AcApEraseCmd.js","sourceRoot":"","sources":["../../src/command/AcApEraseCmd.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,EAAE,cAAc,EAAe,cAAc,EAAE,MAAM,QAAQ,CAAA;AACpE,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AACxC,OAAO,EAAE,0BAA0B,EAAE,MAAM,wBAAwB,CAAA;AACnE,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAC7C,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AAElC;;GAEG;AACH;IAAkC,gCAAW;IAC3C;QACE,YAAA,MAAK,WAAE,SAAA;QACP,KAAI,CAAC,IAAI,GAAG,YAAY,CAAC,MAAM,CAAA;;IACjC,CAAC;IAED;;;;OAIG;IACG,8BAAO,GAAb,UAAc,OAAoB;;;;;;wBAC1B,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,YAAY,CAAA;wBACxC,UAAU,GAAG,IAAI,cAAc,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;6BACvD,CAAA,YAAY,CAAC,KAAK,GAAG,CAAC,CAAA,EAAtB,wBAAsB;wBAElB,GAAG,GACP,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,YAAY,CAAC,MAAM;4BACzC,CAAC,CAAC,UAAU,CAAC,wBAAwB,CAAC,YAAY,CAAC,GAAG,CAAC;4BACvD,CAAC,CAAC,YAAY,CAAC,GAAG,CAAA;wBACtB,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,YAAY,CAAC,GAAG,CAAC,CAAA;wBACxD,YAAY,CAAC,KAAK,EAAE,CAAA;;;wBAEd,OAAO,GAAG,QAAQ,CAAC,YAAY,CAAC,OAAO,CAAC,CAAA;wBACxC,OAAO,GAAG,IAAI,0BAA0B,CAAC,OAAO,CAAC,CAAA;wBAC7C,qBAAM,cAAc,CAAC,QAAQ,CAAC,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,EAAA;;wBAAhE,GAAG,GAAG,SAA0D;wBACpE,IAAI,GAAG,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;4BAC1B,mEAAmE;4BACnE,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,YAAY,CAAC,MAAM;gCAC7C,GAAG,GAAG,UAAU,CAAC,wBAAwB,CAAC,YAAY,CAAC,GAAG,CAAC,CAAA;4BAC7D,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,YAAY,CAAC,GAAG,CAAC,CAAA;4BACxD,YAAY,CAAC,KAAK,EAAE,CAAA;wBACtB,CAAC;;;;;;KAEJ;IACH,mBAAC;AAAD,CAAC,AAnCD,CAAkC,WAAW,GAmC5C"}
+{"version":3,"file":"AcApEraseCmd.js","sourceRoot":"","sources":["../../src/command/AcApEraseCmd.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,EAAE,cAAc,EAAe,cAAc,EAAE,MAAM,QAAQ,CAAA;AACpE,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AACxC,OAAO,EACL,0BAA0B,EAC1B,gBAAgB,EACjB,MAAM,wBAAwB,CAAA;AAC/B,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAC7C,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AAElC;;GAEG;AACH;IAAkC,gCAAW;IAC3C;QACE,YAAA,MAAK,WAAE,SAAA;QACP,KAAI,CAAC,IAAI,GAAG,YAAY,CAAC,MAAM,CAAA;;IACjC,CAAC;IAED;;;;OAIG;IACG,8BAAO,GAAb,UAAc,OAAoB;;;;;;wBAC1B,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,YAAY,CAAA;wBACxC,UAAU,GAAG,IAAI,cAAc,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;6BACvD,CAAA,YAAY,CAAC,KAAK,GAAG,CAAC,CAAA,EAAtB,wBAAsB;wBAElB,GAAG,GACP,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,YAAY,CAAC,MAAM;4BACzC,CAAC,CAAC,UAAU,CAAC,wBAAwB,CAAC,YAAY,CAAC,GAAG,CAAC;4BACvD,CAAC,CAAC,YAAY,CAAC,GAAG,CAAA;wBACtB,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,YAAY,CAAC,GAAG,CAAC,CAAA;wBACxD,YAAY,CAAC,KAAK,EAAE,CAAA;;;wBAEd,OAAO,GAAG,QAAQ,CAAC,YAAY,CAAC,OAAO,CAAC,CAAA;wBACxC,OAAO,GAAG,IAAI,0BAA0B,CAAC,OAAO,CAAC,CAAA;wBAErD,qBAAM,cAAc,CAAC,QAAQ,CAAC,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,EAAA;;wBADtD,eAAe,GACnB,SAA0D;wBAC5D,IACE,eAAe,CAAC,MAAM,KAAK,gBAAgB,CAAC,EAAE;4BAC9C,eAAe,CAAC,KAAK;4BACrB,eAAe,CAAC,KAAK,CAAC,KAAK,GAAG,CAAC,EAC/B,CAAC;4BACG,GAAG,GAAG,eAAe,CAAC,KAAK,CAAC,GAAG,CAAA;4BACnC,mEAAmE;4BACnE,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,YAAY,CAAC,MAAM,EAAE,CAAC;gCAChD,GAAG,GAAG,UAAU,CAAC,wBAAwB,CAAC,GAAG,CAAC,CAAA;4BAChD,CAAC;4BACD,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,YAAY,CAAC,GAAG,CAAC,CAAA;4BACxD,YAAY,CAAC,KAAK,EAAE,CAAA;wBACtB,CAAC;;;;;;KAEJ;IACH,mBAAC;AAAD,CAAC,AA1CD,CAAkC,WAAW,GA0C5C"}