qcast3/qcast-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dev #688

Merged
ysCha merged 3 commits from dev into prd-deploy 2026-03-04 18:25:38 +09:00
Conversation 0 Commits 3 Files Changed 2 +52 -32
2 changed files with 52 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/hooks/module/useModuleBasicSetting.js
View File

@ -2677,7 +2677,7 @@ export function useModuleBasicSetting(tabNum) {
isInstall = true
//마지막에 설치된 모듈의 Y 좌표
installedLastHeightCoord = moduleY + width + widthMargin
installedLastHeightCoord = moduleY + width + heightMargin
} else {
//디버깅용
/*tempModule.set({ fill: 'transparent', stroke: 'red', strokeWidth: 1 })

82
src/util/skeleton-utils.js
View File

@ -404,15 +404,25 @@ export const skeletonBuilder = (roofId, canvas, textMode) => {
}, { x: 0, y: 0 })
// baseLine을 offset만큼 바깥으로 평행이동
const offsetLine = (line) => {
const offsetLine = (line, index) => {
const sp = line.startPoint, ep = line.endPoint
const offset = line.attributes?.offset ?? 0
let offset = line.attributes?.offset ?? 0
// 모든 offset이 동일할 때 수치적 안정성을 위해 약간의 변화 추가
if (baseLines.every(l => (l.attributes?.offset ?? 0) === offset)) {
offset += index * 0.01 // 각 라인에 약간의 차이 추가
}
const edx = ep.x - sp.x, edy = ep.y - sp.y
const len = Math.hypot(edx, edy)
if (len === 0) return { sp: { ...sp }, ep: { ...ep } }
// 수직 벡터 계산 (항상 바깥 방향)
let nx = -edy / len, ny = edx / len
const mid = { x: (sp.x + ep.x) / 2, y: (sp.y + ep.y) / 2 }
if (nx * (centroid.x - mid.x) + ny * (centroid.y - mid.y) > 0) { nx = -nx; ny = -ny }
// 방향 결정 로직 제거 - 항상 바깥으로 확장
// if (nx * (centroid.x - mid.x) + ny * (centroid.y - mid.y) > 0) { nx = -nx; ny = -ny }
return {
sp: { x: sp.x + nx * offset, y: sp.y + ny * offset },
ep: { x: ep.x + nx * offset, y: ep.y + ny * offset }
@ -433,37 +443,47 @@ export const skeletonBuilder = (roofId, canvas, textMode) => {
isSamePoint(point, line.startPoint) || isSamePoint(point, line.endPoint)
)
if (adjLines.length < 2) return { ...point }
const oL1 = offsetLine(adjLines[0]), oL2 = offsetLine(adjLines[1])
const idx1 = baseLines.indexOf(adjLines[0])
const idx2 = baseLines.indexOf(adjLines[1])
const oL1 = offsetLine(adjLines[0], idx1), oL2 = offsetLine(adjLines[1], idx2)
return lineIntersect(oL1.sp, oL1.ep, oL2.sp, oL2.ep) || { ...point }
})
// 중복 좌표 및 일직선 위의 불필요한 점 제거 (L자 확장 시 사각형으로 단순화)
const simplifyPolygon = (pts) => {
let result = [...pts]
let changed = true
while (changed) {
changed = false
for (let i = result.length - 1; i >= 0; i--) {
const next = result[(i + 1) % result.length]
if (Math.abs(result[i].x - next.x) < 0.5 && Math.abs(result[i].y - next.y) < 0.5) {
result.splice(i, 1)
changed = true
}
}
for (let i = result.length - 1; i >= 0 && result.length > 3; i--) {
const prev = result[(i - 1 + result.length) % result.length]
const curr = result[i]
const next = result[(i + 1) % result.length]
const cross = (curr.x - prev.x) * (next.y - prev.y) - (curr.y - prev.y) * (next.x - prev.x)
if (Math.abs(cross) < 1) {
result.splice(i, 1)
changed = true
}
}
}
return result
}
changRoofLinePoints = simplifyPolygon(changRoofLinePoints)
// const simplifyPolygon = (pts) => {
// let result = [...pts]
// // 복잡한 형태 보호를 위해 최소 6개 점 유지
// if (result.length <= 6) return result
// let changed = true
// while (changed) {
// changed = false
// for (let i = result.length - 1; i >= 0; i--) {
// const next = result[(i + 1) % result.length]
// if (Math.abs(result[i].x - next.x) < 1.0 && Math.abs(result[i].y - next.y) < 1.0) {
// result.splice(i, 1)
// changed = true
// }
// }
// // 최소 6개 점 유지 확인
// if (result.length <= 6) break
// for (let i = result.length - 1; i >= 0 && result.length > 3; i--) {
// const prev = result[(i - 1 + result.length) % result.length]
// const curr = result[i]
// const next = result[(i + 1) % result.length]
// const cross = (curr.x - prev.x) * (next.y - prev.y) - (curr.y - prev.y) * (next.x - prev.x)
// // 복잡한 형태 보호를 위해 임계값 대폭 증가
// if (Math.abs(cross) < 50) {
// result.splice(i, 1)
// changed = true
// }
// }
// }
// return result
// }
// changRoofLinePoints = simplifyPolygon(changRoofLinePoints)
let roofLineContactPoints = [...changRoofLinePoints]