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

sk2

Browse Source
This commit is contained in:
yscha 2025-12-17 00:29:46 +09:00
parent 24ae965d7c
commit 80e555d653
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -440,8 +440,8 @@ export const skeletonBuilder = (roofId, canvas, textMode) => {
*/ */
const createInnerLinesFromSkeleton = (roofId, canvas, skeleton, textMode) => { const createInnerLinesFromSkeleton = (roofId, canvas, skeleton, textMode) => {
if (!skeleton?.Edges) return [] if (!skeleton?.Edges) return []
let roof = canvas?.getObjects().find((object) => object.id === roofId) const roof = canvas?.getObjects().find((object) => object.id === roofId)
let wall = canvas.getObjects().find((obj) => obj.name === POLYGON_TYPE.WALL && obj.attributes.roofId === roofId) const wall = canvas.getObjects().find((obj) => obj.name === POLYGON_TYPE.WALL && obj.attributes.roofId === roofId)
let skeletonLines = [] let skeletonLines = []
let findPoints = []; let findPoints = [];
@ -766,6 +766,7 @@ const createInnerLinesFromSkeleton = (roofId, canvas, skeleton, textMode) => {
}); });
}; };
console.log("wallBaseLines", wall.baseLines)
// const sortedWallLines = sortCurrentRoofLines(wall.lines); // const sortedWallLines = sortCurrentRoofLines(wall.lines);
// roofLines의 방향에 맞춰 currentRoofLines 조정 후 정렬 // roofLines의 방향에 맞춰 currentRoofLines 조정 후 정렬
const alignedCurrentRoofLines = alignLineDirection(currentRoofLines, roofLines); const alignedCurrentRoofLines = alignLineDirection(currentRoofLines, roofLines);
@ -784,16 +785,19 @@ const createInnerLinesFromSkeleton = (roofId, canvas, skeleton, textMode) => {
//wall.baseLine은 움직인라인 //wall.baseLine은 움직인라인
const movedLines = [] const movedLines = []
// 조건에 맞는 라인들만 필터링
wallLines.forEach((wallLine, index) => { const validWallLines = wallLines.filter((wallLine, index) => wallLine.idx - 1 === index);
// const roofLine = sortedRoofLines[index]; validWallLines.forEach((wallLine, index) => {
// const currentRoofLine = sortedCurrentRoofLines[index];
// const moveLine = sortedWallBaseLines[index]
// const wallBaseLine = sortedWallBaseLines[index]
const roofLine = sortRoofLines[index]; const originalIndex = wallLines.indexOf(wallLine);
const roofLine = sortRoofLines[originalIndex];
const currentRoofLine = currentRoofLines[originalIndex];
const moveLine = wall.baseLines[originalIndex];
const wallBaseLine = wall.baseLines[originalIndex];
// const roofLine = sortRoofLines[index];
if(roofLine.attributes.wallLine !== wallLine.id || (roofLine.idx - 1) !== index ){ if(roofLine.attributes.wallLine !== wallLine.id || (roofLine.idx - 1) !== index ){
console.log("wallLine2::::", wallLine.id) console.log("wallLine2::::", wallLine.id)
@ -804,9 +808,9 @@ const createInnerLinesFromSkeleton = (roofId, canvas, skeleton, textMode) => {
return false return false
}//roofLines.find(line => line.attributes.wallLineId === wallLine.attributes.wallId); }//roofLines.find(line => line.attributes.wallLineId === wallLine.attributes.wallId);
const currentRoofLine = currentRoofLines[index]; // const currentRoofLine = currentRoofLines[index];
const moveLine = wall.baseLines[index] // const moveLine = wall.baseLines[index]
const wallBaseLine = wall.baseLines[index] // const wallBaseLine = wall.baseLines[index]
//console.log("wallBaseLine", wallBaseLine); //console.log("wallBaseLine", wallBaseLine);
//roofline 외곽선 설정 //roofline 외곽선 설정