Cleanups and outer circle for inner gears

This commit is contained in:
Florian Festi 2016-07-09 19:46:17 +02:00
parent c6b4fcc588
commit c0a9d42abd
1 changed files with 5 additions and 12 deletions

View File

@ -668,7 +668,6 @@ class Gears():
self.drawPoints(points) self.drawPoints(points)
bbox_center = points_to_bbox_center( points ) bbox_center = points_to_bbox_center( points )
path = ""
# Spokes (add to current path) # Spokes (add to current path)
if not self.options.internal_ring: # only draw internals if spur gear if not self.options.internal_ring: # only draw internals if spur gear
msg = self.generate_spokes(root_radius, spoke_width, spoke_count, mount_radius, mount_hole, msg = self.generate_spokes(root_radius, spoke_width, spoke_count, mount_radius, mount_hole,
@ -679,20 +678,14 @@ class Gears():
# A : rx,ry x-axis-rotation, large-arch-flag, sweepflag x,y # A : rx,ry x-axis-rotation, large-arch-flag, sweepflag x,y
r = mount_hole / 2 r = mount_hole / 2
self.boxes.hole(0, 0, r) self.boxes.hole(0, 0, r)
path += (
"M %f,%f" % (0,r) +
"A %f,%f %s %s %s %f,%f" % (r,r, 0,0,0, 0,-r) +
"A %f,%f %s %s %s %f,%f" % (r,r, 0,0,0, 0,r)
)
else: else:
# its a ring gear # its a ring gear
# which only has an outer ring where width = spoke width # which only has an outer ring where width = spoke width
r = outer_radius + spoke_width r = outer_radius + spoke_width + self.boxes.burn
path += ( self.boxes.ctx.save()
"M %f,%f" % (0,r) + self.boxes.moveTo(r, 0)
"A %f,%f %s %s %s %f,%f" % (r,r, 0,0,0, 0,-r) + self.boxes.ctx.arc(-r, 0, r, 0, 2*pi)
"A %f,%f %s %s %s %f,%f" % (r,r, 0,0,0, 0,r) self.boxes.ctx.restore()
)
# Add center # Add center
if centercross: if centercross:
cs = pitch / 3.0 # centercross length cs = pitch / 3.0 # centercross length