From 6dd2dcee161b49309309fe2db8f4cd590d8908dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Mon, 19 Jan 2015 16:34:40 +0100 Subject: [PATCH] GCODE viewer: Even better version of initial bed centering, backported from c858c8f75b3ba7192864272935a7525e80d6bc78 See #719 --- src/octoprint/static/gcodeviewer/js/renderer.js | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/octoprint/static/gcodeviewer/js/renderer.js b/src/octoprint/static/gcodeviewer/js/renderer.js index 73a89139..d864ca39 100644 --- a/src/octoprint/static/gcodeviewer/js/renderer.js +++ b/src/octoprint/static/gcodeviewer/js/renderer.js @@ -513,7 +513,16 @@ GCODE.renderer = (function(){ bedWidth = bedHeight = renderOptions["bed"]["r"] * 2; } zoomFactor = Math.min((canvas.width - 10) / bedWidth, (canvas.height - 10) / bedHeight); - ctx.translate((canvas.width - bedWidth * zoomFactor) / 2, (canvas.height + bedHeight * zoomFactor) / 2); + + var translationX, translationY; + if (renderOptions["bed"]["circular"]) { + translationX = canvas.width / 2; + translationY = canvas.height / 2; + } else { + translationX = (canvas.width - bedWidth * zoomFactor) / 2; + translationY = bedHeight * zoomFactor + (canvas.height - bedHeight * zoomFactor) / 2; + } + ctx.translate(translationX, translationY); offsetModelX = 0; offsetModelY = 0;