From d97c0692b1e00959dd50117123331ccee997d1ab Mon Sep 17 00:00:00 2001
From: Christian Colglazier <christian@cacolglazier.com>
Date: Sun, 22 May 2022 11:30:45 -0400
Subject: [PATCH] Removed some center hacks

---
 follow_focus.py | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/follow_focus.py b/follow_focus.py
index 5224199..c9f915f 100644
--- a/follow_focus.py
+++ b/follow_focus.py
@@ -100,6 +100,7 @@ copy = base.faces('>>Z[0]').workplane().center(0, -offset-loop_width)\
                                        .polarLine(stepper_motor_size, slant_degree)\
                                        .polarLine(-2*stepper_motor_size, 90+slant_degree)\
                                        .hLine(-2*stepper_motor_size).close().cutThruAll()
+
 copy = copy.faces('+Z').workplane().center(0, -offset-loop_width)\
                                    .polarLine(2*stepper_motor_size,-slant_degree)\
                                    .vLine(stepper_motor_size)\
@@ -107,7 +108,7 @@ copy = copy.faces('+Z').workplane().center(0, -offset-loop_width)\
                                    .close().cutBlind(-lid_thicknesss)
 base = base.faces('+Z').shell(-wall_width)
 base = base.add(copy)
-base = base.faces('<<Z[0]').workplane().center(0, offset+loop_width)\
+base = base.faces('<<Z[0]').workplane().vLine(offset+loop_width, forConstruction=True)\
                                        .polarLine(stepper_motor_size, -slant_degree)\
                                        .polarLine(stepper_motor_size, -slant_degree-3.75)\
                                        .vLine(2*stepper_motor_size)\
@@ -116,8 +117,7 @@ base = base.faces('<<Z[0]').workplane().center(0, offset+loop_width)\
 
 # Stepper motor mount points
 stepper_hole_radius=stepper_hole_width/2*math.sqrt(2)
-stepper_center = cq.Workplane('XY').center(0, -offset-loop_width)\
-                                   .lineTo(0, offset)\
+stepper_center = cq.Workplane('XY').lineTo(0, offset)\
                                    .polarLine(stepper_motor_size/2, 90-slant_degree)\
                                    .polarLine(stepper_motor_size/2, -slant_degree)\
                                    .val().endPoint().toTuple()
@@ -134,14 +134,13 @@ base = base.faces('>>Z[0]').workplane().center(stepper_center[0], -stepper_cente
                                        .circle(3/2).cutBlind(-wall_width)
 
 lid = lid.cut(base)
-copy = lid.faces('>>Z[0]').workplane().center(0, -offset-loop_width)\
-                                      .polarLine(stepper_motor_size*2, slant_degree)\
+copy = lid.faces('>>Z[0]').workplane().vLine(-offset-wall_width, forConstruction=True).polarLine(stepper_motor_size*2, slant_degree)\
                                       .polarLine(-2*stepper_motor_size, 90+slant_degree)\
                                       .hLine(-3*stepper_motor_size).close().cutThruAll()
 lid = lid.faces('>Z[0]').shell(.000001-wall_width)
 lid = lid.add(copy)
 
-lid = lid.faces('>Z[1]').workplane().center(stepper_center[0], -stepper_center[1]-offset-loop_width)\
+lid = lid.faces('>Z[1]').workplane().center(stepper_center[0], -stepper_center[1])\
                                     .circle(5).extrude(lid_thicknesss-wall_width)
 lid = lid.faces('>Z[0]').workplane().circle(5/2).cutThruAll()
 
@@ -193,7 +192,7 @@ l_gear = cq.Workplane('XY').gear(SpurGear(module=mod,
                                           teeth_number=63,
                                           width=gear_thinkness,
                                           bore_d=large_gear_diameter))
-l_gear = l_gear.translate((21+stepper_center[0],20.15+stepper_center[1]+offset+loop_width,(gear_thinkness+gear_offset)/2))
+l_gear = l_gear.translate((21+stepper_center[0],20.15+stepper_center[1],(gear_thinkness+gear_offset)/2))
 s_gear = cq.Workplane('XY').gear(SpurGear(module=mod,
                                           teeth_number=11,
                                           width=gear_thinkness))
@@ -207,7 +206,7 @@ copy = s_gear.faces('<Z[0]').workplane().vLine(tab_distance, forConstruction=Tru
                                                                         .close().cutThruAll()
 s_gear = s_gear.faces('<Z[0]').sketch().circle(shaft_diameter/2).finalize().cutThruAll()
 s_gear = s_gear.add(copy)
-s_gear = s_gear.translate((stepper_center[0],stepper_center[1]+offset+loop_width,(gear_thinkness+gear_offset)/2))
+s_gear = s_gear.translate((stepper_center[0],stepper_center[1],(gear_thinkness+gear_offset)/2))
 
 # Render
 show_object(base, name='Follow Focus Base')