eomsangdonandClaude Opus 5
e599884888
조사표 8~13절 검토에서 "기본 기능"으로 고른 것을 반영한다. - 좌표 입력: 절대·상대 좌표가 양수만 받아 `@-100,50`을 거부했다. 부호를 허용하고 극좌표 `@거리<각도`·`거리<각도`를 더했다. `-`·`+`가 확대·축소 단축키로 먼저 잡혀 음수의 첫 글자를 먹고 있어 그 두 단축키를 뺐다(줌은 휠·뷰 막대·명령). - 그립 편집: 선택 객체에 그립을 그리고 집어서 옮긴다. 선 끝점·중점, 폴리선 정점, 사각형 모서리, 원 중심·반지름, 문자·점 기준점. 폴리선은 세그먼트 중점을 끌면 정점이 늘고 정점 위 Ctrl+클릭이면 준다. 형상 필드가 private이라 공개 생성자로 다시 만들어 바꿔 끼우고 id·도면층·색·그룹을 물려받는다. - 자동 백업·복구: 5초 디바운스로 복구 전용 키에 저장하고, 시작할 때 백업이 있으면 눌러서 되살리는 안내를 띄운다. 저장(QSAVE)에 성공하면 백업을 지운다. - 선택 순환: 같은 자리를 다시 클릭하면 겹친 후보를 차례로 돌린다. - 상태막대: `극좌표 추적` 버튼이 `직교`와 같은 onClick이라 같은 일을 하고 있었다. 각각 45°·90°를 켜고 끄도록 고치고, 스냅 추적 토글과 F3·F7·F8·F10을 붙였다. - 문자 굵게·기울임을 캔버스·SVG·JSON·스타일 패널에 연결했다. - 조사표: 이미 되어 있던 5건의 표기를 정정하고, 출력·내보내기(9절)는 결재창 이후 PDF·DXF·DWG로 반영할 것이라 보류(P)로 구분해 사유를 남겼다. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
247 lines
8.5 KiB
TypeScript
247 lines
8.5 KiB
TypeScript
import { Point } from '@flatten-js/core';
|
|
import { toast } from 'react-toastify';
|
|
import {
|
|
CURSOR_SIZE,
|
|
GRIP_COLOR,
|
|
GRIP_SIZE,
|
|
GUIDE_LINE_COLOR,
|
|
GUIDE_LINE_STYLE,
|
|
GUIDE_LINE_WIDTH,
|
|
SNAP_POINT_COLOR,
|
|
SNAP_POINT_SIZE,
|
|
} from '../App.consts';
|
|
import { type SnapPoint, SnapPointType } from '../App.types';
|
|
import type { DrawController } from '../drawControllers/DrawController';
|
|
import type { ScreenCanvasDrawController } from '../drawControllers/screenCanvas.drawController';
|
|
import type { Entity } from '../entities/Entity';
|
|
import { getLayerById, isEntityHighlighted, isEntitySelected } from '../state';
|
|
import { getGrips } from './grips';
|
|
import { isEntityHidden } from './visibility';
|
|
|
|
export function drawEntities(drawController: DrawController, entities: Entity[]) {
|
|
for (const entity of entities) {
|
|
const layer = getLayerById(entity.layerId);
|
|
if (!layer) {
|
|
toast.error(`Failed to find layer for entity: ${entity?.id}`);
|
|
console.error('Failed to find layer for entity: ', entity);
|
|
continue;
|
|
}
|
|
if (!layer?.isVisible || layer.isFrozen) {
|
|
continue; // 꺼졌거나 동결된 도면층은 그리지 않는다
|
|
}
|
|
if (isEntityHidden(entity)) {
|
|
continue; // ISOLATEOBJECTS·HIDEOBJECTS로 숨긴 객체
|
|
}
|
|
drawController.setOpacity(entity.opacity ?? layer.opacity ?? 1);
|
|
drawController.setLineStyles(
|
|
isEntityHighlighted(entity),
|
|
isEntitySelected(entity),
|
|
entity.lineColor,
|
|
entity.lineWidth,
|
|
[]
|
|
);
|
|
entity.draw(drawController);
|
|
drawController.setOpacity(1);
|
|
}
|
|
}
|
|
|
|
export function drawDebugEntities(drawController: DrawController, debugEntities: Entity[]) {
|
|
for (const debugEntity of debugEntities) {
|
|
drawController.setLineStyles(
|
|
isEntityHighlighted(debugEntity),
|
|
isEntitySelected(debugEntity),
|
|
'#FF5500',
|
|
1,
|
|
[]
|
|
);
|
|
debugEntity.draw(drawController);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Draw the point to which the mouse will snap when the user clicks to draw the next point
|
|
* @param drawController
|
|
* @param snapPointInfo
|
|
* @param isMarked indicates that the point has been hovered lang enough to draw guides from this point
|
|
*/
|
|
export function drawSnapPoint(
|
|
drawController: ScreenCanvasDrawController,
|
|
snapPointInfo: SnapPoint | null,
|
|
isMarked: boolean
|
|
) {
|
|
if (!snapPointInfo) return;
|
|
const snapPoint = snapPointInfo.point;
|
|
const screenSnapPoint = drawController.worldToTarget(snapPoint);
|
|
|
|
drawController.setLineStyles(false, false, SNAP_POINT_COLOR, 1, []);
|
|
|
|
if (isMarked) {
|
|
// We will draw a plus sign inside the current snap point to indicate that it is marked
|
|
drawController.drawLineScreen(
|
|
new Point(screenSnapPoint.x - SNAP_POINT_SIZE / 2, screenSnapPoint.y),
|
|
new Point(screenSnapPoint.x + SNAP_POINT_SIZE / 2, screenSnapPoint.y)
|
|
);
|
|
drawController.drawLineScreen(
|
|
new Point(screenSnapPoint.x, screenSnapPoint.y - SNAP_POINT_SIZE / 2),
|
|
new Point(screenSnapPoint.x, screenSnapPoint.y + SNAP_POINT_SIZE / 2)
|
|
);
|
|
}
|
|
|
|
switch (snapPointInfo.type) {
|
|
case SnapPointType.LineEndPoint:
|
|
// Endpoint is marked with a square
|
|
|
|
// top
|
|
drawController.drawLineScreen(
|
|
new Point(screenSnapPoint.x - SNAP_POINT_SIZE / 2, screenSnapPoint.y - SNAP_POINT_SIZE / 2),
|
|
new Point(screenSnapPoint.x + SNAP_POINT_SIZE / 2, screenSnapPoint.y - SNAP_POINT_SIZE / 2)
|
|
);
|
|
|
|
// right
|
|
drawController.drawLineScreen(
|
|
new Point(screenSnapPoint.x + SNAP_POINT_SIZE / 2, screenSnapPoint.y - SNAP_POINT_SIZE / 2),
|
|
new Point(screenSnapPoint.x + SNAP_POINT_SIZE / 2, screenSnapPoint.y + SNAP_POINT_SIZE / 2)
|
|
);
|
|
|
|
// bottom
|
|
drawController.drawLineScreen(
|
|
new Point(screenSnapPoint.x - SNAP_POINT_SIZE / 2, screenSnapPoint.y + SNAP_POINT_SIZE / 2),
|
|
new Point(screenSnapPoint.x + SNAP_POINT_SIZE / 2, screenSnapPoint.y + SNAP_POINT_SIZE / 2)
|
|
);
|
|
|
|
// left
|
|
drawController.drawLineScreen(
|
|
new Point(screenSnapPoint.x - SNAP_POINT_SIZE / 2, screenSnapPoint.y - SNAP_POINT_SIZE / 2),
|
|
new Point(screenSnapPoint.x - SNAP_POINT_SIZE / 2, screenSnapPoint.y + SNAP_POINT_SIZE / 2)
|
|
);
|
|
|
|
break;
|
|
|
|
case SnapPointType.LineMidPoint:
|
|
// Midpoint is shown with a triangle
|
|
|
|
drawController.drawLineScreen(
|
|
new Point(screenSnapPoint.x, screenSnapPoint.y - SNAP_POINT_SIZE / 2),
|
|
new Point(screenSnapPoint.x - SNAP_POINT_SIZE / 2, screenSnapPoint.y + SNAP_POINT_SIZE / 2)
|
|
);
|
|
|
|
drawController.drawLineScreen(
|
|
new Point(screenSnapPoint.x - SNAP_POINT_SIZE / 2, screenSnapPoint.y + SNAP_POINT_SIZE / 2),
|
|
new Point(screenSnapPoint.x + SNAP_POINT_SIZE / 2, screenSnapPoint.y + SNAP_POINT_SIZE / 2)
|
|
);
|
|
|
|
drawController.drawLineScreen(
|
|
new Point(screenSnapPoint.x + SNAP_POINT_SIZE / 2, screenSnapPoint.y + SNAP_POINT_SIZE / 2),
|
|
new Point(screenSnapPoint.x, screenSnapPoint.y - SNAP_POINT_SIZE / 2)
|
|
);
|
|
break;
|
|
|
|
case SnapPointType.AngleGuide:
|
|
// Angle guide is shown with an hourglass
|
|
|
|
drawController.drawLineScreen(
|
|
new Point(screenSnapPoint.x - SNAP_POINT_SIZE / 2, screenSnapPoint.y - SNAP_POINT_SIZE / 2),
|
|
new Point(screenSnapPoint.x + SNAP_POINT_SIZE / 2, screenSnapPoint.y - SNAP_POINT_SIZE / 2)
|
|
);
|
|
|
|
drawController.drawLineScreen(
|
|
new Point(screenSnapPoint.x + SNAP_POINT_SIZE / 2, screenSnapPoint.y - SNAP_POINT_SIZE / 2),
|
|
new Point(screenSnapPoint.x - SNAP_POINT_SIZE / 2, screenSnapPoint.y + SNAP_POINT_SIZE / 2)
|
|
);
|
|
|
|
drawController.drawLineScreen(
|
|
new Point(screenSnapPoint.x - SNAP_POINT_SIZE / 2, screenSnapPoint.y + SNAP_POINT_SIZE / 2),
|
|
new Point(screenSnapPoint.x + SNAP_POINT_SIZE / 2, screenSnapPoint.y + SNAP_POINT_SIZE / 2)
|
|
);
|
|
|
|
drawController.drawLineScreen(
|
|
new Point(screenSnapPoint.x + SNAP_POINT_SIZE / 2, screenSnapPoint.y + SNAP_POINT_SIZE / 2),
|
|
new Point(screenSnapPoint.x - SNAP_POINT_SIZE / 2, screenSnapPoint.y - SNAP_POINT_SIZE / 2)
|
|
);
|
|
break;
|
|
|
|
case SnapPointType.Intersection:
|
|
// Intersection is shown with a cross
|
|
|
|
drawController.drawLineScreen(
|
|
new Point(screenSnapPoint.x - SNAP_POINT_SIZE / 2, screenSnapPoint.y - SNAP_POINT_SIZE / 2),
|
|
new Point(screenSnapPoint.x + SNAP_POINT_SIZE / 2, screenSnapPoint.y + SNAP_POINT_SIZE / 2)
|
|
);
|
|
|
|
drawController.drawLineScreen(
|
|
new Point(screenSnapPoint.x + SNAP_POINT_SIZE / 2, screenSnapPoint.y - SNAP_POINT_SIZE / 2),
|
|
new Point(screenSnapPoint.x - SNAP_POINT_SIZE / 2, screenSnapPoint.y + SNAP_POINT_SIZE / 2)
|
|
);
|
|
break;
|
|
|
|
case SnapPointType.CircleCenter:
|
|
// Circle center is shown with a circle
|
|
drawController.drawArcScreen(screenSnapPoint, SNAP_POINT_SIZE / 2, 0, 2 * Math.PI, true);
|
|
break;
|
|
|
|
case SnapPointType.CircleCardinal:
|
|
// Circle cardinal is shown with a diamond
|
|
drawController.drawLineScreen(
|
|
new Point(screenSnapPoint.x, screenSnapPoint.y - SNAP_POINT_SIZE / 2),
|
|
new Point(screenSnapPoint.x - SNAP_POINT_SIZE / 2, screenSnapPoint.y)
|
|
);
|
|
drawController.drawLineScreen(
|
|
new Point(screenSnapPoint.x - SNAP_POINT_SIZE / 2, screenSnapPoint.y),
|
|
new Point(screenSnapPoint.x, screenSnapPoint.y + SNAP_POINT_SIZE / 2)
|
|
);
|
|
drawController.drawLineScreen(
|
|
new Point(screenSnapPoint.x, screenSnapPoint.y + SNAP_POINT_SIZE / 2),
|
|
new Point(screenSnapPoint.x + SNAP_POINT_SIZE / 2, screenSnapPoint.y)
|
|
);
|
|
drawController.drawLineScreen(
|
|
new Point(screenSnapPoint.x + SNAP_POINT_SIZE / 2, screenSnapPoint.y),
|
|
new Point(screenSnapPoint.x, screenSnapPoint.y - SNAP_POINT_SIZE / 2)
|
|
);
|
|
break;
|
|
}
|
|
}
|
|
|
|
export function drawHelpers(drawController: DrawController, helperEntities: Entity[]) {
|
|
for (const entity of helperEntities) {
|
|
drawController.setLineStyles(
|
|
isEntityHighlighted(entity),
|
|
isEntitySelected(entity),
|
|
GUIDE_LINE_COLOR,
|
|
GUIDE_LINE_WIDTH,
|
|
GUIDE_LINE_STYLE
|
|
);
|
|
entity.draw(drawController);
|
|
}
|
|
}
|
|
|
|
export function drawCursor(drawController: ScreenCanvasDrawController) {
|
|
drawController.setLineStyles(false, false, '#FFF', 1, []);
|
|
|
|
const screenMouseLocation = drawController.getScreenMouseLocation();
|
|
|
|
drawController.drawLineScreen(
|
|
new Point(screenMouseLocation.x, screenMouseLocation.y - CURSOR_SIZE),
|
|
new Point(screenMouseLocation.x, screenMouseLocation.y + CURSOR_SIZE)
|
|
);
|
|
drawController.drawLineScreen(
|
|
new Point(screenMouseLocation.x - CURSOR_SIZE, screenMouseLocation.y),
|
|
new Point(screenMouseLocation.x + CURSOR_SIZE, screenMouseLocation.y)
|
|
);
|
|
}
|
|
|
|
/** 선택한 객체의 그립(편집점)을 화면 크기 고정 사각형으로 그린다 */
|
|
export function drawGrips(drawController: ScreenCanvasDrawController, entities: Entity[]) {
|
|
for (const entity of entities) {
|
|
for (const grip of getGrips(entity)) {
|
|
const screenPoint = drawController.worldToTarget(grip.point);
|
|
drawController.fillRectScreen(
|
|
screenPoint.x - GRIP_SIZE / 2,
|
|
screenPoint.y - GRIP_SIZE / 2,
|
|
GRIP_SIZE,
|
|
GRIP_SIZE,
|
|
GRIP_COLOR
|
|
);
|
|
}
|
|
}
|
|
}
|