Skip to content

Commit

Permalink
Make "Slicing done" notification green
Browse files Browse the repository at this point in the history
Implements #558
  • Loading branch information
foosel committed Oct 22, 2014
1 parent 7150f5b commit 9a7733c
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 8 deletions.
15 changes: 9 additions & 6 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,15 @@
* Better error reporting for timelapse rendering and system commands
* Custom control can now be defined so that they show a Confirm dialog with configurable text before executing
([#532](https://github.com/foosel/OctoPrint/issues/532) and [#590](https://github.com/foosel/OctoPrint/pull/590))
* Slicing has been greatly improved and now allows for a definition of slicing profiles to use for slicing plus overrides
which can be defined per slicing job. Slicers themselves are integrated into the system via ``SlicingPlugins``. Please
note that the [Cura integration](https://github.com/daid/Cura) has changed in such a way that OctoPrint now calls the
[CuraEngine](https://github.com/Ultimaker/CuraEngine) directly instead of depending on the full Cura installation. See
[the wiki](https://github.com/foosel/OctoPrint/wiki/Plugin:-Cura) for instructions on how to change your setup to
accommodate the new integration.
* Slicing has been greatly improved:
* It now allows for a definition of slicing profiles to use for slicing plus overrides which can be defined per slicing
job (defining overrides is not yet part of the UI but it's on the roadmap).
* Slicers themselves are integrated into the system via ``SlicingPlugins``.
* The [Cura integration](https://github.com/daid/Cura) has changed in such a way that OctoPrint now calls the
[CuraEngine](https://github.com/Ultimaker/CuraEngine) directly instead of depending on the full Cura installation. See
[the wiki](https://github.com/foosel/OctoPrint/wiki/Plugin:-Cura) for instructions on how to change your setup to
accommodate the new integration.
* The "Slicing done" notification is now colored green ([#558](https://github.com/foosel/OctoPrint/issues/558)).
* File management now supports STL files as first class citizens (including UI adjustments to allow management of
uploaded STL files including removal and reslicing) and also allows folders (not yet supported by UI)

Expand Down
4 changes: 2 additions & 2 deletions src/octoprint/static/js/app/dataupdater.js
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ function DataUpdater(allViewModels) {
var payload = data["payload"];
var html = "";

console.log("Got event " + type + " with payload: " + JSON.stringify(payload))
console.log("Got event " + type + " with payload: " + JSON.stringify(payload));

if (type == "UpdatedFiles") {
_.each(self.allViewModels, function(viewModel) {
Expand Down Expand Up @@ -186,7 +186,7 @@ function DataUpdater(allViewModels) {
gcodeUploadProgress.removeClass("progress-striped").removeClass("active");
gcodeUploadProgressBar.css("width", "0%");
gcodeUploadProgressBar.text("");
new PNotify({title: gettext("Slicing done"), text: _.sprintf(gettext("Sliced %(stl)s to %(gcode)s, took %(time).2f seconds"), payload)});
new PNotify({title: gettext("Slicing done"), text: _.sprintf(gettext("Sliced %(stl)s to %(gcode)s, took %(time).2f seconds"), payload), type: "success"});

_.each(self.allViewModels, function (viewModel) {
if (viewModel.hasOwnProperty("onSlicingDone")) {
Expand Down

0 comments on commit 9a7733c

Please sign in to comment.