Skip to content
Open
Changes from 7 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion src/components/widgets/status/StatusTab.vue
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
</status-label>

<status-label :label="$t('app.general.label.filament')">
<span v-if="filament_used > 0 && printerPrinting">{{ $filters.getReadableLengthString(filament_used) }}</span>
<span v-if="filament_used > 0 && printerPrinting">{{ $filters.getReadableLengthString(filament_used) }} / {{ $filters.getReadableLengthString(filament_total) }} <br /> remaining: {{filament_weight_needed.toFixed(2)}} g </span>
</status-label>

<status-label :label="$t('app.general.label.layer')">
Expand Down Expand Up @@ -341,6 +341,18 @@ export default class StatusTab extends Mixins(StateMixin, FilesMixin) {
return this.$store.state.printer.printer.current_file.filament_total || 0
}

/**
* Total filament weight according to the current file / slicer.
*/
get filament_weight_needed () {
const filament_weight_total = this.$store.state.printer.printer.current_file.filament_weight_total || 0
if (this.filament_used > 0 && this.filament_total > 0 && filament_weight_total > 0) {
return (1 - this.filament_used / this.filament_total) * filament_weight_total
} else {
return 0
}
}

/**
* Work out flow provided our used filament changed, and we've not calculated
* within a given delta (2sec).
Expand Down