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

prepared tests for designs misfitting the working area.

Browse source
This commit is contained in:
Teja 2015-06-16 15:54:15 +02:00
parent 2501813dad
commit 67c44e3ec0
2 changed files with 44 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/octoprint/plugins/svgtogcode/static/js/drag_scale_rotate.js
View file

@ -64,7 +64,7 @@ Snap.plugin(function (Snap, Element, Paper, global) {
return elem;
};
});
@ -103,7 +103,7 @@ Snap.plugin(function (Snap, Element, Paper, global) {
freetransEl.data( "scaleFactor", calcDistance( bb.cx, bb.cy, rotateDragger.attr('cx'), rotateDragger.attr('cy') ) );
translateDragger.drag(
elementDragMove.bind( translateDragger, freetransEl ),
elementDragMove.bind( translateDragger, freetransEl ),
elementDragStart.bind( translateDragger, freetransEl ),
elementDragEnd.bind( translateDragger, freetransEl )
);

42
src/octoprint/plugins/svgtogcode/static/js/working_area.js
View file

@ -241,6 +241,14 @@ $(function(){
if(hasText !== null && hasText.length > 0){
self.svg_contains_text_warning(newSvg);
}
// TODO debug. bounding boxes are always zero sized when not displayed.
// var misfitting = self.outsideWorkingArea(newSvg);
// if(misfitting.oversized || misfitting.outside){
// self.svg_misfitting_warning(newSvg, misfitting);
// newSvg.translate(misfitting.dx, misfitting.dy);
// newSvg.scale(misfitting.scale);
// }
newSvg.bake(); // remove transforms
newSvg.attr(newSvgAttrs);
var id = self.getEntryId(file);
@ -277,6 +285,26 @@ $(function(){
// });
};
self.outsideWorkingArea = function(svg){
var waBB = snap.select('#userContent').getBBox();
var svgBB = svg.getBBox();
var tooWide = svgBB.w > waBB.w;
var tooHigh = svgBB.h > waBB.h;
var scale = 1;
if(tooWide || tooHigh){
scale = Math.min(waBB.w / svgBB.w, waBB.h / svgBB.h);
}
var outside = svgBB.x < waBB.x || svgBB.x2 > waBB.x2 || svgBB.y < waBB.y || svgBB.y2 > waBB.y2;
var dx = 0;
var dy = 0;
if(outside){
dx = -svgBB.x;
dy = -svgBB.y;
}
return { oversized: tooWide || tooHigh, outside: outside, scale: scale, dx: dx, dy: dy };
};
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>";
//error += pnotifyAdditionalInfo("<pre>" + data.jqXHR.responseText + "</pre>");
@ -288,6 +316,20 @@ $(function(){
});
svg.selectAll('text,tspan').remove();
};
self.svg_misfitting_warning = function(svg, misfitting){
var outside = gettext("<br/>It has been moved to (0,0). ");
var oversized = gettext("<br/>It has resized to %d %. ", misfitting.scale);
var error = "<p>" + gettext("The design was originally not fitting into the working area.")
+ outside + oversized + gettext("<br/>Please check the result.") + "</p>";
new PNotify({
title: "Design moved",
text: error,
type: "warn",
hide: false
});
};
self.getDocumentDimensionsInPt = function(doc_width, doc_height, doc_viewbox){
if(doc_width === null){