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

Merge pull request '보조선 처리 추가' (#235) from dev into prd-deploy

Browse Source 
Reviewed-on: #235
This commit is contained in:
ysCha 2025-07-24 15:25:40 +09:00
commit 764be3f594
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/hooks/roofcover/useRoofAllocationSetting.js
View File

@ -364,6 +364,14 @@ export function useRoofAllocationSetting(id) {
let result = false let result = false
roofBases.forEach((roof) => { roofBases.forEach((roof) => {
const auxiliaryLines = canvas
.getObjects()
.filter((obj) => obj.name === 'auxiliaryLine' && roof.inPolygonImproved(obj.startPoint) && roof.inPolygonImproved(obj.endPoint))
auxiliaryLines.forEach((auxiliaryLine) => {
roof.innerLines.push(auxiliaryLine)
})
if (roof.separatePolygon.length === 0) { if (roof.separatePolygon.length === 0) {
roof.innerLines.forEach((line) => { roof.innerLines.forEach((line) => {
if ((!line.attributes.actualSize || line.attributes?.actualSize === 0) && line.length > 1) { if ((!line.attributes.actualSize || line.attributes?.actualSize === 0) && line.length > 1) {

8
src/hooks/usePolygon.js
View File

@ -765,13 +765,7 @@ export const usePolygon = () => {
const splitPolygonWithLines = (polygon) => { const splitPolygonWithLines = (polygon) => {
polygon.set({ visible: false }) polygon.set({ visible: false })
const auxiliaryLines = canvas const auxiliaryLines = canvas.getObjects().filter((obj) => obj.name === 'auxiliaryLine')
.getObjects()
.filter((obj) => obj.name === 'auxiliaryLine' && polygon.inPolygonImproved(obj.startPoint) && polygon.inPolygonImproved(obj.endPoint))
auxiliaryLines.forEach((auxiliaryLine) => {
polygon.innerLines.push(auxiliaryLine)
})
let innerLines = [...polygon.innerLines].filter((line) => line.visible) let innerLines = [...polygon.innerLines].filter((line) => line.visible)