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

fixed conflict

Browse Source
This commit is contained in:
casperlamboo 2015-05-01 14:12:04 +02:00
parent 324b511d39
commit 052f894c70
1 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/slicer.js
View File

@ -420,23 +420,10 @@ D3D.Slicer.prototype.dataToGcode = function (data, printer) {
D3D.Slicer.prototype.drawPaths = function (printer, min, max) { D3D.Slicer.prototype.drawPaths = function (printer, min, max) {
"use strict"; "use strict";
<<<<<<< HEAD
var canvas = document.createElement("canvas");
canvas.width = 400;
canvas.height = 400;
var context = canvas.getContext("2d");
=======
>>>>>>> development
var layerHeight = printer.config["printer.layerHeight"]; var layerHeight = printer.config["printer.layerHeight"];
var dimensionsZ = printer.config["printer.dimensions.z"]; var dimensionsZ = printer.config["printer.dimensions.z"];
function drawPolygons (paths, color) { function drawPolygons (paths, color) {
<<<<<<< HEAD
"use strict";
=======
>>>>>>> development
context.fillStyle = color; context.fillStyle = color;
context.strokeStyle = color; context.strokeStyle = color;
context.beginPath(); context.beginPath();
@ -460,14 +447,11 @@ D3D.Slicer.prototype.drawPaths = function (printer, min, max) {
var data = this.slicesToData(slices, printer); var data = this.slicesToData(slices, printer);
<<<<<<< HEAD
=======
var canvas = document.createElement("canvas"); var canvas = document.createElement("canvas");
canvas.width = 400; canvas.width = 400;
canvas.height = 400; canvas.height = 400;
var context = canvas.getContext("2d"); var context = canvas.getContext("2d");
>>>>>>> development
for (var layer = min; layer < max; layer ++) { for (var layer = min; layer < max; layer ++) {
var layer = 0; var layer = 0;
context.clearRect(0, 0, 400, 400); context.clearRect(0, 0, 400, 400);