From 0f80684c1bf403b1a63d9a0390bf9989c919262f Mon Sep 17 00:00:00 2001
From: Yeicor <4929005+Yeicor@users.noreply.github.com>
Date: Fri, 5 Jan 2024 19:19:11 +0100
Subject: [PATCH] Better handle bars

---
 parts/__pycache__/handle_bars.cpython-311.pyc | Bin 0 -> 4981 bytes
 parts/__pycache__/stem.cpython-311.pyc        | Bin 5191 -> 5524 bytes
 parts/handle_bars.py                          |  29 ++++++++++--------
 parts/stem.py                                 |   9 +++---
 4 files changed, 21 insertions(+), 17 deletions(-)
 create mode 100644 parts/__pycache__/handle_bars.cpython-311.pyc

diff --git a/parts/__pycache__/handle_bars.cpython-311.pyc b/parts/__pycache__/handle_bars.cpython-311.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..4826db9a157dd43e82118aa0770f77d614b6304a
GIT binary patch
literal 4981
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

literal 0
HcmV?d00001

diff --git a/parts/__pycache__/stem.cpython-311.pyc b/parts/__pycache__/stem.cpython-311.pyc
index 086e644e3bd393d0c50c557c3d3872acef68b792..42d91bec84807967645407c7e8ce49e40289e60c 100644
GIT binary patch
delta 1595
zcma)5O=ufO6rRz}dRMY!tt?rVC0SZ2bt+kEV%Lsqr>SGRBv3WQg+QU+f)L$t<HbMi
z$|hh6QcDiLw2_${N>4fjHzmHgP!e(o6k||L6Bj{)$RU>=+LH@Cn4bD(-Hjt#lnl(<
z_r87eeKYUP?4)jGJl}adE(GI)@oy+y_w+bA<@MB`$s1@U;6PM1y7*5%HelYhJZ`E%
zHi`WrqTNP_l}We5-NU{Y;;e$bQdpB|xEkRJ>?T%9Q6TDVUVaYE!~l(-Kvh5!G-@Pm
zCF7LsHKDKA=&S?qK09iaT|&rsne-!)=Iqv6X_>8iHaj*%s1wY?fsxL390Ogan@@@n
zRjaRB6^aWAK32>@caOau&7`0rX_}%=+P?~&+VpNXKmevK@IOqUQVXK~lN6e&aha1%
z$^e?Bu?-B8Fl|W-4b#_*Gd8xV9N!k?oTWnMzf<1CUbaReSAETO_!1vdwG@cGgupR=
z>|?{?B+jhY&JgO;JJ}tvw|jsNfQo1g+MBha*V$7sb8!g#lecgf(1eb3L|wCj_4VoK
zsFbq;9fE(H|8m=V@pCjrhd2Gr1(+ED4uOV^H<&7g2py@8@pg|PfX~xW<4t=r7JbyX
zV8=&SSP!hWBQz`Uw(DIiEcFhKXfbVA8`Z)Ze^hTZ7ZV=UIG|aWpm$hOc$>i>=Asvy
zlaD{(NUJ;7e|RSLz%febgdSu$=`8MMtJ1fuPreT=eI|c}<80CSZnhKlZ~DO$1u*Kw
zgc*Quqhn=p?z0t|Uov%SQr!##7-hdZ&*R{h>YBq2Gt7Qyf7n5;7v|?1;zD8h<7;M!
zeeS+}b!ug9UVpz}E;pRTWxA06l)EC;KcU5joX;;77HB@-kc-!ruIFK~=>=*t$PHKi
zN4~JIq_51=akBs+zr4jiwhEq)@YZg}JyL2zZQk;SUuZY9eI(#$<((%)D!;uZugR6z
zo~+hob&n+KB=MLeo+w=vab3D4{idkDDrz-wJGiH$>PqTPXI;sbVWq2ld2Ots?~zEI
zL>`mKz66vOuVwz?3V(C+92-1xU+@kN4xVSc0PnjHakH=eDO_bg`je$VdoC;d6rW6A
z3W(dX8-ncsxfF74hXn3NF!!TVVF-3crhK`8ShKQf0g?+jYgSe*g1H|hkW|Z(+<;UY
o!eD<MI&~!}>?X;T)6#AlgZ)LBbWZmPkNU`TT6&bl(~h+CFUamN$^ZZW

delta 1347
zcma)5O-vI(6rSmJ>9)|qLVsXsDQ!Uu<zK;4k-vmXMHAz}q&3-8W*XSEAX^B+1!BCC
zK*j?x9(pi%u%0-n7ZXD;l>><v(s<yCH?N+2Ti8HpW0+*#%=_Lq@4b2R=5^>GXnk+B
zS`ZAmXNNx7wl*0anzn<#oiRJ9p^l^><|NivDCROCDkzO?i*w;7wul>eL?xw}edSzM
zTa$LaII?cd#y;XYlP4}vPqszZ*S+AObr)D4&bbH;qL>d*e;FD8w2gX|cAcu+(03*1
zO&v`d01xU~CH6W(%5~@$PD<I8Q>n-%wYj=o9xe*=Y+yv#7ek+;qx7a2(LlEIyh62x
z?3KdyUn*=Y1SRRBA!??MHF&R_xNCq2F!c!ka}`+Ek2}f_#shK9TK+cOfc8+|E`~rb
z^*}|`Lwl7z9m~~UO$Ipqv^(3WGuSGwW@%&R<A%}-yu@eTD#q|#FGjI`;2Zib$WP#I
z_RG}EiNwy{@*dX!9e@bDa!b#osNH5qd}wSC_T{}d1ZW#U1W`+pE3P6z7agAD=pfiM
z|B<Q(-aFJshjNb6`^UoIgQFg082*Q|Di)#P>|HI*VFZQ|8d2`)=@bKal~G;4XkFr5
zt41ivX|GLO%x3a5gyX*WP&^X%#Jw~e8>8c-k=cY^_>iN*8?nQ1Is$G~?Khulf*lK=
zvB;Qt6Z@IZa=**2nH?Z99EjHOan%WH!L~d<x42B@1(i^h64ec$m+e?0xN+~NWe$f5
z;%s7`r0BDRDre>hm0zqDj4O#$s$jcpSfi?&jn;e>_;g}vW>%G0jrH9`W{IZd=LvPG
zAjtB3B28tvAY^72R%CFXiV#a})P$DGUtuJ@K$cT<RGk4;Yr4#%J<j$N*PhtjM@T%b
zw{MXxX~VWB*M2gZ1!QgBFrRSM?7KaPH`yP%e_pDN4shSvCpxAie&1FD%D!ZrYBBG(
zaN6F7wY`5*0_9+2QjAJ`zR1c;#%PN<Uu5NdSlj!JK*|poqeG_rFb4T!I4~XL4ui(&
KF4JKz2Kf)13jXo{

diff --git a/parts/handle_bars.py b/parts/handle_bars.py
index 5a822e8..24b0228 100644
--- a/parts/handle_bars.py
+++ b/parts/handle_bars.py
@@ -1,7 +1,6 @@
 # %%
 from contextlib import suppress
 from build123d import *
-from copy import copy, deepcopy
 import math
 try:
     from global_params import *
@@ -14,23 +13,18 @@
 
 # ================== PARAMETERS ==================
 
-stem_angle = 20  # Stem angle wrt the headset
-stem_rect = (35, 35)  # Stem "rectangle" (horizontal, vertical)
-# Where to connect to the stem from the center of the circle
-stem_range = (20, 45)
-stem_fillet = 5.0  # Fillet radius of the stem (square -> circle)
-# How much to overlap the stem with our model for a stronger connection
-stem_clip = (stem_fillet, 2.0)
-
 handlebar_side_xy = (60, 20)  # (center, start)
 handlebar_size = (10, wall)  # (width, height)
+handlebar_rot = 5  # Rotation of the handlebar (degrees)
+handlebar_rad = 16  # Radius of the handlebar
 
 # ================== MODELLING ==================
 
 handlebar_side_loc = Location(
     (handlebar_side_xy[0], handlebar_side_xy[1], stem_height), (0, 90, 90))
 with BuildSketch(handlebar_side_loc) as handlebar_side:
-    Rectangle(handlebar_size[0], handlebar_size[1], align=Align.MIN)
+    Rectangle(handlebar_size[0], handlebar_size[1],
+              align=Align.MIN, rotation=-handlebar_rot)
 with BuildPart() as handlebar_side_conn:
     conn_base = sum(stem_part_core.faces().group_by(
         Axis.Y)[-3:], ShapeList())
@@ -56,7 +50,7 @@
     with BuildLine() as handlebar_side_conn_path:
         Spline(face_loc.position,
                handlebar_side_loc.position,
-               tangents=[(0, 1, 0), (1, 0, 0)],
+               tangents=[(0, 1, 0), Vector(1, 0, -0.2).normalized()],
                tangent_scalars=[.5, 1])
     sweep(sections=[handlebar_side.sketch, face],
           path=handlebar_side_conn_path, multisection=True)
@@ -64,12 +58,23 @@
     del face_loc
     del handlebar_side_conn_path
     del handlebar_side_loc
-    del handlebar_side
+
+save = handlebar_side_conn.faces().group_by(Axis.X)[-1].face().center_location
+with BuildPart() as handle_bar_core:
+    with BuildSketch(save):
+        Rectangle(handlebar_size[1], handlebar_size[0],
+                  rotation=-handlebar_rot)
+    revolve(axis=Axis(save.position - (0, 0, handlebar_rad +
+                                       handlebar_size[1]/2), (0, 1, 0)))
+    del save
+handlebar_side_conn.part += handle_bar_core.part
 
 # Join a mirrored version of the handlebar side
 with BuildPart() as handle_bars_part:
     add(handlebar_side_conn)
+
     add(mirror(objects=handlebar_side_conn.part))
+    del handlebar_side_conn
 
 if __name__ == "__main__":  # While developing this single part
     ocp_vscode.show_all()
diff --git a/parts/stem.py b/parts/stem.py
index 662c4bb..50fb111 100644
--- a/parts/stem.py
+++ b/parts/stem.py
@@ -22,9 +22,6 @@
 # How much to overlap the stem with our model for a stronger connection
 stem_clip = (stem_fillet, 2.0)
 
-handlebar_side_xy = (60, 20)  # (center, start)
-handlebar_size = (10, wall)  # (width, height)
-
 # ================== MODELLING ==================
 
 
@@ -80,8 +77,10 @@ def unique_ordered(seq):
 del conn_face_bb
 # Stem part core is required as is by handle_bars.py
 
-
-stem_part = stem_part_core
+with BuildPart() as stem_part:
+    add(deepcopy(stem_part_core))
+    to_fillet = edges().group_by(Axis.X)[-1]
+    fillet(to_fillet, wall)
 
 if __name__ == "__main__":  # While developing this single part
     ocp_vscode.show_all()