# HG changeset patch
# User Robert McIntyre <rlm@mit.edu>
# Date 1283054589 14400
# Node ID 397ab24b4952f3b68b37486ace719936eeca4532
# Parent  aadb93318584b58d7031ab8dd259531f8302e267
saving, to update with correct fix later

diff -r aadb93318584 -r 397ab24b4952 src/laser/rasterize.clj
--- a/src/laser/rasterize.clj	Tue Aug 24 19:10:22 2010 -0400
+++ b/src/laser/rasterize.clj	Sun Aug 29 00:03:09 2010 -0400
@@ -183,7 +183,11 @@
 
 (defn row->gcode [[x-dpi y-dpi] row]
   (let [[x1 y1] (first row)
-	[x2 y2] (last row)]
+	[x2 y2] (last row)
+	x2 (+ x2 (* x-dpi 0.318))]
+	  
+
+;    (println x2)
     (str (format "G0 X%.3f Y%.3f\n"
 		 (float (* x1 (/ x-dpi)))
 		 (float (* y1 (/ y-dpi))))
@@ -232,7 +236,8 @@
 		  (reverse (gather-row row))
 		  (gather-row row))]
 	    (let [x (float (* x (/ x-dpi)))
-		  y (float (* y (/ x-dpi)))]
+		  y (float (* y (/ x-dpi)))
+		  x (+ x 0.159)];; shift by a small margin.
 	      (if-not forward?
 		(str (format "0 0 1 %.3f\n" x)
 		     (format "0 1 1 %.3f\n" y))
@@ -245,7 +250,6 @@
 
 
 (defn make-rows [pic]
-  
   (map (partial sort #(< (first %1) (first %2)))
        (partition-by last
 		     (sort (fn [[x1 y1][x2 y2]] (> y2 y1))
@@ -368,3 +372,13 @@
 	(with-bindings  {#'*out* temp}
 	  (Thread/sleep 5000)
 	  (println "hi")))))))
+
+
+(comment
+  (do
+    (require 'rlm.quick)
+    (ns laser.rasterize)
+    (rlm.quick/dirty)
+    (use :reload-all 'laser.rasterize)
+    (undef map-keys)
+    (use :reload-all 'laser.rasterize)))