having import issues

3 files changed, 17 insertions, 42 deletions

diff --git a/dummy13/frame_sample_sizes.scad b/dummy13/frame_sample_sizes.scad
index b4d6eee..c18cd16 100644
--- a/dummy13/frame_sample_sizes.scad
+++ b/dummy13/frame_sample_sizes.scad
@@ -1,57 +1,31 @@
 
 use <../supports/runner.scad>;
 
-module frame_parts (size=1) {
-	translate([20.5, 10.5, 0]) {
+module frame_parts (size=1.0) {
+	translate([15.5, 7.7, 0])
 		scale(size) 
 			translate([0, 0, 2.5])
 				import("src/frame-hips-v3.stl");
-		translate([5.5, 10, 0])
-			rotate([0, 0, 90])
-				scale(size)
-					translate([0, 0, 2.5])
-						import ("src/frame-waist-v6.stl");
-	}
-	translate([15, 0, 0]) {
+	translate([12, 20, 0])
+		scale(size)
+			translate([0, 0, 2.5])
+				import ("src/frame-waist-v6.stl");
+	*translate([18, 28, 0]) {
 		difference() {
 			cube([10, 5, 0.5]);
 			translate([10 / 2, 5 / 2 , 0.25])
 				linear_extrude(height = 1)
-					text(str(size), size = 1, halign = "center", valign = "center");
+					text(str(size), size = 2, halign = "center", valign = "center");
 		}
 	}
 }
 
-runner(140, 60);
-
-translate([0, 0, 0]) 
-	frame_parts(1);
-
-translate([25, 0, 0]) 
-	frame_parts(0.99);
-
-translate([50, 0, 0]) 
-	frame_parts(0.98);
-
-translate([75, 0, 0]) 
-	frame_parts(0.97);
+*runner(60, 37.5, frequency=7.5);
 
-translate([100, 0, 0]) 
-	frame_parts(0.96);
-
-translate([0, 30, 0]) 
-	frame_parts(0.95);
-
-translate([25, 30, 0]) 
-	frame_parts(0.94);
-
-translate([50, 30, 0]) 
-	frame_parts(0.93);
-
-translate([75, 30, 0]) 
-	frame_parts(0.92);
-
-translate([100, 30, 0]) 
-	frame_parts(0.91);
+spacing_x = 30;
 
+translate([0*spacing_x, 0, 0]) 
+	frame_parts();
 
+translate([1*spacing_x, 0, 0]) 
+	frame_parts(0.99);
diff --git a/lib/measure_stl.py b/lib/measure_stl.py
index b1da3f9..f76cd88 100755
--- a/lib/measure_stl.py
+++ b/lib/measure_stl.py
@@ -8,7 +8,8 @@
 
 from stl import mesh
 
-file_path = './dummy13/src/frame-hips-v3.stl'
+file_path = './dummy13/src/frame-waist-v6.stl'
+#file_path = './dummy13/src/frame-hips-v3.stl'
 mesh = mesh.Mesh.from_file(file_path)
 
 x_min = mesh.x.min()
diff --git a/lib/view_stl.scad b/lib/view_stl.scad
index 4d12598..9fa795d 100644
--- a/lib/view_stl.scad
+++ b/lib/view_stl.scad
@@ -1,2 +1,2 @@
 
-import ("../supports/runner.stl");
+import ("../dummy13/frame_sample_sizes.stl");