pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed problem when svg elements contain mm units, by converting them to pixel with a fixed dpi of 90.

Browse source
This commit is contained in:
make-ing 2016-06-17 14:18:44 +02:00
parent 25be52587e
commit 12a3f092e2
1 changed files with 49 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

85
src/octoprint/plugins/svgtogcode/static/js/matrix_oven.js
View file

@ -1,7 +1,7 @@
// Matrix Oven - a snapsvg.io plugin to apply & remove transformations from svg files. // Matrix Oven - a snapsvg.io plugin to apply & remove transformations from svg files.
// Copyright (C) 2015 Teja Philipp <osd@tejaphilipp.de> // 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 // 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 // This program is free software: you can redistribute it and/or modify
@ -20,10 +20,10 @@
Snap.plugin(function (Snap, Element, Paper, global) { Snap.plugin(function (Snap, Element, Paper, global) {
/** /**
* bakes transformations of the element and all sub-elements into coordinates * bakes transformations of the element and all sub-elements into coordinates
* *
* @param {boolean} toCubics : use only cubic path segments * @param {boolean} toCubics : use only cubic path segments
* @param {integer} dec : number of digits after decimal separator. defaults to 5 * @param {integer} dec : number of digits after decimal separator. defaults to 5
* @returns {undefined} * @returns {undefined}
@ -55,14 +55,14 @@ Snap.plugin(function (Snap, Element, Paper, global) {
elem.type !== "polyline" && elem.type !== "polyline" &&
elem.type !== "image" && elem.type !== "image" &&
elem.type !== "path"){ elem.type !== "path"){
// if(elem.type !== 'g' && elem.type !== 'desc' && elem.type !== 'defs') // if(elem.type !== 'g' && elem.type !== 'desc' && elem.type !== 'defs')
// console.log('skipping unsupported element ', elem.type); // console.log('skipping unsupported element ', elem.type);
return; return;
} }
if (elem.type == 'image'){ if (elem.type == 'image'){
// TODO ... // TODO ...
var x = parseFloat(elem.attr('x')), var x = parseFloat(elem.attr('x')),
y = parseFloat(elem.attr('y')), y = parseFloat(elem.attr('y')),
w = parseFloat(elem.attr('width')), w = parseFloat(elem.attr('width')),
@ -84,7 +84,7 @@ Snap.plugin(function (Snap, Element, Paper, global) {
var transformedY = matrix.y(x, y); var transformedY = matrix.y(x, y);
var transformedW = matrix.x(x+w, y+h) - transformedX; var transformedW = matrix.x(x+w, y+h) - transformedX;
var transformedH = matrix.y(x+w, y+h) - transformedY; var transformedH = matrix.y(x+w, y+h) - transformedY;
elem.attr({x: transformedX, y: transformedY, width: transformedW, height: transformedH}); elem.attr({x: transformedX, y: transformedY, width: transformedW, height: transformedH});
return; return;
} }
@ -101,7 +101,7 @@ Snap.plugin(function (Snap, Element, Paper, global) {
} else { } else {
dec = false; dec = false;
} }
function r(num) { function r(num) {
if (dec !== false) { if (dec !== false) {
return Math.round(num * Math.pow(10, dec)) / Math.pow(10, dec); return Math.round(num * Math.pow(10, dec)) / Math.pow(10, dec);
@ -114,8 +114,8 @@ Snap.plugin(function (Snap, Element, Paper, global) {
var d = path_elem.attr('d'); var d = path_elem.attr('d');
d = (d || "").trim(); d = (d || "").trim();
var arr_orig; var arr_orig;
arr = Snap.parsePathString(d); arr = Snap.parsePathString(d);
if (!toCubics) { if (!toCubics) {
arr_orig = arr; arr_orig = arr;
arr = Snap.path.toAbsolute(arr); arr = Snap.path.toAbsolute(arr);
} else { } else {
@ -128,7 +128,7 @@ Snap.plugin(function (Snap, Element, Paper, global) {
var matrix = transform['totalMatrix']; var matrix = transform['totalMatrix'];
// apply the matrix transformation on the path segments // apply the matrix transformation on the path segments
var j; var j;
var m = arr.length; var m = arr.length;
var letter = ''; var letter = '';
var letter_orig = ''; var letter_orig = '';
@ -136,8 +136,8 @@ Snap.plugin(function (Snap, Element, Paper, global) {
var y = 0; var y = 0;
var new_segments = []; var new_segments = [];
var pt = {x: 0, y: 0}; var pt = {x: 0, y: 0};
var pt_baked = {}; var pt_baked = {};
var subpath_start = {}; var subpath_start = {};
var prevX = 0; var prevX = 0;
var prevY = 0; var prevY = 0;
subpath_start.x = null; subpath_start.x = null;
@ -155,7 +155,7 @@ Snap.plugin(function (Snap, Element, Paper, global) {
pt.x = arr[i][6]; pt.x = arr[i][6];
pt.y = arr[i][7]; 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); 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') { } else if (letter !== 'Z') {
// parse other segs than Z and A // parse other segs than Z and A
for (j = 1; j < arr[i].length; j = j + 2) { for (j = 1; j < arr[i].length; j = j + 2) {
@ -191,7 +191,7 @@ Snap.plugin(function (Snap, Element, Paper, global) {
y = subpath_start.y; y = subpath_start.y;
} }
} }
// Convert all that was relative back to relative // Convert all that was relative back to relative
// This could be combined to above, but to make code more readable // This could be combined to above, but to make code more readable
// this is made separately. // this is made separately.
@ -261,7 +261,7 @@ Snap.plugin(function (Snap, Element, Paper, global) {
//console.log("baked matrix ", matrix, " of ", path_elem.attr('id')); //console.log("baked matrix ", matrix, " of ", path_elem.attr('id'));
}; };
/** /**
* Helper to apply matrix transformations to arcs. * Helper to apply matrix transformations to arcs.
* From flatten.js (https://gist.github.com/timo22345/9413158), modified a bit. * From flatten.js (https://gist.github.com/timo22345/9413158), modified a bit.
@ -269,7 +269,7 @@ Snap.plugin(function (Snap, Element, Paper, global) {
* @param {type} a_rh : r1 of the ellipsis in degree * @param {type} a_rh : r1 of the ellipsis in degree
* @param {type} a_rv : r2 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} 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 {int} sweep_flag : 0 or 1
* @param {object} endpoint with properties x and y * @param {object} endpoint with properties x and y
* @param {type} matrix : transformation matrix * @param {type} matrix : transformation matrix
@ -311,12 +311,12 @@ Snap.plugin(function (Snap, Element, Paper, global) {
// convert implicit equation to angle and halfaxis: // convert implicit equation to angle and halfaxis:
// disabled intentionally // disabled intentionally
if (false && NEARZERO(B)) { // there is a bug in this optimization: does not work for path below if (false && NEARZERO(B)) { // there is a bug in this optimization: does not work for path below
a_offsetrot = 0; a_offsetrot = 0;
// d="M0,350 l 50,-25 // d="M0,350 l 50,-25
// a25,25 -30 0,1 50,-25 l 50,-25 // a25,25 -30 0,1 50,-25 l 50,-25
// a25,50 -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,75 -30 0,1 50,-25 l 50,-25
// a25,100 -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)" // with matrix transform="scale(0.5,2.0)"
A2 = A; A2 = A;
@ -332,7 +332,7 @@ Snap.plugin(function (Snap, Element, Paper, global) {
// Clamp (precision issues might need this.. not likely, but better save than sorry) // Clamp (precision issues might need this.. not likely, but better save than sorry)
K = (K < 0) ? 0 : Math.sqrt(K); K = (K < 0) ? 0 : Math.sqrt(K);
A2 = 0.5 * (A + C + K * ac); A2 = 0.5 * (A + C + K * ac);
C2 = 0.5 * (A + C - K * ac); C2 = 0.5 * (A + C - K * ac);
a_offsetrot = 0.5 * Math.atan2(B, ac); a_offsetrot = 0.5 * Math.atan2(B, ac);
@ -353,7 +353,7 @@ Snap.plugin(function (Snap, Element, Paper, global) {
a_rh = A2; 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. // winding order of the ellise needs to be changed.
if ((matrix.a * matrix.d) - (matrix.b * matrix.c) < 0){ if ((matrix.a * matrix.d) - (matrix.b * matrix.c) < 0){
sweep_flag = !sweep_flag ? 1 : 0; sweep_flag = !sweep_flag ? 1 : 0;
@ -376,30 +376,30 @@ Snap.plugin(function (Snap, Element, Paper, global) {
var _convertToString = function (arr) { var _convertToString = function (arr) {
return arr.join(',').replace(_p2s, '$1'); return arr.join(',').replace(_p2s, '$1');
}; };
/** /**
* Replaces an element with a path of same shape. * Replaces an element with a path of same shape.
* Supports rect, ellipse, circle, line, polyline, polygon and of course path * 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} * @returns {path}
*/ */
Element.prototype.convertToPath = function(){ Element.prototype.convertToPath = function(){
var old_element = this; var old_element = this;
var path = old_element.toPath(); var path = old_element.toPath();
old_element.before(path); old_element.before(path);
old_element.remove(); old_element.remove();
return path; return path;
}; };
/** /**
* Creates a path in the same shape as the origin element * Creates a path in the same shape as the origin element
* Supports rect, ellipse, circle, line, polyline, polygon and of course path * 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 * https://github.com/duopixel/Method-Draw/blob/master/editor/src/svgcanvas.js
* Modifications: Timo (https://github.com/timo22345) * Modifications: Timo (https://github.com/timo22345)
* *
* @returns {path} path element * @returns {path} path element
*/ */
Element.prototype.toPath = function () { Element.prototype.toPath = function () {
@ -430,7 +430,7 @@ Snap.plugin(function (Snap, Element, Paper, global) {
var validRadius = function (val) { var validRadius = function (val) {
return (isFinite(val) && (val >= 0)); return (isFinite(val) && (val >= 0));
}; };
var validCoordinate = function (val) { var validCoordinate = function (val) {
return (isFinite(val)); return (isFinite(val));
}; };
@ -438,6 +438,19 @@ Snap.plugin(function (Snap, Element, Paper, global) {
// Possibly the cubed root of 6, but 1.81 works best // Possibly the cubed root of 6, but 1.81 works best
var num = 1.81; var num = 1.81;
var tag = old_element.type; 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) { switch (tag) {
case 'ellipse': case 'ellipse':
case 'circle': case 'circle':
@ -448,13 +461,13 @@ Snap.plugin(function (Snap, Element, Paper, global) {
if (tag === 'circle') { if (tag === 'circle') {
rx = ry = +old_element.attr('r'); rx = ry = +old_element.attr('r');
} }
// If 'x' and 'y' are not specified, then set both to 0. // CorelDraw is creating that sometimes // If 'x' and 'y' are not specified, then set both to 0. // CorelDraw is creating that sometimes
if (!validCoordinate(cx)) if (!validCoordinate(cx))
cx = 0; cx = 0;
if (!validCoordinate(cy)) if (!validCoordinate(cy))
cy = 0; cy = 0;
d += _convertToString([ d += _convertToString([
['M', (cx - rx), (cy)], ['M', (cx - rx), (cy)],
['C', (cx - rx), (cy - ry / num), (cx - rx / num), (cy - ry), (cx), (cy - ry)], ['C', (cx - rx), (cy - ry / num), (cx - rx / num), (cy - ry), (cx), (cy - ry)],
@ -481,7 +494,7 @@ Snap.plugin(function (Snap, Element, Paper, global) {
d = 'M' + old_element.attr('points') + 'Z'; d = 'M' + old_element.attr('points') + 'Z';
break; break;
case 'rect': case 'rect':
// TODO ... // TODO ...
var rx = parseFloat(old_element.attr('rx')), var rx = parseFloat(old_element.attr('rx')),
ry = parseFloat(old_element.attr('ry')), ry = parseFloat(old_element.attr('ry')),
x = parseFloat(old_element.attr('x')), x = parseFloat(old_element.attr('x')),