X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=earring-stand.scad;h=28024a876f5ed3bba2b98947420128b2b6d30943;hb=11bbae0f64a33a21098dfd6c6f6001a53cbdd072;hp=60b5199e858894be97f460e89e1912fd6fedb9a7;hpb=df13097f02f97b7f7e15721e82387ec1c1a72eac;p=reprap-play.git

diff --git a/earring-stand.scad b/earring-stand.scad
index 60b5199..28024a8 100644
--- a/earring-stand.scad
+++ b/earring-stand.scad
@@ -1,5 +1,7 @@
 // -*- C -*-
 
+include <commitid.scad>
+
 eclip_inner_rad = 2.5;
 eclip_gap_rad = 0.5;
 eclip_prong_th = 3;
@@ -36,6 +38,8 @@ rgap = eclip_gap_rad;
 eclip_base_offset = r1;
 eclip_wall_offset = -ppxl;
 
+eclip_ra_offset = r2 - 0.1;
+
 $fn=70;
 
 module EclipLPlanCore(alpha){
@@ -80,7 +84,7 @@ module EclipPPlan(main_th){
   translate([ppxl, 0]) square([main_th, r2]);
 }
 
-module TestBase(){
+module TestBase(){ ////toplevel
   translate([0,0, eclip_base_offset]){
     for (i=[0 : 2: test_eclips-1]) {
       translate([0, i*eclip_each_every])
@@ -95,20 +99,38 @@ module TestBase(){
 	EclipRPlan(test_alpha, test_main_th);
     }
   }
-  translate([-r2, -eclip_each_len, -test_base_th])
-    cube([r2*2,
-	  test_len,
-	  test_base_th]);
+  translate([-r2, -eclip_each_len, -test_base_th]){
+    difference(){
+      cube([r2*2,
+	    test_len,
+	    test_base_th]);
+      mirror([0,0,1]) Commitid_BestCount_M([r2*2, test_len]);
+    }
+  }
 }
 
-module TestProtr(){
-  translate([0,0, test_main_th - eclip_wall_offset])
-    rotate([0,90,0])
-    linear_extrude(height=test_len)
-    EclipPPlan(test_main_th);
+module TestProtr(){ ////toplevel
+  difference(){
+    translate([0,0, test_main_th - eclip_wall_offset])
+      rotate([0,90,0])
+      linear_extrude(height=test_len)
+      EclipPPlan(test_main_th);
+    mirror([0,0,1]) Commitid_BestCount_M([test_len, r2]);
+  }
+}
+
+module TestRAProtr(){ ////toplevel
+  rotate([-90,0,0]) TestProtr();
+  mirror([1,0,0])
+    translate([-test_len,
+	       -r2,
+	       -(eclip_ra_offset + test_base_th)])
+    cube([test_len,
+	  r2*2,
+	  test_base_th]);
 }
 
-module PlanDemo(){
+module TestPlanDemo(){
   color("red") EclipLPlan(test_alpha);
   color("blue") rotate(test_alpha) EclipPPlan(test_main_th);
   color("green") EclipRPlan(test_alpha, test_main_th);
@@ -116,4 +138,5 @@ module PlanDemo(){
 
 //PlanDemo();
 //TestBase();
-TestProtr();
+//TestProtr();
+//TestRAProtr();