From 089e807e82b4ac2e68bb160fd8c601ee128e6bf7 Mon Sep 17 00:00:00 2001
From: Axel <git@axelsylvester.com>
Date: Fri, 24 May 2013 01:27:06 +0200
Subject: [PATCH] Bugfix: gcode coordinates in IModelaMill driver were too big
---
src/com/t_oster/liblasercut/drivers/IModelaMill.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/com/t_oster/liblasercut/drivers/IModelaMill.java b/src/com/t_oster/liblasercut/drivers/IModelaMill.java
index db951ff..7c087f2 100644
--- a/src/com/t_oster/liblasercut/drivers/IModelaMill.java
+++ b/src/com/t_oster/liblasercut/drivers/IModelaMill.java
@@ -230,7 +230,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;
@@ -244,7 +244,7 @@ public class IModelaMill extends LaserCutter
{
x+= leftToRight ? 1 : -1;
}
- move(out, Util.mm2px(offset.x+x, dpi), Util.mm2px(offset.y+y, dpi));
+ move(out, Util.px2mm(offset.x+x, dpi), Util.px2mm(offset.y+y, dpi));
}
else
{
@@ -253,7 +253,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
--
GitLab