vmario/Doodle3D-Slicer
0
0
Fork 0
mirror of https://github.com/Doodle3D/Doodle3D-Slicer.git synced 2024-12-23 19:43:48 +01:00
Code Issues Projects Releases Wiki Activity

cleanup slices to geode

Browse Source
This commit is contained in:
casperlamboo 2016-04-23 09:56:15 +02:00
parent ebbe75ef2e
commit 9e4109a3f8
1 changed files with 36 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/sliceActions/slicesToGCode.js
View File

@ -1,18 +1,14 @@
import GCode from '../gcode.js'; import GCode from '../gcode.js';
export default function slicesToGCode(slices, settings) { function pathToGCode(gcode, shape, retract, unRetract, layer, type) {
var gcode = new GCode().setSettings(settings); for (let i = 0; i < shape.paths.length; i ++) {
const line = shape.paths[i];
function pathToGCode (shape, retract, unRetract, type) { const length = shape.closed ? (line.length + 1) : line.length;
for (var i = 0; i < shape.paths.length; i ++) { for (let i = 0; i < length; i ++) {
var line = shape.paths[i]; const point = line[i % line.length];
var length = shape.closed ? (line.length + 1) : line.length; if (i === 0) {
for (var j = 0; j < length; j ++) {
var point = line[j % line.length];
if (j === 0) {
// TODO // TODO
// moveTo should impliment combing // moveTo should impliment combing
gcode.moveTo(point.X, point.Y, layer); gcode.moveTo(point.X, point.Y, layer);
@ -20,8 +16,7 @@ export default function slicesToGCode(slices, settings) {
if (unRetract) { if (unRetract) {
gcode.unRetract(); gcode.unRetract();
} }
} } else {
else {
gcode.lineTo(point.X, point.Y, layer, type); gcode.lineTo(point.X, point.Y, layer, type);
} }
} }
@ -32,8 +27,11 @@ export default function slicesToGCode(slices, settings) {
} }
} }
for (var layer = 0; layer < slices.length; layer ++) { export default function slicesToGCode(slices, settings) {
var slice = slices[layer]; const gcode = new GCode().setSettings(settings);
for (let layer = 0; layer < slices.length; layer ++) {
const slice = slices[layer];
if (layer === 1) { if (layer === 1) {
gcode.turnFanOn(); gcode.turnFanOn();
@ -41,30 +39,29 @@ export default function slicesToGCode(slices, settings) {
} }
if (slice.brim !== undefined) { if (slice.brim !== undefined) {
pathToGCode(slice.brim, true, true, "brim"); pathToGCode(gcode, slice.brim, true, true, layer, 'brim');
} }
for (var i = 0; i < slice.parts.length; i ++) { for (let i = 0; i < slice.parts.length; i ++) {
var part = slice.parts[i]; const part = slice.parts[i];
if (part.shape.closed) { if (part.shape.closed) {
pathToGCode(part.outerLine, false, true, "outerLine"); pathToGCode(gcode, part.outerLine, false, true, layer, 'outerLine');
for (var j = 0; j < part.innerLines.length; j ++) { for (let i = 0; i < part.innerLines.length; i ++) {
var innerLine = part.innerLines[j]; const innerLine = part.innerLines[i];
pathToGCode(innerLine, false, false, "innerLine"); pathToGCode(gcode, innerLine, false, false, layer, 'innerLine');
} }
pathToGCode(part.fill, true, false, "fill"); pathToGCode(gcode, part.fill, true, false, layer, 'fill');
} } else {
else { const retract = !(slice.parts.length === 1 && slice.support === undefined);
var retract = !(slice.parts.length === 1 && slice.support === undefined); pathToGCode(gcode, part.shape, retract, retract, layer, 'outerLine');
pathToGCode(part.shape, retract, retract, "outerLine");
} }
} }
if (slice.support !== undefined) { if (slice.support !== undefined) {
pathToGCode(slice.support, true, true, "support"); pathToGCode(gcode, slice.support, true, true, layer, 'support');
} }
} }