From 51b0df5c1fba5ad19f77b2f40f05d04cc5e03e61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Mon, 9 Sep 2013 16:55:06 +0200 Subject: [PATCH] Also measure time needed for slicing and include it in event payload, display that in the UI too --- octoprint/gcodefiles.py | 4 +++- octoprint/static/js/app/dataupdater.js | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/octoprint/gcodefiles.py b/octoprint/gcodefiles.py index c8223e82..2ac7292a 100644 --- a/octoprint/gcodefiles.py +++ b/octoprint/gcodefiles.py @@ -166,8 +166,10 @@ class GcodeManager: gcodePath = util.genGcodeFileName(absolutePath) config = self._settings.get(["cura", "config"]) + slicingStart = time.time() def stlProcessed(stlPath, gcodePath): - eventManager().fire("SlicingDone", {"stl": self._getBasicFilename(stlPath), "gcode": self._getBasicFilename(gcodePath)}) + slicingStop = time.time() + eventManager().fire("SlicingDone", {"stl": self._getBasicFilename(stlPath), "gcode": self._getBasicFilename(gcodePath), "time": "%.2f" % (slicingStop - slicingStart)}) self.processGcode(gcodePath) eventManager().fire("SlicingStarted", {"stl": self._getBasicFilename(absolutePath), "gcode": self._getBasicFilename(gcodePath)}) diff --git a/octoprint/static/js/app/dataupdater.js b/octoprint/static/js/app/dataupdater.js index 226bc6f6..2a07e0ec 100644 --- a/octoprint/static/js/app/dataupdater.js +++ b/octoprint/static/js/app/dataupdater.js @@ -109,7 +109,7 @@ function DataUpdater(loginStateViewModel, connectionViewModel, printerStateViewM } else if (type == "slicingStarted") { $.pnotify({title: "Slicing started", text: "Slicing " + payload.stl + " to " + payload.gcode}); } else if (type == "slicingDone") { - $.pnotify({title: "Slicing done", text: "Sliced " + payload.stl + " to " + payload.gcode}); + $.pnotify({title: "Slicing done", text: "Sliced " + payload.stl + " to " + payload.gcode + ", took " + payload.time + " seconds"}); gcodeFilesViewModel.requestData(payload.gcode); } break;