Files
Aislo/B07_DesignDetail/openwebcad/src/entities/ArcEntity.ts
T
eomsangdon ea9d9685be feat(B07): CAD를 AutoCAD 명령 체계로 재구성한다 (조사표 1·2·3·5절)
저장소 사고로 잃은 4개 커밋(38eb7cd4·b8a11756·281528bf·f60b488d)의 작업물을
하나로 다시 담았다. 내용은 동일하다.

■ 구조
- commands/: 명령 정의(id·AutoCAD 별칭·글리프·도구/즉시실행)를 단일 소스로 두고
  리본·명령행·단축키가 모두 이 레지스트리를 읽는다. tools/tool.consts.ts 폐지.
- ribbon/: 탭→패널→명령 데이터(ribbon.config.ts)와 범용 렌더러 분리.
  AutoCAD 배치(홈·삽입·주석·뷰·출력)와 패널 확장(▾)을 따른다.
- tools/factories/sequence-tool.ts: 점·숫자·문자·객체·선택 단계를 선언하면
  xstate 머신을 만들어 주는 공장. 명령당 170줄 보일러플레이트 제거.
- helpers/geometry/: 3점 호·정다각형·타원·스플라인·구름형·평행이동·해치 스캔선·
  점렬 샘플링 등 상태 없는 순수 함수.
- Toolbar 483줄을 QuickAccessBar/Ribbon/InspectorPanel/StatusBar/CommandLine/
  ViewControls/PropertiesEditor/QuickProperties로 분해.

■ 명령 (조사표 기준)
- 1절 그리기 21건, 2절 수정 27건, 3절 도면층·특성·그룹·유틸리티 39건 전부 반영.
- 5절 주석 34건 중 26건 반영(문자·치수 16종·지시선·표·구름형·주석 축척).
- HatchEntity 추가(solid·pattern·cross·gradient) + JSON 왕복, Layer에 색·선가중치·
  선종류·동결·투명도 필드 추가, 그리기 루프가 동결·숨김·투명도를 반영.

■ 화면 실측에서 고친 결함
- 명령행 포커스 상태에서 ENTER가 도구로 가지 않던 문제
- 명령행 문자 입력이 접두사가 같은 명령으로 실행되던 문제
- 명령이 끝나도 입력을 계속 먹던 문제(점 입력 명령만 반복, 나머지는 선택 도구 복귀)
- 시퀀스 단계 인덱스 오사용 9건 + 단계 값 종류 검사 추가
- 해치 내부를 클릭해도 선택되지 않던 문제

미반영 8건(맞춤법 검사·꺾기 치수·치수 끊기/재연관/검사 치수·기하공차·지시선 수집·
축척 리스트 편집)은 조사표 `반영` 열과 PLAN.md에 사유를 적었다.
2026-08-30 01:34:13 +09:00

281 lines
7.0 KiB
TypeScript

