From a8c57b1c53e886345c084485dbc12093cc75be5e Mon Sep 17 00:00:00 2001 From: "hyojun.choi" Date: Wed, 14 May 2025 10:59:29 +0900 Subject: [PATCH] =?UTF-8?q?=EC=A7=80=EB=B6=95=EC=9E=AC=20=ED=95=A0?= =?UTF-8?q?=EB=8B=B9=ED=9B=84=20=EC=B2=98=EB=A6=AC=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/hooks/roofcover/useRoofAllocationSetting.js | 1 + src/hooks/usePolygon.js | 9 +++++++++ src/util/canvas-util.js | 2 -- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/hooks/roofcover/useRoofAllocationSetting.js b/src/hooks/roofcover/useRoofAllocationSetting.js index 79510bc1..fee893a6 100644 --- a/src/hooks/roofcover/useRoofAllocationSetting.js +++ b/src/hooks/roofcover/useRoofAllocationSetting.js @@ -383,6 +383,7 @@ export function useRoofAllocationSetting(id) { } } catch (e) { console.log(e) + canvas.discardActiveObject() return } diff --git a/src/hooks/usePolygon.js b/src/hooks/usePolygon.js index 7e2e28ee..577274ad 100644 --- a/src/hooks/usePolygon.js +++ b/src/hooks/usePolygon.js @@ -1168,6 +1168,15 @@ export const usePolygon = () => { canvas.remove(polygon) canvas.renderAll() }) + + //지붕 완료 후 보조선을 전부 제거한다. + const auxiliaryLines = canvas.getObjects().filter((obj) => obj.name === 'auxiliaryLine') + + auxiliaryLines.forEach((line) => { + canvas.remove(line) + }) + canvas.renderAll() + canvas.discardActiveObject() } const getSplitRoofsPoints = (allLines) => { diff --git a/src/util/canvas-util.js b/src/util/canvas-util.js index 1d067ad8..c7a1fc17 100644 --- a/src/util/canvas-util.js +++ b/src/util/canvas-util.js @@ -549,8 +549,6 @@ export function isPointOnLine({ x1, y1, x2, y2 }, { x, y }, epsilon = 2) { withinYRange = withinYRange && 2 <= Math.max(y1, y2) - y } - console.log(Math.min(x1, x2) - x, Math.max(x1, x2) - x) - return withinXRange && withinYRange } /**