suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Disabling debugging and smooth paths for PR.

Browse Source
This commit is contained in:
ml 2016-10-17 19:14:43 -07:00 committed by Markus Lampert
parent 23713a2c51
commit d6e75ff4f3
1 changed files with 46 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
src/Mod/Path/PathScripts/DogboneDressup.py
View File

@ -47,19 +47,27 @@ except AttributeError:
movecommands = ['G0', 'G00', 'G1', 'G01', 'G2', 'G02', 'G3', 'G03'] movecommands = ['G0', 'G00', 'G1', 'G01', 'G2', 'G02', 'G3', 'G03']
movestraight = ['G1', 'G01'] movestraight = ['G1', 'G01']
debugDogbone = False
def debugPrint(msg):
if debugDogbone:
print(msg)
def debugMarker(vector, label): def debugMarker(vector, label):
obj = FreeCAD.ActiveDocument.addObject("Part::Sphere", label) if debugDogbone:
obj.Label = label obj = FreeCAD.ActiveDocument.addObject("Part::Sphere", label)
obj.Radius = 0.5 obj.Label = label
obj.Placement = FreeCAD.Placement(vector, FreeCAD.Rotation(FreeCAD.Vector(0,0,1), 0)) obj.Radius = 0.5
obj.Placement = FreeCAD.Placement(vector, FreeCAD.Rotation(FreeCAD.Vector(0,0,1), 0))
def debugCircle(vector, r, label): def debugCircle(vector, r, label):
obj = FreeCAD.ActiveDocument.addObject("Part::Cylinder", label) if debugDogbone:
obj.Label = label obj = FreeCAD.ActiveDocument.addObject("Part::Cylinder", label)
obj.Radius = r obj.Label = label
obj.Height = 1 obj.Radius = r
obj.Placement = FreeCAD.Placement(vector, FreeCAD.Rotation(FreeCAD.Vector(0,0,1), 0)) obj.Height = 1
obj.ViewObject.Transparency = 95 obj.Placement = FreeCAD.Placement(vector, FreeCAD.Rotation(FreeCAD.Vector(0,0,1), 0))
obj.ViewObject.Transparency = 95
class Style: class Style:
Dogbone = 'Dogbone' Dogbone = 'Dogbone'
@ -108,7 +116,7 @@ class Chord (object):
return "Chord([%g, %g, %g] -> [%g, %g, %g])" % (self.Start.x, self.Start.y, self.Start.z, self.End.x, self.End.y, self.End.z) return "Chord([%g, %g, %g] -> [%g, %g, %g])" % (self.Start.x, self.Start.y, self.Start.z, self.End.x, self.End.y, self.End.z)
def moveTo(self, newEnd): def moveTo(self, newEnd):
#print("Chord(%s -> %s)" % (self.End, newEnd)) #debugPrint("Chord(%s -> %s)" % (self.End, newEnd))
return Chord(self.End, newEnd) return Chord(self.End, newEnd)
def moveToParameters(self, params): def moveToParameters(self, params):
@ -238,8 +246,8 @@ class ObjectDressup:
obj.setEditorMode('BoneBlacklist', 2) # hide this one obj.setEditorMode('BoneBlacklist', 2) # hide this one
obj.addProperty("App::PropertyEnumeration", "Incision", "Dressup", QtCore.QT_TRANSLATE_NOOP("Dogbone_Dressup", "The algorithm to determine the bone length")) obj.addProperty("App::PropertyEnumeration", "Incision", "Dressup", QtCore.QT_TRANSLATE_NOOP("Dogbone_Dressup", "The algorithm to determine the bone length"))
obj.Incision = Incision.All obj.Incision = Incision.All
obj.Incision = Incision.Adaptive obj.Incision = Incision.Fixed
obj.addProperty("App::PropertyFloat", "Custom", "Dressup", QtCore.QT_TRANSLATE_NOOP("Dogbone_Dressup", "Dressup length if lenght == custom")) obj.addProperty("App::PropertyFloat", "Custom", "Dressup", QtCore.QT_TRANSLATE_NOOP("Dogbone_Dressup", "Dressup length if Incision == custom"))
obj.Custom = 0.0 obj.Custom = 0.0
obj.Proxy = self obj.Proxy = self
@ -268,46 +276,46 @@ class ObjectDressup:
dest = inChord.moveTo(FreeCAD.Vector(v.x, v.y, v.z)) dest = inChord.moveTo(FreeCAD.Vector(v.x, v.y, v.z))
destAngle = dest.getAngleXY() destAngle = dest.getAngleXY()
distance = dest.getLength() - self.toolRadius * math.fabs(math.cos(destAngle - angle)) distance = dest.getLength() - self.toolRadius * math.fabs(math.cos(destAngle - angle))
#print("adapt") #debugPrint("adapt")
#print(" in = %s -> %s" % (inChord, iChord)) #debugPrint(" in = %s -> %s" % (inChord, iChord))
#print(" out = %s -> %s" % (outChord, oChord)) #debugPrint(" out = %s -> %s" % (outChord, oChord))
#print(" = (%.2f, %.2f) -> %.2f (%.2f %.2f) -> %.2f" % (x, y, dest.getLength(), destAngle/math.pi, angle/math.pi, distance)) #debugPrint(" = (%.2f, %.2f) -> %.2f (%.2f %.2f) -> %.2f" % (x, y, dest.getLength(), destAngle/math.pi, angle/math.pi, distance))
return distance return distance
def smoothChordCommands(self, inChord, outChord, side, smooth): def smoothChordCommands(self, inChord, outChord, side, smooth):
if smooth == 0: if smooth == 0:
return [ inChord.g1Command(), outChord.g1Command() ] return [ inChord.g1Command(), outChord.g1Command() ]
print("(%.2f, %.2f) -> (%.2f, %.2f) -> (%.2f, %.2f)" % (inChord.Start.x, inChord.Start.y, inChord.End.x, inChord.End.y, outChord.End.x, outChord.End.y)) debugPrint("(%.2f, %.2f) -> (%.2f, %.2f) -> (%.2f, %.2f)" % (inChord.Start.x, inChord.Start.y, inChord.End.x, inChord.End.y, outChord.End.x, outChord.End.y))
inAngle = inChord.getAngleXY() inAngle = inChord.getAngleXY()
outAngle = outChord.getAngleXY() outAngle = outChord.getAngleXY()
print(" inAngle = %.2f outAngle = %.2f" % (inAngle/math.pi, outAngle/math.pi)) debugPrint(" inAngle = %.2f outAngle = %.2f" % (inAngle/math.pi, outAngle/math.pi))
if inAngle == outAngle: # straight line, outChord includes inChord if inAngle == outAngle: # straight line, outChord includes inChord
print(" ---> (%.2f, %.2f)" %(outChord.End.x, outChord.End.y)) debugPrint(" ---> (%.2f, %.2f)" %(outChord.End.x, outChord.End.y))
return [ outChord.g1Command() ] return [ outChord.g1Command() ]
print("%s :: %s" % (inChord, outChord)) debugPrint("%s :: %s" % (inChord, outChord))
inEdge = DraftGeomUtils.edg(inChord.Start, inChord.End) inEdge = DraftGeomUtils.edg(inChord.Start, inChord.End)
outEdge = DraftGeomUtils.edg(outChord.Start, outChord.End) outEdge = DraftGeomUtils.edg(outChord.Start, outChord.End)
#wire = Part.Wire([inEdge, outEdge]) #wire = Part.Wire([inEdge, outEdge])
#print(" => %s" % wire) #debugPrint(" => %s" % wire)
#wire = wire.makeOffset2D(self.toolRadius) #wire = wire.makeOffset2D(self.toolRadius)
#print(" ==> %s" % wire) #debugPrint(" ==> %s" % wire)
#wire = wire.makeOffset2D(-self.toolRadius) #wire = wire.makeOffset2D(-self.toolRadius)
#print(" ===> %s" % wire) #debugPrint(" ===> %s" % wire)
radius = self.toolRadius radius = self.toolRadius
while radius > 0: while radius > 0:
lastpt = None lastpt = None
commands = "" commands = ""
edges = DraftGeomUtils.fillet([inEdge, outEdge], radius) edges = DraftGeomUtils.fillet([inEdge, outEdge], radius)
if DraftGeomUtils.isSameLine(edges[0], inEdge) or DraftGeomUtils.isSameLine(edges[1], inEdge): if DraftGeomUtils.isSameLine(edges[0], inEdge) or DraftGeomUtils.isSameLine(edges[1], inEdge):
print("Oh, we got a problem, try smaller radius") debugPrint("Oh, we got a problem, try smaller radius")
radius = radius - 0.1 * self.toolRadius radius = radius - 0.1 * self.toolRadius
continue continue
print("we're good") debugPrint("we're good")
#for edge in wire.Edges[:-1]: # makeOffset2D closes the wire #for edge in wire.Edges[:-1]: # makeOffset2D closes the wire
for edge in edges: for edge in edges:
if not lastpt: if not lastpt:
lastpt = edge.Vertexes[0].Point lastpt = edge.Vertexes[0].Point
lastpt, cmds = PathUtils.edge_to_path(lastpt, edge, 0) lastpt, cmds = PathUtils.edge_to_path(lastpt, edge, inChord.Start.z)
commands += cmds commands += cmds
path = Path.Path(commands) path = Path.Path(commands)
return path.Commands return path.Commands
@ -325,12 +333,12 @@ class ObjectDressup:
boneInChord = inChord.moveBy(x, y, 0) boneInChord = inChord.moveBy(x, y, 0)
boneOutChord = boneInChord.moveTo(outChord.Start) boneOutChord = boneInChord.moveTo(outChord.Start)
debugCircle(boneInChord.Start, self.toolRadius, 'boneStart') #debugCircle(boneInChord.Start, self.toolRadius, 'boneStart')
debugCircle(boneInChord.End, self.toolRadius, 'boneEnd') debugCircle(boneInChord.End, self.toolRadius, 'boneEnd')
bones = [] bones = []
bones.extend(self.smoothChordCommands(inChord, boneInChord, obj.Side, smooth & Smooth.In)) bones.extend(self.smoothChordCommands(inChord, boneInChord, obj.Side, 0)) #smooth & Smooth.In))
bones.extend(self.smoothChordCommands(boneOutChord, outChord, obj.Side, smooth & Smooth.Out)) bones.extend(self.smoothChordCommands(boneOutChord, outChord, obj.Side, 0)) #smooth & Smooth.Out))
return bones return bones
def dogboneAngle(self, obj, inChord, outChord): def dogboneAngle(self, obj, inChord, outChord):
@ -343,7 +351,7 @@ class ObjectDressup:
boneAngle += 2*math.pi boneAngle += 2*math.pi
while boneAngle > math.pi: while boneAngle > math.pi:
boneAngle -= 2*math.pi boneAngle -= 2*math.pi
#print("base=%+3.2f turn=%+3.2f bone=%+3.2f" % (baseAngle/math.pi, turnAngle/math.pi, boneAngle/math.pi)) #debugPrint("base=%+3.2f turn=%+3.2f bone=%+3.2f" % (baseAngle/math.pi, turnAngle/math.pi, boneAngle/math.pi))
return boneAngle return boneAngle
def dogbone(self, obj, inChord, outChord, smooth): def dogbone(self, obj, inChord, outChord, smooth):
@ -414,18 +422,18 @@ class ObjectDressup:
return [ inChord.g1Command(), outChord.g1Command() ] return [ inChord.g1Command(), outChord.g1Command() ]
def insertBone(self, boneId, obj, inChord, outChord, commands, smooth): def insertBone(self, boneId, obj, inChord, outChord, commands, smooth):
print(">----------------------------------- %d --------------------------------------" % boneId) debugPrint(">----------------------------------- %d --------------------------------------" % boneId)
loc = (inChord.End.x, inChord.End.y) loc = (inChord.End.x, inChord.End.y)
blacklisted, inaccessible = self.boneIsBlacklisted(obj, boneId, loc) blacklisted, inaccessible = self.boneIsBlacklisted(obj, boneId, loc)
enabled = not blacklisted enabled = not blacklisted
self.bones.append((boneId, loc, enabled, inaccessible)) self.bones.append((boneId, loc, enabled, inaccessible))
if boneId < 9: if debugDogbone and boneId > 3:
bones = self.boneCommands(obj, enabled, inChord, outChord, smooth)
else:
bones = self.boneCommands(obj, False, inChord, outChord, smooth) bones = self.boneCommands(obj, False, inChord, outChord, smooth)
else:
bones = self.boneCommands(obj, enabled, inChord, outChord, smooth)
commands.extend(bones[:-1]) commands.extend(bones[:-1])
print("<----------------------------------- %d --------------------------------------" % boneId) debugPrint("<----------------------------------- %d --------------------------------------" % boneId)
return boneId + 1, bones[-1] return boneId + 1, bones[-1]
def execute(self, obj): def execute(self, obj):
@ -478,13 +486,13 @@ class ObjectDressup:
lastCommand = None lastCommand = None
commands.append(thisCmd) commands.append(thisCmd)
#for cmd in commands: #for cmd in commands:
# print("cmd = '%s'" % cmd) # debugPrint("cmd = '%s'" % cmd)
path = Path.Path(commands) path = Path.Path(commands)
obj.Path = path obj.Path = path
def setup(self, obj): def setup(self, obj):
if not hasattr(self, 'toolRadius'): if not hasattr(self, 'toolRadius'):
print("Here we go ... ") debugPrint("Here we go ... ")
if hasattr(obj.Base, "BoneBlacklist"): if hasattr(obj.Base, "BoneBlacklist"):
# dressing up a bone dressup # dressing up a bone dressup
obj.Side = obj.Base.Side obj.Side = obj.Base.Side