Compare commits

...

7 Commits

Author SHA1 Message Date
Jaeyoung Lee
86d595ef52 주석처리 안된곳 처리. 2025-12-17 17:50:18 +09:00
Jaeyoung Lee
ce5192ba1a Merge branch 'dev' into feature/design-remake 2025-12-17 17:34:56 +09:00
Jaeyoung Lee
3a8769bd91 변별로 설정 1차 운영서버 반영 2025-12-17 17:33:16 +09:00
Jaeyoung Lee
f3cd10931d 변별로 처리 중간저장 2025-12-11 14:39:46 +09:00
Jaeyoung Lee
6c0cc73cb8 중간 저장(반박공지붕 추가) 2025-11-24 10:35:00 +09:00
Jaeyoung Lee
a201d65ebe 변별로 대응 중간 저장 2025-11-21 14:15:52 +09:00
Jaeyoung Lee
d148077e6b 변별로 설정 중간 저장 2025-11-12 10:40:57 +09:00
2 changed files with 4391 additions and 26 deletions

View File

@ -2,7 +2,7 @@ import { fabric } from 'fabric'
import { v4 as uuidv4 } from 'uuid'
import { QLine } from '@/components/fabric/QLine'
import { distanceBetweenPoints, findTopTwoIndexesByDistance, getDirectionByPoint, sortedPointLessEightPoint, sortedPoints } from '@/util/canvas-util'
import { calculateAngle, drawGableRoof, drawRidgeRoof, drawShedRoof, toGeoJSON } from '@/util/qpolygon-utils'
import { calculateAngle, drawGableRoof, drawRoofByAttribute, drawShedRoof, toGeoJSON } from '@/util/qpolygon-utils'
import * as turf from '@turf/turf'
import { LINE_TYPE, POLYGON_TYPE } from '@/common/common'
import Big from 'big.js'
@ -314,14 +314,18 @@ export const QPolygon = fabric.util.createClass(fabric.Polygon, {
}
const getParallelEavesLines = function (shedLines, lines) {
const eavesLines = lines.filter((line) => line.attributes?.type === LINE_TYPE.WALLLINE.EAVES)
const referenceAngle = calculateAngle(shedLines[0].startPoint, shedLines[0].endPoint)
return eavesLines.filter((line) => {
const eavesAngle = calculateAngle(line.startPoint, line.endPoint)
return Math.abs(referenceAngle - eavesAngle) === 180
const otherSideLines = lines.filter((line) => {
const lineAngle = calculateAngle(line.startPoint, line.endPoint)
return Math.abs(referenceAngle - lineAngle) === 180
})
const containNotEaves = otherSideLines.filter((line) => line.attributes?.type !== LINE_TYPE.WALLLINE.EAVES)
if (containNotEaves.length === 0) {
return otherSideLines
} else {
return []
}
}
const parallelEaves = getParallelEavesLines(shedLines, lines)
@ -337,7 +341,7 @@ export const QPolygon = fabric.util.createClass(fabric.Polygon, {
// 용마루 -- straight-skeleton
console.log('용마루 지붕')
///drawRidgeRoof(this.id, this.canvas, textMode)
drawSkeletonRidgeRoof(this.id, this.canvas, textMode);
drawSkeletonRidgeRoof(this.id, this.canvas, textMode)
} else if (isGableRoof(types)) {
// A형, B형 박공 지붕
console.log('패턴 지붕')
@ -347,7 +351,7 @@ export const QPolygon = fabric.util.createClass(fabric.Polygon, {
drawShedRoof(this.id, this.canvas, textMode)
} else {
console.log('변별로 설정')
drawRidgeRoof(this.id, this.canvas, textMode)
drawRoofByAttribute(this.id, this.canvas, textMode)
}
},

File diff suppressed because it is too large Load Diff