Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion freecad/Curves/JoinCurves.py
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ def __init__(self, obj):
''' Add the properties '''
obj.addProperty("App::PropertyLinkSubList", "Edges", "InputSources", "List of edges to join")
obj.addProperty("App::PropertyLink", "Base", "InputSources", "Join all the edges of this base object")
obj.addProperty("App::PropertyBool", "ClaimChildren", "InputSources", "Should Base be claimed as a Child?").ClaimChildren=True
obj.addProperty("App::PropertyFloat", "Tolerance", "Join", "Tolerance").Tolerance = 0.01
obj.addProperty("App::PropertyBool", "CornerBreak", "Join", "Break on sharp corners").CornerBreak = False
obj.addProperty("App::PropertyBool", "ForceContact", "Join", "Force connection of edges").ForceContact = True
Expand Down Expand Up @@ -197,6 +198,7 @@ def execute(self, obj):
class joinVP:
def __init__(self, vobj):
vobj.Proxy = self
self.fp = vobj.Object

def getIcon(self):
return (TOOL_ICON)
Expand All @@ -217,7 +219,10 @@ def __getstate__(self):
def __setstate__(self, state):
self.loads(state)

# def claimChildren(self):
def claimChildren(self):
if hasattr(self, 'fp'):
if self.fp.Base and self.fp.ClaimChildren:
return [ self.fp.Base ]
# return None #[self.Object.Base, self.Object.Tool]


Expand Down