From 753cb7845d34abfeaf0b338951bcd7f8df737e89 Mon Sep 17 00:00:00 2001 From: make-ing Date: Thu, 11 Feb 2016 22:20:37 +0100 Subject: [PATCH] added viewbox to change to mm in svg and adjusted coordgrid --- .../plugins/svgtogcode/static/js/working_area.js | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/octoprint/plugins/svgtogcode/static/js/working_area.js b/src/octoprint/plugins/svgtogcode/static/js/working_area.js index 24f4d498..678ef9df 100644 --- a/src/octoprint/plugins/svgtogcode/static/js/working_area.js +++ b/src/octoprint/plugins/svgtogcode/static/js/working_area.js @@ -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