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

added viewbox to change to mm in svg and adjusted coordgrid

Browse source
This commit is contained in:
make-ing 2016-02-11 22:20:37 +01:00
parent 8c218b21f8
commit 753cb7845d
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -64,7 +64,8 @@ $(function(){
// matrix scales svg units to display_pixels
self.scaleMatrix = ko.computed(function(){
var m = new Snap.Matrix();
var factor = 25.4/self.svgDPI() * 1/self.px2mm_factor();
//var factor = 25.4/self.svgDPI() * 1/self.px2mm_factor();
var factor = 1
if(!isNaN(factor)){
m.scale(factor);
return m;
@ -573,18 +574,18 @@ $(function(){
self.draw_coord_grid = function(){
var grid = snap.select('#coordGrid');
if(grid.attr('fill') === 'none'){
var w = self.mm2svgUnits(self.workingAreaWidthMM());
var h = self.mm2svgUnits(self.workingAreaHeightMM());
var w = self.workingAreaWidthMM();
var h = self.workingAreaHeightMM();
var max_lines = 20;
var linedistMM = Math.floor(Math.max(self.workingAreaWidthMM(), self.workingAreaHeightMM()) / (max_lines * 10))*10;
var yPatternOffset = self.mm2svgUnits(self.workingAreaHeightMM() % linedistMM);
var linedist = self.mm2svgUnits(linedistMM);
var yPatternOffset = self.workingAreaHeightMM() % linedistMM;
var linedist = linedistMM;
var marker = snap.circle(linedist/2, linedist/2, 1).attr({
var marker = snap.circle(linedist/2, linedist/2, self.px2mm(1)).attr({
fill: "#000000",
stroke: "none",
strokeWidth: 1
strokeWidth: self.px2mm(1)
});
// dot pattern