diff --git a/src/util/skeleton-utils.js b/src/util/skeleton-utils.js index c9a905d7..cbbc4127 100644 --- a/src/util/skeleton-utils.js +++ b/src/util/skeleton-utils.js @@ -766,15 +766,19 @@ const createInnerLinesFromSkeleton = (roofId, canvas, skeleton, textMode) => { }); }; - const sortedWallLines = sortCurrentRoofLines(wall.lines); + // const sortedWallLines = sortCurrentRoofLines(wall.lines); // roofLines의 방향에 맞춰 currentRoofLines 조정 후 정렬 const alignedCurrentRoofLines = alignLineDirection(currentRoofLines, roofLines); const sortedCurrentRoofLines = sortCurrentRoofLines(alignedCurrentRoofLines); - const sortedRoofLines = sortCurrentRoofLines(roofLines); + // const sortedRoofLines = sortCurrentRoofLines(roofLines); const sortedWallBaseLines = sortCurrentRoofLines(wall.baseLines); - const sortedBaseLines = sortBaseLinesByWallLines(wall.baseLines, wallLines); + // const sortedBaseLines = sortBaseLinesByWallLines(wall.baseLines, wallLines); const sortRoofLines = sortBaseLinesByWallLines(roofLines, wallLines); + // 원본 wallLines를 복사하여 사용 + const sortedWallLines = [...wallLines]; + const sortedBaseLines = sortBaseLinesByWallLines(wall.baseLines, sortedWallLines); + const sortedRoofLines = sortBaseLinesByWallLines(roofLines, sortedWallLines); //wall.lines 는 기본 벽 라인 //wall.baseLine은 움직인라인 @@ -802,7 +806,7 @@ const createInnerLinesFromSkeleton = (roofId, canvas, skeleton, textMode) => { const currentRoofLine = currentRoofLines[index]; const moveLine = sortedBaseLines[index] const wallBaseLine = sortedBaseLines[index] - console.log("wallBaseLine", wallBaseLine); + //console.log("wallBaseLine", wallBaseLine); //roofline 외곽선 설정 @@ -876,7 +880,7 @@ const createInnerLinesFromSkeleton = (roofId, canvas, skeleton, textMode) => { return line } - getAddLine(roofLine.startPoint, roofLine.endPoint, ) + //getAddLine(roofLine.startPoint, roofLine.endPoint, ) //외곽선을 그린다 newPStart = { x: roofLine.x1, y: roofLine.y1 } newPEnd = { x: roofLine.x2, y: roofLine.y2 } @@ -1228,6 +1232,7 @@ const createInnerLinesFromSkeleton = (roofId, canvas, skeleton, textMode) => { getAddLine({ x: pLineX, y: newPointY }, { x: sPoint.x, y: sPoint.y }, 'pink') } //getAddLine({ x: roofLine.x2, y: roofLine.y2 }, { x: roofLine.x2, y: newPointY }, 'orange') + } if(isStartEnd.end){ @@ -1479,6 +1484,8 @@ const createInnerLinesFromSkeleton = (roofId, canvas, skeleton, textMode) => { getAddLine(newPStart, newPEnd, 'red') //canvas.remove(roofLine) + }else{ + getAddLine(roofLine.startPoint, roofLine.endPoint, ) } canvas.renderAll() });