From 25b58dafec512099dd1a0480343f2e030ded3cf8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=8B=9D?=
<43837214+Minsiki@users.noreply.github.com>
Date: Thu, 20 Feb 2025 17:52:52 +0900
Subject: [PATCH] =?UTF-8?q?-=20=EC=B9=98=EC=88=98=20=EC=9E=85=EB=A0=A5=20?=
=?UTF-8?q?=EB=B0=A9=EB=B2=95=EC=9D=B4=20=EC=9C=A1=EC=A7=80=EB=B6=95?=
=?UTF-8?q?=EC=9D=BC=20=EB=95=8C=20=EC=84=A0=20=EC=86=8D=EC=84=B1=20?=
=?UTF-8?q?=EC=84=A4=EC=A0=95=20=EC=83=9D=EB=9E=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/hooks/surface/usePlacementShapeDrawing.js | 7 ++++++-
src/hooks/surface/useSurfaceShapeBatch.js | 5 +++--
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/hooks/surface/usePlacementShapeDrawing.js b/src/hooks/surface/usePlacementShapeDrawing.js
index c2b7ff98..6ebd1414 100644
--- a/src/hooks/surface/usePlacementShapeDrawing.js
+++ b/src/hooks/surface/usePlacementShapeDrawing.js
@@ -3,6 +3,7 @@ import {
adsorptionPointAddModeState,
adsorptionPointModeState,
adsorptionRangeState,
+ canvasSettingState,
canvasState,
dotLineIntervalSelector,
globalPitchState,
@@ -49,7 +50,7 @@ export function usePlacementShapeDrawing(id) {
const { addPolygonByLines, drawDirectionArrow } = usePolygon()
const { tempGridMode } = useTempGrid()
const { setSurfaceShapePattern } = useRoofFn()
-
+ const canvasSetting = useRecoilValue(canvasSettingState)
const verticalHorizontalMode = useRecoilValue(verticalHorizontalModeState)
const adsorptionPointAddMode = useRecoilValue(adsorptionPointAddModeState)
const adsorptionPointMode = useRecoilValue(adsorptionPointModeState)
@@ -246,6 +247,10 @@ export function usePlacementShapeDrawing(id) {
setPoints([])
canvas?.renderAll()
+ if (+canvasSetting?.roofSizeSet === 3) {
+ closePopup(id)
+ return
+ }
addPopup(id, 1, , false)
}
diff --git a/src/hooks/surface/useSurfaceShapeBatch.js b/src/hooks/surface/useSurfaceShapeBatch.js
index abb3688b..7b0efec8 100644
--- a/src/hooks/surface/useSurfaceShapeBatch.js
+++ b/src/hooks/surface/useSurfaceShapeBatch.js
@@ -2,7 +2,7 @@
import { useEffect } from 'react'
import { useRecoilState, useRecoilValue, useResetRecoilState } from 'recoil'
-import { canvasState, currentCanvasPlanState, globalPitchState } from '@/store/canvasAtom'
+import { canvasSettingState, canvasState, currentCanvasPlanState, globalPitchState } from '@/store/canvasAtom'
import { MENU, POLYGON_TYPE } from '@/common/common'
import { getIntersectionPoint } from '@/util/canvas-util'
import { degreesToRadians } from '@turf/turf'
@@ -29,7 +29,7 @@ export function useSurfaceShapeBatch({ isHidden, setIsHidden }) {
const lengthTextFont = useRecoilValue(fontSelector('lengthText'))
const resetOuterLinePoints = useResetRecoilState(outerLinePointsState)
const resetPlacementShapeDrawingPoints = useResetRecoilState(placementShapeDrawingPointsState)
-
+ const canvasSetting = useRecoilValue(canvasSettingState)
const canvas = useRecoilValue(canvasState)
const globalPitch = useRecoilValue(globalPitchState)
const roofDisplay = useRecoilValue(roofDisplaySelector)
@@ -200,6 +200,7 @@ export function useSurfaceShapeBatch({ isHidden, setIsHidden }) {
// closePopup(id)
initEvent()
+ if (+canvasSetting?.roofSizeSet === 3) return
const popupId = uuidv4()
addPopup(popupId, 2, )
})