flyscreen-handle: entirely new retain (apropos v5)

diff --git a/flyscreen-handle.scad b/flyscreen-handle.scad
index 227fa24e225afbbe9ec159b7ba7813543dc2154d..84edd65f62aaaf2bdf99439327de12b99ecd2654 100644 (file)
--- a/flyscreen-handle.scad
+++ b/flyscreen-handle.scad
@@ -7,10 +7,14 @@ 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;
+
+retain_stalk_len = 8.0;
+retain_stalk_h = 1.5;
+retain_bend_gap = 2.0;
+retain_empir_angle = -25;
 
 hgap_empir_adjust = -0.5 -2.50;
 
@@ -46,6 +50,9 @@ 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];
+
 module InsertSection(){
   hull(){
     translate([-ins_irad, -ins_irad])
@@ -95,20 +102,21 @@ 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_rad * 2 + retain_bend_gap]);
+      }
     }
   }
 }