diff --git a/src/components/panels/GcodefilesPanel.vue b/src/components/panels/GcodefilesPanel.vue index be86f7dda..f14284102 100644 --- a/src/components/panels/GcodefilesPanel.vue +++ b/src/components/panels/GcodefilesPanel.vue @@ -212,6 +212,9 @@ {{ formatDate(item.modified) }} {{ item.object_height ? item.object_height.toFixed(2)+' mm' : '--' }} {{ item.layer_height ? item.layer_height.toFixed(2)+' mm' : '--' }} + {{ item.nozzle_diameter ? item.nozzle_diameter.toFixed(2)+' mm' : '--' }} + {{ item.filament_name ? item.filament_name : '--' }} + {{ item.filament_type ? item.filament_type : '--' }} {{ item.filament_total ? item.filament_total.toFixed()+' mm' : '--' }} {{ item.filament_weight_total ? item.filament_weight_total.toFixed(2)+' g' : '--' }} {{ formatPrintTime(item.estimated_time) }} @@ -579,6 +582,9 @@ export default class GcodefilesPanel extends Mixins(BaseMixin) { { text: this.$t('Files.LastModified'), value: 'modified', align: 'right', configable: true, visible: true }, { text: this.$t('Files.ObjectHeight'), value: 'object_height', align: 'right', configable: true, visible: true }, { text: this.$t('Files.LayerHeight'), value: 'layer_height', align: 'right', configable: true, visible: true }, + { text: this.$t('Files.NozzleDiameter'), value: 'nozzle_diameter', align: 'right', configable: true, visible: true }, + { text: this.$t('Files.FilamentName'), value: 'filament_name', align: 'right', configable: true, visible: true }, + { text: this.$t('Files.FilamentType'), value: 'filament_type', align: 'right', configable: true, visible: true }, { text: this.$t('Files.FilamentUsage'), value: 'filament_total', align: 'right', configable: true, visible: true }, { text: this.$t('Files.FilamentWeight'), value: 'filament_weight_total', align: 'right', configable: true, visible: true }, { text: this.$t('Files.PrintTime'), value: 'estimated_time', align: 'right', configable: true, visible: true }, diff --git a/src/locales/de.json b/src/locales/de.json index b4aafc68f..6f3835b61 100644 --- a/src/locales/de.json +++ b/src/locales/de.json @@ -180,7 +180,10 @@ "LastModified": "Zuletzt geändert", "ObjectHeight": "Objekthöhe", "LayerHeight": "Schichthöhe", + "NozzleDiameter": "Düsendurchmesser", "Filament": "Filament", + "FilamentName": "Filament Name", + "FilamentType": "Filament Typ", "FilamentUsage": "Filamentverbrauch", "FilamentWeight": "Filamentgewicht", "PrintTime": "Druckdauer", diff --git a/src/locales/en.json b/src/locales/en.json index a025f45f1..53d5593c7 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -180,7 +180,10 @@ "LastModified": "Last modified", "ObjectHeight": "Object Height", "LayerHeight": "Layer Height", + "NozzleDiameter": "Nozzle Diameter", "Filament": "Filament", + "FilamentName": "Filament Name", + "FilamentType": "Filament Type", "FilamentUsage": "Filament Usage", "FilamentWeight": "Filament Weight", "PrintTime": "Print Time", diff --git a/src/store/variables.ts b/src/store/variables.ts index 49c4dc4ab..1a79e226c 100644 --- a/src/store/variables.ts +++ b/src/store/variables.ts @@ -73,8 +73,11 @@ export const checkKlipperConfigModules = [ */ export const allowedMetadata = [ 'estimated_time', + 'filament_name', + 'filament_type', 'filament_total', 'filament_weight_total', + 'nozzle_diameter', 'first_layer_bed_temp', 'first_layer_extr_temp', 'first_layer_height',