Merge remote-tracking branch 'kennethjiang/master'

Box3FromObject debugging code removed, too.

octoprint_slicer/static/js/octoprint_slicer.min.js

@@ -34666,7 +34666,7 @@ function isDev() {
 
 if (!isDev() && typeof Raven !== 'undefined') {
     Raven.config('https://[email protected]/141297', {
-        release: '1.2.6',
+        release: '1.2.7',
         ignoreErrors: ["Failed to execute 'arc' on 'CanvasRenderingContext2D': The radius provided", "Cannot read property 'highlightFill' of undefined", "Argument 1 of SVGMatrix.translate is not a finite floating-point value", /_jp.*is not a function/, "chrome is not defined", "You cannot apply bindings multiple times to the same element.", "SVG_MATRIX_NOT_INVERTABLE", "The index is not in the allowed range."]
     }).install();
 }
@@ -35166,17 +35166,6 @@ function SlicerViewModel(parameters) {
                 groupBox3.expandByPoint(model.userData.box3FromObject().min);
                 groupBox3.expandByPoint(model.userData.box3FromObject().max);
             });
-            var DEBUGGING = false;
-            if (DEBUGGING) {
-                var oldBox3 = new Box3().setFromObject(group);
-                var maxDiff = groupBox3.max.clone().sub(oldBox3.max);
-                var minDiff = groupBox3.min.clone().sub(oldBox3.min);
-                var EPSILON = 0.0001; // Set this to 0 to see even microscopic differences.
-                if (maxDiff.x > EPSILON || maxDiff.y > EPSILON || maxDiff.z > EPSILON || minDiff.x > EPSILON || minDiff.y > EPSILON || minDiff.z > EPSILON) {
-                    console.log("new - old: " + JSON.stringify(groupBox3.max.clone().sub(oldBox3.max)) + "," + JSON.stringify(groupBox3.min.clone().sub(oldBox3.min)));
-                    console.log("new, old: " + JSON.stringify(groupBox3) + "," + JSON.stringify(oldBox3));
-                }
-            }
 
             sliceRequestData = self.sliceRequestData(self.slicingViewModel, groupBox3.getCenter());
 

setup.py

@@ -14,7 +14,7 @@
 plugin_name = "OctoPrint-Slicer"
 
 # The plugin's version. Can be overwritten within OctoPrint's internal data via __plugin_version__ in the plugin module
-plugin_version = "1.2.6.20170503"
+plugin_version = "1.2.7"
 
 # The plugin's description. Can be overwritten within OctoPrint's internal data via __plugin_description__ in the plugin
 # module

src/slicer.js

@@ -23,7 +23,7 @@ function isDev() {
 
 if ( ! isDev() && typeof(Raven) !== 'undefined' ) {
     Raven.config('https://[email protected]/141297', {
-        release: '1.2.6',
+        release: '1.2.7',
         ignoreErrors: [
             "Failed to execute 'arc' on 'CanvasRenderingContext2D': The radius provided",
             "Cannot read property 'highlightFill' of undefined",
@@ -527,17 +527,6 @@ function SlicerViewModel(parameters) {
                 groupBox3.expandByPoint(model.userData.box3FromObject().min);
                 groupBox3.expandByPoint(model.userData.box3FromObject().max);
             });
-            let DEBUGGING = false;
-            if (DEBUGGING) {
-                var oldBox3 = new THREE.Box3().setFromObject(group);
-                var maxDiff = groupBox3.max.clone().sub(oldBox3.max);
-                var minDiff = groupBox3.min.clone().sub(oldBox3.min);
-                var EPSILON = 0.0001; // Set this to 0 to see even microscopic differences.
-                if (maxDiff.x > EPSILON || maxDiff.y > EPSILON || maxDiff.z > EPSILON || minDiff.x > EPSILON || minDiff.y > EPSILON || minDiff.z > EPSILON) {
-                    console.log("new - old: " + JSON.stringify(groupBox3.max.clone().sub(oldBox3.max)) + "," + JSON.stringify(groupBox3.min.clone().sub(oldBox3.min)));
-                    console.log("new, old: " + JSON.stringify(groupBox3) + "," + JSON.stringify(oldBox3));
-                }
-            }
 
             sliceRequestData = self.sliceRequestData(self.slicingViewModel, groupBox3.getCenter());