import { Arc, type Box, Line, Point, type Segment } from '@flatten-js/core';
import { uniqWith } from 'es-toolkit';
import {
type Shape,
type SnapPoint,
SnapPointType,
type StartAndEndpointEntity,
} from '../App.types';
import type { DrawController } from '../drawControllers/DrawController.ts';
import { getExportColor } from '../helpers/get-export-color';
import { isPointEqual } from '../helpers/is-point-equal';
import { mirrorPointOverAxis } from '../helpers/mirror-point-over-axis.ts';
import { scalePoint } from '../helpers/scale-point';
import { sortPointsOnArc } from '../helpers/sort-points-on-arc';
import { getActiveLayerId, isEntityHighlighted, isEntitySelected } from '../state.ts';
import { type Entity, EntityName, type JsonEntity } from './Entity';
import type { LineEntity } from './LineEntity.ts';
export class ArcEntity implements Entity, StartAndEndpointEntity {
public id: string = crypto.randomUUID();
public lineColor = '#fff';
public lineWidth = 1;
public lineDash: number[] | undefined = undefined;
public layerId: string;
/** 0~1 객체 투명도 (Entity 인터페이스의 선택 항목) */
public opacity?: number;
/** GROUP으로 묶인 객체가 공유하는 식별자 */
public groupId?: string;
private arc: Arc;
public static getAngle(centerPoint: Point, pointOnArc: Point): number {
return new Line(centerPoint, pointOnArc).slope;
}
constructor(
layerId: string,
centerPoint: Point,
radius: number,
startAngle: number,
endAngle: number,
counterClockwise = true
) {
this.layerId = layerId;
this.arc = new Arc(centerPoint, radius, startAngle, endAngle, counterClockwise);
}
public draw(
drawController: DrawController,
parentHighlighted?: boolean,
parentSelected?: boolean
): void {
drawController.setLineStyles(
parentHighlighted ?? isEntityHighlighted(this),
parentSelected ?? isEntitySelected(this),
this.lineColor,
this.lineWidth,
this.lineDash
);
drawController.drawArc(
this.arc.center,
this.arc.r.valueOf(),
this.arc?.startAngle || 0,
this.arc?.endAngle || 2 * Math.PI,
this.arc.counterClockwise
);
}
public move(x: number, y: number) {
this.arc = this.arc.translate(x, y);
}
public scale(scaleOrigin: Point, scaleFactor: number) {
const center = scalePoint(this.arc.center, scaleOrigin, scaleFactor);
this.arc = new Arc(
center,
this.arc.r.valueOf() * scaleFactor,
this.arc.startAngle,
this.arc.endAngle,
this.arc.counterClockwise
);
}
public rotate(rotateOrigin: Point, angle: number) {
this.arc = this.arc.rotate(angle, rotateOrigin);
}
public mirror(mirrorAxis: LineEntity) {
const mirroredCenter = mirrorPointOverAxis(this.arc.center, mirrorAxis);
mirrorAxis.getAngle();
this.arc = new Arc(
mirroredCenter,
this.arc.r.valueOf(),
-this.arc.startAngle,
-this.arc.endAngle,
!this.arc.counterClockwise
);
}
public clone(): Entity {
if (this.arc) {
const { center, r, startAngle, endAngle, counterClockwise } = this.arc;
return new ArcEntity(
getActiveLayerId(),
center,
r.valueOf(),
startAngle,
endAngle,
counterClockwise
);
}
return this;
}
public intersectsWithBox(box: Box): boolean {
return this.arc.intersect(box).length > 0;
}
public isContainedInBox(box: Box): boolean {
return box.contains(this.arc);
}
public getBoundingBox(): Box {
return this.arc.box;
}
public getShape(): Shape | null {
return this.arc;
}
public getSnapPoints(): SnapPoint[] {
return [
{
point: this.arc.center,
type: SnapPointType.CircleCenter,
},
{
point: this.arc.start,
type: SnapPointType.LineEndPoint,
},
{
point: this.arc.end,
type: SnapPointType.LineEndPoint,
},
// TODO add cardinal points if they lay on the arc
// TODO add tangent points from mouse location to circle
];
}
public getIntersections(entity: Entity): Point[] {
const otherShape = entity.getShape();
if (!otherShape) {
return [];
}
return this.arc.intersect(otherShape);
}
public getFirstPoint(): Point | null {
return this.arc.center;
}
public distanceTo(shape: Shape): [number, Segment] | null {
return this.arc.distanceTo(shape);
}
public getSvgString(): string | null {
return (
this.arc.svg({
strokeWidth: this.lineWidth,
stroke: getExportColor(this.lineColor),
}) || null
);
}
public getType(): EntityName {
return EntityName.Arc;
}
public containsPointOnShape(point: Point): boolean {
if (!this.arc) {
return false;
}
return this.arc.contains(point);
}
public cutAtPoints(pointsOnShape: Point[]): ArcEntity[] {
const points = uniqWith([this.arc.start, this.arc.end, ...pointsOnShape], isPointEqual);
const sortedPoints = sortPointsOnArc(points, this.arc.center, this.arc.start);
const segmentArcs: ArcEntity[] = [];
for (let i = 0; i < sortedPoints.length - 1; i++) {
const point1 = sortedPoints[i];
const point2 = sortedPoints[i + 1];
const startAngle = ArcEntity.getAngle(this.arc.center, point1);
const endAngle = ArcEntity.getAngle(this.arc.center, point2);
const newArc = new ArcEntity(
getActiveLayerId(),
this.arc.center,
Number(this.arc.r),
startAngle,
endAngle,
this.arc.counterClockwise
);
newArc.lineColor = this.lineColor;
newArc.lineWidth = this.lineWidth;
segmentArcs.push(newArc);
}
return segmentArcs;
}
public async toJson(): Promise<JsonEntity<ArcJsonData> | null> {
if (!this.arc) {
return null;
}
return {
id: this.id,
type: EntityName.Arc,
lineColor: this.lineColor,
lineWidth: this.lineWidth,
lineDash: this.lineDash,
layerId: this.layerId,
shapeData: {
center: { x: this.arc.center.x, y: this.arc.center.y },
radius: this.arc.r.valueOf(),
startAngle: this.arc.startAngle,
endAngle: this.arc.endAngle,
counterClockwise: this.arc.counterClockwise,
},
};
}
public static async fromJson(jsonEntity: JsonEntity<ArcJsonData>): Promise<ArcEntity> {
if (jsonEntity.type !== EntityName.Arc) {
throw new Error('Invalid Entity type in JSON');
}
if (!jsonEntity.shapeData) {
throw new Error('Invalid JSON entity of type Arc: missing shapeData');
}
const center = new Point(jsonEntity.shapeData.center.x, jsonEntity.shapeData.center.y);
const radius = jsonEntity.shapeData.radius;
const startAngle = jsonEntity.shapeData.startAngle;
const endAngle = jsonEntity.shapeData.endAngle;
const counterClockwise = jsonEntity.shapeData.counterClockwise;
const arcEntity = new ArcEntity(
jsonEntity.layerId || getActiveLayerId(),
center,
radius,
startAngle,
endAngle,
counterClockwise
);
arcEntity.id = jsonEntity.id;
arcEntity.lineColor = jsonEntity.lineColor;
arcEntity.lineWidth = jsonEntity.lineWidth;
arcEntity.lineDash = jsonEntity.lineDash;
return arcEntity;
}
public getStartPoint(): Point {
return this.arc.start;
}
public getEndPoint(): Point {
return this.arc.end;
}
}
export interface ArcJsonData {
center: { x: number; y: number };
radius: number;
startAngle: number;
endAngle: number;
counterClockwise: boolean;
}