From d26fcc5271ee28c912f77e6e1e67a48f93b4b7b2 Mon Sep 17 00:00:00 2001
From: Christian Colglazier <christian@cacolglazier.com>
Date: Tue, 17 May 2022 20:42:56 -0400
Subject: [PATCH] Improved sizing

---
 follow_focus.py | 33 ++++++++++++++++++++++++++++-----
 1 file changed, 28 insertions(+), 5 deletions(-)

diff --git a/follow_focus.py b/follow_focus.py
index 102f7b8..bd1ae6a 100644
--- a/follow_focus.py
+++ b/follow_focus.py
@@ -2,6 +2,9 @@ import cadquery as cq
 
 import math
 
+from shapely.geometry import LineString
+from shapely.geometry import Point
+
 slant_degree=15.0
 thickness=20
 rod_thickness=15.2
@@ -13,15 +16,35 @@ gap = stepper_motor_size * math.sin(math.radians(slant_degree)) / math.sin(math.
 width = math.sqrt(gap**2 + stepper_motor_size**2 - 2*gap*stepper_motor_size*math.cos(math.radians(90)))
 base = cq.Workplane('XY').lineTo(0,offset).polarLine(stepper_motor_size, 90-slant_degree)
 end_x=gap+stepper_motor_size-5
-end_y=0
-angle=45
+end_y=-3.5
+angle=40
 outer_ring_diameter=rod_thickness+2*loop_thickness
 center_x=end_x-math.cos(math.radians(angle))*outer_ring_diameter/2
 center_y=end_y-math.sin(math.radians(angle))*outer_ring_diameter/2
-log('{} {}'.format(center_x, center_y))
+
 base = base.hLine(width).polarLine(stepper_motor_size-5,270-slant_degree).tangentArcPoint((end_x, end_y), relative=False)
-base = base.threePointArc((center_x+outer_ring_diameter/2 ,center_y), (center_x+math.cos(math.radians(270-slant_degree))*outer_ring_diameter/2, center_y+math.sin(math.radians(270-slant_degree))*outer_ring_diameter/2)).polarLine(20, 180-slant_degree).vLine(4).polarLine(15.5, -slant_degree)
-base = base.threePointArc((center_x+rod_thickness/2 ,center_y), (center_x+math.cos(math.radians(200))*rod_thickness/2, center_y+math.sin(math.radians(200))*rod_thickness/2)).polarLine(15, 180-slant_degree)
+d=20
+t=6
+outer_x=center_x+math.cos(math.radians(270-slant_degree))*outer_ring_diameter/2
+outer_y=center_y+math.sin(math.radians(270-slant_degree))*outer_ring_diameter/2
+base = base.threePointArc((center_x+outer_ring_diameter/2 ,center_y), (outer_x, outer_y)).polarLine(d, 180-slant_degree).vLine(t)
+
+n_x=base.val().endPoint().toTuple()[0]
+n_y=base.val().endPoint().toTuple()[1]
+
+p = Point(center_x, center_y)
+c = p.buffer(rod_thickness/2).boundary
+l = LineString([(n_x, n_y), (n_x+100*math.cos(math.radians(-slant_degree)), n_y+100*math.sin(math.radians(-slant_degree)))])
+i = c.intersection(l)
+log((n_x,n_y))
+log((n_x+10*math.cos(math.radians(-slant_degree)), n_y+10*math.sin(math.radians(-slant_degree))))
+log((i.geoms[0].coords[0][0], i.geoms[0].coords[0][1]))
+
+
+
+#base = base.polarLine(15.5, -slant_degree)
+base = base.lineTo(i.geoms[1].coords[0][0], i.geoms[1].coords[0][1])
+base = base.threePointArc((center_x+rod_thickness/2 ,center_y), (center_x+math.cos(math.radians(180))*rod_thickness/2, center_y+math.sin(math.radians(180))*rod_thickness/2)).polarLine(15, 180-slant_degree)
 base = base.close().extrude(20)
 
 # Render