fix: cancel button during pause

fix: print time durations
fluidd-core · Oct 1, 2020 · 6647b25 · 6647b25
1 parent 6df061d
commit 6647b25
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 11 deletions.
diff --git a/src/components/widgets/PrintStatusWidget.vue b/src/components/widgets/PrintStatusWidget.vue
@@ -62,7 +62,7 @@
             @click="cancelPrint()"
             :loading="hasWait(waits.onPrintCancel)"
             :width="buttonWidths"
-            v-if="printerPrinting"
+            v-if="printerPrinting || printerPaused"
             color="secondary"
             class="mb-2">
             <v-icon small>mdi-window-close</v-icon>
@@ -156,14 +156,6 @@ export default class PrintStatusWidget extends Mixins(UtilsMixin) {
     }
   }
 
-  // get usedFilament () {
-  //   return this.$store.state.socket.printer.print_stats.filament_used
-  // }
-
-  // get estimatedTotalFilament () {
-  //   return this.$store.state.socket.printer.current_file.filament_total
-  // }
-
   cancelPrint () {
     SocketActions.printerPrintCancel()
   }

diff --git a/src/store/socket/getters.ts b/src/store/socket/getters.ts
@@ -63,12 +63,12 @@ export const getters: GetterTree<SocketState, RootState> = {
         break
       }
       case 'filament': {
-        totalDuration = duration / (usedFilament / estimatedFilament) - duration
+        totalDuration = duration / (usedFilament / estimatedFilament)
         timeLeft = totalDuration - duration
         break
       }
       case 'file': {
-        totalDuration = duration / (progress) - duration
+        totalDuration = duration / (progress)
         timeLeft = totalDuration - duration
         break
       }