From c75bd69eb4d146387c208b341b78339ad28af28e Mon Sep 17 00:00:00 2001 From: make-ing Date: Thu, 24 Sep 2015 10:30:40 +0200 Subject: [PATCH 1/3] added horizontal and vertical ui label --- src/octoprint/templates/mrbeam_index.jinja2 | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/octoprint/templates/mrbeam_index.jinja2 b/src/octoprint/templates/mrbeam_index.jinja2 index 514f78ad..0e9d5384 100644 --- a/src/octoprint/templates/mrbeam_index.jinja2 +++ b/src/octoprint/templates/mrbeam_index.jinja2 @@ -242,11 +242,12 @@
0,0 - - 100% - - +
+ + 0mm + + 0mm
Design exceeds the working area. From 2f387c55cc6957302d2f191d86b4c6a034ad8dad Mon Sep 17 00:00:00 2001 From: make-ing Date: Thu, 24 Sep 2015 10:56:07 +0200 Subject: [PATCH 2/3] fixed wrong class bug --- src/octoprint/templates/mrbeam_index.jinja2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/octoprint/templates/mrbeam_index.jinja2 b/src/octoprint/templates/mrbeam_index.jinja2 index 0e9d5384..5d454b5b 100644 --- a/src/octoprint/templates/mrbeam_index.jinja2 +++ b/src/octoprint/templates/mrbeam_index.jinja2 @@ -245,9 +245,9 @@
- 0mm + 0mm - 0mm + 0mm
Design exceeds the working area. From 156ac00f52cf6491fe47a36f15bce5206cb321e6 Mon Sep 17 00:00:00 2001 From: make-ing Date: Thu, 24 Sep 2015 11:31:57 +0200 Subject: [PATCH 3/3] img id bug fix --- src/octoprint/plugins/svgtogcode/static/js/working_area.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/octoprint/plugins/svgtogcode/static/js/working_area.js b/src/octoprint/plugins/svgtogcode/static/js/working_area.js index df3b1351..b4888f54 100644 --- a/src/octoprint/plugins/svgtogcode/static/js/working_area.js +++ b/src/octoprint/plugins/svgtogcode/static/js/working_area.js @@ -414,7 +414,7 @@ $(function(){ newImg.transformable(); newImg.ftDisableRotate(); newImg.ftRegisterCallback(self.svgTransformUpdate); - file.id = previewId; + file.id = id; file.previewId = previewId; file.url = url; file.subtype = "bitmap";