diff --git a/src/com/t_oster/liblasercut/drivers/EpilogCutter.java b/src/com/t_oster/liblasercut/drivers/EpilogCutter.java index 6d8fb8bfcbbcee730907726d12d828e0a2bc6aa2..a5cff64843f01520674c5ec68dc2b1498973c33d 100644 --- a/src/com/t_oster/liblasercut/drivers/EpilogCutter.java +++ b/src/com/t_oster/liblasercut/drivers/EpilogCutter.java @@ -339,13 +339,16 @@ abstract class EpilogCutter extends LaserCutter toDo.remove(0); } else - {//vector parts can be prepended by one raster part + {//vector parts can be prepended by one raster part, but one job has + //to have the same resolution everywhere (??? if you have time, feel + //free to experiment) + double currentDpi = toDo.get(0).getDPI(); if (toDo.get(0) instanceof RasterPart) { currentSplit.add(toDo.get(0)); toDo.remove(0); } - while (!toDo.isEmpty() && toDo.get(0) instanceof VectorPart) + while (!toDo.isEmpty() && toDo.get(0) instanceof VectorPart && toDo.get(0).getDPI() == currentDpi) { currentSplit.add(toDo.get(0)); toDo.remove(0); diff --git a/src/com/t_oster/liblasercut/drivers/EpilogZing.java b/src/com/t_oster/liblasercut/drivers/EpilogZing.java index b1d6c0346fff33102376192ddb5331850d1b1eec..12e17a6b22ff181346ff8cd95733c606cc88521f 100644 --- a/src/com/t_oster/liblasercut/drivers/EpilogZing.java +++ b/src/com/t_oster/liblasercut/drivers/EpilogZing.java @@ -52,7 +52,7 @@ public class EpilogZing extends EpilogCutter private static final double[] RESOLUTIONS = new double[] { - 300, 500, 600, 1000 + 100, 200, 250, 400, 500, 1000 }; @Override