From fe8321878f4d07d466d17a02c884ac06abc3638e Mon Sep 17 00:00:00 2001
From: Michael Gale <michael@fxbricks.com>
Date: Mon, 19 Aug 2024 15:53:27 -0400
Subject: [PATCH] Added fix for tapered extrusions depending on version of
 CadQuery

---
 CHANGELOG.md        |  1 +
 README.md           |  2 +-
 cqkit/__init__.py   |  2 +-
 cqkit/cq_helpers.py | 12 +++++++++++-
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fd3e2e5..8d76abf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,3 +7,4 @@
 - v.0.5.1 - Update to fix setup.py issues
 - v.0.5.4 - Added new helper functions in cq_helpers. Added new object arrangers i cq_layout. New Makefile
 - v.0.5.6 - Added basic drafted solid builders (cq_basic.py). Solids can be hollow with different combinations of wall/floor/roof thicknesses. Added inverse_fillet and inverse_chamfer helpers
+- v.0.5.8 - Added automatic compensation for height of tapered extrusions depending on CadQuery version
diff --git a/README.md b/README.md
index fdfb732..69c746d 100644
--- a/README.md
+++ b/README.md
@@ -578,7 +578,7 @@ r = r.inverse_fillet("<Z", 1.0)
 - v.0.5.3 - Updated with new helpers and updated setup.py
 - v.0.5.4 - Added new helper functions in cq_helpers. Added new object arrangers i cq_layout. New Makefile
 - v.0.5.6 - Added basic drafted solid builders (cq_basic.py). Solids can be hollow with different combinations of wall/floor/roof thicknesses. Added inverse_fillet and inverse_chamfer helpers
-
+- v.0.5.8 - Added automatic compensation for height of tapered extrusions depending on CadQuery version
 
 ## Authors
 
diff --git a/cqkit/__init__.py b/cqkit/__init__.py
index 5c12580..40c1ad5 100644
--- a/cqkit/__init__.py
+++ b/cqkit/__init__.py
@@ -4,7 +4,7 @@
 
 # fmt: off
 __project__ = 'cqkit'
-__version__ = '0.5.7'
+__version__ = '0.5.8'
 # fmt: on
 
 VERSION = __project__ + "-" + __version__
diff --git a/cqkit/cq_helpers.py b/cqkit/cq_helpers.py
index 9ecff55..e977fe4 100644
--- a/cqkit/cq_helpers.py
+++ b/cqkit/cq_helpers.py
@@ -35,6 +35,16 @@
 
 from cqkit.cq_selectors import HasCoordinateSelector, SharedVerticesWithObjectSelector
 
+# Special test to see which version of CadQuery is installed and
+# therefore if any compensation is required for extruded zlen
+# CQ versions < 2.4.0 typically require zlen correction, i.e.
+# scaling the vertical extrusion extent by 1/cos(taper)
+ZLEN_OK = False
+_r = cq.Workplane("XY").rect(2, 2).extrude(1, taper=45)
+_bb = _r.vals()[0].BoundingBox()
+if abs(_bb.zlen - 1.0) < 1e-3:
+    ZLEN_OK = True
+
 
 def multi_extrude(obj, levels, face=">Z"):
     """Extrudes successive layers of a base solid from a reference face.
@@ -42,7 +52,7 @@ def multi_extrude(obj, levels, face=">Z"):
     a tuple of offset and taper angle."""
     for level in levels:
         if isinstance(level, (tuple, list)):
-            cl = level[0] / cos(radians(level[1]))
+            cl = level[0] if ZLEN_OK else level[0] / cos(radians(level[1]))
             obj = obj.faces(face).wires().toPending().extrude(cl, taper=level[1])
         else:
             obj = obj.faces(face).wires().toPending().extrude(level)