From ad2945871bf1fcc520012b69d168b94b1afe46e2 Mon Sep 17 00:00:00 2001
From: Stefan Dej <meteyou@gmail.com>
Date: Sun, 16 Jun 2024 15:34:56 +0200
Subject: [PATCH 1/2] fix(extruderPanel): add speed_factor to estimate
 extrusion calculation

Signed-off-by: Stefan Dej <meteyou@gmail.com>
(cherry picked from commit 4b179997593e0c6bf9ecedb797359d4cfa0628c1)
---
 .../Extruder/EstimatedExtrusionOutput.vue     | 30 +++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/src/components/panels/Extruder/EstimatedExtrusionOutput.vue b/src/components/panels/Extruder/EstimatedExtrusionOutput.vue
index 6d252ed84..c08741f92 100644
--- a/src/components/panels/Extruder/EstimatedExtrusionOutput.vue
+++ b/src/components/panels/Extruder/EstimatedExtrusionOutput.vue
@@ -8,6 +8,21 @@
                     {{ mdiDiameterVariant }}
                 </v-icon>
                 {{ nozzleDiameter }} mm
+                <v-tooltip v-if="showTooltip" top>
+                    <template #activator="{ on, attrs }">
+                        <v-icon small color="red" v-bind="attrs" v-on="on">
+                            {{ mdiInformationOutline }}
+                        </v-icon>
+                    </template>
+                    <span>
+                        <div v-if="speed_factor !== 1">
+                            {{ $t('Panels.ToolheadControlPanel.SpeedFactor') }}: {{ speed_factor * 100 }} %
+                        </div>
+                        <div v-if="extrudeFactor !== 1">
+                            {{ $t('Panels.ExtruderControlPanel.ExtrusionFactor') }}: {{ extrudeFactor * 100 }} %
+                        </div>
+                    </span>
+                </v-tooltip>
             </span>
         </div>
     </v-container>
@@ -16,12 +31,13 @@
 <script lang="ts">
 import { Component, Mixins } from 'vue-property-decorator'
 import BaseMixin from '@/components/mixins/base'
-import { mdiDiameterVariant } from '@mdi/js'
+import { mdiDiameterVariant, mdiInformationOutline } from '@mdi/js'
 import ExtruderMixin from '@/components/mixins/extruder'
 
 @Component({})
 export default class PressureAdvanceSettings extends Mixins(BaseMixin, ExtruderMixin) {
     mdiDiameterVariant = mdiDiameterVariant
+    mdiInformationOutline = mdiInformationOutline
 
     get showEstimatedExtrusion() {
         return this.$store.state.gui.control.extruder.showEstimatedExtrusionInfo ?? true
@@ -35,8 +51,18 @@ export default class PressureAdvanceSettings extends Mixins(BaseMixin, ExtruderM
         )
     }
 
+    get speed_factor() {
+        return this.$store.state.printer.gcode_move?.speed_factor ?? 1
+    }
+
     get volumetricFlow(): number {
-        return Math.round(Math.pow(this.filamentDiameter / 2, 2) * Math.PI * this.feedrate * 10) / 10
+        return (
+            Math.round(Math.pow(this.filamentDiameter / 2, 2) * Math.PI * this.feedrate * this.speed_factor * 10) / 10
+        )
+    }
+
+    get showTooltip() {
+        return this.speed_factor !== 1 || this.extrudeFactor !== 1
     }
 }
 </script>

From d99b4606690551e222e25eaf2c353c5e534fbbf6 Mon Sep 17 00:00:00 2001
From: Stefan Dej <meteyou@gmail.com>
Date: Sun, 16 Jun 2024 16:06:49 +0200
Subject: [PATCH 2/2] chore: change info icon color to warning

Signed-off-by: Stefan Dej <meteyou@gmail.com>
---
 src/components/panels/Extruder/EstimatedExtrusionOutput.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/panels/Extruder/EstimatedExtrusionOutput.vue b/src/components/panels/Extruder/EstimatedExtrusionOutput.vue
index c08741f92..2ce18edae 100644
--- a/src/components/panels/Extruder/EstimatedExtrusionOutput.vue
+++ b/src/components/panels/Extruder/EstimatedExtrusionOutput.vue
@@ -10,7 +10,7 @@
                 {{ nozzleDiameter }} mm
                 <v-tooltip v-if="showTooltip" top>
                     <template #activator="{ on, attrs }">
-                        <v-icon small color="red" v-bind="attrs" v-on="on">
+                        <v-icon small color="warning" v-bind="attrs" v-on="on">
                             {{ mdiInformationOutline }}
                         </v-icon>
                     </template>