diff --git a/src/octoprint/plugins/svgtogcode/static/css/mrbeam.css b/src/octoprint/plugins/svgtogcode/static/css/mrbeam.css index ed02f3af..c244d17c 100644 --- a/src/octoprint/plugins/svgtogcode/static/css/mrbeam.css +++ b/src/octoprint/plugins/svgtogcode/static/css/mrbeam.css @@ -1634,6 +1634,11 @@ input.search-query, #wa_filelist .file_list_entry .detail_information { clear: both; } +#wa_filelist .file_list_entry .local_transformation span { + margin-left:0em; + margin-right:.8em; +} + .misfit_warning { display: none; } diff --git a/src/octoprint/plugins/svgtogcode/static/js/working_area.js b/src/octoprint/plugins/svgtogcode/static/js/working_area.js index e160ca53..77d6bb88 100644 --- a/src/octoprint/plugins/svgtogcode/static/js/working_area.js +++ b/src/octoprint/plugins/svgtogcode/static/js/working_area.js @@ -301,8 +301,9 @@ $(function(){ }; self.svgTransformUpdate = function(svg){ - var tx = self.px2mm(svg.data('tx')).toFixed(0); - var ty = self.px2mm(svg.data('ty')).toFixed(0); + var globalScale = self.scaleMatrix().a; + var tx = self.px2mm(svg.data('tx')*globalScale).toFixed(1); + var ty = self.px2mm(svg.data('ty')*globalScale).toFixed(1); var rot = svg.data('angle').toFixed(1); var scale = Math.round(svg.data('scale')*100); var id = svg.attr('id'); diff --git a/src/octoprint/plugins/svgtogcode/templates/override_index.jinja2 b/src/octoprint/plugins/svgtogcode/templates/override_index.jinja2 index f3006238..0c649b40 100644 --- a/src/octoprint/plugins/svgtogcode/templates/override_index.jinja2 +++ b/src/octoprint/plugins/svgtogcode/templates/override_index.jinja2 @@ -199,9 +199,12 @@