Skip to content
Snippets Groups Projects
Commit b7c3b5a7 authored by Thomas Oster's avatar Thomas Oster
Browse files

EpilogDriver Fix: Wrong resolutions for EpilogZing. Also split a job if the...

EpilogDriver Fix: Wrong resolutions for EpilogZing. Also split a job if the parts have different resolutions
parent 5e2cfd96
No related branches found
No related tags found
No related merge requests found
...@@ -339,13 +339,16 @@ abstract class EpilogCutter extends LaserCutter ...@@ -339,13 +339,16 @@ abstract class EpilogCutter extends LaserCutter
toDo.remove(0); toDo.remove(0);
} }
else 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) if (toDo.get(0) instanceof RasterPart)
{ {
currentSplit.add(toDo.get(0)); currentSplit.add(toDo.get(0));
toDo.remove(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)); currentSplit.add(toDo.get(0));
toDo.remove(0); toDo.remove(0);
......
...@@ -52,7 +52,7 @@ public class EpilogZing extends EpilogCutter ...@@ -52,7 +52,7 @@ public class EpilogZing extends EpilogCutter
private static final double[] RESOLUTIONS = new double[] private static final double[] RESOLUTIONS = new double[]
{ {
300, 500, 600, 1000 100, 200, 250, 400, 500, 1000
}; };
@Override @Override
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment