X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=reprap-play.git;a=blobdiff_plain;f=flyscreen-handle.scad;h=51e7ecbe2796ad530ee52fd5dc814360ebbd5da2;hp=0523a7e92f50b37ff580f6fd10c40be5ce81d3eb;hb=e288468d384b3a997aa2cb132eca5601fcd18d2e;hpb=8012a4be269c37679e7f0880afd5ec5745c81cbd

diff --git a/flyscreen-handle.scad b/flyscreen-handle.scad
index 0523a7e..51e7ecb 100644
--- a/flyscreen-handle.scad
+++ b/flyscreen-handle.scad
@@ -1,18 +1,23 @@
 // -*- C -*-
 
-opening_height = 7.84 - 0.3;
+opening_height = 7.84 - 0.3 + 0.60;
 opening_depth = 6.0; // 7.88;
 openingcnr_dia = 2.75;
 opening_topprotr = 1.54;
 
 gap = 0.25;
 
-retain_empir_angle = 20;
-retain_empir_stalkw = 0.8;
 retain_rad = 1.65;
-retain_empir_inward = 0.65;
+retain_protr = 0.35;
+retain_hgap_adjust = 1.5;
 
-hgap_empir_adjust = -0.5;
+retain_stalk_len = 6.5;
+retain_stalk_h = 1.5;
+retain_bend_gap = 2.0;
+retain_empir_angle = -25;
+retain_pushmore_adj = 0.75;
+
+hgap_empir_adjust = -0.5 -2.50;
 
 topprotr_rad = 0.35;
 
@@ -27,7 +32,6 @@ cutout_gap = 1.5;
 
 total_len = 35;
 retaining_len = 10;
-overret_gaplen = 5;
 
 overret_hch = 5;
 
@@ -46,10 +50,17 @@ handle_x1 = handle_x0 + bot_w + handle_w;
 
 topprotr_y = -ins_irad + opening_topprotr;
 
+retain_mxy = [handle_x0 - retain_rad - retain_hgap_adjust,
+	      -ins_orad + retain_rad - retain_protr - retain_pushmore_adj];
+
+retain_cutout_h = retain_rad * 2 + retain_bend_gap;
+
+overret_gaplen = retain_cutout_h / cos(retain_empir_angle);
+
 module InsertSection(){
   hull(){
     translate([-ins_irad, -ins_irad])
-      mirror([1,0])
+      mirror([1, 0])
       square([opening_depth - ins_irad, 0.1]);
     translate([-ins_irad - topprotr_rad,
 	       topprotr_y - topprotr_rad])
@@ -57,7 +68,7 @@ module InsertSection(){
   }
   translate([0, -ins_orad]) square([ins_irad+1, ins_th]);
   intersection(){
-    translate([0.1, -ins_irad + 0.1])
+    translate([0, -ins_irad])
       mirror([1,1])
       square([100, opening_depth]);
     difference(){
@@ -95,38 +106,43 @@ module HandleSection(){
 }
 
 module RetainSection(){
-  rotate(180-retain_empir_angle)
-    translate([0, ins_orad - retain_empir_inward])
-    circle(r=retain_rad, $fn=20);
+  translate(retain_mxy) {
+    rotate(retain_empir_angle) {
+      circle(r=retain_rad, $fn=20);
+      square([retain_stalk_len + 1, retain_stalk_h]);
+    }
+  }
 }
 
 module RetainCutout(gapping=false){
-  rotate(180-retain_empir_angle)
-    translate([0, ins_orad - retain_empir_inward]) {
-    difference(){
-      circle(r=retain_rad + cutout_gap, $fn=20);
-      if (!gapping)
-	rotate(180 + retain_empir_angle/2)
-	  translate([0, -retain_empir_stalkw])
-	  square([100, retain_empir_stalkw*2]);
+  translate(retain_mxy) {
+    rotate(retain_empir_angle) {
+      translate([-50, -retain_rad]) {
+	square([50 + retain_stalk_len,
+		retain_cutout_h]);
+      }
     }
   }
 }  
 
 module GappingSection(){
   difference(){
-    InsertSection();
+    union(){
+      InsertSection();
+      HandleSection();
+    }
     RetainCutout(true);
   }
-  HandleSection();
 }
 
 module WithRetainSection(){
   difference(){
-    InsertSection();
+    union(){
+      InsertSection();
+      HandleSection();
+    }
     RetainCutout();
   }
-  HandleSection();
   RetainSection();
 }
 
@@ -145,35 +161,34 @@ module Handle(){
   translate([0,0, bs1+0.1]) mirror([0,0,1]) {
     intersection_for (sl=[0,1]) {
       multmatrix([[1,0,0,0],
-		  [0,1,sl*0.65,0],
+		  [0,1,sl,0],
 		  [0,0,1,0],
 		  [0,0,0,1]])
-	linear_extrude(height= overret_gaplen+1, convexity=100)
+	linear_extrude(height= overret_gaplen + 10, convexity=100)
 	BasicSection();
     }
   }
 }
 
 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();
-    translate([0, -handle_y0 + topprotr_y + 10])
-      BasicSection();
+//    translate([0, -handle_y0 + topprotr_y + 10])
+//      BasicSection();
   }
 }
 
 //Demo();
+//HandleSection();
+//InsertSection();
 //WithRetainSection();
 //BasicSection();
 //GappingSection();
-//Test();
-Handle();
+Test();
+//Demo();
+//Handle();