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

Have frontend's printer state also track file path

Browse source 
Also display it on mouse over on the selected file's name.
This commit is contained in:
Gina Häußge 2016-07-08 11:13:14 +02:00
parent d91c6256b4
commit db2c3bf10b
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/octoprint/static/js/app/viewmodels/printerstate.js
View file

@ -25,6 +25,7 @@ $(function() {
});
self.filename = ko.observable(undefined);
self.filepath = ko.observable(undefined);
self.progress = ko.observable(undefined);
self.filesize = ko.observable(undefined);
self.filepos = ko.observable(undefined);
@ -157,10 +158,12 @@ $(function() {
self._processJobData = function(data) {
if (data.file) {
self.filename(data.file.name);
self.filepath(data.file.path);
self.filesize(data.file.size);
self.sd(data.file.origin == "sdcard");
} else {
self.filename(undefined);
self.filepath(undefined);
self.filesize(undefined);
self.sd(undefined);
}

2
src/octoprint/templates/sidebar/state.jinja2
View file

@ -1,5 +1,5 @@
{{ _('Machine State') }}: <strong data-bind="text: stateString"></strong><br>
{{ _('File') }}: <strong data-bind="text: filename"></strong>&nbsp;<strong data-bind="visible: sd">(SD)</strong><br>
{{ _('File') }}: <strong data-bind="text: filename, attr: {title: filepath}"></strong>&nbsp;<strong data-bind="visible: sd">(SD)</strong><br>
{{ _('Timelapse') }}: <strong data-bind="text: timelapseString"></strong><br>
<!-- ko foreach: filament -->
<span data-bind="text: 'Filament (' + name() + '): '"></span><strong data-bind="text: formatFilament(data())"></strong><br>