vmario/doodle3d-client
0
0
Fork 0
mirror of https://github.com/Doodle3D/doodle3d-client.git synced 2024-11-22 09:17:56 +01:00
Code Issues Releases Wiki Activity

gcode changes submitted by Rick, w.r.t. centering the doodle for Ultimakers (means: doodle is only in positive space, i.e. there are no negative coordinates)

Browse Source
This commit is contained in:
Adriaan Wormgoor 2013-09-18 20:15:58 +02:00
parent 979403826a
commit 3d318bb56e
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
js/gcodeGenerating_v01.js
View File

@ -32,6 +32,11 @@ function generate_gcode(callback) {
var startGcode = []; var startGcode = [];
var endGcode = []; var endGcode = [];
// TODO 2013-09-18 evaluate if this should stay here
// this was added when Rick mailed us wrt the Ultimaker delivery of Doodle3D
var gCodeOffsetX = 110; // mm
var gCodeOffsetY = 110; // mm
// get gcode start statements // get gcode start statements
if ($("#startgcode").val().trim().length != 0) { if ($("#startgcode").val().trim().length != 0) {
console.log(" found contents for start-gcode in settings.html") console.log(" found contents for start-gcode in settings.html")
@ -205,6 +210,12 @@ function generate_gcode(callback) {
// this line is probably for drawing efficiency, alternating going from 0->end and end->0 (i.e. to and fro) // this line is probably for drawing efficiency, alternating going from 0->end and end->0 (i.e. to and fro)
// ofPoint to = commands[(even || isLoop || loopAlways) ? i : last-i].to; // ofPoint to = commands[(even || isLoop || loopAlways) ? i : last-i].to;
var to = new Point(); to.set(commands[i][0], commands[i][1]); var to = new Point(); to.set(commands[i][0], commands[i][1]);
// TODO 2013-09-18 evaluate if this should stay..
// this was added when Rick mailed us wrt the Ultimaker delivery of Doodle3D
to.x += gCodeOffsetX;
to.y += gCodeOffsetY;
var sublayer = (layer == 0) ? 0.0 : layer + (useSubLayers ? (curLayerCommand/totalLayerCommands) : 0); var sublayer = (layer == 0) ? 0.0 : layer + (useSubLayers ? (curLayerCommand/totalLayerCommands) : 0);
var z = (sublayer + 1) * layerHeight; // 2013-09-06 removed zOffset (seemed to be useless) var z = (sublayer + 1) * layerHeight; // 2013-09-06 removed zOffset (seemed to be useless)
@ -252,6 +263,12 @@ function generate_gcode(callback) {
} }
} }
function scaleFunction(percent) {
var r;
return r;
}
pointsTranslate = function(p, x, y) { pointsTranslate = function(p, x, y) {
for (var i = 0; i < p.length; i++) { for (var i = 0; i < p.length; i++) {
p[i][0] += x; p[i][0] += x;