남측 빗면, 평면일때 적용

This commit is contained in:
yjnoh 2025-02-08 20:14:05 +09:00
parent 0c1c7452d6
commit ff5c3c5d4c

View File

@ -861,9 +861,9 @@ export function useModuleBasicSetting(tabNum) {
startPoint = { ...startPoint, y1: startPoint.y1 - heightMargin } startPoint = { ...startPoint, y1: startPoint.y1 - heightMargin }
} }
} }
} else { }
//밑에가 평면이면 좌측으로 붙여서 배치 //밑에가 평면이면 좌측으로 붙여서 배치
if (flowLines.bottom.type === 'flat') { if (flowLines.bottom.type === 'flat' && flowLines.left.type === 'curve') {
startPoint = flowLines.left startPoint = flowLines.left
} }
@ -915,6 +915,7 @@ export function useModuleBasicSetting(tabNum) {
canvas?.add(tempModule) canvas?.add(tempModule)
moduleSetupArray.push(tempModule) moduleSetupArray.push(tempModule)
moduleArray.push(tempModule) moduleArray.push(tempModule)
canvas.renderAll()
} }
}) })
} else { } else {
@ -923,12 +924,13 @@ export function useModuleBasicSetting(tabNum) {
canvas?.add(tempModule) canvas?.add(tempModule)
moduleSetupArray.push(tempModule) moduleSetupArray.push(tempModule)
moduleArray.push(tempModule) moduleArray.push(tempModule)
canvas.renderAll()
} }
} else { } else {
//디버깅용 //디버깅용
// tempModule.set({ fill: 'rgba(255,190,41, 0.4)', stroke: 'black', strokeWidth: 1 }) // tempModule.set({ fill: 'rgba(255,190,41, 0.4)', stroke: 'black', strokeWidth: 1 })
// canvas?.add(tempModule) // canvas?.add(tempModule)
} // canvas.renderAll()
} }
} }
} }
@ -972,8 +974,14 @@ export function useModuleBasicSetting(tabNum) {
} }
} }
const maxRightEndPoint = surfaceMaxLines.right.x1 - 100 //최 우측 console.log('flowLines.top', flowLines.top)
const maxTopEndPoint = surfaceMaxLines.top.y1 - 50 //최 상단
if (flowLines.left.type === 'flat') {
startPoint = flowLines.top
}
const maxRightEndPoint = surfaceMaxLines.right.x1 //최 우측
const maxTopEndPoint = surfaceMaxLines.top.y1 //최 상단
const maxBottomEndPoint = surfaceMaxLines.bottom.y1 //최하단 const maxBottomEndPoint = surfaceMaxLines.bottom.y1 //최하단
let totalTopEndPoint = Math.abs(maxTopEndPoint - startPoint.y1) //전체 높이에서 현재 높이를 뺌 let totalTopEndPoint = Math.abs(maxTopEndPoint - startPoint.y1) //전체 높이에서 현재 높이를 뺌
@ -1139,19 +1147,22 @@ export function useModuleBasicSetting(tabNum) {
canvas?.add(tempModule) canvas?.add(tempModule)
moduleSetupArray.push(tempModule) moduleSetupArray.push(tempModule)
moduleArray.push(tempModule) moduleArray.push(tempModule)
canvas.renderAll()
} }
}) })
} else { } else {
//최초 한번은 그냥 그린다 //최초 한번은 그냥 그린다
//겹치는지 확인해서 포함된 모듈만 그린다 //겹치는지 확인해서 포함된 모듈만 그린다
// canvas?.add(tempModule) canvas?.add(tempModule)
// moduleSetupArray.push(tempModule) moduleSetupArray.push(tempModule)
// moduleArray.push(tempModule) moduleArray.push(tempModule)
canvas.renderAll()
} }
} else { } else {
//디버깅용 //디버깅용
tempModule.set({ fill: 'rgba(255,190,41, 0.4)', stroke: 'black', strokeWidth: 1 }) // tempModule.set({ fill: 'rgba(255,190,41, 0.4)', stroke: 'black', strokeWidth: 1 })
canvas?.add(tempModule) // canvas?.add(tempModule)
// canvas.renderAll()
} }
} }
} }
@ -1242,6 +1253,7 @@ export function useModuleBasicSetting(tabNum) {
canvas?.add(tempModule) canvas?.add(tempModule)
moduleSetupArray.push(tempModule) moduleSetupArray.push(tempModule)
moduleArray.push(tempModule) moduleArray.push(tempModule)
canvas.renderAll()
} }
}) })
} else { } else {
@ -1250,11 +1262,13 @@ export function useModuleBasicSetting(tabNum) {
canvas?.add(tempModule) canvas?.add(tempModule)
moduleSetupArray.push(tempModule) moduleSetupArray.push(tempModule)
moduleArray.push(tempModule) moduleArray.push(tempModule)
canvas.renderAll()
} }
} else { } else {
//디버깅용 //디버깅용
// tempModule.set({ fill: 'rgba(255,190,41, 0.4)', stroke: 'black', strokeWidth: 1 }) // tempModule.set({ fill: 'rgba(255,190,41, 0.4)', stroke: 'black', strokeWidth: 1 })
// canvas?.add(tempModule) // canvas?.add(tempModule)
// canvas.renderAll()
} }
} }
} }