주석처리 안된곳 처리.
This commit is contained in:
parent
ce5192ba1a
commit
86d595ef52
@ -6,6 +6,7 @@ import { calculateAngle, drawGableRoof, drawRoofByAttribute, drawShedRoof, toGeo
|
|||||||
import * as turf from '@turf/turf'
|
import * as turf from '@turf/turf'
|
||||||
import { LINE_TYPE, POLYGON_TYPE } from '@/common/common'
|
import { LINE_TYPE, POLYGON_TYPE } from '@/common/common'
|
||||||
import Big from 'big.js'
|
import Big from 'big.js'
|
||||||
|
import { drawSkeletonRidgeRoof } from '@/util/skeleton-utils'
|
||||||
|
|
||||||
export const QPolygon = fabric.util.createClass(fabric.Polygon, {
|
export const QPolygon = fabric.util.createClass(fabric.Polygon, {
|
||||||
type: 'QPolygon',
|
type: 'QPolygon',
|
||||||
@ -340,7 +341,7 @@ export const QPolygon = fabric.util.createClass(fabric.Polygon, {
|
|||||||
// 용마루 -- straight-skeleton
|
// 용마루 -- straight-skeleton
|
||||||
console.log('용마루 지붕')
|
console.log('용마루 지붕')
|
||||||
///drawRidgeRoof(this.id, this.canvas, textMode)
|
///drawRidgeRoof(this.id, this.canvas, textMode)
|
||||||
drawSkeletonRidgeRoof(this.id, this.canvas, textMode);
|
drawSkeletonRidgeRoof(this.id, this.canvas, textMode)
|
||||||
} else if (isGableRoof(types)) {
|
} else if (isGableRoof(types)) {
|
||||||
// A형, B형 박공 지붕
|
// A형, B형 박공 지붕
|
||||||
console.log('패턴 지붕')
|
console.log('패턴 지붕')
|
||||||
|
|||||||
@ -4342,11 +4342,11 @@ export const drawRoofByAttribute = (roofId, canvas, textMode) => {
|
|||||||
partner = j
|
partner = j
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
canvas.remove(checkCircle).renderAll()
|
// canvas.remove(checkCircle).renderAll()
|
||||||
}
|
}
|
||||||
canvas.remove(checkNLine).renderAll()
|
// canvas.remove(checkNLine).renderAll()
|
||||||
})
|
})
|
||||||
canvas.remove(checkCLine).renderAll()
|
// canvas.remove(checkCLine).renderAll()
|
||||||
if (intersectPoint) {
|
if (intersectPoint) {
|
||||||
intersections.push({ index: i, intersect: intersectPoint, linePoint, partner })
|
intersections.push({ index: i, intersect: intersectPoint, linePoint, partner })
|
||||||
}
|
}
|
||||||
@ -9617,8 +9617,8 @@ export const drawRidgeRoof = (roofId, canvas, textMode) => {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
canvas.remove(prevGableLine)
|
// canvas.remove(prevGableLine)
|
||||||
canvas.remove(nextGableLine)
|
// canvas.remove(nextGableLine)
|
||||||
baseHipLines = baseHipLines.filter((base) => base.line !== prevGableLine && base.line !== nextGableLine)
|
baseHipLines = baseHipLines.filter((base) => base.line !== prevGableLine && base.line !== nextGableLine)
|
||||||
|
|
||||||
const points = [prevGableLine.x1, prevGableLine.y1, nextGableLine.x1, nextGableLine.y1]
|
const points = [prevGableLine.x1, prevGableLine.y1, nextGableLine.x1, nextGableLine.y1]
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user