q3k
/
OctoPrint
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not display -1mm when printing from sd

master
Gina Häußge 2013-06-09 18:13:12 +02:00
parent 4509eab816
commit 9963c523c0
4 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
octoprint/printer.py
View File

@ -201,7 +201,7 @@ class Printer():
if self._comm.isPrinting(): if self._comm.isPrinting():
return return
self._setCurrentZ(-1) self._setCurrentZ(None)
if self._sdFile is not None: if self._sdFile is not None:
# we are working in sd mode # we are working in sd mode
self._sdPrinting = True self._sdPrinting = True

5
octoprint/static/js/ui.js
View File

@ -231,6 +231,11 @@ function PrinterStateViewModel(loginStateViewModel) {
var currentLine = self.currentLine() ? self.currentLine() : "-"; var currentLine = self.currentLine() ? self.currentLine() : "-";
return currentLine + " / " + self.totalLines(); return currentLine + " / " + self.totalLines();
}); });
self.heightString = ko.computed(function() {
if (!self.currentHeight())
return "-";
return self.currentHeight();
})
self.progressString = ko.computed(function() { self.progressString = ko.computed(function() {
if (!self.progress()) if (!self.progress())
return 0; return 0;

2
octoprint/templates/index.jinja2
View File

@ -112,7 +112,7 @@
Filament: <strong data-bind="text: filament"></strong><br> Filament: <strong data-bind="text: filament"></strong><br>
Estimated Print Time: <strong data-bind="text: estimatedPrintTime"></strong><br> Estimated Print Time: <strong data-bind="text: estimatedPrintTime"></strong><br>
Line: <strong data-bind="text: lineString"></strong><br> Line: <strong data-bind="text: lineString"></strong><br>
Height: <strong data-bind="text: currentHeight"></strong><br> Height: <strong data-bind="text: heightString"></strong><br>
Print Time: <strong data-bind="text: printTime"></strong><br> Print Time: <strong data-bind="text: printTime"></strong><br>
Print Time Left: <strong data-bind="text: printTimeLeft"></strong><br> Print Time Left: <strong data-bind="text: printTimeLeft"></strong><br>

2
octoprint/util/comm.py
View File

@ -358,7 +358,7 @@ class MachineCom(object):
self._commandQueue = queue.Queue() self._commandQueue = queue.Queue()
self._logQueue = queue.Queue(256) self._logQueue = queue.Queue(256)
self._feedRateModifier = {} self._feedRateModifier = {}
self._currentZ = -1 self._currentZ = None
self._heatupWaitStartTime = 0 self._heatupWaitStartTime = 0
self._heatupWaitTimeLost = 0.0 self._heatupWaitTimeLost = 0.0
self._printStartTime = None self._printStartTime = None