From 5daf9891800be586c370c9392653d0fa35667da5 Mon Sep 17 00:00:00 2001 From: "hyojun.choi" Date: Tue, 29 Oct 2024 12:56:38 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B0=81=EB=8F=84=20=EA=B3=84=EC=82=B0=20?= =?UTF-8?q?=EC=88=98=EC=A0=95,=20=EC=A7=80=EB=B6=95=EB=A9=B4=20=EC=99=84?= =?UTF-8?q?=EB=A3=8C=20=EC=8B=9C=20=EC=99=B8=EB=B2=BD=EC=84=A0=20=EC=A0=9C?= =?UTF-8?q?=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/hooks/roofcover/useEavesGableEdit.js | 5 ++++- src/hooks/roofcover/useRoofAllocationSetting.js | 6 ++++++ src/util/canvas-util.js | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/hooks/roofcover/useEavesGableEdit.js b/src/hooks/roofcover/useEavesGableEdit.js index b0085019..7696dc7a 100644 --- a/src/hooks/roofcover/useEavesGableEdit.js +++ b/src/hooks/roofcover/useEavesGableEdit.js @@ -170,7 +170,10 @@ export function useEavesGableEdit(id) { }) const wallLines = canvas.getObjects().filter((obj) => obj.name === 'wallLine') - + const removeTargets = canvas.getObjects().filter((obj) => obj.name === 'pitchText') + removeTargets.forEach((obj) => { + canvas.remove(obj) + }) wallLines.forEach((wallLine) => { addPitchTextsByOuterLines() const roof = drawRoofPolygon(wallLine) diff --git a/src/hooks/roofcover/useRoofAllocationSetting.js b/src/hooks/roofcover/useRoofAllocationSetting.js index 3f355111..3be745d6 100644 --- a/src/hooks/roofcover/useRoofAllocationSetting.js +++ b/src/hooks/roofcover/useRoofAllocationSetting.js @@ -130,6 +130,12 @@ export function useRoofAllocationSetting(id) { setSurfaceShapePattern(roof, roofDisplay.column) drawDirectionArrow(roof) }) + + const removeTargets = canvas.getObjects().filter((obj) => obj.name === 'outerLinePoint' || obj.name === 'outerLine') + removeTargets.forEach((obj) => { + canvas.remove(obj) + }) + closePopup(id) } diff --git a/src/util/canvas-util.js b/src/util/canvas-util.js index 9f8b9469..73464722 100644 --- a/src/util/canvas-util.js +++ b/src/util/canvas-util.js @@ -268,7 +268,7 @@ export const getDegreeByChon = (chon) => { export const getChonByDegree = (degree) => { // tan(theta) = height / base const radians = (degree * Math.PI) / 180 - return Number(Number(Math.tan(radians) * 10).toFixed(1)) + return Number(Number(Math.tan(radians) * 10).toFixed(2)) } /**