diff --git a/src/hooks/module/useModuleBasicSetting.js b/src/hooks/module/useModuleBasicSetting.js index c5ef9667..53b03c01 100644 --- a/src/hooks/module/useModuleBasicSetting.js +++ b/src/hooks/module/useModuleBasicSetting.js @@ -171,7 +171,7 @@ export function useModuleBasicSetting(tabNum) { case LINE_TYPE.SUBLINE.RIDGE: return data.ridgeIntvl / 10 default: - return 60 + return 60 / 10 } } //선택 배치면 배열` @@ -241,13 +241,23 @@ export function useModuleBasicSetting(tabNum) { } else { let offsetLength = canvasSetting.roofSizeSet === '3' ? -30 : (trestleDetail.eaveIntvl / 10) * -1 setSurfaceShapePattern(roof, roofDisplay.column, true, roof.roofMaterial) //패턴 변경 + // let offsetPoints = createPaddingPolygon(createRoofPolygon(roof.points), roof.lines).vertices //안쪽 offset let offsetPoints = null + console.log(roof, roof.getCurrentPoints()) + const polygon = createRoofPolygon(roof.getCurrentPoints()) + const originPolygon = new QPolygon(roof.getCurrentPoints(), { fontSize: 0 }) - if (['south', 'west'].includes(roof.direction)) { - offsetPoints = createPaddingPolygon(createRoofPolygon(roof.getCurrentPoints()), roof.lines).vertices //안쪽 offset + let result = createPaddingPolygon(polygon, roof.lines).vertices + + //margin polygon 의 point가 기준 polygon의 밖에 있는지 판단한다. + const allPointsOutside = result.every((point) => !originPolygon.inPolygon(point)) + + if (allPointsOutside) { + offsetPoints = createMarginPolygon(polygon, roof.lines).vertices } else { - offsetPoints = createMarginPolygon(createRoofPolygon(roof.getCurrentPoints()), roof.lines).vertices //안쪽 offset + offsetPoints = createPaddingPolygon(polygon, roof.lines).vertices } + //모듈설치영역?? 생성 const surfaceId = uuidv4()