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

Merge branch 'dev' of ssh://git.jetbrains.space/nalpari/q-cast-iii/qcast-front into dev

Browse Source
This commit is contained in:
김민식 2025-02-08 20:30:19 +09:00
commit af19411521
4 changed files with 122 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/hooks/module/useModuleBasicSetting.js
View File

@ -841,6 +841,8 @@ export function useModuleBasicSetting(tabNum) {
const flowLines = getFlowLines(moduleSetupSurface, height)
//육지붕이 아닐때만 넣는다 육지붕일땐 클릭 이벤트에 별도로 넣어놓음
// let startPoint = flowLines.bottom
let startPoint = flowLines.bottom
const moduleArray = []
@ -859,7 +861,12 @@ export function useModuleBasicSetting(tabNum) {
startPoint = { ...startPoint, y1: startPoint.y1 - heightMargin }
}
}
} else {
}
//밑에가 평면이면 좌측으로 붙여서 배치
if (flowLines.bottom.type === 'flat' && flowLines.left.type === 'curve') {
startPoint = flowLines.left
}
const maxLeftEndPoint = surfaceMaxLines.left.x1 //최 좌측
const maxRightEndPoint = surfaceMaxLines.right.x1 //최 우측
const maxTopEndPoint = surfaceMaxLines.top.y1 //최 상단
@ -908,6 +915,7 @@ export function useModuleBasicSetting(tabNum) {
canvas?.add(tempModule)
moduleSetupArray.push(tempModule)
moduleArray.push(tempModule)
canvas.renderAll()
}
})
} else {
@ -916,12 +924,13 @@ export function useModuleBasicSetting(tabNum) {
canvas?.add(tempModule)
moduleSetupArray.push(tempModule)
moduleArray.push(tempModule)
canvas.renderAll()
}
} else {
//디버깅용
tempModule.set({ fill: 'rgba(255,190,41, 0.4)', stroke: 'black', strokeWidth: 1 })
canvas?.add(tempModule)
}
// tempModule.set({ fill: 'rgba(255,190,41, 0.4)', stroke: 'black', strokeWidth: 1 })
// canvas?.add(tempModule)
// canvas.renderAll()
}
}
}
@ -965,6 +974,12 @@ export function useModuleBasicSetting(tabNum) {
}
}
console.log('flowLines.top', flowLines.top)
if (flowLines.left.type === 'flat') {
startPoint = flowLines.top
}
const maxRightEndPoint = surfaceMaxLines.right.x1 //최 우측
const maxTopEndPoint = surfaceMaxLines.top.y1 //최 상단
const maxBottomEndPoint = surfaceMaxLines.bottom.y1 //최하단
@ -1013,6 +1028,7 @@ export function useModuleBasicSetting(tabNum) {
canvas?.add(tempModule)
moduleSetupArray.push(tempModule)
moduleArray.push(tempModule)
canvas.renderAll()
}
})
} else {
@ -1021,11 +1037,13 @@ export function useModuleBasicSetting(tabNum) {
canvas?.add(tempModule)
moduleSetupArray.push(tempModule)
moduleArray.push(tempModule)
canvas.renderAll()
}
} else {
//디버깅용
tempModule.set({ fill: 'rgba(255,190,41, 0.4)', stroke: 'black', strokeWidth: 1 })
canvas?.add(tempModule)
// tempModule.set({ fill: 'rgba(255,190,41, 0.4)', stroke: 'black', strokeWidth: 1 })
// canvas?.add(tempModule)
// canvas.renderAll()
}
}
}
@ -1129,6 +1147,7 @@ export function useModuleBasicSetting(tabNum) {
canvas?.add(tempModule)
moduleSetupArray.push(tempModule)
moduleArray.push(tempModule)
canvas.renderAll()
}
})
} else {
@ -1137,11 +1156,13 @@ export function useModuleBasicSetting(tabNum) {
canvas?.add(tempModule)
moduleSetupArray.push(tempModule)
moduleArray.push(tempModule)
canvas.renderAll()
}
} else {
//디버깅용
tempModule.set({ fill: 'rgba(255,190,41, 0.4)', stroke: 'black', strokeWidth: 1 })
canvas?.add(tempModule)
// tempModule.set({ fill: 'rgba(255,190,41, 0.4)', stroke: 'black', strokeWidth: 1 })
// canvas?.add(tempModule)
// canvas.renderAll()
}
}
}
@ -1232,6 +1253,7 @@ export function useModuleBasicSetting(tabNum) {
canvas?.add(tempModule)
moduleSetupArray.push(tempModule)
moduleArray.push(tempModule)
canvas.renderAll()
}
})
} else {
@ -1240,11 +1262,13 @@ export function useModuleBasicSetting(tabNum) {
canvas?.add(tempModule)
moduleSetupArray.push(tempModule)
moduleArray.push(tempModule)
canvas.renderAll()
}
} else {
//디버깅용
tempModule.set({ fill: 'rgba(255,190,41, 0.4)', stroke: 'black', strokeWidth: 1 })
canvas?.add(tempModule)
// tempModule.set({ fill: 'rgba(255,190,41, 0.4)', stroke: 'black', strokeWidth: 1 })
// canvas?.add(tempModule)
// canvas.renderAll()
}
}
}

