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

bugfix. images in groups with transform attributes are transformed correct now.

Browse source
This commit is contained in:
Teja 2016-01-27 17:53:41 +01:00
parent a5330313a4
commit 597481905b
1 changed files with 27 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -53,6 +53,7 @@ Snap.plugin(function (Snap, Element, Paper, global) {
elem.type !== "line" &&
elem.type !== "polygon" &&
elem.type !== "polyline" &&
elem.type !== "image" &&
elem.type !== "path"){
// if(elem.type !== 'g' && elem.type !== 'desc' && elem.type !== 'defs')
@ -60,6 +61,32 @@ Snap.plugin(function (Snap, Element, Paper, global) {
return;
}
if (elem.type == 'image'){
// TODO ...
var x = parseFloat(elem.attr('x')),
y = parseFloat(elem.attr('y')),
w = parseFloat(elem.attr('width')),
h = parseFloat(elem.attr('height'));
// Validity checks from http://www.w3.org/TR/SVG/shapes.html#RectElement:
// If 'x' and 'y' are not specified, then set both to 0. // CorelDraw is creating that sometimes
if (!isFinite(x))
console.log('No attribute "x" in image tag. Assuming 0.')
x = 0;
if (!isFinite(y))
console.log('No attribute "y" in image tag. Assuming 0.')
y = 0;
var transform = elem.transform();
var matrix = transform['totalMatrix'];
var transformedX = matrix.x(x, y);
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();