Compare commits

..

No commits in common. "764be3f594101e5fad5be75640977d82e442448f" and "c5e2a56e08f51ea9b396f2ab642ccbd48db1f8e0" have entirely different histories.

2 changed files with 7 additions and 9 deletions

View File

@ -364,14 +364,6 @@ 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) {

View File

@ -765,7 +765,13 @@ export const usePolygon = () => {
const splitPolygonWithLines = (polygon) => { const splitPolygonWithLines = (polygon) => {
polygon.set({ visible: false }) polygon.set({ visible: false })
const auxiliaryLines = canvas.getObjects().filter((obj) => obj.name === 'auxiliaryLine') const auxiliaryLines = canvas
.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)