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

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

Browse Source
This commit is contained in:
hyojun.choi 2024-12-16 16:16:27 +09:00
commit bb467e3c8d
1 changed files with 49 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -279,22 +279,22 @@ export function useModuleBasicSetting() {
//설치된 셀에 좌측에 스냅 //설치된 셀에 좌측에 스냅
if (Math.abs(smallRight - holdCellLeft) < snapDistance) { if (Math.abs(smallRight - holdCellLeft) < snapDistance) {
tempModule.left = holdCellLeft - width - 0.5 tempModule.left = holdCellLeft - width - 1
} }
//설치된 셀에 우측에 스냅 //설치된 셀에 우측에 스냅
if (Math.abs(smallLeft - holdCellRight) < snapDistance) { if (Math.abs(smallLeft - holdCellRight) < snapDistance) {
tempModule.left = holdCellRight + 0.5 tempModule.left = holdCellRight + 1
} }
//설치된 셀에 위쪽에 스냅 //설치된 셀에 위쪽에 스냅
if (Math.abs(smallBottom - holdCellTop) < snapDistance) { if (Math.abs(smallBottom - holdCellTop) < snapDistance) {
tempModule.top = holdCellTop - height - 0.5 tempModule.top = holdCellTop - height - 1
} }
//설치된 셀에 밑쪽에 스냅 //설치된 셀에 밑쪽에 스냅
if (Math.abs(smallTop - holdCellBottom) < snapDistance) { if (Math.abs(smallTop - holdCellBottom) < snapDistance) {
tempModule.top = holdCellBottom + 0.5 tempModule.top = holdCellBottom + 1
} }
//가운데 -> 가운데 //가운데 -> 가운데
if (Math.abs(smallCenterX - holdCellCenterX) < cellSnapDistance) { if (Math.abs(smallCenterX - holdCellCenterX) < cellSnapDistance) {
@ -312,14 +312,14 @@ export function useModuleBasicSetting() {
if (Math.abs(smallCenterY - holdCellCenterY) < cellSnapDistance) { if (Math.abs(smallCenterY - holdCellCenterY) < cellSnapDistance) {
tempModule.top = holdCellCenterY - height / 2 tempModule.top = holdCellCenterY - height / 2
} }
//위쪽 -> 가운데 // //위쪽 -> 가운데
if (Math.abs(smallTop - holdCellCenterY) < cellSnapDistance) { // if (Math.abs(smallTop - holdCellCenterY) < cellSnapDistance) {
tempModule.top = holdCellCenterY // tempModule.top = holdCellCenterY
} // }
//아랫쪽 -> 가운데 // //아랫쪽 -> 가운데
if (Math.abs(smallBottom - holdCellCenterY) < cellSnapDistance) { // if (Math.abs(smallBottom - holdCellCenterY) < cellSnapDistance) {
tempModule.top = holdCellCenterY - height // tempModule.top = holdCellCenterY - height
} // }
}) })
} }
@ -393,13 +393,13 @@ export function useModuleBasicSetting() {
if (!inside) return if (!inside) return
if (tempModule) { if (tempModule) {
const rectPoints = [ const rectPoints = [
{ x: tempModule.left + 0.5, y: tempModule.top + 0.5 }, { x: tempModule.left, y: tempModule.top },
{ x: tempModule.left + 0.5 + tempModule.width * tempModule.scaleX, y: tempModule.top + 0.5 }, { x: tempModule.left + tempModule.width * tempModule.scaleX, y: tempModule.top },
{ {
x: tempModule.left + tempModule.width * tempModule.scaleX + 0.5, x: tempModule.left + tempModule.width * tempModule.scaleX,
y: tempModule.top + tempModule.height * tempModule.scaleY + 0.5, y: tempModule.top + tempModule.height * tempModule.scaleY,
}, },
{ x: tempModule.left + 0.5, y: tempModule.top + tempModule.height * tempModule.scaleY + 0.5 }, { x: tempModule.left, y: tempModule.top + tempModule.height * tempModule.scaleY },
] ]
tempModule.set({ points: rectPoints }) tempModule.set({ points: rectPoints })
@ -1556,30 +1556,6 @@ export function useModuleBasicSetting() {
name: 'module', name: 'module',
} }
// function getRotatedCorners(rect) {
// // 사각형의 중심점
// const center = rect.getCenterPoint()
// // 사각형의 원래 꼭짓점 좌표 (로컬 좌표 기준)
// const halfWidth = (rect.width / 2) * rect.scaleX
// const halfHeight = (rect.height / 2) * rect.scaleY
// const corners = [
// { x: -halfWidth, y: -halfHeight }, // 좌상단
// { x: halfWidth, y: -halfHeight }, // 우상단
// { x: halfWidth, y: halfHeight }, // 우하단
// { x: -halfWidth, y: halfHeight }, // 좌하단
// ]
// // 각 꼭짓점 좌표를 캔버스 좌표로 변환
// const transformedCorners = corners.map((corner) => {
// const point = new fabric.Point(corner.x, corner.y)
// return fabric.util.transformPoint(point, rect.calcTransformMatrix())
// })
// return transformedCorners
// }
if (moduleSetupSurfaces.length !== 0) { if (moduleSetupSurfaces.length !== 0) {
let tempModule let tempModule
let manualDrawModules = [] let manualDrawModules = []
@ -1624,10 +1600,9 @@ export function useModuleBasicSetting() {
const mousePoint = canvas.getPointer(e.e) const mousePoint = canvas.getPointer(e.e)
for (let i = 0; i < moduleSetupSurfaces.length; i++) { for (let i = 0; i < moduleSetupSurfaces.length; i++) {
turfPolygon = polygonToTurfPolygon(moduleSetupSurfaces[i], true) turfPolygon = polygonToTurfPolygon(moduleSetupSurfaces[i])
trestlePolygon = moduleSetupSurfaces[i] trestlePolygon = moduleSetupSurfaces[i]
manualDrawModules = moduleSetupSurfaces[i].modules // 앞에서 자동으로 했을때 추가됨 manualDrawModules = moduleSetupSurfaces[i].modules // 앞에서 자동으로 했을때 추가됨
flowDirection = moduleSetupSurfaces[i].flowDirection //도형의 방향 flowDirection = moduleSetupSurfaces[i].flowDirection //도형의 방향
let width = flowDirection === 'south' || flowDirection === 'north' ? 172 : 113 let width = flowDirection === 'south' || flowDirection === 'north' ? 172 : 113
let height = flowDirection === 'south' || flowDirection === 'north' ? 113 : 172 let height = flowDirection === 'south' || flowDirection === 'north' ? 113 : 172
@ -1640,13 +1615,14 @@ export function useModuleBasicSetting() {
] ]
const turfPoints = coordToTurfPolygon(points) const turfPoints = coordToTurfPolygon(points)
if (turf.booleanWithin(turfPoints, turfPolygon)) { if (turf.booleanWithin(turfPoints, turfPolygon)) {
let isDrawing = false let isDrawing = false
if (isDrawing) return if (isDrawing) return
canvas?.remove(...canvas?.getObjects().filter((obj) => obj.name === 'tempModule')) //움직일때 일단 지워가면서 움직임 canvas?.remove(...canvas?.getObjects().filter((obj) => obj.name === 'tempModule')) //움직일때 일단 지워가면서 움직임
tempModule = new QPolygon(points, { tempModule = new fabric.Rect({
fill: 'white', fill: 'white',
stroke: 'black', stroke: 'black',
strokeWidth: 1, strokeWidth: 1,
@ -1706,7 +1682,7 @@ export function useModuleBasicSetting() {
//설치된 셀에 우측에 스냅 //설치된 셀에 우측에 스냅
if (Math.abs(smallLeft - holdCellRight) < snapDistance) { if (Math.abs(smallLeft - holdCellRight) < snapDistance) {
tempModule.left = holdCellRight + 0.5 tempModule.left = holdCellRight + 1
} }
//설치된 셀에 위쪽에 스냅 //설치된 셀에 위쪽에 스냅
@ -1734,14 +1710,14 @@ export function useModuleBasicSetting() {
if (Math.abs(smallCenterY - holdCellCenterY) < cellSnapDistance) { if (Math.abs(smallCenterY - holdCellCenterY) < cellSnapDistance) {
tempModule.top = holdCellCenterY - height / 2 tempModule.top = holdCellCenterY - height / 2
} }
//위쪽 -> 가운데 // //위쪽 -> 가운데
if (Math.abs(smallTop - holdCellCenterY) < cellSnapDistance) { // if (Math.abs(smallTop - holdCellCenterY) < cellSnapDistance) {
tempModule.top = holdCellCenterY // tempModule.top = holdCellCenterY
} // }
//아랫쪽 -> 가운데 // //아랫쪽 -> 가운데
if (Math.abs(smallBottom - holdCellCenterY) < cellSnapDistance) { // if (Math.abs(smallBottom - holdCellCenterY) < cellSnapDistance) {
tempModule.top = holdCellCenterY - height // tempModule.top = holdCellCenterY - height
} // }
}) })
} }
@ -1814,6 +1790,17 @@ export function useModuleBasicSetting() {
let isIntersection = true let isIntersection = true
if (!inside) return if (!inside) return
if (tempModule) { if (tempModule) {
const rectPoints = [
{ x: tempModule.left, y: tempModule.top },
{ x: tempModule.left + tempModule.width * tempModule.scaleX, y: tempModule.top },
{
x: tempModule.left + tempModule.width * tempModule.scaleX,
y: tempModule.top + tempModule.height * tempModule.scaleY,
},
{ x: tempModule.left, y: tempModule.top + tempModule.height * tempModule.scaleY },
]
tempModule.set({ points: rectPoints })
const tempTurfModule = polygonToTurfPolygon(tempModule) const tempTurfModule = polygonToTurfPolygon(tempModule)
//도머 객체를 가져옴 //도머 객체를 가져옴
@ -1844,6 +1831,8 @@ export function useModuleBasicSetting() {
//마우스 클릭시 set으로 해당 위치에 셀을 넣음 //마우스 클릭시 set으로 해당 위치에 셀을 넣음
const isOverlap = manualDrawModules.some((module) => turf.booleanOverlap(tempTurfModule, polygonToTurfPolygon(module))) //겹치는지 확인 const isOverlap = manualDrawModules.some((module) => turf.booleanOverlap(tempTurfModule, polygonToTurfPolygon(module))) //겹치는지 확인
if (!isOverlap) { if (!isOverlap) {
console.log('tempModule.points', tempModule.points)
let manualModule = new QPolygon(tempModule.points, { ...moduleOptions }) let manualModule = new QPolygon(tempModule.points, { ...moduleOptions })
canvas?.add(manualModule) canvas?.add(manualModule)
manualDrawModules.push(tempModule) manualDrawModules.push(tempModule)
@ -2273,12 +2262,14 @@ export function useModuleBasicSetting() {
moduleSetupSurface.set({ modules: setupedModules }) moduleSetupSurface.set({ modules: setupedModules })
// const moduleArray = [...moduleIsSetup] // console.log('moduleSetupSurface', moduleSetupSurface)
// moduleArray.push({ // console.log('setupedModules', setupedModules)
// surfaceId: moduleSetupSurface.surfaceId,
// moduleSetupArray: setupedModules, // const groupTest = new fabric.Group([moduleSetupSurface, ...setupedModules], {
// angle: compasDeg,
// }) // })
// setModuleIsSetup(moduleArray)
// canvas.add(groupTest)
}) })
// console.log(calculateForApi()) // console.log(calculateForApi())
} }