feature/jaeyoung #46

Merged
LEE_JAEYOUNG merged 58 commits from feature/jaeyoung into dev 2025-05-21 13:53:44 +09:00
2 changed files with 9 additions and 3 deletions
Showing only changes of commit bb6a796b9f - Show all commits

View File

@ -849,8 +849,14 @@ export function useAuxiliaryDrawing(id, isUseEffect = true) {
if (
lineHistory.current.some(
(history) =>
JSON.stringify(history.startPoint) === JSON.stringify(line.startPoint) &&
JSON.stringify(history.endPoint) === JSON.stringify(line.endPoint),
(Math.abs(history.startPoint.x - line.startPoint.x) < 2 &&
Math.abs(history.startPoint.y - line.startPoint.y) < 2 &&
Math.abs(history.endPoint.x - line.endPoint.x) < 2 &&
Math.abs(history.endPoint.y - line.endPoint.y) < 2) ||
(Math.abs(history.startPoint.x - line.endPoint.x) < 2 &&
Math.abs(history.startPoint.y - line.endPoint.y) < 2 &&
Math.abs(history.endPoint.x - line.startPoint.x) < 2 &&
Math.abs(history.endPoint.y - line.startPoint.y) < 2),
)
) {
canvas.remove(line)

View File

@ -412,7 +412,7 @@ export function useRoofAllocationSetting(id) {
})
/** 외곽선 삭제 */
const removeTargets = canvas.getObjects().filter((obj) => obj.name === 'outerLinePoint' || obj.name === 'outerLine')
const removeTargets = canvas.getObjects().filter((obj) => obj.name === 'outerLinePoint' || obj.name === 'outerLine' || obj.name === 'pitchText')
removeTargets.forEach((obj) => {
canvas.remove(obj)
})