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)) } /**