Merge branch 'stable-1.2.2' into v2_proto
This commit is contained in:
make-ing
commit
f799a3285f
12 changed files with 1991 additions and 1902 deletions
File diff suppressed because it is too large
Load diff
|
|
@ -158,7 +158,7 @@ $(function() {
|
|||
text += "<small>" + gettext("Those components marked with <i class=\"icon-ok\"></i> can be updated directly.") + "</small>";
|
||||
|
||||
var options = {
|
||||
title: gettext("Update Available"),
|
||||
title: gettext("Mr Beam Update Available"),
|
||||
text: text,
|
||||
hide: false
|
||||
};
|
||||
|
|
|
|||
|
|
@ -270,7 +270,7 @@ class SvgToGcodePlugin(octoprint.plugin.SlicerPlugin,
|
|||
feedrate = max(1,data["defaultFeedrate"])
|
||||
s.set(["defaultFeedrate"], feedrate)
|
||||
if "svgDPI" in data and data["svgDPI"]:
|
||||
s.set(["svgDPI"], data["svgDPI"])
|
||||
s.set_int(["svgDPI"], data["svgDPI"])
|
||||
if "debug_logging" in data:
|
||||
old_debug_logging = s.get_boolean(["debug_logging"])
|
||||
new_debug_logging = data["debug_logging"] in octoprint.settings.valid_boolean_trues
|
||||
|
|
@ -344,7 +344,7 @@ class SvgToGcodePlugin(octoprint.plugin.SlicerPlugin,
|
|||
if not machinecode_path:
|
||||
path, _ = os.path.splitext(model_path)
|
||||
machinecode_path = path + ".gco"
|
||||
|
||||
|
||||
self._svgtogcode_logger.info("### Slicing %s to %s using profile stored at %s" % (model_path, machinecode_path, profile_path))
|
||||
|
||||
## direct call
|
||||
|
|
@ -357,6 +357,8 @@ class SvgToGcodePlugin(octoprint.plugin.SlicerPlugin,
|
|||
converter_path = '/home/teja/workspace/mrbeam-inkscape-ext'
|
||||
elif("denkbrett" in hostname):
|
||||
converter_path = '/home/flo/mrbeam/git/mrbeam-inkscape-ext'
|
||||
elif ("clems-Air" in hostname):
|
||||
converter_path = '/Users/clem/Dropbox/mrBeam/mrbeam-inkscape-ext'
|
||||
|
||||
import sys
|
||||
sys.path.append(converter_path)
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ defaults = dict(
|
|||
# general settings
|
||||
svgDPI = 90,
|
||||
pierce_time = 0,
|
||||
|
||||
|
||||
# vector settings
|
||||
speed = 300,
|
||||
intensity = 500,
|
||||
|
|
@ -24,7 +24,7 @@ defaults = dict(
|
|||
cross_fill = False,
|
||||
fill_angle = 0,
|
||||
fill_spacing = 0.25,
|
||||
|
||||
|
||||
# pixel settings
|
||||
beam_diameter = 0.25,
|
||||
intensity_white = 0,
|
||||
|
|
@ -251,8 +251,8 @@ class Profile(object):
|
|||
}
|
||||
|
||||
return settings
|
||||
|
||||
|
||||
|
||||
|
||||
def convert_to_engine2(self):
|
||||
|
||||
settings = {
|
||||
|
|
|
|||
|
|
@ -41,8 +41,10 @@ $(function(){
|
|||
// image engraving stuff
|
||||
// preset values are a good start for wood engraving
|
||||
self.images_placed = ko.observable(false);
|
||||
self.text_placed = ko.observable(false);
|
||||
self.show_image_parameters = ko.computed(function(){
|
||||
return self.images_placed() || (self.fill_areas() && self.show_vector_parameters());
|
||||
return (self.images_placed() || self.text_placed()
|
||||
|| (self.fill_areas() && self.show_vector_parameters()));
|
||||
});
|
||||
self.imgIntensityWhite = ko.observable(0);
|
||||
self.imgIntensityBlack = ko.observable(500);
|
||||
|
|
@ -85,6 +87,7 @@ $(function(){
|
|||
self.show_vector_parameters(self.workingArea.getPlacedSvgs().length > 0);
|
||||
self.show_fill_areas_checkbox(self.workingArea.hasFilledVectors())
|
||||
self.images_placed(self.workingArea.getPlacedImages().length > 0);
|
||||
self.text_placed(self.workingArea.hasTextItems());
|
||||
//self.show_image_parameters(self.workingArea.getPlacedImages().length > 0);
|
||||
|
||||
if(self.show_vector_parameters() || self.show_image_parameters()){
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
// Matrix Oven - a snapsvg.io plugin to apply & remove transformations from svg files.
|
||||
// Copyright (C) 2015 Teja Philipp <osd@tejaphilipp.de>
|
||||
//
|
||||
// based on work by https://gist.github.com/timo22345/9413158
|
||||
//
|
||||
// based on work by https://gist.github.com/timo22345/9413158
|
||||
// and https://github.com/duopixel/Method-Draw/blob/master/editor/src/svgcanvas.js
|
||||
//
|
||||
// This program is free software: you can redistribute it and/or modify
|
||||
|
|
@ -20,24 +20,25 @@
|
|||
|
||||
|
||||
Snap.plugin(function (Snap, Element, Paper, global) {
|
||||
|
||||
|
||||
/**
|
||||
* bakes transformations of the element and all sub-elements into coordinates
|
||||
*
|
||||
*
|
||||
* @param {boolean} toCubics : use only cubic path segments
|
||||
* @param {integer} dec : number of digits after decimal separator. defaults to 5
|
||||
* @returns {undefined}
|
||||
*/
|
||||
Element.prototype.bake = function (toCubics, dec) {
|
||||
var elem = this;
|
||||
if (!elem || !elem.paper) // don't handle unplaced elements. this causes double handling.
|
||||
|
||||
if (!elem || !elem.paper || elem.type !== "text" || elem.type !== "#text" || elem.type !== "tspan"){
|
||||
return;
|
||||
} // don't handle unplaced elements. this causes double handling.
|
||||
|
||||
if (typeof (toCubics) === 'undefined')
|
||||
toCubics = false;
|
||||
if (typeof (dec) === 'undefined')
|
||||
dec = 5;
|
||||
//var children = elem.selectAll('*')
|
||||
var children = elem.children();
|
||||
if (children.length > 0) {
|
||||
for (var i = 0; i < children.length; i++) {
|
||||
|
|
@ -54,15 +55,16 @@ Snap.plugin(function (Snap, Element, Paper, global) {
|
|||
elem.type !== "polygon" &&
|
||||
elem.type !== "polyline" &&
|
||||
elem.type !== "image" &&
|
||||
elem.type !== "path"){
|
||||
|
||||
// if(elem.type !== 'g' && elem.type !== 'desc' && elem.type !== 'defs')
|
||||
// console.log('skipping unsupported element ', elem.type);
|
||||
elem.type !== "path" &&
|
||||
elem.type !== "text" &&
|
||||
elem.type !== "tspan" &&
|
||||
elem.type !== "#text"){
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
if (elem.type == 'image'){
|
||||
// TODO ...
|
||||
if (elem.type == 'image' || elem.type == "text" || elem.type == "#text"){
|
||||
// TODO ...
|
||||
var x = parseFloat(elem.attr('x')),
|
||||
y = parseFloat(elem.attr('y')),
|
||||
w = parseFloat(elem.attr('width')),
|
||||
|
|
@ -84,12 +86,11 @@ Snap.plugin(function (Snap, Element, Paper, global) {
|
|||
var transformedY = matrix.y(x, y);
|
||||
var transformedW = matrix.x(x+w, y+h) - transformedX;
|
||||
var transformedH = matrix.y(x+w, y+h) - transformedY;
|
||||
|
||||
|
||||
elem.attr({x: transformedX, y: transformedY, width: transformedW, height: transformedH});
|
||||
return;
|
||||
}
|
||||
|
||||
//if(elem.type !== 'path') console.log("bake: converting " + elem.type + " to path");
|
||||
var path_elem = elem.convertToPath();
|
||||
|
||||
if (!path_elem || path_elem.attr('d') === '' || path_elem.attr('d') === null)
|
||||
|
|
@ -101,7 +102,7 @@ Snap.plugin(function (Snap, Element, Paper, global) {
|
|||
} else {
|
||||
dec = false;
|
||||
}
|
||||
|
||||
|
||||
function r(num) {
|
||||
if (dec !== false) {
|
||||
return Math.round(num * Math.pow(10, dec)) / Math.pow(10, dec);
|
||||
|
|
@ -114,8 +115,8 @@ Snap.plugin(function (Snap, Element, Paper, global) {
|
|||
var d = path_elem.attr('d');
|
||||
d = (d || "").trim();
|
||||
var arr_orig;
|
||||
arr = Snap.parsePathString(d);
|
||||
if (!toCubics) {
|
||||
arr = Snap.parsePathString(d);
|
||||
if (!toCubics) {
|
||||
arr_orig = arr;
|
||||
arr = Snap.path.toAbsolute(arr);
|
||||
} else {
|
||||
|
|
@ -128,7 +129,7 @@ Snap.plugin(function (Snap, Element, Paper, global) {
|
|||
var matrix = transform['totalMatrix'];
|
||||
|
||||
// apply the matrix transformation on the path segments
|
||||
var j;
|
||||
var j;
|
||||
var m = arr.length;
|
||||
var letter = '';
|
||||
var letter_orig = '';
|
||||
|
|
@ -136,8 +137,8 @@ Snap.plugin(function (Snap, Element, Paper, global) {
|
|||
var y = 0;
|
||||
var new_segments = [];
|
||||
var pt = {x: 0, y: 0};
|
||||
var pt_baked = {};
|
||||
var subpath_start = {};
|
||||
var pt_baked = {};
|
||||
var subpath_start = {};
|
||||
var prevX = 0;
|
||||
var prevY = 0;
|
||||
subpath_start.x = null;
|
||||
|
|
@ -155,7 +156,7 @@ Snap.plugin(function (Snap, Element, Paper, global) {
|
|||
pt.x = arr[i][6];
|
||||
pt.y = arr[i][7];
|
||||
new_segments[i] = _arc_transform(arr[i][1], arr[i][2], arr[i][3], arr[i][4], arr[i][5], pt, matrix);
|
||||
|
||||
|
||||
} else if (letter !== 'Z') {
|
||||
// parse other segs than Z and A
|
||||
for (j = 1; j < arr[i].length; j = j + 2) {
|
||||
|
|
@ -191,7 +192,7 @@ Snap.plugin(function (Snap, Element, Paper, global) {
|
|||
y = subpath_start.y;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// Convert all that was relative back to relative
|
||||
// This could be combined to above, but to make code more readable
|
||||
// this is made separately.
|
||||
|
|
@ -261,7 +262,7 @@ Snap.plugin(function (Snap, Element, Paper, global) {
|
|||
//console.log("baked matrix ", matrix, " of ", path_elem.attr('id'));
|
||||
|
||||
};
|
||||
|
||||
|
||||
/**
|
||||
* Helper to apply matrix transformations to arcs.
|
||||
* From flatten.js (https://gist.github.com/timo22345/9413158), modified a bit.
|
||||
|
|
@ -269,7 +270,7 @@ Snap.plugin(function (Snap, Element, Paper, global) {
|
|||
* @param {type} a_rh : r1 of the ellipsis in degree
|
||||
* @param {type} a_rv : r2 of the ellipsis in degree
|
||||
* @param {type} a_offsetrot : x-axis rotation in degree
|
||||
* @param {type} large_arc_flag : 0 or 1
|
||||
* @param {type} large_arc_flag : 0 or 1
|
||||
* @param {int} sweep_flag : 0 or 1
|
||||
* @param {object} endpoint with properties x and y
|
||||
* @param {type} matrix : transformation matrix
|
||||
|
|
@ -311,12 +312,12 @@ Snap.plugin(function (Snap, Element, Paper, global) {
|
|||
|
||||
// convert implicit equation to angle and halfaxis:
|
||||
// disabled intentionally
|
||||
if (false && NEARZERO(B)) { // there is a bug in this optimization: does not work for path below
|
||||
a_offsetrot = 0;
|
||||
// d="M0,350 l 50,-25
|
||||
// a25,25 -30 0,1 50,-25 l 50,-25
|
||||
// a25,50 -30 0,1 50,-25 l 50,-25
|
||||
// a25,75 -30 0,1 50,-25 l 50,-25
|
||||
if (false && NEARZERO(B)) { // there is a bug in this optimization: does not work for path below
|
||||
a_offsetrot = 0;
|
||||
// d="M0,350 l 50,-25
|
||||
// a25,25 -30 0,1 50,-25 l 50,-25
|
||||
// a25,50 -30 0,1 50,-25 l 50,-25
|
||||
// a25,75 -30 0,1 50,-25 l 50,-25
|
||||
// a25,100 -30 0,1 50,-25 l 50,-25"
|
||||
// with matrix transform="scale(0.5,2.0)"
|
||||
A2 = A;
|
||||
|
|
@ -332,7 +333,7 @@ Snap.plugin(function (Snap, Element, Paper, global) {
|
|||
|
||||
// Clamp (precision issues might need this.. not likely, but better save than sorry)
|
||||
K = (K < 0) ? 0 : Math.sqrt(K);
|
||||
|
||||
|
||||
A2 = 0.5 * (A + C + K * ac);
|
||||
C2 = 0.5 * (A + C - K * ac);
|
||||
a_offsetrot = 0.5 * Math.atan2(B, ac);
|
||||
|
|
@ -353,7 +354,7 @@ Snap.plugin(function (Snap, Element, Paper, global) {
|
|||
a_rh = A2;
|
||||
}
|
||||
|
||||
// If the transformation matrix contain a mirror-component
|
||||
// If the transformation matrix contain a mirror-component
|
||||
// winding order of the ellise needs to be changed.
|
||||
if ((matrix.a * matrix.d) - (matrix.b * matrix.c) < 0){
|
||||
sweep_flag = !sweep_flag ? 1 : 0;
|
||||
|
|
@ -376,30 +377,30 @@ Snap.plugin(function (Snap, Element, Paper, global) {
|
|||
var _convertToString = function (arr) {
|
||||
return arr.join(',').replace(_p2s, '$1');
|
||||
};
|
||||
|
||||
|
||||
/**
|
||||
* Replaces an element with a path of same shape.
|
||||
* Supports rect, ellipse, circle, line, polyline, polygon and of course path
|
||||
* The element will be replaced by the path with same id.
|
||||
*
|
||||
* The element will be replaced by the path with same id.
|
||||
*
|
||||
* @returns {path}
|
||||
*/
|
||||
Element.prototype.convertToPath = function(){
|
||||
var old_element = this;
|
||||
var path = old_element.toPath();
|
||||
old_element.before(path);
|
||||
old_element.remove();
|
||||
old_element.remove();
|
||||
return path;
|
||||
};
|
||||
|
||||
/**
|
||||
* Creates a path in the same shape as the origin element
|
||||
* Supports rect, ellipse, circle, line, polyline, polygon and of course path
|
||||
*
|
||||
* based on
|
||||
*
|
||||
* based on
|
||||
* https://github.com/duopixel/Method-Draw/blob/master/editor/src/svgcanvas.js
|
||||
* Modifications: Timo (https://github.com/timo22345)
|
||||
*
|
||||
*
|
||||
* @returns {path} path element
|
||||
*/
|
||||
Element.prototype.toPath = function () {
|
||||
|
|
@ -430,7 +431,7 @@ Snap.plugin(function (Snap, Element, Paper, global) {
|
|||
var validRadius = function (val) {
|
||||
return (isFinite(val) && (val >= 0));
|
||||
};
|
||||
|
||||
|
||||
var validCoordinate = function (val) {
|
||||
return (isFinite(val));
|
||||
};
|
||||
|
|
@ -438,6 +439,19 @@ Snap.plugin(function (Snap, Element, Paper, global) {
|
|||
// Possibly the cubed root of 6, but 1.81 works best
|
||||
var num = 1.81;
|
||||
var tag = old_element.type;
|
||||
|
||||
var convertMMtoPixel = function (val) {
|
||||
attrList = ['rx','ry','r','cx','cy','x1','x2','y1','y2','x','y','width','height'];
|
||||
for(var attrIdx in attrList) {
|
||||
if(val.attr(attrList[attrIdx]) != null && val.attr(attrList[attrIdx]).indexOf('mm') > -1) {
|
||||
var tmp = parseFloat(val.attr(attrList[attrIdx])) * 3.5433;
|
||||
val.attr(attrList[attrIdx], tmp);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
convertMMtoPixel(old_element);
|
||||
|
||||
switch (tag) {
|
||||
case 'ellipse':
|
||||
case 'circle':
|
||||
|
|
@ -448,13 +462,13 @@ Snap.plugin(function (Snap, Element, Paper, global) {
|
|||
if (tag === 'circle') {
|
||||
rx = ry = +old_element.attr('r');
|
||||
}
|
||||
|
||||
|
||||
// If 'x' and 'y' are not specified, then set both to 0. // CorelDraw is creating that sometimes
|
||||
if (!validCoordinate(cx))
|
||||
cx = 0;
|
||||
if (!validCoordinate(cy))
|
||||
cy = 0;
|
||||
|
||||
|
||||
d += _convertToString([
|
||||
['M', (cx - rx), (cy)],
|
||||
['C', (cx - rx), (cy - ry / num), (cx - rx / num), (cy - ry), (cx), (cy - ry)],
|
||||
|
|
@ -481,7 +495,7 @@ Snap.plugin(function (Snap, Element, Paper, global) {
|
|||
d = 'M' + old_element.attr('points') + 'Z';
|
||||
break;
|
||||
case 'rect':
|
||||
// TODO ...
|
||||
// TODO ...
|
||||
var rx = parseFloat(old_element.attr('rx')),
|
||||
ry = parseFloat(old_element.attr('ry')),
|
||||
x = parseFloat(old_element.attr('x')),
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
// render_fills.js - a snapsvg.io plugin to render the infill of svg files into a bitmap.
|
||||
// Copyright (C) 2015 Teja Philipp <osd@tejaphilipp.de>
|
||||
//
|
||||
// based on work by http://davidwalsh.name/convert-canvas-image
|
||||
//
|
||||
// based on work by http://davidwalsh.name/convert-canvas-image
|
||||
// and http://getcontext.net/read/svg-images-on-a-html5-canvas
|
||||
//
|
||||
// This program is free software: you can redistribute it and/or modify
|
||||
|
|
@ -20,12 +20,12 @@
|
|||
|
||||
|
||||
Snap.plugin(function (Snap, Element, Paper, global) {
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* @param {elem} elem start point
|
||||
*
|
||||
*
|
||||
* @returns {path}
|
||||
*/
|
||||
|
||||
|
|
@ -34,7 +34,7 @@ Snap.plugin(function (Snap, Element, Paper, global) {
|
|||
var selection = [];
|
||||
var children = elem.children();
|
||||
|
||||
|
||||
|
||||
if (children.length > 0) {
|
||||
var goRecursive = (elem.type !== "defs" && // ignore these tags
|
||||
elem.type !== "clipPath" &&
|
||||
|
|
@ -42,7 +42,7 @@ Snap.plugin(function (Snap, Element, Paper, global) {
|
|||
elem.type !== "rdf:rdf" &&
|
||||
elem.type !== "cc:work" &&
|
||||
elem.type !== "sodipodi:namedview");
|
||||
|
||||
|
||||
if(goRecursive) {
|
||||
for (var i = 0; i < children.length; i++) {
|
||||
var child = children[i];
|
||||
|
|
@ -50,7 +50,7 @@ Snap.plugin(function (Snap, Element, Paper, global) {
|
|||
}
|
||||
}
|
||||
} else {
|
||||
if(elem.type === 'image'){
|
||||
if(elem.type === 'image' || elem.type === "text" || elem.type === "#text"){
|
||||
selection.push(elem);
|
||||
} else {
|
||||
if(fillPaths && elem.is_filled()){
|
||||
|
|
@ -65,7 +65,7 @@ Snap.plugin(function (Snap, Element, Paper, global) {
|
|||
|
||||
Element.prototype.is_filled = function(){
|
||||
var elem = this;
|
||||
|
||||
|
||||
// TODO text support
|
||||
// TODO opacity support
|
||||
if (elem.type !== "circle" &&
|
||||
|
|
@ -74,14 +74,17 @@ Snap.plugin(function (Snap, Element, Paper, global) {
|
|||
elem.type !== "line" &&
|
||||
elem.type !== "polygon" &&
|
||||
elem.type !== "polyline" &&
|
||||
elem.type !== "path" ){
|
||||
|
||||
elem.type !== "path" //&&
|
||||
// elem.type !== "text" &&
|
||||
// elem.type !== "#text"
|
||||
){
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
var fill = elem.attr('fill');
|
||||
var opacity = elem.attr('fill-opacity');
|
||||
|
||||
|
||||
if(fill !== 'none'){
|
||||
if(opacity === null || opacity > 0){
|
||||
return true;
|
||||
|
|
@ -89,7 +92,7 @@ Snap.plugin(function (Snap, Element, Paper, global) {
|
|||
}
|
||||
return false;
|
||||
};
|
||||
|
||||
|
||||
Element.prototype.embedImage = function(callback){
|
||||
var elem = this;
|
||||
if(elem.type !== 'image') return;
|
||||
|
|
@ -113,15 +116,15 @@ Snap.plugin(function (Snap, Element, Paper, global) {
|
|||
};
|
||||
|
||||
image.src = url;
|
||||
|
||||
|
||||
};
|
||||
|
||||
|
||||
Element.prototype.renderPNG = function (wMM, hMM, pxPerMM, callback) {
|
||||
var elem = this;
|
||||
|
||||
// get svg as dataUrl
|
||||
var svgStr = elem.outerSVG();
|
||||
var svgDataUri = 'data:image/svg+xml;base64,' + window.btoa(svgStr);
|
||||
var svgDataUri = 'data:image/svg+xml;base64,' + window.btoa(unescape(encodeURIComponent(svgStr))); //deprecated unescape needed!
|
||||
var source = new Image();
|
||||
source.src = svgDataUri;
|
||||
|
||||
|
|
@ -129,7 +132,7 @@ Snap.plugin(function (Snap, Element, Paper, global) {
|
|||
var renderCanvas = document.createElement('canvas');
|
||||
renderCanvas.id = "renderCanvas";
|
||||
renderCanvas.width = wMM * pxPerMM;
|
||||
renderCanvas.height = hMM * pxPerMM;
|
||||
renderCanvas.height = hMM * pxPerMM;
|
||||
document.getElementsByTagName('body')[0].appendChild(renderCanvas);
|
||||
var renderCanvasContext = renderCanvas.getContext('2d');
|
||||
|
||||
|
|
|
|||
|
|
@ -107,6 +107,7 @@ $(function(){
|
|||
self.clear = function(){
|
||||
snap.selectAll('#userContent>*').remove();
|
||||
snap.selectAll('#placedGcodes>*').remove();
|
||||
snap.selectAll('rect:not(#coordGrid)').remove();
|
||||
self.placedDesigns([]);
|
||||
};
|
||||
|
||||
|
|
@ -132,14 +133,9 @@ $(function(){
|
|||
};
|
||||
|
||||
self.getXYCoord = function(evt){
|
||||
if(isFirefox) {
|
||||
var scale = evt.target.parentElement.transform.baseVal[0].matrix.a;
|
||||
var x = self.px2mm(evt.offsetX) * scale;
|
||||
var y = self.px2mm(parseFloat(evt.target.attributes.height.value) - evt.offsetY) * scale;
|
||||
} else {
|
||||
var x = self.px2mm(evt.offsetX);
|
||||
var y = self.px2mm(evt.target.ownerSVGElement.getBoundingClientRect().height - evt.offsetY); // hopefully this works across browsers
|
||||
}
|
||||
var scale = evt.target.parentElement.transform.baseVal[0].matrix.a;
|
||||
var x = self.px2mm(evt.offsetX) * scale;
|
||||
var y = self.px2mm(parseFloat(evt.target.attributes.height.value) - evt.offsetY) * scale;
|
||||
x = Math.min(x, self.workingAreaWidthMM());
|
||||
y = Math.min(y, self.workingAreaHeightMM());
|
||||
return {x:x, y:y};
|
||||
|
|
@ -241,11 +237,26 @@ $(function(){
|
|||
var url = self._getSVGserveUrl(file);
|
||||
callback = function (f) {
|
||||
var newSvgAttrs = {};
|
||||
var root_attrs = f.select('svg').node.attributes;
|
||||
if(f.select('svg') == null){
|
||||
root_attrs = f.node.attributes;
|
||||
} else {
|
||||
var root_attrs = f.select('svg').node.attributes;
|
||||
}
|
||||
var doc_width = null;
|
||||
var doc_height = null;
|
||||
var doc_viewbox = null;
|
||||
|
||||
// find clippath elements
|
||||
var clipPathEl = f.selectAll('clipPath');
|
||||
if(clipPathEl.length != 0){
|
||||
console.warn("Warning: removed unsupported clipPath element in SVG");
|
||||
self.svg_contains_clipPath_warning();
|
||||
clipPathEl.remove()
|
||||
}
|
||||
|
||||
// find all elements with "display=none" and remove them
|
||||
f.selectAll("[display=none]").remove()
|
||||
|
||||
// iterate svg tag attributes
|
||||
for(var i = 0; i < root_attrs.length; i++){
|
||||
var attr = root_attrs[i];
|
||||
|
|
@ -261,9 +272,19 @@ $(function(){
|
|||
}
|
||||
}
|
||||
|
||||
// find Illustrator comment and notify
|
||||
f.node.childNodes.forEach(function(entry) {
|
||||
if(entry.nodeType == 8) { // Nodetype 8 = comment
|
||||
if(entry.textContent.indexOf('Illustrator') > -1) {
|
||||
new PNotify({title: gettext("Illustrator SVG Detected"), text: "Illustrator SVG detected! To preserve coorect scale, please go to the \'Settings\' menu and change the \'SVG dpi\' field under \'Plugins/Svg Conversion\' according to your file. And add it again.", type: "info", hide: false});
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
// scale matrix
|
||||
var mat = self.getDocumentViewBoxMatrix(doc_width, doc_height, doc_viewbox);
|
||||
var scaleMatrixStr = new Snap.Matrix(mat[0][0],mat[0][1],mat[1][0],mat[1][1],mat[0][2],mat[1][2]).toTransformString();
|
||||
var dpiscale = 90 / self.settings.settings.plugins.svgtogcode.svgDPI();
|
||||
var scaleMatrixStr = new Snap.Matrix(mat[0][0],mat[0][1],mat[1][0],mat[1][1],mat[0][2],mat[1][2]).scale(dpiscale).toTransformString();
|
||||
newSvgAttrs['transform'] = scaleMatrixStr;
|
||||
|
||||
var newSvg = snap.group(f.selectAll("svg>*"));
|
||||
|
|
@ -389,8 +410,20 @@ $(function(){
|
|||
};
|
||||
};
|
||||
|
||||
|
||||
self.svg_contains_clipPath_warning = function(){
|
||||
var error = "<p>" + gettext("The SVG file contains clipPath elements.<br/>clipPath is not supported yet and has been removed from file.") + "</p>";
|
||||
//error += pnotifyAdditionalInfo("<pre>" + data.jqXHR.responseText + "</pre>");
|
||||
new PNotify({
|
||||
title: "clipPath elements removed",
|
||||
text: error,
|
||||
type: "warn",
|
||||
hide: false
|
||||
});
|
||||
};
|
||||
|
||||
self.svg_contains_text_warning = function(svg){
|
||||
var error = "<p>" + gettext("The svg file contains text elements.<br/>Please convert them to paths.<br/>Otherwise they will be ignored.") + "</p>";
|
||||
var error = "<p>" + gettext("The SVG file contains text elements.<br/>If you want to laser just their outlines,<br/>please convert them to paths.<br/>Otherwise they will be engraved with infill.") + "</p>";
|
||||
//error += pnotifyAdditionalInfo("<pre>" + data.jqXHR.responseText + "</pre>");
|
||||
new PNotify({
|
||||
title: "Text elements found",
|
||||
|
|
@ -398,7 +431,6 @@ $(function(){
|
|||
type: "warn",
|
||||
hide: false
|
||||
});
|
||||
svg.selectAll('text,tspan').remove();
|
||||
};
|
||||
|
||||
self.svg_misfitting_warning = function(svg, misfitting){
|
||||
|
|
@ -704,6 +736,16 @@ $(function(){
|
|||
return snap.selectAll("#userContent image");
|
||||
};
|
||||
|
||||
self.hasTextItems = function () {
|
||||
if(snap.selectAll("#userContent tspan").length > 0 ||
|
||||
snap.selectAll("#userContent text").length > 0 ||
|
||||
snap.selectAll("userContent #text").length > 0) {
|
||||
return true
|
||||
}else{
|
||||
return false
|
||||
}
|
||||
};
|
||||
|
||||
self.getPlacedGcodes = ko.computed(function() {
|
||||
var gcodeFiles = [];
|
||||
ko.utils.arrayForEach(self.placedDesigns(), function(design) {
|
||||
|
|
@ -826,7 +868,7 @@ $(function(){
|
|||
for (var i = 0; i < fillings.length; i++) {
|
||||
var item = fillings[i];
|
||||
|
||||
if (item.type === 'image') {
|
||||
if (item.type === 'image' || item.type === "text" || item.type === "#text") {
|
||||
// remove filter effects on images for proper rendering
|
||||
var style = item.attr('style');
|
||||
if (style !== null) {
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
</div>
|
||||
<div class="controls alert alert-info hint" data-bind="visible: showHints">
|
||||
<span class="icon icon-question-sign" aria-hidden="true"></span>
|
||||
Sets the intensity of the laser. The more intensity the deeper the effect on the material.
|
||||
Sets the intensity of the laser. The more intensity the deeper the effect on the material.
|
||||
Cutting needs higher intensities than engraving.
|
||||
The effect in general is dependent from the material and its color and surface.
|
||||
</div>
|
||||
|
|
@ -33,8 +33,8 @@
|
|||
</div>
|
||||
<div class="controls alert alert-info hint" data-bind="visible: showHints">
|
||||
<span class="icon icon-question-sign" aria-hidden="true"></span>
|
||||
Sets the velocity of the laser head. The slower the movement the deeper the effect on the material.
|
||||
Cutting needs slower movement than engraving.
|
||||
Sets the velocity of the laser head. The slower the movement the deeper the effect on the material.
|
||||
Cutting needs slower movement than engraving.
|
||||
The effect in general is dependent from the material and its color and surface.
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -56,11 +56,11 @@
|
|||
<div class="controls alert alert-info hint" data-bind="visible: showHints">
|
||||
<span class="icon icon-question-sign" aria-hidden="true"></span>
|
||||
Some (especially bright) materials require the laser to dwell a little until the surface has absorbed enough energy to be affected.
|
||||
This parameter sets the amount of time in milliseconds the movement is paused after the laser is switched on.
|
||||
This parameter sets the amount of time in milliseconds the movement is paused after the laser is switched on.
|
||||
If the result shows gaps in lines for example increase this value carefully. The higher the value the higher the risk of material ignition.
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div data-bind="visible: show_image_parameters ">
|
||||
<p>{{ _('Image engraving parameters:') }}</p>
|
||||
<div class="control-group" >
|
||||
|
|
@ -103,10 +103,10 @@
|
|||
<div class="controls alert alert-info hint" data-bind="visible: showHints">
|
||||
<span class="icon icon-question-sign" aria-hidden="true"></span>
|
||||
Pixel / raster engravings are done line by line. This sets the distance between the single lines.
|
||||
Smaller values allow finer engravings but require a more precise focus and are slower.
|
||||
Smaller values allow finer engravings but require a more precise focus and are slower.
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
<p >{{ _('Image Preprocessing') }}</p>
|
||||
<div class="controls">
|
||||
<div class="img_preprocessing_preview before" style="background-image:url(/plugin/svgtogcode/static/img/kitty_grayscale.png);" >before</div>
|
||||
|
|
@ -114,22 +114,22 @@
|
|||
<div class="img_preprocessing_preview contrast" style="background-image:url(/plugin/svgtogcode/static/img/kitty_contrast.png);" data-bind="style: { opacity: contrastPreview }" ></div>
|
||||
<div class="img_preprocessing_preview sharpened" style="background-image:url(/plugin/svgtogcode/static/img/kitty_sharpened.png);" data-bind="style: { opacity: sharpenedPreview }" ></div>
|
||||
<div class="img_preprocessing_preview dithered" style="background-image:url(/plugin/svgtogcode/static/img/kitty_dithered_150.png);" data-bind="visible: imgDithering"></div>
|
||||
|
||||
|
||||
</div>
|
||||
<div class="photo_attribution"><a href="http://www.christianholmer.com" target="_blank">Photo: Christian Holmér</a></div>
|
||||
</div>
|
||||
|
||||
|
||||
<div data-bind="disable:imgDithering ">
|
||||
<label class="control-label">{{ _('Contrast') }}</label>
|
||||
<div class="controls img_slider">
|
||||
<input id="svgtogcode_contrast_slider" type="text" data-bind="value: imgContrast" >
|
||||
</div>
|
||||
<div style="clear:both"></div>
|
||||
<div style="clear:both"></div>
|
||||
<div class="controls alert alert-info hint" data-bind="visible: showHints">
|
||||
<span class="icon icon-question-sign" aria-hidden="true"></span>
|
||||
Increases the image contrast before converting to gcode.
|
||||
Increases the image contrast before converting to gcode.
|
||||
</div>
|
||||
|
||||
|
||||
<label class="control-label">{{ _('Sharpening') }}</label>
|
||||
<div class="controls img_slider">
|
||||
<input id="svgtogcode_sharpening_slider" class="uninitialized" type="text" data-bind="value: imgSharpening">
|
||||
|
|
@ -137,10 +137,10 @@
|
|||
<div style="clear:both"></div>
|
||||
<div class="controls alert alert-info hint" data-bind="visible: showHints">
|
||||
<span class="icon icon-question-sign" aria-hidden="true"></span>
|
||||
Sharpens the image before converting to gcode.
|
||||
Sharpens the image before converting to gcode.
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<label class="control-label">{{ _('Dithering') }}</label>
|
||||
<div class="controls">
|
||||
<label class="checkbox">
|
||||
|
|
@ -149,8 +149,8 @@
|
|||
</div>
|
||||
<div class="controls alert alert-info hint" data-bind="visible: showHints">
|
||||
<span class="icon icon-question-sign" aria-hidden="true"></span>
|
||||
Converts the image to solely black and white pixels.
|
||||
Use this if the laser effect on your material is not able to transfer grayscales.
|
||||
Converts the image to solely black and white pixels.
|
||||
Use this if the laser effect on your material is not able to transfer grayscales.
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
|
@ -185,4 +185,4 @@
|
|||
<a href="#" class="btn" data-dismiss="modal" aria-hidden="true" data-bind="click: $root.cancel_conversion()">{{ _('Cancel') }}</a>
|
||||
<a href="#" class="btn btn-primary" data-bind="click: function() { if ($root.enableConvertButton()) { $root.convert() } }, enabled: enableConvertButton, css: {disabled: !$root.enableConvertButton()}">{{ _('Convert') }}</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -331,7 +331,7 @@ class Printer(PrinterInterface, comm.MachineComPrintCallback):
|
|||
def position(self, x, y):
|
||||
printer_profile = self._printerProfileManager.get_current_or_default()
|
||||
movement_speed = min(printer_profile["axes"]["x"]["speed"], printer_profile["axes"]["y"]["speed"])
|
||||
self.commands(["G90", "G0 X%.3f Y%.3f F%d" % (x, y, movement_speed), "?"])
|
||||
self.commands(["G90", "G0 X%.3f Y%.3f F%d" % (x, y, movement_speed)])
|
||||
|
||||
def _convert_rate_value(self, factor, min=0, max=200):
|
||||
if not isinstance(factor, (int, float, long)):
|
||||
|
|
|
|||
|
|
@ -568,8 +568,8 @@ msgstr ""
|
|||
"aktualisiert werden."
|
||||
|
||||
#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:131
|
||||
msgid "Update Available"
|
||||
msgstr "Aktualisierung verfügbar"
|
||||
msgid "Mr Beam Update Available"
|
||||
msgstr "Mr Beam Aktualisierung verfügbar"
|
||||
|
||||
#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:143
|
||||
msgid "Ignore"
|
||||
|
|
|
|||
|
|
@ -88,7 +88,7 @@ class MachineCom(object):
|
|||
self._finished_passes = 0
|
||||
|
||||
# regular expressions
|
||||
self._regex_command = re.compile("^\s*\$?([GM]\d+|[TH])")
|
||||
self._regex_command = re.compile("^\s*\$?([GM]\d+|[THX])")
|
||||
self._regex_feedrate = re.compile("F\d+", re.IGNORECASE)
|
||||
self._regex_intensity = re.compile("S\d+", re.IGNORECASE)
|
||||
|
||||
|
|
@ -147,7 +147,7 @@ class MachineCom(object):
|
|||
elif line.startswith('['): # feedback message
|
||||
self._handle_feedback_message(line)
|
||||
elif line.startswith('Grb'): # Grbl startup message
|
||||
self._handle_startup_message()
|
||||
self._handle_startup_message(line)
|
||||
except:
|
||||
self._logger.exception("Something crashed inside the monitoring loop, please report this to Mr. Beam")
|
||||
errorMsg = "See octoprint.log for details"
|
||||
|
|
@ -406,7 +406,7 @@ class MachineCom(object):
|
|||
elif line[1:].startswith('Dis'): # [Disabled]
|
||||
pass
|
||||
|
||||
def _handle_startup_message(self):
|
||||
def _handle_startup_message(self, line):
|
||||
if self.isOperational():
|
||||
errorMsg = "Machine reset."
|
||||
self._cmd = None
|
||||
|
|
@ -421,7 +421,14 @@ class MachineCom(object):
|
|||
self._changeState(self.STATE_LOCKED)
|
||||
eventManager().fire(Events.ERROR, {"error": self.getErrorString()})
|
||||
else:
|
||||
self._onConnected(self.STATE_LOCKED)
|
||||
versionMatch = re.search("Grbl (?P<grbl>.+?)(_(?P<git>[0-9a-f]{7})(?P<dirty>-dirty)?)? \[.+\]", line)
|
||||
if versionMatch:
|
||||
versionDict = versionMatch.groupdict()
|
||||
self._writeGrblVersionToFile(versionDict)
|
||||
if self._compareGrblVersion(versionDict) is False:
|
||||
self._flashGrbl()
|
||||
else:
|
||||
self._onConnected(self.STATE_LOCKED)
|
||||
|
||||
def _update_grbl_pos(self, line):
|
||||
# line example:
|
||||
|
|
@ -617,7 +624,7 @@ class MachineCom(object):
|
|||
params = ["avrdude", "-patmega328p", "-carduino", "-b" + str(self._baudrate), "-P" + str(self._port), "-D", "-Uflash:w:" + pathToGrblHex]
|
||||
rc = subprocesscall(params)
|
||||
|
||||
if rc is False:
|
||||
if rc == 0:
|
||||
self._log("successfully flashed new grbl version")
|
||||
self._openSerial()
|
||||
self._changeState(self.STATE_CONNECTING)
|
||||
|
|
@ -754,6 +761,10 @@ class MachineCom(object):
|
|||
self._changeState(self.STATE_HOMING)
|
||||
return cmd
|
||||
|
||||
def _gcode_X_sent(self, cmd, cmd_type=None):
|
||||
self._changeState(self.STATE_HOMING) # TODO: maybe change to seperate $X mode
|
||||
return cmd
|
||||
|
||||
def _gcode_Hold_sent(self, cmd, cmd_type=None):
|
||||
self._changeState(self.STATE_PAUSED)
|
||||
return cmd
|
||||
|
|
@ -1164,6 +1175,9 @@ class PrintingGcodeFileInformation(PrintingFileInformation):
|
|||
|
||||
if not os.path.exists(self._filename) or not os.path.isfile(self._filename):
|
||||
raise IOError("File %s does not exist" % self._filename)
|
||||
|
||||
self._stripCommments()
|
||||
|
||||
self._size = os.stat(self._filename).st_size
|
||||
self._pos = 0
|
||||
|
||||
|
|
@ -1217,6 +1231,16 @@ class PrintingGcodeFileInformation(PrintingFileInformation):
|
|||
self._logger.exception("Exception while processing line")
|
||||
raise e
|
||||
|
||||
def _stripCommments(self):
|
||||
dir = os.path.dirname(os.path.abspath(self._filename))
|
||||
tmpfile = open(dir + '/gcode.tmp', 'w')
|
||||
with open(self._filename, "r") as fileobject:
|
||||
for line in fileobject:
|
||||
if process_gcode_line(line) is not None:
|
||||
tmpfile.write(line)
|
||||
tmpfile.close()
|
||||
self._filename = dir + '/gcode.tmp'
|
||||
|
||||
def convert_pause_triggers(configured_triggers):
|
||||
triggers = {
|
||||
"enable": [],
|
||||
|
|
@ -1281,6 +1305,7 @@ def serialList():
|
|||
baselist = baselist \
|
||||
+ glob.glob("/dev/ttyUSB*") \
|
||||
+ glob.glob("/dev/ttyACM*") \
|
||||
+ glob.glob("/dev/ttyAMA*") \
|
||||
+ glob.glob("/dev/tty.usb*") \
|
||||
+ glob.glob("/dev/cu.*") \
|
||||
+ glob.glob("/dev/cuaU*") \
|
||||
|
|
|
|||
Loading…
Reference in a new issue