From 58141b6ea59f9e7d0733c690bcfa7e1af7187dc8 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 7 Sep 2012 00:54:33 +0100
Subject: [PATCH] filamentclip revert, break out filamentteeth

---
 filamentclip.scad  | 99 ++++++++++------------------------------------
 filamentteeth.scad | 37 +++++++++++++++++
 2 files changed, 57 insertions(+), 79 deletions(-)
 create mode 100644 filamentteeth.scad

diff --git a/filamentclip.scad b/filamentclip.scad
index b530736..8726b14 100644
--- a/filamentclip.scad
+++ b/filamentclip.scad
@@ -1,113 +1,54 @@
 include <cliphook.scad>
+include <filamentteeth.scad>
 
+rad=19;
 h=3.5;
+w=2.5;
 teethw=1.5;
 
 looprad=2.5;
+loopw=w;
 
 fdia=1.77;
 //fdia=3;
 
 d=0.01;
 
-module FilamentClipTeeth(teethw=teethw,
-			 stembendd=0.5,	stembendl=7, teethxl=1.5) {
-  gapw = fdia-stembendd*2;
-  teethbigw = gapw + teethw*2;
-  basew = fdia+teethw*2-stembendd*2;
-  based = basew/3;
-
-  translate([-based, -basew/2, 0]) cube([based, basew, h]);
-  difference() {
-    union() {
-      translate([-d, -teethbigw/2, 0])
-	cube([d+stembendl + teethw, teethbigw, h]);
-//  translate([
-//  stembigw = fdia + stembend
-//  translate([-d, -stemw, 
-      linear_extrude(height=h) {
-	translate([stembendl-fdia/2, 0]) circle(fdia/2+teethw, $fn=30);
-      }
-    }
-    translate([0,0,-1]) {
-      translate([0,-gapw/2])
-	cube([stembendl+teethxl+1, gapw, h+2]);
-      linear_extrude(height=h+2) {
-	translate([stembendl-fdia/2, 0]) circle(fdia/2, $fn=30);
-      }
-    }
-  }
-
-  for (mirr=[0:1]) {
-    mirror([0,mirr,0]) {
-      translate([stembendl + teethw, gapw/2, 0])
-	rotate([0,0,30])
-	cube([teethxl, teethw, h]);
-    }
-  }
-}
-
 module our_ClipHook(ye){
   ClipHook(h=h, w=w, g=0.6, k=1.5, g=0.6, ye=ye, cupcaph=0.5, cupcapg=0.8);
 }
 
-module FilamentClip(w, rad, trans) {
-  loopw=w;
-
-  rotate([0,0, trans ? -90 : -70]) {
-    translate([(trans ? 7 : 0), rad - (trans ? 0 : 1.5), 0]) {
+module FilamentClip() {
+  rotate([0,0,-70]) {
+    translate([0,rad-1.5,0]) {
       rotate([0,0,8])
-	our_ClipHook(w=w, ye=-1.3);
+	our_ClipHook(ye=-1.3);
     }
   }
 
-  rotate([0,0, trans ? -55 : -35]) {
-    translate([(trans ? +1.5 : 0), rad, 0]) {
+  rotate([0,0,-35]) {
+    translate([0,rad,0]) {
       rotate([0,0,180])
-	our_ClipHook(w=w, ye=0.8);
+	our_ClipHook(ye=0.8);
     }
   }
 
   linear_extrude(height=h) {
     assign($fn=80) {
-      FlatArc(0,0, rad-w/2,rad+w/2, 80,181);
-      translate([0,-trans,0])
-	FlatArc(0,0, rad-w/2,rad+w/2, 179, trans ? 360 : 350);
+      FlatArc(0,0, rad-w/2,rad+w/2, 80,350);
     }
     assign($fn=30) {
-      rotate([0,0,loopang])
-	FlatArc(0,rad+looprad+w, looprad,looprad+loopw);
+      FlatArc(0,rad+looprad+w, looprad,looprad+loopw);
     }
   }
 
-  if (trans==0) {
-    for (mir=[0,1]) {
-      mirror([mir,0,0])
-	rotate([0,0,-40])
-	translate([rad+w*0.3+teethw*0.3+fdia/2, 0, 0])
-	rotate([0,0,95])
-	FilamentClipTeeth();
-    }
-  } else {
-    for (mir=[0,1]) {
-      mirror([mir,0,0])
-	translate([0, mir==0 ? 0 : -trans, 0])
-	rotate([0,0, mir ? 0 : 180])
-	translate([0,-2,0])
-	rotate([0,0, -25])
-	translate([rad+w*0.3+teethw*0.3+fdia/2 - 1.6, 0, 0])
-	rotate([0,0,95])
-	FilamentClipTeeth();
-    }
-    for (mir=[0,1]) {
-      mirror([mir,0,0])
-	translate([-rad-w/2, -trans-0.1, 0])
-	cube([w, trans+0.2 + (mir ? -13 : 0), h]);
-    }
+  for (mir=[0,1]) {
+    mirror([mir,0,0])
+      rotate([0,0,-40])
+      translate([rad+w*0.3+teethw*0.3+fdia/2, 0, 0])
+      rotate([0,0,95])
+      FilamentTeeth(fdia=fdia);
   }
 }
 
-//FilamentClip(w=2.5, rad=19, trans=0);
-
-//translate([40,0,0])
-  FilamentClip(w=1.5, rad=4, trans=13);
+FilamentClip();
diff --git a/filamentteeth.scad b/filamentteeth.scad
new file mode 100644
index 0000000..588b809
--- /dev/null
+++ b/filamentteeth.scad
@@ -0,0 +1,37 @@
+module FilamentTeeth(fdia, teethw=teethw,
+			 stembendd=0.5,	stembendl=7, teethxl=1.5) {
+  gapw = fdia-stembendd*2;
+  teethbigw = gapw + teethw*2;
+  basew = fdia+teethw*2-stembendd*2;
+  based = basew/3;
+
+  translate([-based, -basew/2, 0]) cube([based, basew, h]);
+  difference() {
+    union() {
+      translate([-d, -teethbigw/2, 0])
+	cube([d+stembendl + teethw, teethbigw, h]);
+//  translate([
+//  stembigw = fdia + stembend
+//  translate([-d, -stemw, 
+      linear_extrude(height=h) {
+	translate([stembendl-fdia/2, 0]) circle(fdia/2+teethw, $fn=30);
+      }
+    }
+    translate([0,0,-1]) {
+      translate([0,-gapw/2])
+	cube([stembendl+teethxl+1, gapw, h+2]);
+      linear_extrude(height=h+2) {
+	translate([stembendl-fdia/2, 0]) circle(fdia/2, $fn=30);
+      }
+    }
+  }
+
+  for (mirr=[0:1]) {
+    mirror([0,mirr,0]) {
+      translate([stembendl + teethw, gapw/2, 0])
+	rotate([0,0,30])
+	cube([teethxl, teethw, h]);
+    }
+  }
+}
+
-- 
2.30.2