Merge remote-tracking branch 'kennethjiang/master'

eyal0 · May 2, 2017 · cc5bdaa · cc5bdaa
2 parents 592c406 + 2b3d62f
commit cc5bdaa
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 17 deletions.
diff --git a/.gitmodules b/.gitmodules
diff --git a/lib/3tk b/lib/3tk
diff --git a/octoprint_slicer/static/js/octoprint_slicer.min.js b/octoprint_slicer/static/js/octoprint_slicer.min.js
@@ -33044,7 +33044,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));
 
@@ -34746,9 +34746,9 @@ function isDev() {
     return window.location.hostname == "localhost";
 }
 
-if (!isDev()) {
+if (!isDev() && typeof Raven !== 'undefined') {
     Raven.config('https://[email protected]/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/octoprint_slicer/templates/slicer_tab.jinja2 b/octoprint_slicer/templates/slicer_tab.jinja2
@@ -212,17 +212,40 @@ mixpanel.init("ade6b64c4db77172707571c1f9cfcebe");</script><!-- end Mixpanel -->
                               <input type="checkbox" data-bind="checked: $data['profile.retraction_enable']"></input>
                           </div>
                       </div>
-                      <div title="Filament retraction speed" class="input-append" data-bind="visible: !_.isUndefined($data['profile.retraction_enable']())">
-                          <label class="control-label">Retraction speed</label>
+                      <div data-bind="visible: $data['profile.retraction_enable']">
+                          <div title="Filament retraction speed" class="input-append" data-bind="visible: !_.isUndefined($data['profile.retraction_enable']())">
+                              <label class="control-label">Retraction speed</label>
+                              <div class="controls">
+                                  <input data-bind="numericValue: $data['profile.retraction_speed']" type="number" min="0" max="300" step="1"></input>
+                                  <span class="add-on">mm/s</span>
+                              </div>
+                          </div>
+                          <div title="Filament retraction distance" class="input-append" data-bind="visible: !_.isUndefined($data['profile.retraction_enable']())">
+                              <label class="control-label">Retraction distance</label>
+                              <div class="controls">
+                                  <input data-bind="numericValue: $data['profile.retraction_amount']" type="number" min="0" max="30" step="0.1"></input>
+                                  <span class="add-on">mm</span>
+                              </div>
+                          </div>
+                      </div>
+                      <div title="First layer temperature" class="input-append" data-bind="visible: !_.isUndefined($data['profile.first_layer_temperature']())">
+                          <label class="control-label">1st layer temperature</label>
                           <div class="controls">
-                              <input data-bind="numericValue: $data['profile.retraction_speed'], enable: $data['profile.retraction_enable']" type="number" min="0" max="300" step="1"></input>
-                              <span class="add-on">mm/s</span>
+                              <input data-bind="numericValue: $data['profile.first_layer_temperature']" type="number" min="0" max="315" step="1"></input>
+                              <span class="add-on">°C</span>
+                          </div>
+                      </div>
+                      <div title="First layer bed temperature" class="input-append" data-bind="visible: !_.isUndefined($data['profile.first_layer_bed_temperature']())">
+                          <label class="control-label">1st layer bed temperature</label>
+                          <div class="controls">
+                              <input data-bind="numericValue: $data['profile.first_layer_bed_temperature']" type="number" min="0" max="110" step="1"></input>
+                              <span class="add-on">°C</span>
                           </div>
                       </div>
-                      <div title="Filament retraction distance" class="input-append" data-bind="visible: !_.isUndefined($data['profile.retraction_enable']())">
-                          <label class="control-label">Retraction distance</label>
+                      <div title="Brim width" class="input-append" data-bind="visible: !_.isUndefined($data['profile.brim_width']())">
+                          <label class="control-label">Brim width</label>
                           <div class="controls">
-                              <input data-bind="numericValue: $data['profile.retraction_amount'], enable: $data['profile.retraction_enable']" type="number" min="0" max="30" step="0.1"></input>
+                              <input data-bind="numericValue: $data['profile.brim_width']" type="number" min="0" max="30" step="0.1"></input>
                               <span class="add-on">mm</span>
                           </div>
                       </div>

diff --git 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.20170430"
+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/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",

diff --git a/src/slicer.js b/src/slicer.js
@@ -22,9 +22,9 @@ function isDev() {
     return window.location.hostname == "localhost";
 }
 
-if ( ! isDev() ) {
+if ( ! isDev() && typeof(Raven) !== 'undefined' ) {
     Raven.config('https://[email protected]/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",