offset => width로 수정
This commit is contained in:
parent
6f3bef54bc
commit
da26423cc2
@ -26,6 +26,7 @@ import {
|
||||
import { calculateDistance, calculateIntersection, distanceBetweenPoints, findClosestPoint } from '@/util/canvas-util'
|
||||
import { fabric } from 'fabric'
|
||||
import { useAdsorptionPoint } from '@/hooks/useAdsorptionPoint'
|
||||
import { useSwal } from '@/hooks/useSwal'
|
||||
|
||||
// 보조선 작성
|
||||
export function useAuxiliaryDrawing(setShowAuxiliaryModal) {
|
||||
@ -34,6 +35,7 @@ export function useAuxiliaryDrawing(setShowAuxiliaryModal) {
|
||||
const { getIntersectMousePoint } = useMouse()
|
||||
const { addLine, removeLine } = useLine()
|
||||
const { tempGridMode } = useTempGrid()
|
||||
const { swalFire } = useSwal()
|
||||
const { getAdsorptionPoints } = useAdsorptionPoint()
|
||||
|
||||
const adsorptionRange = useRecoilValue(adsorptionRangeState)
|
||||
@ -80,18 +82,19 @@ export function useAuxiliaryDrawing(setShowAuxiliaryModal) {
|
||||
// innerLines가 있을경우 삭제
|
||||
const roofs = canvas?.getObjects().filter((obj) => obj.name === 'roofBase')
|
||||
if (roofs.length === 0) {
|
||||
swalFire({ text: '지붕형상이 없습니다.' })
|
||||
setShowAuxiliaryModal(false)
|
||||
return
|
||||
}
|
||||
|
||||
// 지붕의 각 꼭지점을 흡착점으로 설정
|
||||
const roofsPoints = roofs.map((roof) => roof.points).flat()
|
||||
console.log(roofsPoints)
|
||||
roofAdsorptionPoints.current = [...roofsPoints]
|
||||
|
||||
addCanvasMouseEventListener('mouse:move', mouseMove)
|
||||
addCanvasMouseEventListener('mouse:down', mouseDown)
|
||||
addDocumentEventListener('contextmenu', document, cutAuxiliary)
|
||||
addDocumentEventListener('keydown', document, keydown)
|
||||
addDocumentEventListener('keydown', document, keydown[type])
|
||||
|
||||
return () => {
|
||||
canvas.remove(...canvas.getObjects().filter((obj) => obj.name === 'innerPoint'))
|
||||
@ -120,7 +123,6 @@ export function useAuxiliaryDrawing(setShowAuxiliaryModal) {
|
||||
|
||||
const keydown = {
|
||||
outerLine: (e) => {
|
||||
console.log(123)
|
||||
if (mousePointerArr.current.length === 0) {
|
||||
return
|
||||
}
|
||||
@ -622,11 +624,9 @@ export function useAuxiliaryDrawing(setShowAuxiliaryModal) {
|
||||
const roofBases = canvas.getObjects().find((obj) => obj.name === 'roofBase')
|
||||
const innerLines = [...lineHistory.current]
|
||||
|
||||
console.log('innerLines', innerLines)
|
||||
|
||||
roofBases.innerLines = [...innerLines]
|
||||
|
||||
setShowAuxiliaryModal(close)
|
||||
setShowAuxiliaryModal(false)
|
||||
}
|
||||
|
||||
return {
|
||||
|
||||
@ -384,7 +384,7 @@ export function useRoofShapeSetting(setShowRoofShapeSettingModal) {
|
||||
// 벽
|
||||
attributes = {
|
||||
type: LINE_TYPE.WALLLINE.WALL,
|
||||
offset: hasSleeve === '0' ? 0 : sleeveOffset / 10,
|
||||
width: hasSleeve === '0' ? 0 : sleeveOffset / 10,
|
||||
}
|
||||
break
|
||||
}
|
||||
@ -412,7 +412,7 @@ export function useRoofShapeSetting(setShowRoofShapeSettingModal) {
|
||||
// 한쪽흐름
|
||||
attributes = {
|
||||
type: LINE_TYPE.WALLLINE.SHED,
|
||||
offset: shedWidth / 10,
|
||||
width: shedWidth / 10,
|
||||
}
|
||||
break
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user