From 7226984ede5fc3add1aae911ec26a07347ef3e8a Mon Sep 17 00:00:00 2001 From: Kenneth Jiang Date: Sun, 30 Apr 2017 08:33:21 -0700 Subject: [PATCH 1/6] Raven should not be called when it fails to be loaded --- octoprint_slicer/static/js/octoprint_slicer.min.js | 2 +- src/slicer.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/octoprint_slicer/static/js/octoprint_slicer.min.js b/octoprint_slicer/static/js/octoprint_slicer.min.js index aaa3e9c..1ee6b25 100644 --- a/octoprint_slicer/static/js/octoprint_slicer.min.js +++ b/octoprint_slicer/static/js/octoprint_slicer.min.js @@ -31126,7 +31126,7 @@ function isDev() { return window.location.hostname == "localhost"; } -if (!isDev()) { +if (!isDev() && typeof Raven !== 'undefined') { Raven.config('https://85bd9314656d40da9249aec5a32a2b52@sentry.io/141297', { release: '1.2.5', 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."] diff --git a/src/slicer.js b/src/slicer.js index e1c51b1..c737de6 100644 --- a/src/slicer.js +++ b/src/slicer.js @@ -20,7 +20,7 @@ function isDev() { return window.location.hostname == "localhost"; } -if ( ! isDev() ) { +if ( ! isDev() && typeof(Raven) !== 'undefined' ) { Raven.config('https://85bd9314656d40da9249aec5a32a2b52@sentry.io/141297', { release: '1.2.5', ignoreErrors: [ From 5c1360e527c587997d8182b76e7893cd4d45b0ab Mon Sep 17 00:00:00 2001 From: Kenneth Jiang Date: Sun, 30 Apr 2017 09:28:55 -0700 Subject: [PATCH 2/6] Closes #98. More Sli3r settings --- .../static/js/octoprint_slicer.min.js | 2 +- octoprint_slicer/templates/slicer_tab.jinja2 | 21 +++++++++++++++++++ src/profile_overrides.js | 3 +++ 3 files changed, 25 insertions(+), 1 deletion(-) diff --git a/octoprint_slicer/static/js/octoprint_slicer.min.js b/octoprint_slicer/static/js/octoprint_slicer.min.js index 1ee6b25..feac30f 100644 --- a/octoprint_slicer/static/js/octoprint_slicer.min.js +++ b/octoprint_slicer/static/js/octoprint_slicer.min.js @@ -30724,7 +30724,7 @@ function OverridesViewModel(parameters, array_keys, enum_keys, item_keys, boolea "support": ko.observableArray(["none", "buildplate", "everywhere"]), "platform_adhesion": ko.observableArray(["none", "brim", "raft"]) }, - ITEM_KEYS = ["layer_height", "temperature", "bed_temperature", "print_bed_temperature", "fill_density", "wall_thickness", "print_speed", "solid_layer_thickness", "travel_speed", "outer_shell_speed", "inner_shell_speed", "infill_speed", "bottom_layer_speed", "filament_flow", "retraction_speed", "retraction_amount", "extrusion_multiplier", "fan_full_height", "fan_speed", "fan_speed_max"], + ITEM_KEYS = ["layer_height", "temperature", "bed_temperature", "print_bed_temperature", "fill_density", "wall_thickness", "print_speed", "solid_layer_thickness", "travel_speed", "outer_shell_speed", "inner_shell_speed", "infill_speed", "bottom_layer_speed", "filament_flow", "retraction_speed", "retraction_amount", "extrusion_multiplier", "fan_full_height", "fan_speed", "fan_speed_max", "first_layer_temperature", "first_layer_bed_temperature", "brim_width"], BOOLEAN_KEYS = ["support_material", "overhangs", "retraction_enable", "fan_enabled", "cooling", "fan_always_on"]; var ALL_KEYS = BOOLEAN_KEYS.concat(ITEM_KEYS).concat(ARRAY_KEYS).concat(Object.keys(ENUM_KEYS)); diff --git a/octoprint_slicer/templates/slicer_tab.jinja2 b/octoprint_slicer/templates/slicer_tab.jinja2 index 64b5041..04ed05a 100644 --- a/octoprint_slicer/templates/slicer_tab.jinja2 +++ b/octoprint_slicer/templates/slicer_tab.jinja2 @@ -226,6 +226,27 @@ mixpanel.init("ade6b64c4db77172707571c1f9cfcebe"); mm +
+ +
+ + °C +
+
+
+ +
+ + °C +
+
+
+ +
+ + mm +
+
diff --git a/src/profile_overrides.js b/src/profile_overrides.js index d6afe3a..88aea97 100644 --- a/src/profile_overrides.js +++ b/src/profile_overrides.js @@ -58,6 +58,9 @@ export function OverridesViewModel(parameters, array_keys, enum_keys, item_keys, "fan_full_height", "fan_speed", "fan_speed_max", + "first_layer_temperature", + "first_layer_bed_temperature", + "brim_width", ], BOOLEAN_KEYS = [ "support_material", From 7f90d87dacadc8ad4c23e841b58dd665bf2019eb Mon Sep 17 00:00:00 2001 From: Kenneth Jiang Date: Sun, 30 Apr 2017 09:31:24 -0700 Subject: [PATCH 3/6] bump version --- octoprint_slicer/static/js/octoprint_slicer.min.js | 2 +- setup.py | 2 +- src/slicer.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/octoprint_slicer/static/js/octoprint_slicer.min.js b/octoprint_slicer/static/js/octoprint_slicer.min.js index feac30f..e68d614 100644 --- a/octoprint_slicer/static/js/octoprint_slicer.min.js +++ b/octoprint_slicer/static/js/octoprint_slicer.min.js @@ -31128,7 +31128,7 @@ function isDev() { if (!isDev() && typeof Raven !== 'undefined') { Raven.config('https://85bd9314656d40da9249aec5a32a2b52@sentry.io/141297', { - release: '1.2.5', + release: '1.2.6', 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(); } diff --git a/setup.py b/setup.py index 63fb2d4..bfdf902 100644 --- a/setup.py +++ b/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.5" +plugin_version = "1.2.6" # The plugin's description. Can be overwritten within OctoPrint's internal data via __plugin_description__ in the plugin # module diff --git a/src/slicer.js b/src/slicer.js index c737de6..0b955e0 100644 --- a/src/slicer.js +++ b/src/slicer.js @@ -22,7 +22,7 @@ function isDev() { if ( ! isDev() && typeof(Raven) !== 'undefined' ) { Raven.config('https://85bd9314656d40da9249aec5a32a2b52@sentry.io/141297', { - release: '1.2.5', + release: '1.2.6', ignoreErrors: [ "Failed to execute 'arc' on 'CanvasRenderingContext2D': The radius provided", "Cannot read property 'highlightFill' of undefined", From 557ec26be1ac8322c526f58c8b9cc4a2dbc84c60 Mon Sep 17 00:00:00 2001 From: Kenneth Jiang Date: Sun, 30 Apr 2017 12:23:46 -0700 Subject: [PATCH 4/6] remove lib/3tk as submodule --- .gitmodules | 3 --- lib/3tk | 1 - 2 files changed, 4 deletions(-) delete mode 160000 lib/3tk diff --git a/.gitmodules b/.gitmodules index f4c947a..e69de29 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +0,0 @@ -[submodule "lib/3tk"] - path = lib/3tk - url = git@github.com:kennethjiang/3tk.git diff --git a/lib/3tk b/lib/3tk deleted file mode 160000 index 3422207..0000000 --- a/lib/3tk +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 34222074525eb0c7a1dbbc56ae3a9268da047bc0 From fe0a39a0715271718287213b3be8ae4ab75a2be1 Mon Sep 17 00:00:00 2001 From: Kenneth Jiang Date: Sun, 30 Apr 2017 12:24:09 -0700 Subject: [PATCH 5/6] remove gitmodules file as there is no more submodules --- .gitmodules | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 .gitmodules diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index e69de29..0000000 From 2b3d62f82f3492fa9c01d53606df3714020960c2 Mon Sep 17 00:00:00 2001 From: Kenneth Jiang Date: Mon, 1 May 2017 06:19:54 -0700 Subject: [PATCH 6/6] Hide retraction settings when it is disabled. Keep it consistent with fan settings --- octoprint_slicer/templates/slicer_tab.jinja2 | 24 +++++++++++--------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/octoprint_slicer/templates/slicer_tab.jinja2 b/octoprint_slicer/templates/slicer_tab.jinja2 index 04ed05a..f6ad4c1 100644 --- a/octoprint_slicer/templates/slicer_tab.jinja2 +++ b/octoprint_slicer/templates/slicer_tab.jinja2 @@ -212,18 +212,20 @@ mixpanel.init("ade6b64c4db77172707571c1f9cfcebe");
-
- -
- - mm/s +
+
+ +
+ + mm/s +
-
-
- -
- - mm +
+ +
+ + mm +