17
src/hooks/roofcover/useAuxiliaryDrawing.js
View File

@ -24,7 +24,7 @@ import { calculateAngle, isSamePoint } from '@/util/qpolygon-utils'
import { POLYGON_TYPE } from '@/common/common'
// 보조선 작성
export function useAuxiliaryDrawing(id) {
export function useAuxiliaryDrawing(id, isUseEffect = true) {
const canvas = useRecoilValue(canvasState)
const { addCanvasMouseEventListener, addDocumentEventListener, removeMouseLine, initEvent } = useEvent()
// const { addCanvasMouseEventListener, addDocumentEventListener, removeMouseLine, initEvent } = useContext(EventContext)
@ -654,6 +654,8 @@ export function useAuxiliaryDrawing(id) {
selectable: true,
name: 'auxiliaryLine',
isFixed: true,
attributes: { ...line1.attributes },
parentId: line1.parentId,
},
)
lineHistory.current.push(newLine)
@ -674,6 +676,8 @@ export function useAuxiliaryDrawing(id) {
selectable: false,
name: 'auxiliaryLine',
isFixed: true,
attributes: { ...line1.attributes },
parentId: line1.parentId,
})
lineHistory.current.push(newLine)
lineHistory.current = lineHistory.current.filter((history) => history !== line1)
@ -685,6 +689,8 @@ export function useAuxiliaryDrawing(id) {
selectable: false,
name: 'auxiliaryLine',
isFixed: true,
attributes: { ...line1.attributes },
parentId: line1.parentId,
})
lineHistory.current.push(newLine)
lineHistory.current = lineHistory.current.filter((history) => history !== line1)
@ -724,6 +730,8 @@ export function useAuxiliaryDrawing(id) {
selectable: true,
name: 'auxiliaryLine',
isFixed: true,
attributes: { ...line1.attributes },
parentId: line1.parentId,
intersectionPoint,
})
} else {
@ -733,6 +741,8 @@ export function useAuxiliaryDrawing(id) {
selectable: true,
name: 'auxiliaryLine',
isFixed: true,
attributes: { ...line1.attributes },
parentId: line1.parentId,
intersectionPoint,
})
}
@ -825,7 +835,7 @@ export function useAuxiliaryDrawing(id) {
//lineHistory.current에 있는 선들 중 startPoint와 endPoint가 겹치는 line은 제거
// 겹치는 선 하나는 canvas에서 제거한다.
const tempLines = [...lineHistory.current]
const tempLines = canvas.getObjects().filter((obj) => obj.name === 'auxiliaryLine' && !obj.isAuxiliaryFixed)
lineHistory.current = []
tempLines.forEach((line) => {
if (
@ -842,7 +852,7 @@ export function useAuxiliaryDrawing(id) {
lineHistory.current.push(line)
})
const innerLines = lineHistory.current
const innerLines = lineHistory.current.filter((line) => line.name === 'auxiliaryLine' && line.visible)
roofBases.forEach((roofBase) => {
const tempPolygonPoints = [...roofBase.points].map((obj) => {
@ -865,6 +875,7 @@ export function useAuxiliaryDrawing(id) {
actualSize: line.attributes?.actualSize ?? 0,
planeSize: line.getLength(),
}
line.isAuxiliaryFixed = true
return true
}
})

23
src/hooks/useContextMenu.js
View File

@ -180,6 +180,12 @@ export function useContextMenu() {
fn: () => {
if (!currentObject) return
const roof = canvas.getObjects().filter((obj) => obj.id === currentObject.attributes.roofId)[0]
if (!roof) {
// 아직 innerLines로 세팅이 안되어있는 line인 경우 제거
canvas.remove(currentObject)
canvas.discardActiveObject()
return
}
const innerLines = roof.innerLines?.filter((line) => currentObject.id !== line.id)
roof.innerLines = [...innerLines]
canvas.remove(currentObject)
@ -221,6 +227,11 @@ export function useContextMenu() {
name: 'auxiliaryLine',
attributes: { ...currentObject.attributes },
})
if (!currentObject.attributes.roofId) {
return
}
canvas
.getObjects()
.filter((obj) => obj.id === currentObject.attributes.roofId)[0]
@ -235,11 +246,21 @@ export function useContextMenu() {
swalFire({ text: '지붕을 선택해주세요.' })
return
}
const innerLines = canvas.getObjects().filter((obj) => obj.id === currentObject.attributes.roofId)[0].innerLines
const innerLines = canvas.getObjects().filter((obj) => obj.id === currentObject.attributes.roofId)[0]?.innerLines
if (innerLines) {
innerLines.forEach((line) => {
canvas.remove(line)
})
innerLines.length = 0
}
// 확정되지 않은 보조선
const notFixedAuxiliaryLines = canvas.getObjects().filter((obj) => obj.name === 'auxiliaryLine' && !obj.isAuxiliaryFixed)
notFixedAuxiliaryLines.forEach((line) => {
canvas.remove(line)
})
canvas.renderAll()
},
},

2
src/store/localeAtom.js
View File

@ -2,7 +2,7 @@ import { atom } from 'recoil'
export const globalLocaleStore = atom({
key: 'globalLocaleState',
default: 'ko',
default: 'ja',
})
export const appMessageStore = atom({