From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu, 22 Nov 2018 00:12:46 +0000 (+0000)
Subject: poster-tube-lid: catch wip, CatchPostDistort PoC
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=reprap-play.git;a=commitdiff_plain;h=16d6292c3b733932410128a16bebe486c5418f78

poster-tube-lid: catch wip, CatchPostDistort PoC

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/Makefile b/Makefile
index beda1a8..a812662 100644
--- a/Makefile
+++ b/Makefile
@@ -185,6 +185,12 @@ electron-token.stl: electron-token.scad
 		screw-recess-test-number-s$s.fig \
 		screw-recess-test-number-s$s.eps)
 
+poster-tube-lid,CatchPostDistort.stl: \
+	distort-stl poster-tube-lid,CatchPreDistort.auto.stl
+		./distort-stl <poster-tube-lid,CatchPreDistort.auto.stl \
+			project-cylinder 100 >$@.tmp
+		mv -f $@.tmp $@
+
 %.dxf:		%.eps
 		pstoedit -dt -f "dxf: -polyaslines -mm" $< $@
 
diff --git a/poster-tube-lid.scad b/poster-tube-lid.scad
index 4ce2176..35c73c8 100644
--- a/poster-tube-lid.scad
+++ b/poster-tube-lid.scad
@@ -145,7 +145,7 @@ catch_stem_end_h = catch_stem_h;
 catch_pin_width = rivet_entry_width - catch_pin_gap;
 
 cppy6 = -catch_strap_width/2;
-cppxC = TAU * 0.34 * main_dia/2;
+cppxC = 0.34 * sm_inner_rad * TAU;
 cppB = [ catch_pin_width/2,
 	 cppy6
 	 + catch_stem_below_gap
@@ -564,7 +564,8 @@ module CatchCoreProfile(){ ////toplevel
 }
 
 module CatchPreDistort(){ /////toplevel
-  rotate([90,0,0])
+  scale(100 / sm_inner_rad)
+    rotate([90,0,0])
     linear_extrude(height=catch_strap_thick, convexity=10)
     CatchCoreProfile();
 }