From cee6cc8edd79376357bfeac823f87b9b7ce6a4b1 Mon Sep 17 00:00:00 2001 From: Axel <git@axelsylvester.com> Date: Fri, 24 May 2013 01:37:07 +0200 Subject: [PATCH] Bugfix: gcode coordinates in IModelaMill driver were too big. Also in raster3d --- src/com/t_oster/liblasercut/drivers/IModelaMill.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/com/t_oster/liblasercut/drivers/IModelaMill.java b/src/com/t_oster/liblasercut/drivers/IModelaMill.java index 7c087f2..8567a3d 100644 --- a/src/com/t_oster/liblasercut/drivers/IModelaMill.java +++ b/src/com/t_oster/liblasercut/drivers/IModelaMill.java @@ -269,7 +269,7 @@ public class IModelaMill extends LaserCutter applyProperty(out, prop); boolean leftToRight = true; Point offset = p.getRasterStart(); - move(out, Util.mm2px(offset.x, dpi), Util.mm2px(offset.y, dpi)); + move(out, Util.px2mm(offset.x, dpi), Util.px2mm(offset.y, dpi)); for (int y = 0; y < p.getRasterHeight(); y+= toolDiameterInPx/2) { for (int x = leftToRight ? 0 : p.getRasterWidth() - 1; @@ -283,7 +283,7 @@ public class IModelaMill extends LaserCutter { x+= leftToRight ? 1 : -1; } - line(out, Util.mm2px(offset.x+x, dpi), Util.mm2px(offset.y+y, dpi)); + line(out, Util.px2mm(offset.x+x, dpi), Util.px2mm(offset.y+y, dpi)); } //invert direction leftToRight = !leftToRight; -- GitLab