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

Add Draft workbench to .pre-commit-config (#24664)

Browse Source 
* Add Draft workbench to .pre-commit-config

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
This commit is contained in:
marcuspollio
2025-10-15 11:21:09 +02:00
committed by GitHub
parent f43af65eca
commit e831fc9163
225 changed files with 10713 additions and 9269 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -41,7 +41,7 @@ from draftutils.translate import translate
class Shape2DView(DraftObject):
"""The Shape2DView object"""
def __init__(self,obj):
def __init__(self, obj):
self.setProperties(obj)
super().__init__(obj, "Shape2DView")
@@ -53,101 +53,108 @@ class Shape2DView(DraftObject):
obj, vp_module="view_base", vp_class="ViewProviderDraftAlt", format=False
)
def setProperties(self,obj):
def setProperties(self, obj):
pl = obj.PropertiesList
if not "Base" in pl:
_tip = QT_TRANSLATE_NOOP("App::Property",
"The base object this 2D view must represent")
obj.addProperty("App::PropertyLink", "Base",
"Draft", _tip, locked=True)
_tip = QT_TRANSLATE_NOOP("App::Property", "The base object this 2D view must represent")
obj.addProperty("App::PropertyLink", "Base", "Draft", _tip, locked=True)
if not "Projection" in pl:
_tip = QT_TRANSLATE_NOOP("App::Property",
"The projection vector of this object")
obj.addProperty("App::PropertyVector", "Projection",
"Draft", _tip, locked=True)
obj.Projection = App.Vector(0,0,1)
_tip = QT_TRANSLATE_NOOP("App::Property", "The projection vector of this object")
obj.addProperty("App::PropertyVector", "Projection", "Draft", _tip, locked=True)
obj.Projection = App.Vector(0, 0, 1)
if not "ProjectionMode" in pl:
_tip = QT_TRANSLATE_NOOP("App::Property",
"The way the viewed object must be projected")
obj.addProperty("App::PropertyEnumeration", "ProjectionMode",
"Draft", _tip, locked=True)
obj.ProjectionMode = ["Solid", "Individual Faces",
"Cutlines", "Cutfaces","Solid faces"]
_tip = QT_TRANSLATE_NOOP("App::Property", "The way the viewed object must be projected")
obj.addProperty(
"App::PropertyEnumeration", "ProjectionMode", "Draft", _tip, locked=True
)
obj.ProjectionMode = [
"Solid",
"Individual Faces",
"Cutlines",
"Cutfaces",
"Solid faces",
]
if not "FaceNumbers" in pl:
_tip = QT_TRANSLATE_NOOP("App::Property",
"The indices of the faces to be projected in Individual Faces mode")
obj.addProperty("App::PropertyIntegerList", "FaceNumbers",
"Draft", _tip, locked=True)
_tip = QT_TRANSLATE_NOOP(
"App::Property", "The indices of the faces to be projected in Individual Faces mode"
)
obj.addProperty("App::PropertyIntegerList", "FaceNumbers", "Draft", _tip, locked=True)
if not "HiddenLines" in pl:
_tip = QT_TRANSLATE_NOOP("App::Property",
"Show hidden lines")
obj.addProperty("App::PropertyBool", "HiddenLines",
"Draft", _tip, locked=True)
_tip = QT_TRANSLATE_NOOP("App::Property", "Show hidden lines")
obj.addProperty("App::PropertyBool", "HiddenLines", "Draft", _tip, locked=True)
obj.HiddenLines = False
if not "FuseArch" in pl:
_tip = QT_TRANSLATE_NOOP("App::Property",
"Fuse wall and structure objects of same type and material")
obj.addProperty("App::PropertyBool", "FuseArch",
"Draft", _tip, locked=True)
_tip = QT_TRANSLATE_NOOP(
"App::Property", "Fuse wall and structure objects of same type and material"
)
obj.addProperty("App::PropertyBool", "FuseArch", "Draft", _tip, locked=True)
if not "Tessellation" in pl:
_tip = QT_TRANSLATE_NOOP("App::Property",
"Tessellate Ellipses and B-splines into line segments")
obj.addProperty("App::PropertyBool", "Tessellation",
"Draft", _tip, locked=True)
_tip = QT_TRANSLATE_NOOP(
"App::Property", "Tessellate Ellipses and B-splines into line segments"
)
obj.addProperty("App::PropertyBool", "Tessellation", "Draft", _tip, locked=True)
obj.Tessellation = False
if not "InPlace" in pl:
_tip = QT_TRANSLATE_NOOP("App::Property",
"For Cutlines and Cutfaces modes, this leaves the faces at the cut location")
obj.addProperty("App::PropertyBool", "InPlace",
"Draft", _tip, locked=True)
_tip = QT_TRANSLATE_NOOP(
"App::Property",
"For Cutlines and Cutfaces modes, this leaves the faces at the cut location",
)
obj.addProperty("App::PropertyBool", "InPlace", "Draft", _tip, locked=True)
obj.InPlace = True
if not "SegmentLength" in pl:
_tip = QT_TRANSLATE_NOOP("App::Property",
"Length of line segments if tessellating Ellipses or B-splines into line segments")
obj.addProperty("App::PropertyFloat", "SegmentLength",
"Draft", _tip, locked=True)
obj.SegmentLength = .05
_tip = QT_TRANSLATE_NOOP(
"App::Property",
"Length of line segments if tessellating Ellipses or B-splines into line segments",
)
obj.addProperty("App::PropertyFloat", "SegmentLength", "Draft", _tip, locked=True)
obj.SegmentLength = 0.05
if not "VisibleOnly" in pl:
_tip = QT_TRANSLATE_NOOP("App::Property",
"If this is True, this object will include only visible objects")
obj.addProperty("App::PropertyBool", "VisibleOnly",
"Draft", _tip, locked=True)
_tip = QT_TRANSLATE_NOOP(
"App::Property", "If this is True, this object will include only visible objects"
)
obj.addProperty("App::PropertyBool", "VisibleOnly", "Draft", _tip, locked=True)
obj.VisibleOnly = False
if not "ExclusionPoints" in pl:
_tip = QT_TRANSLATE_NOOP("App::Property",
"A list of exclusion points. Any edge touching any of those points will not be drawn.")
obj.addProperty("App::PropertyVectorList", "ExclusionPoints",
"Draft", _tip, locked=True)
_tip = QT_TRANSLATE_NOOP(
"App::Property",
"A list of exclusion points. Any edge touching any of those points will not be drawn.",
)
obj.addProperty(
"App::PropertyVectorList", "ExclusionPoints", "Draft", _tip, locked=True
)
if not "ExclusionNames" in pl:
_tip = QT_TRANSLATE_NOOP("App::Property",
"A list of exclusion object names. Any object viewed that matches a name from the list will not be drawn.")
obj.addProperty("App::PropertyStringList", "ExclusionNames",
"Draft", _tip, locked=True)
_tip = QT_TRANSLATE_NOOP(
"App::Property",
"A list of exclusion object names. Any object viewed that matches a name from the list will not be drawn.",
)
obj.addProperty("App::PropertyStringList", "ExclusionNames", "Draft", _tip, locked=True)
if not "OnlySolids" in pl:
_tip = QT_TRANSLATE_NOOP("App::Property",
"If this is True, only solid geometry is handled. This overrides the base object's Only Solids property")
obj.addProperty("App::PropertyBool", "OnlySolids",
"Draft", _tip, locked=True)
_tip = QT_TRANSLATE_NOOP(
"App::Property",
"If this is True, only solid geometry is handled. This overrides the base object's Only Solids property",
)
obj.addProperty("App::PropertyBool", "OnlySolids", "Draft", _tip, locked=True)
if not "Clip" in pl:
_tip = QT_TRANSLATE_NOOP("App::Property",
"If this is True, the contents are clipped to the borders of the section plane, if applicable. This overrides the base object's Clip property")
obj.addProperty("App::PropertyBool", "Clip",
"Draft", _tip, locked=True)
_tip = QT_TRANSLATE_NOOP(
"App::Property",
"If this is True, the contents are clipped to the borders of the section plane, if applicable. This overrides the base object's Clip property",
)
obj.addProperty("App::PropertyBool", "Clip", "Draft", _tip, locked=True)
if not "AutoUpdate" in pl:
_tip = QT_TRANSLATE_NOOP("App::Property",
"This object will be recomputed only if this is True.")
obj.addProperty("App::PropertyBool", "AutoUpdate",
"Draft", _tip, locked=True)
_tip = QT_TRANSLATE_NOOP(
"App::Property", "This object will be recomputed only if this is True."
)
obj.addProperty("App::PropertyBool", "AutoUpdate", "Draft", _tip, locked=True)
obj.AutoUpdate = True
def getProjected(self,obj,shape,direction):
def getProjected(self, obj, shape, direction):
"returns projected edges from a shape and a direction"
import Part
import TechDraw
import DraftGeomUtils
edges = []
_groups = TechDraw.projectEx(shape, direction)
for g in _groups[0:5]:
@@ -157,22 +164,22 @@ class Shape2DView(DraftObject):
for g in _groups[5:]:
if not g.isNull():
edges.append(g)
edges = self.cleanExcluded(obj,edges)
edges = self.cleanExcluded(obj, edges)
if getattr(obj, "Tessellation", False):
return DraftGeomUtils.cleanProjection(Part.makeCompound(edges),
obj.Tessellation,
obj.SegmentLength)
return DraftGeomUtils.cleanProjection(
Part.makeCompound(edges), obj.Tessellation, obj.SegmentLength
)
else:
return Part.makeCompound(edges)
def cleanExcluded(self,obj,shapes):
def cleanExcluded(self, obj, shapes):
"""removes any edge touching exclusion points"""
import Part
MAXDIST = 0.0001
if (not hasattr(obj,"ExclusionPoints")) or (not obj.ExclusionPoints):
if (not hasattr(obj, "ExclusionPoints")) or (not obj.ExclusionPoints):
return shapes
#verts = [Part.Vertex(obj.Placement.multVec(p)) for p in obj.ExclusionPoints]
# verts = [Part.Vertex(obj.Placement.multVec(p)) for p in obj.ExclusionPoints]
verts = [Part.Vertex(p) for p in obj.ExclusionPoints]
nedges = []
for s in shapes:
@@ -183,14 +190,16 @@ class Shape2DView(DraftObject):
if d and (d[0] <= MAXDIST):
break
except RuntimeError:
print("FIXME: shape2dview: distance unavailable for edge",e,"in",obj.Label)
print(
"FIXME: shape2dview: distance unavailable for edge", e, "in", obj.Label
)
else:
nedges.append(e)
return nedges
def excludeNames(self,obj,objs):
if hasattr(obj,"ExclusionNames"):
objs = [o for o in objs if not(o.Name in obj.ExclusionNames)]
def excludeNames(self, obj, objs):
if hasattr(obj, "ExclusionNames"):
objs = [o for o in objs if not (o.Name in obj.ExclusionNames)]
return objs
def _get_shapes(self, shape, onlysolids=False):
@@ -203,39 +212,39 @@ class Shape2DView(DraftObject):
return [shape.copy()]
def execute(self, obj):
if self.props_changed_placement_only(obj) \
or not getattr(obj, "AutoUpdate", True):
if self.props_changed_placement_only(obj) or not getattr(obj, "AutoUpdate", True):
obj.positionBySupport()
self.props_changed_clear()
return
import Part
import DraftGeomUtils
pl = obj.Placement
if obj.Base:
if utils.get_type(obj.Base) in ["BuildingPart","SectionPlane","IfcAnnotation"]:
if utils.get_type(obj.Base) in ["BuildingPart", "SectionPlane", "IfcAnnotation"]:
objs = []
if utils.get_type(obj.Base) == "SectionPlane":
objs = self.excludeNames(obj,obj.Base.Objects)
objs = self.excludeNames(obj, obj.Base.Objects)
cutplane = obj.Base.Shape
elif utils.get_type(obj.Base) == "IfcAnnotation":
# this is a NativeIFC section plane
objs, cutplane = obj.Base.Proxy.get_section_data(obj.Base)
objs = self.excludeNames(obj, objs)
else:
objs = self.excludeNames(obj,obj.Base.Group)
objs = self.excludeNames(obj, obj.Base.Group)
cutplane = Part.makePlane(1000, 1000, App.Vector(-500, -500, 0))
m = 1
if obj.Base.ViewObject and hasattr(obj.Base.ViewObject,"CutMargin"):
if obj.Base.ViewObject and hasattr(obj.Base.ViewObject, "CutMargin"):
m = obj.Base.ViewObject.CutMargin.Value
cutplane.translate(App.Vector(0,0,m))
cutplane.translate(App.Vector(0, 0, m))
cutplane.Placement = cutplane.Placement.multiply(obj.Base.Placement)
if objs:
onlysolids = True
# TODO Fix this : 2025.1.26, why test obj.Base.OnlySolids if override by obj.OnlySolids
if hasattr(obj.Base,"OnlySolids"):
if hasattr(obj.Base, "OnlySolids"):
onlysolids = obj.Base.OnlySolids
if hasattr(obj,"OnlySolids"): # override base object
if hasattr(obj, "OnlySolids"): # override base object
onlysolids = obj.OnlySolids
try:
import Arch
@@ -243,17 +252,20 @@ class Shape2DView(DraftObject):
print("Shape2DView: BIM not present, unable to recompute")
return
objs = groups.get_group_contents(objs, walls=True)
if getattr(obj,"VisibleOnly",True):
if getattr(obj, "VisibleOnly", True):
objs = gui_utils.remove_hidden(objs)
shapes = []
if getattr(obj,"FuseArch", False):
if getattr(obj, "FuseArch", False):
shtypes = {}
for o in objs:
if utils.get_type(o) in ["Wall","Structure"]:
if utils.get_type(o) in ["Wall", "Structure"]:
shtypes.setdefault(
o.Material.Name
if (hasattr(o,"Material") and o.Material) else "None",
[]
(
o.Material.Name
if (hasattr(o, "Material") and o.Material)
else "None"
),
[],
).extend(self._get_shapes(o.Shape, onlysolids))
elif hasattr(o, "Shape"):
shapes.extend(self._get_shapes(o.Shape, onlysolids))
@@ -281,18 +293,18 @@ class Shape2DView(DraftObject):
shapes.extend(self._get_shapes(o.Shape, onlysolids))
clip = False
# TODO Fix this : 2025.1.26, why test obj.Base.Clip if override by obj.Clip
if hasattr(obj.Base,"Clip"):
if hasattr(obj.Base, "Clip"):
clip = obj.Base.Clip
if hasattr(obj,"Clip"): #override base object
if hasattr(obj, "Clip"): # override base object
clip = obj.Clip
depth = None
if hasattr(obj.Base,"Depth"):
if hasattr(obj.Base, "Depth"):
depth = obj.Base.Depth.Value
cutp, cutv, iv = Arch.getCutVolume(cutplane, shapes, clip, depth)
cuts = []
opl = App.Placement(obj.Base.Placement)
proj = opl.Rotation.multVec(App.Vector(0, 0, 1))
if obj.ProjectionMode in ["Solid","Solid faces"]:
if obj.ProjectionMode in ["Solid", "Solid faces"]:
shapes_to_cut = shapes
if obj.ProjectionMode == "Solid faces":
shapes_to_cut = []
@@ -302,9 +314,9 @@ class Shape2DView(DraftObject):
if cutv and (not cutv.isNull()) and (not sh.isNull()):
if sh.Volume < 0:
sh.reverse()
#if cutv.BoundBox.intersect(sh.BoundBox):
# if cutv.BoundBox.intersect(sh.BoundBox):
# c = sh.cut(cutv)
#else:
# else:
# c = sh.copy()
try:
c = sh.cut(cutv)
@@ -316,7 +328,7 @@ class Shape2DView(DraftObject):
else:
cuts.extend(self._get_shapes(sh, onlysolids))
comp = Part.makeCompound(cuts)
obj.Shape = self.getProjected(obj,comp,proj)
obj.Shape = self.getProjected(obj, comp, proj)
elif obj.ProjectionMode in ["Cutlines", "Cutfaces"]:
if not cutp: # Cutfaces and Cutlines needs cutp
obj.Shape = Part.Shape()
@@ -332,7 +344,7 @@ class Shape2DView(DraftObject):
facesOrg = sc.Faces
if not facesOrg:
continue
if hasattr(obj,"InPlace"):
if hasattr(obj, "InPlace"):
if obj.InPlace:
faces = facesOrg
# Alternative approach in https://forum.freecad.org/viewtopic.php?p=807314#p807314, not adopted
@@ -340,7 +352,7 @@ class Shape2DView(DraftObject):
for faceOrg in facesOrg:
if len(faceOrg.Wires) == 1:
wireProj = self.getProjected(obj, faceOrg, proj)
#return Compound
# return Compound
wireProjWire = Part.Wire(wireProj.Edges)
faceProj = Part.Face(wireProjWire)
elif len(faceOrg.Wires) == 2:
@@ -349,22 +361,28 @@ class Shape2DView(DraftObject):
if not w.isEqual(wireClosedOuter):
wireClosedInner = w
break
wireProjOuter = self.getProjected(obj, wireClosedOuter, proj)
#return Compound
wireProjOuter = self.getProjected(
obj, wireClosedOuter, proj
)
# return Compound
wireProjOuterWire = Part.Wire(wireProjOuter.Edges)
faceProj = Part.Face(wireProjOuterWire)
wireProjInner = self.getProjected(obj, wireClosedInner, proj)
#return Compound
wireProjInner = self.getProjected(
obj, wireClosedInner, proj
)
# return Compound
wireProjInnerWire = Part.Wire(wireProjInner.Edges)
faceProj.cutHoles([wireProjInnerWire]) # (list of wires)
faceProj.cutHoles(
[wireProjInnerWire]
) # (list of wires)
faces.append(faceProj)
else:
c = sh.section(cutp)
if hasattr(obj,"InPlace"):
if hasattr(obj, "InPlace"):
if not obj.InPlace:
c = self.getProjected(obj, c, proj)
#faces = []
#if (obj.ProjectionMode == "Cutfaces") and (sh.ShapeType == "Solid"):
# faces = []
# if (obj.ProjectionMode == "Cutfaces") and (sh.ShapeType == "Solid"):
# wires = DraftGeomUtils.findWires(c.Edges)
# for w in wires:
# if w.isClosed():
@@ -381,21 +399,23 @@ class Shape2DView(DraftObject):
elif obj.Base.isDerivedFrom("App::DocumentObjectGroup"):
shapes = []
objs = self.excludeNames(obj,groups.get_group_contents(obj.Base))
objs = self.excludeNames(obj, groups.get_group_contents(obj.Base))
for o in objs:
if hasattr(o, "Shape"):
shapes.extend(self._get_shapes(o.Shape))
if shapes:
import Part
comp = Part.makeCompound(shapes)
obj.Shape = self.getProjected(obj,comp,obj.Projection)
obj.Shape = self.getProjected(obj, comp, obj.Projection)
elif hasattr(obj.Base, "Shape"):
if not DraftVecUtils.isNull(obj.Projection):
if obj.ProjectionMode == "Solid":
obj.Shape = self.getProjected(obj,obj.Base.Shape,obj.Projection)
obj.Shape = self.getProjected(obj, obj.Base.Shape, obj.Projection)
elif obj.ProjectionMode == "Individual Faces":
import Part
if obj.FaceNumbers:
faces = []
for i in obj.FaceNumbers:
@@ -403,11 +423,11 @@ class Shape2DView(DraftObject):
faces.append(obj.Base.Shape.Faces[i])
views = []
for f in faces:
views.append(self.getProjected(obj,f,obj.Projection))
views.append(self.getProjected(obj, f, obj.Projection))
if views:
obj.Shape = Part.makeCompound(views)
else:
App.Console.PrintWarning(obj.ProjectionMode+" mode not implemented\n")
App.Console.PrintWarning(obj.ProjectionMode + " mode not implemented\n")
obj.Placement = pl
obj.positionBySupport()