kindred/create
1
1
Fork 0
Code Issues 53 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Draft: shape2dview: avoid issues with intersecting solids

Browse Source 
Add `Shape.SubShapes` instead of a copy of the shape. This avoids cut problems if there are intersecting solids.

Forum topic:
https://forum.freecad.org/viewtopic.php?t=81240
This commit is contained in:
Roy-043
2023-09-17 18:58:56 +02:00
parent a6971d376c
commit 32dcd008ff
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/Mod/Draft/draftobjects/shape2dview.py
View File

@@ -241,12 +241,12 @@ class Shape2DView(DraftObject):
else:
shtypes.setdefault(o.Material.Name
if (hasattr(o,"Material") and o.Material)
else "None",[]).append(o.Shape.copy())
else "None",[]).extend(o.Shape.SubShapes)
elif hasattr(o,'Shape'):
if onlysolids:
shapes.extend(o.Shape.Solids)
else:
shapes.append(o.Shape.copy())
shapes.extend(o.Shape.SubShapes)
for k, v in shtypes.items():
v1 = v.pop()
if v:
@@ -264,14 +264,14 @@ class Shape2DView(DraftObject):
shapes.extend(v1.Solids)
else:
print("Shape2DView: Fusing Arch objects produced non-solid results")
shapes.append(v1)
shapes.extend(v1.SubShapes)
else:
for o in objs:
if hasattr(o,'Shape'):
if onlysolids:
shapes.extend(o.Shape.Solids)
else:
shapes.append(o.Shape.copy())
shapes.extend(o.Shape.SubShapes)
clip = False
if hasattr(obj.Base,"Clip"):
clip = obj.Base.Clip
@@ -302,12 +302,12 @@ class Shape2DView(DraftObject):
if onlysolids:
cuts.extend(c.Solids)
else:
cuts.append(c)
cuts.extend(c.SubShapes)
else:
if onlysolids:
cuts.extend(sh.Solids)
else:
cuts.append(sh.copy())
cuts.extend(sh.SubShapes)
comp = Part.makeCompound(cuts)
obj.Shape = self.getProjected(obj,comp,proj)
elif obj.ProjectionMode in ["Cutlines", "Cutfaces"]:
@@ -339,9 +339,7 @@ class Shape2DView(DraftObject):
objs = self.excludeNames(obj,groups.get_group_contents(obj.Base))
for o in objs:
if hasattr(o,'Shape'):
if o.Shape:
if not o.Shape.isNull():
shapes.append(o.Shape)
shapes.extend(o.Shape.SubShapes)
if shapes:
import Part
comp = Part.makeCompound(shapes)