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

better placement of the make it fit function.

Browse source
This commit is contained in:
Teja 2015-06-29 16:28:36 +02:00
parent 463b0de306
commit 0cc04b9a89
1 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -326,12 +326,25 @@ $(function(){
if(tooWide || tooHigh){
scale = Math.min(waBB.w / svgBB.w, waBB.h / svgBB.h) - 0.01; // scale minimal smaller to avoid rounding errors
}
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;
var outside = false;
if(svgBB.x < waBB.x){
dx = -svgBB.x + 0.01;
outside = true;
}
if(svgBB.x2 > waBB.x2){
dx = -svgBB.x2 + waBB.x2 - 0.01;
outside = true;
}
if(svgBB.y < waBB.y){
dy = -svgBB.y + 0.01;
outside = true;
}
if(svgBB.y2 > waBB.y2){
dy = -svgBB.y2 + waBB.y2 - 0.01;
outside = true;
}
return {