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

chrome vs. firefox bugfix... Maybe needs further check to see if it can be simplyfied. Maybe use other values etc...

Browse source
This commit is contained in:
make-ing 2016-10-04 13:03:35 +02:00
parent eb5e7408a9
commit 39c8f7886a
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -133,9 +133,15 @@ $(function(){
}; };
self.getXYCoord = function(evt){ self.getXYCoord = function(evt){
var scale = evt.target.parentElement.transform.baseVal[0].matrix.a; if(/firefox/.test(navigator.userAgent.toLowerCase())) {
var x = self.px2mm(evt.offsetX) * scale; var scale = evt.target.parentElement.transform.baseVal[0].matrix.a;
var y = self.px2mm(parseFloat(evt.target.attributes.height.value) - evt.offsetY) * scale; var x = self.px2mm(evt.offsetX) * scale;
var y = self.px2mm(parseFloat(evt.target.attributes.height.value) - evt.offsetY) * scale;
} else
{
var x = self.px2mm(evt.offsetX);
var y = self.px2mm(parseFloat(evt.target.farthestViewportElement.clientHeight) - evt.offsetY);
}
x = Math.min(x, self.workingAreaWidthMM()); x = Math.min(x, self.workingAreaWidthMM());
y = Math.min(y, self.workingAreaHeightMM()); y = Math.min(y, self.workingAreaHeightMM());
return {x:x, y:y}; return {x:x, y:y};