pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'devel' into imrahil-print_time

Browse source
This commit is contained in:
Gina Häußge 2014-04-01 22:24:34 +02:00
commit 7b56b36564
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/octoprint/static/js/app/viewmodels/gcode.js
View file

@ -168,7 +168,7 @@ function GcodeViewModel(loginStateViewModel, settingsViewModel) {
step: 1,
value: 0,
enabled: false,
formatter: function(value) { return "Layer #" + value; }
formatter: function(value) { return "Layer #" + (value + 1); }
}).on("slide", self.changeLayer);
};
@ -333,7 +333,7 @@ function GcodeViewModel(loginStateViewModel, settingsViewModel) {
self.currentCommand = [0, 1];
} else {
var output = [];
output.push("Layer number: " + layer.number);
output.push("Layer number: " + (layer.number + 1));
output.push("Layer height (mm): " + layer.height);
output.push("GCODE commands in layer: " + layer.commands);
if (layer.filament.length == 1) {

11
src/octoprint/timelapse.py
View file

@ -236,10 +236,13 @@ class Timelapse(object):
return filename
def _captureWorker(self, filename):
eventManager().fire(Events.CAPTURE_START, {"file": filename});
urllib.urlretrieve(self._snapshotUrl, filename)
self._logger.debug("Image %s captured from %s" % (filename, self._snapshotUrl))
eventManager().fire(Events.CAPTURE_DONE, {"file": filename});
eventManager().fire(Events.CAPTURE_START, {"file": filename})
try:
urllib.urlretrieve(self._snapshotUrl, filename)
self._logger.debug("Image %s captured from %s" % (filename, self._snapshotUrl))
except:
self._logger.exception("Could not capture image %s from %s" % (filename, self._snapshotUrl))
eventManager().fire(Events.CAPTURE_DONE, {"file": filename})
def _createMovie(self, success=True):
ffmpeg = settings().get(["webcam", "ffmpeg"])