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

removed debug coloring, cleanup works

Browse source
This commit is contained in:
Teja 2015-10-13 18:19:05 +02:00
parent 8974ab535e
commit 07bafed37e
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -412,7 +412,7 @@ $(function(){
newImg.attr({id: previewId, filter: 'url(#grayscale_filter)', 'data-serveurl': url});
snap.select("#userContent").append(newImg);
newImg.transformable();
newImg.ftDisableRotate();
//newImg.ftDisableRotate();
newImg.ftRegisterCallback(self.svgTransformUpdate);
file.id = id;
file.previewId = previewId;
@ -630,13 +630,14 @@ $(function(){
var wPT = wMM * 90 / 25.4;
var hPT = hMM * 90 / 25.4;
var compSvg = Snap(wPT, hPT);
compSvg.attr('id', 'tmpSvg');
compSvg.attr('id', 'compSvg');
var userContent = snap.select("#userContent").clone();
compSvg.append(userContent);
self.renderInfill(compSvg, wMM, hMM, 10, function(){
callback( self._wrapInSvgAndScale(compSvg));
$('#compSvg').remove();
});
};
@ -797,15 +798,17 @@ $(function(){
}
var cb = function(result) {
svg.selectAll('image').remove();
var waBB = snap.select('#coordGrid').getBBox();
var fillImage = snap.image(result, 0, 0, waBB.w, waBB.h);
fillImage.attr('id', 'fillRendering');
svg.append(fillImage);
if(fillings.length > 0){
svg.selectAll('image').remove();
var waBB = snap.select('#coordGrid').getBBox();
var fillImage = snap.image(result, 0, 0, waBB.w, waBB.h);
fillImage.attr('id', 'fillRendering');
svg.append(fillImage);
}
if (typeof callback === 'function') {
callback(svg);
}
self._cleanup_render_mess();
};
tmpSvg.renderPNG(wMM, hMM, pxPerMM, cb);