Merge remote-tracking branch 'refs/remotes/origin/gh-pages' into dev

lautr3k · 69b3175beb3d885ccc74e52f1c987cbe1b5dd196 · lautr3k committed Apr 12, 2016 · Apr 12, 2016 · 69b3175
2 parents 6917848 + ee50e51
commit 69b3175beb3d885ccc74e52f1c987cbe1b5dd196
Unified Split

Showing with 24 additions and 4 deletions.

+1 −1 README.md

+23 −3 js/main.js
diff --git a/README.md b/README.md
@@ -20,5 +20,5 @@
 # To do soon
 - Network communication (SmoothieBoard).
 - Serial communication (Chrome only).
-- Export slices as DXF (zipped folder).
+- Export slices as SVG, DXF (zipped folder).
 - Refactoring.
diff --git a/js/main.js b/js/main.js
@@ -709,14 +709,21 @@ function updateTransformAction() {
 }
 
 function updateTransformValues() {
-    var input = {
+    var current = transformations[transformAction];
+    var uniform = $('#transform input[type=radio]:checked').val() == 'yes';
+    var input   = {
         x: parseFloat($transformX.val()),
         y: parseFloat($transformY.val()),
         z: parseFloat($transformZ.val())
     };
 
-    var current = transformations[transformAction];
-    var uniform = $('#transform input[type=radio]:checked').val() == 'yes';
+    input.x = isNaN(input.x) ? current.x : input.x;
+    input.y = isNaN(input.y) ? current.y : input.y;
+    input.z = isNaN(input.z) ? current.z : input.z;
+
+    $transformX.val(input.x);
+    $transformY.val(input.y);
+    $transformZ.val(input.z);
 
     if (transformAction == 'scale') {
         if (uniform) {
@@ -838,10 +845,23 @@ function loadGeometry(geometry) {
     }
 }
 
+// Haaaaaaaaaaaaaaaaaa!!!!
+function ultraMegaDirtyFix() {
+    $transformBody.find('#transform-x').val(1.1);
+    $transformBody.find('#transform-y').val(1.1);
+    $transformBody.find('#transform-z').val(1.1);
+    updateTransformValues();
+    $transformBody.find('#transform-x').val(1);
+    $transformBody.find('#transform-y').val(1);
+    $transformBody.find('#transform-z').val(1);
+    updateTransformValues();
+}
+
 // On Geometry loaded
 loader.onGeometry = function(geometry) {
     resetTransformValues();
     loadGeometry(geometry);
+    ultraMegaDirtyFix();
 };
 
 // On loading error