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

changed placeIMG to only use mm instead of px.

Browse source
This commit is contained in:
make-ing 2016-03-16 14:53:22 +01:00
parent 5a62fc35c1
commit 9099bdb303
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -401,12 +401,12 @@ $(function(){
var wpx = this.width;
var hpx = this.height;
var dimPT = self.getUsefulDimensions(wpx, hpx);
var wPT = dimPT[0];
var hPT = dimPT[1];
var dimMM = self.getUsefulDimensions(wpx, hpx);
var wMM = dimMM[0];
var hMM = dimMM[1];
var y = self.mm2svgUnits(self.workingAreaHeightMM()) - hPT;
var newImg = snap.image(url, 0, y, wPT, hPT);
var y = self.workingAreaHeightMM() - hMM;
var newImg = snap.image(url, 0, y, wMM, hMM);
var id = self.getEntryId(file);
var previewId = self.generateUniqueId(id); // appends # if multiple times the same design is placed.
newImg.attr({id: previewId, filter: 'url(#grayscale_filter)', 'data-serveurl': url});
@ -438,9 +438,7 @@ $(function(){
} else {
destHeightMM = destWidthMM / aspectRatio;
}
var destWidthPT = self.mm2svgUnits(destWidthMM);
var destHeightPT = self.mm2svgUnits(destHeightMM);
return [destWidthPT, destHeightPT];
return [destWidthMM, destHeightMM];
};
self.getDocumentDimensionsInPt = function(doc_width, doc_height, doc_viewbox){