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

현의 상(out), 하(in) 의미 변경 #404

Merged
ysCha merged 1 commits from dev_ysCha into dev 2025-10-29 16:03:55 +09:00
Conversation 0 Commits 1 Files Changed 1 +124 -76
1 changed files with 124 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

200
src/hooks/roofcover/useMovementSetting.js
View File

@ -91,7 +91,7 @@ export function useMovementSetting(id) {
} }
wall.baseLines.forEach((line) => { wall.baseLines.forEach((line) => {
if (type === TYPE.UP_DOWN) { if (type === TYPE.UP_DOWN) {
line.set({ selectable: true, visible: true, stroke: '#1083E3', strokeWidth: 5 }) line.set({ selectable: true, visible: true, stroke: '#1085E5', strokeWidth: 5 })
line.setCoords() line.setCoords()
line.bringToFront() line.bringToFront()
} else { } else {
@ -102,7 +102,7 @@ export function useMovementSetting(id) {
/** outerLines 속성처리*/ /** outerLines 속성처리*/
const outerLines = canvas.getObjects().filter((obj) => obj.name === 'outerLine') const outerLines = canvas.getObjects().filter((obj) => obj.name === 'outerLine')
outerLines.forEach((line) => line.set({ visible: false })) outerLines.forEach((line) => line.set({ visible: true }))
canvas.renderAll() canvas.renderAll()
}, [type]) }, [type])
@ -194,101 +194,144 @@ export function useMovementSetting(id) {
canvas.renderAll() canvas.renderAll()
}, [currentObject]) }, [currentObject])
const clearRef = () => { const clearRef = () => {
if (type === TYPE.FLOW_LINE) { if (type === TYPE.FLOW_LINE) {
FLOW_LINE_REF.POINTER_INPUT_REF.current.value = '' // 안전한 ref 접근
FLOW_LINE_REF.FILLED_INPUT_REF.current.value = '' if (FLOW_LINE_REF.POINTER_INPUT_REF.current) {
FLOW_LINE_REF.POINTER_INPUT_REF.current.value = ''
if (FLOW_LINE_REF.UP_RIGHT_RADIO_REF.current.checked || FLOW_LINE_REF.DOWN_LEFT_RADIO_REF.current.checked) { }
// If one is checked, uncheck the other if (FLOW_LINE_REF.FILLED_INPUT_REF.current) {
FLOW_LINE_REF.UP_RIGHT_RADIO_REF.current.checked = !FLOW_LINE_REF.DOWN_LEFT_RADIO_REF.current.checked; FLOW_LINE_REF.FILLED_INPUT_REF.current.value = ''
FLOW_LINE_REF.DOWN_LEFT_RADIO_REF.current.checked = !FLOW_LINE_REF.UP_RIGHT_RADIO_REF.current.checked;
}else{
FLOW_LINE_REF.DOWN_LEFT_RADIO_REF.current.checked = true
FLOW_LINE_REF.UP_RIGHT_RADIO_REF.current.checked = false
} }
const upRightChecked = FLOW_LINE_REF.UP_RIGHT_RADIO_REF.current?.checked || false
const downLeftChecked = FLOW_LINE_REF.DOWN_LEFT_RADIO_REF.current?.checked || false
if (upRightChecked || downLeftChecked) {
if (FLOW_LINE_REF.UP_RIGHT_RADIO_REF.current) {
FLOW_LINE_REF.UP_RIGHT_RADIO_REF.current.checked = !downLeftChecked
}
if (FLOW_LINE_REF.DOWN_LEFT_RADIO_REF.current) {
FLOW_LINE_REF.DOWN_LEFT_RADIO_REF.current.checked = !upRightChecked
}
} else {
if (FLOW_LINE_REF.DOWN_LEFT_RADIO_REF.current) {
FLOW_LINE_REF.DOWN_LEFT_RADIO_REF.current.checked = true
}
if (FLOW_LINE_REF.UP_RIGHT_RADIO_REF.current) {
FLOW_LINE_REF.UP_RIGHT_RADIO_REF.current.checked = false
}
}
} }
if (type === TYPE.UP_DOWN) { if (type === TYPE.UP_DOWN) {
UP_DOWN_REF.POINTER_INPUT_REF.current.value = '' // 안전한 ref 접근
UP_DOWN_REF.FILLED_INPUT_REF.current.value = '' if (UP_DOWN_REF.POINTER_INPUT_REF.current) {
UP_DOWN_REF.UP_RADIO_REF.current.checked = true UP_DOWN_REF.POINTER_INPUT_REF.current.value = ''
UP_DOWN_REF.DOWN_RADIO_REF.current.checked = false }
if (UP_DOWN_REF.FILLED_INPUT_REF.current) {
UP_DOWN_REF.FILLED_INPUT_REF.current.value = ''
}
if (UP_DOWN_REF.UP_RADIO_REF.current) {
UP_DOWN_REF.UP_RADIO_REF.current.checked = true
}
if (UP_DOWN_REF.DOWN_RADIO_REF.current) {
UP_DOWN_REF.DOWN_RADIO_REF.current.checked = false
}
} }
} }
let currentCalculatedValue = 0 let currentCalculatedValue = 0
const mouseMoveEvent = (e) => { const mouseMoveEvent = (e) => {
const target = canvas.getActiveObject() const target = canvas.getActiveObject()
if (!target) return if (!target) return
// 디버깅 로그 추가
if (typeRef.current === TYPE.UP_DOWN) {
console.log('UP_DOWN_REF.POINTER_INPUT_REF.current:', UP_DOWN_REF.POINTER_INPUT_REF.current);
if (!UP_DOWN_REF.POINTER_INPUT_REF.current) {
console.warn('UP_DOWN_REF.POINTER_INPUT_REF.current is null/undefined');
}
}
const { top: targetTop, left: targetLeft } = target const { top: targetTop, left: targetLeft } = target
const currentX = Big(getIntersectMousePoint(e).x) //.round(0, Big.roundUp) const currentX = Big(getIntersectMousePoint(e).x)
const currentY = Big(getIntersectMousePoint(e).y) //.round(0, Big.roundUp) const currentY = Big(getIntersectMousePoint(e).y)
let value = '' let value = ''
if (Math.abs(target.y1 - target.y2) < 0.5) { if (Math.abs(target.y1 - target.y2) < 0.5) {
// 가로라인의 경우
value = Big(targetTop).minus(currentY).times(10).round(0) value = Big(targetTop).minus(currentY).times(10).round(0)
console.log('가로라인 계산:', `${targetTop} - ${currentY.toNumber()} = ${value.toNumber()}`)
} else { } else {
// 세로라인의 경우
value = Big(targetLeft).minus(currentX).times(10).round(0).neg() value = Big(targetLeft).minus(currentX).times(10).round(0).neg()
console.log('세로라인 계산:', `-(${targetLeft} - ${currentX.toNumber()}) = ${value.toNumber()}`)
} }
currentCalculatedValue = value.toNumber() currentCalculatedValue = value.toNumber()
if (typeRef.current === TYPE.FLOW_LINE) { if (typeRef.current === TYPE.FLOW_LINE) {
FLOW_LINE_REF.POINTER_INPUT_REF.current.value = value.toNumber() // ref가 존재하는지 확인 후 값 설정
} else { if (FLOW_LINE_REF.POINTER_INPUT_REF.current) {
UP_DOWN_REF.POINTER_INPUT_REF.current.value = value.abs().toNumber() FLOW_LINE_REF.POINTER_INPUT_REF.current.value = value.toNumber()
const midX = Big(target.x1).plus(target.x2).div(2) }
const midY = Big(target.y1).plus(target.y2).div(2) } else {
const wall = canvas.getObjects().find((obj) => obj.id === target.attributes.wallId) // UP_DOWN 타입일 때 안전한 접근
let checkPoint if (UP_DOWN_REF.POINTER_INPUT_REF.current) {
if (target.y1 === target.y2) { UP_DOWN_REF.POINTER_INPUT_REF.current.value = value.abs().toNumber()
checkPoint = { x: midX.toNumber(), y: midY.plus(10).toNumber() } }
if (wall.inPolygon(checkPoint)) {
if (value.s === -1) { const midX = Big(target.x1).plus(target.x2).div(2)
UP_DOWN_REF.UP_RADIO_REF.current.checked = false const midY = Big(target.y1).plus(target.y2).div(2)
UP_DOWN_REF.DOWN_RADIO_REF.current.checked = true const wall = canvas.getObjects().find((obj) => obj.id === target.attributes.wallId)
} else { let checkPoint
UP_DOWN_REF.UP_RADIO_REF.current.checked = true
UP_DOWN_REF.DOWN_RADIO_REF.current.checked = false
} if (target.y1 === target.y2) { //수평벽
} else { checkPoint = { x: midX.toNumber(), y: midY.plus(10).toNumber() }
if (value.s === 1) { if (wall.inPolygon(checkPoint)) { //선택라인이 내부
UP_DOWN_REF.UP_RADIO_REF.current.checked = false if (value.s !== -1) {
UP_DOWN_REF.DOWN_RADIO_REF.current.checked = true console.log('-1value:::', value.s)
} else { if (UP_DOWN_REF.UP_RADIO_REF.current) UP_DOWN_REF.UP_RADIO_REF.current.checked = false
UP_DOWN_REF.UP_RADIO_REF.current.checked = true if (UP_DOWN_REF.DOWN_RADIO_REF.current) UP_DOWN_REF.DOWN_RADIO_REF.current.checked = true
UP_DOWN_REF.DOWN_RADIO_REF.current.checked = false
}
}
} else { } else {
checkPoint = { x: midX.plus(10).toNumber(), y: midY.toNumber() } if (UP_DOWN_REF.UP_RADIO_REF.current) UP_DOWN_REF.UP_RADIO_REF.current.checked = true
if (wall.inPolygon(checkPoint)) { if (UP_DOWN_REF.DOWN_RADIO_REF.current) UP_DOWN_REF.DOWN_RADIO_REF.current.checked = false
if (value.s === 1) { }
UP_DOWN_REF.UP_RADIO_REF.current.checked = false } else { //
UP_DOWN_REF.DOWN_RADIO_REF.current.checked = true if (value.s === 1) { //선택라인이 외부
} else { console.log('+1value:::', value.s)
UP_DOWN_REF.UP_RADIO_REF.current.checked = true if (UP_DOWN_REF.UP_RADIO_REF.current) UP_DOWN_REF.UP_RADIO_REF.current.checked = false
UP_DOWN_REF.DOWN_RADIO_REF.current.checked = false if (UP_DOWN_REF.DOWN_RADIO_REF.current) UP_DOWN_REF.DOWN_RADIO_REF.current.checked = true
} } else {
} else { if (UP_DOWN_REF.UP_RADIO_REF.current) UP_DOWN_REF.UP_RADIO_REF.current.checked = true
if (value.s === -1) { if (UP_DOWN_REF.DOWN_RADIO_REF.current) UP_DOWN_REF.DOWN_RADIO_REF.current.checked = false
UP_DOWN_REF.UP_RADIO_REF.current.checked = false }
UP_DOWN_REF.DOWN_RADIO_REF.current.checked = true }
} else { } else {
UP_DOWN_REF.UP_RADIO_REF.current.checked = true checkPoint = { x: midX.plus(10).toNumber(), y: midY.toNumber() }
UP_DOWN_REF.DOWN_RADIO_REF.current.checked = false if (wall.inPolygon(checkPoint)) {
} if (value.s !== 1) {
} if (UP_DOWN_REF.UP_RADIO_REF.current) UP_DOWN_REF.UP_RADIO_REF.current.checked = false
if (UP_DOWN_REF.DOWN_RADIO_REF.current) UP_DOWN_REF.DOWN_RADIO_REF.current.checked = true
} else {
if (UP_DOWN_REF.UP_RADIO_REF.current) UP_DOWN_REF.UP_RADIO_REF.current.checked = true
if (UP_DOWN_REF.DOWN_RADIO_REF.current) UP_DOWN_REF.DOWN_RADIO_REF.current.checked = false
}
} else {
if (value.s === -1) {
if (UP_DOWN_REF.UP_RADIO_REF.current) UP_DOWN_REF.UP_RADIO_REF.current.checked = false
if (UP_DOWN_REF.DOWN_RADIO_REF.current) UP_DOWN_REF.DOWN_RADIO_REF.current.checked = true
} else {
if (UP_DOWN_REF.UP_RADIO_REF.current) UP_DOWN_REF.UP_RADIO_REF.current.checked = true
if (UP_DOWN_REF.DOWN_RADIO_REF.current) UP_DOWN_REF.DOWN_RADIO_REF.current.checked = false
} }
} }
} }
}
}
@ -348,14 +391,15 @@ export function useMovementSetting(id) {
const roof = canvas.getObjects().find((obj) => obj.id === roofId) const roof = canvas.getObjects().find((obj) => obj.id === roofId)
// 현이동, 동이동 추가 // 현이동, 동이동 추가
let flPointValue = FLOW_LINE_REF.POINTER_INPUT_REF.current?.value??0; let flPointValue = FLOW_LINE_REF.POINTER_INPUT_REF.current?.value ?? 0;
let flFilledValue = FLOW_LINE_REF.FILLED_INPUT_REF.current?.value??0; let flFilledValue = FLOW_LINE_REF.FILLED_INPUT_REF.current?.value ?? 0;
flPointValue = (flFilledValue > 0 || flFilledValue < 0)? flFilledValue : flPointValue; flPointValue = (flFilledValue > 0 || flFilledValue < 0) ? flFilledValue : flPointValue;
const moveFlowLine = typeRef.current === TYPE.FLOW_LINE ? flPointValue : 0 const moveFlowLine = typeRef.current === TYPE.FLOW_LINE ? flPointValue : 0
let udPointValue = UP_DOWN_REF.POINTER_INPUT_REF.current?.value??0;
let udFilledValue = UP_DOWN_REF.FILLED_INPUT_REF.current?.value??0; let udPointValue = UP_DOWN_REF.POINTER_INPUT_REF.current?.value ?? 0;
let udFilledValue = UP_DOWN_REF.FILLED_INPUT_REF.current?.value ?? 0;
udPointValue = udFilledValue > 0 ? udFilledValue : udPointValue; udPointValue = udFilledValue > 0 ? udFilledValue : udPointValue;
const moveUpDown = typeRef.current === TYPE.UP_DOWN ? udPointValue: 0 const moveUpDown = typeRef.current === TYPE.UP_DOWN ? udPointValue : 0
roof.moveFlowLine = parseInt(moveFlowLine, 10) || 0; roof.moveFlowLine = parseInt(moveFlowLine, 10) || 0;
roof.moveUpDown = parseInt(moveUpDown, 10) || 0; roof.moveUpDown = parseInt(moveUpDown, 10) || 0;
roof.moveDirect = ""; roof.moveDirect = "";
@ -448,6 +492,7 @@ export function useMovementSetting(id) {
break break
} }
} else { } else {
roof.moveDirect = UP_DOWN_REF.UP_RADIO_REF.current.checked ? 'out' : UP_DOWN_REF.DOWN_RADIO_REF.current.checked ? 'in' : 'out'
targetBaseLines.push({ line: target, distance: 0 }) targetBaseLines.push({ line: target, distance: 0 })
} }
@ -516,9 +561,12 @@ export function useMovementSetting(id) {
const inPolygon = wall.inPolygon(checkPoint) const inPolygon = wall.inPolygon(checkPoint)
if (UP_DOWN_REF.UP_RADIO_REF.current.checked && inPolygon) { // if (UP_DOWN_REF.UP_RADIO_REF.current.checked && inPolygon) {
value = value.neg() // value = value.neg()
} else if (UP_DOWN_REF.DOWN_RADIO_REF.current.checked && !inPolygon) { // } else if (UP_DOWN_REF.DOWN_RADIO_REF.current.checked && !inPolygon) {
// value = value.neg()
// }
if (UP_DOWN_REF.DOWN_RADIO_REF.current.checked){
value = value.neg() value = value.neg()
} }
} }