From 6fd68e0df0f25001bcf271d442ae5a201a9e41ff Mon Sep 17 00:00:00 2001
From: make-ing <bckr.florian@gmail.com>
Date: Wed, 23 Sep 2015 13:26:30 +0200
Subject: [PATCH] changed detail information image display from percent to
 horizontal and vertical mm

---
 .../plugins/svgtogcode/static/js/working_area.js          | 6 ++++--
 src/octoprint/templates/mrbeam_index.jinja2               | 8 +++++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/octoprint/plugins/svgtogcode/static/js/working_area.js b/src/octoprint/plugins/svgtogcode/static/js/working_area.js
index 671f52dd..14a35df1 100644
--- a/src/octoprint/plugins/svgtogcode/static/js/working_area.js
+++ b/src/octoprint/plugins/svgtogcode/static/js/working_area.js
@@ -317,11 +317,13 @@ $(function(){
 			var endIdx = transform.local.indexOf(',', startIdx);
 			var rot = parseFloat(transform.local.substring(startIdx, endIdx)) || 0;
 //			if(!rot) rot = 0; // avoid NaN
-			var scale = (Math.pow(transform.localMatrix.a,2) + Math.pow(transform.localMatrix.b,2)) * 100;
+			var horizontal = self.px2mm(bbox.x2 - bbox.x);
+			var vertical = self.px2mm(bbox.y2 - bbox.y);
 			var id = svg.attr('id');
 			var label_id = id.substr(0, id.indexOf('-'));
 			$('#'+label_id+' .translation').text(tx.toFixed(1) + ',' + ty.toFixed(1));
-			$('#'+label_id+' .scale').text(scale.toFixed(1) + '%');
+			$('#'+label_id+' .horizontal').text(horizontal.toFixed() + 'mm');
+			$('#'+label_id+' .vertical').text(vertical.toFixed() + 'mm');
 			$('#'+label_id+' .rotation').text(rot.toFixed(1) + '°');
 		};
 
diff --git a/src/octoprint/templates/mrbeam_index.jinja2 b/src/octoprint/templates/mrbeam_index.jinja2
index e070d684..657ce2aa 100644
--- a/src/octoprint/templates/mrbeam_index.jinja2
+++ b/src/octoprint/templates/mrbeam_index.jinja2
@@ -127,7 +127,7 @@
 										</div>
 									</div>
 
-									<div class="accordion-body in" id="connection_wrapper" 
+									<div class="accordion-body in" id="connection_wrapper"
 										 data-bind="visible: !isFlashing() && isErrorOrClosed() && loginState.isUser()">
 										<div class="accordion-inner">
 											<label for="connection_ports" data-bind="css: {disabled: !isErrorOrClosed()}, enable: isErrorOrClosed() && loginState.isUser()">{{ _('Serial Port') }}</label>
@@ -216,8 +216,10 @@
 														<div class="local_transformation muted">
 															<i class="icon-move" title="{{ _('translation') }}"></i>
 															<span class="translation" >0,0</span>
-															<i class="icon-resize-full" title="{{ _('scale') }}"></i>
-															<span class="scale" >100%</span>
+															<i class="icon-resize-horizontal" title="{{ _('horizontal') }}"></i>
+															<span class="horizontal" >0mm</span>
+															<i class="icon-resize-vertical" title="{{ _('vertical') }}"></i>
+															<span class="vertical" >0mm</span>
 															<i class="icon-repeat" title="{{ _('rotation') }}"></i>
 															<span class="rotation" >0°</span>