From ce5c4cccacca81e5356d17641b18ab8ff494a3a1 Mon Sep 17 00:00:00 2001
From: Marco Merlin <marcomerli@gmail.com>
Date: Mon, 4 Nov 2024 09:24:13 +0100
Subject: [PATCH] moved neck bend to bottom assembly to avoid issues with
 cadquery

---
 pylele2/pylele_bottom_assembly.py | 9 +++++++++
 pylele2/pylele_neck_assembly.py   | 6 ++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/pylele2/pylele_bottom_assembly.py b/pylele2/pylele_bottom_assembly.py
index 2d71134a..2a7da34b 100755
--- a/pylele2/pylele_bottom_assembly.py
+++ b/pylele2/pylele_bottom_assembly.py
@@ -26,6 +26,7 @@
 from pylele2.pylele_tuners import LeleTuners
 from pylele2.pylele_fretboard_assembly import pylele_fretboard_assembly_parser
 from pylele2.pylele_worm import pylele_worm_parser
+from pylele2.pylele_neck_bend import LeleNeckBend
 
 
 class LeleBottomAssembly(LeleBase):
@@ -54,6 +55,14 @@ def gen(self) -> Shape:
             body -= LeleNeckJoint(cli=self.cli, isCut=True)\
                 .mv(-self.api.getJoinCutTol(), 0, self.api.getJoinCutTol())
 
+        ## Neck Bend
+        if self.cli.body_type in [
+            LeleBodyType.FLAT,
+            LeleBodyType.HOLLOW,
+            LeleBodyType.TRAVEL
+        ]:
+            body += LeleNeckBend(cli=self.cli)
+
         ## Fretboard Spines
         if (self.cli.separate_fretboard or
             self.cli.separate_neck or
diff --git a/pylele2/pylele_neck_assembly.py b/pylele2/pylele_neck_assembly.py
index 4ad1a7e5..c9cef224 100644
--- a/pylele2/pylele_neck_assembly.py
+++ b/pylele2/pylele_neck_assembly.py
@@ -24,7 +24,7 @@
 from pylele2.pylele_head import LeleHead
 from pylele2.pylele_neck_joint import LeleNeckJoint
 from pylele2.pylele_neck import LeleNeck
-from pylele2.pylele_neck_bend import LeleNeckBend
+# from pylele2.pylele_neck_bend import LeleNeckBend
 from pylele2.pylele_spines import LeleSpines
 
 class LeleNeckAssembly(LeleBase):
@@ -58,7 +58,8 @@ def gen(self) -> Shape:
         ## Spines
         if self.cli.num_spines > 0:
             neck -= LeleSpines(cli=self.cli, isCut=True).mv(0, 0, self.api.getJoinCutTol())
-
+        
+        """
         ## Neck Bend
         if self.cli.body_type in [
             LeleBodyType.FLAT,
@@ -66,6 +67,7 @@ def gen(self) -> Shape:
             LeleBodyType.TRAVEL
         ]:
             neck += LeleNeckBend(cli=self.cli)
+        """
 
         ## Fretboard Spines
         if (self.cli.separate_fretboard or self.cli.separate_top or self.cli.separate_neck) and self.cli.num_spines > 0: