flyscreen-handle: take RetainCutout out of HandleSection too

[reprap-play.git] / flyscreen-handle.scad

diff --git a/flyscreen-handle.scad b/flyscreen-handle.scad
index 4fbca30688da7c7474025d15af614a7178768d6e..1c55f80af6b833d9e5e8799ce5a2b41b1f661966 100644 (file)
--- a/flyscreen-handle.scad
+++ b/flyscreen-handle.scad
@@ -1,9 +1,9 @@
 // -*- C -*-
 
 opening_height = 7.84 - 0.3;
-opening_depth = 7.88;
+opening_depth = 6.0; // 7.88;
 openingcnr_dia = 2.75;
-opening_topprotr = 1.54 - 0.65;
+opening_topprotr = 1.54;
 
 gap = 0.25;
 
@@ -12,14 +12,15 @@ retain_empir_stalkw = 0.8;
 retain_rad = 1.65;
 retain_empir_inward = 0.65;
 
+hgap_empir_adjust = -0.5;
+
 topprotr_rad = 0.35;
 
 bot_overlap = 5;
 bot_w = 3;
 
-handle_d = 2;
 handle_w = 8;
-handle_rh = 2;
+handle_rh = 3;
 handle_rcut = 3;
 
 cutout_gap = 1.5;
@@ -36,23 +37,29 @@ ins_irad = openingcnr_dia/2 + gap;
 ins_orad = openingcnr_dia/2 + opening_height - gap;
 ins_th = ins_orad - ins_irad;
 
-handle_x0 = ins_irad;
+handle_x0 = ins_irad + hgap_empir_adjust;
 handle_h = bot_overlap + ins_th;
 handle_y0 = -ins_orad-bot_overlap;
 handle_y1 = handle_y0 + handle_h;
 
 handle_x1 = handle_x0 + bot_w + handle_w;
 
+topprotr_y = -ins_irad + opening_topprotr;
+
 module InsertSection(){
   hull(){
-    translate([-ins_orad, 0]) square([ins_th, 0.1]);
+    translate([-ins_irad, -ins_irad])
+      mirror([1,0])
+      square([opening_depth - ins_irad, 0.1]);
     translate([-ins_irad - topprotr_rad,
-              opening_topprotr - topprotr_rad])
+              topprotr_y - topprotr_rad])
       circle(r=topprotr_rad, $fn=10);
   }
   translate([0, -ins_orad]) square([ins_irad+1, ins_th]);
   intersection(){
-    translate([0.1,0.1]) mirror([1,1]) square([100,100]);
+    translate([0.1, -ins_irad + 0.1])
+      mirror([1,1])
+      square([100, opening_depth]);
     difference(){
       circle(r= ins_orad);
       circle(r= ins_irad, $fn=20);
@@ -116,10 +123,12 @@ module GappingSection(){
 
 module WithRetainSection(){
   difference(){
-    InsertSection();
+    union(){
+      InsertSection();
+      HandleSection();
+    }
     RetainCutout();
   }
-  HandleSection();
   RetainSection();
 }
 
@@ -148,21 +157,24 @@ module Handle(){
 }
 
 module Demo(){
-  difference(){
-    InsertSection();
-    RetainCutout();
-  }
-  HandleSection();
-  color("red") RetainSection();
+  color("red") translate([0,0,-3]) BasicSection();
+  color("blue") translate([0,0,3]) WithRetainSection();
 }
 
 module Test(){
-  linear_extrude(height=2) WithRetainSection();
+  linear_extrude(height=2) {
+    WithRetainSection();
+    translate([0, -handle_y0 + topprotr_y + 10])
+      BasicSection();
+  }
 }
 
 //Demo();
+//HandleSection();
+//InsertSection();
 //WithRetainSection();
 //BasicSection();
 //GappingSection();
-Test();
+//Test();
+Demo();
 //Handle();