Merge pull request 'dev' (#635) from dev into dev-deploy

Reviewed-on: #635
This commit is contained in:
ysCha 2026-02-03 18:46:21 +09:00
commit edcbfd1ef9
3 changed files with 10 additions and 5 deletions

View File

@ -21,6 +21,7 @@ export default function FlowDirectionSetting(props) {
const canvas = useRecoilValue(canvasState) const canvas = useRecoilValue(canvasState)
const { getMessage } = useMessage() const { getMessage } = useMessage()
const { setSurfaceShapePattern } = useRoofFn() const { setSurfaceShapePattern } = useRoofFn()
const { setPolygonLinesActualSize } = usePolygon()
const { changeSurfaceLineType } = useSurfaceShapeBatch({}) const { changeSurfaceLineType } = useSurfaceShapeBatch({})
@ -85,6 +86,8 @@ export default function FlowDirectionSetting(props) {
drawDirectionArrow(roof) drawDirectionArrow(roof)
canvas?.renderAll() canvas?.renderAll()
changeSurfaceLineType(roof) changeSurfaceLineType(roof)
setPolygonLinesActualSize(roof, true)
canvas.renderAll()
closePopup(id) closePopup(id)
} }

View File

@ -166,9 +166,10 @@ export const useLine = () => {
* @param line * @param line
* @param direction polygon의 방향 * @param direction polygon의 방향
* @param pitch * @param pitch
* @param forceUpdate
*/ */
const setActualSize = (line, direction, pitch = globalPitch) => { const setActualSize = (line, direction, pitch = globalPitch, forceUpdate = false) => {
if (line.attributes.isCalculated) { if (line.attributes.isCalculated && !forceUpdate) {
return return
} }
const { x1, y1, x2, y2 } = line const { x1, y1, x2, y2 } = line

View File

@ -1943,8 +1943,9 @@ export const usePolygon = () => {
/** /**
* 폴리곤의 라인 속성을 복도치수, 실제치수에 따라 actualSize 설정 * 폴리곤의 라인 속성을 복도치수, 실제치수에 따라 actualSize 설정
* @param polygon * @param polygon
* @param forceUpdate
*/ */
const setPolygonLinesActualSize = (polygon) => { const setPolygonLinesActualSize = (polygon, forceUpdate = false) => {
if (!polygon.lines || polygon.lines.length === 0 || !polygon.roofMaterial) { if (!polygon.lines || polygon.lines.length === 0 || !polygon.roofMaterial) {
return return
} }
@ -1973,7 +1974,7 @@ export const usePolygon = () => {
} }
polygon.lines.forEach((line, index) => { polygon.lines.forEach((line, index) => {
if (line.attributes.isCalculated) { if (line.attributes.isCalculated && !forceUpdate) {
return return
} }
//text 와 planSize 및 actualSize가 안맞는 문제 //text 와 planSize 및 actualSize가 안맞는 문제
@ -1985,7 +1986,7 @@ export const usePolygon = () => {
} }
}*/ }*/
setActualSize(line, polygon.direction, +polygon.roofMaterial?.pitch) setActualSize(line, polygon.direction, +polygon.roofMaterial?.pitch, forceUpdate)
}) })
addLengthText(polygon) addLengthText(polygon)