Skip to content

Commit b9ca4d7

Browse files
committed
Added support for new toPause estimate (M73 C)
1 parent d02661d commit b9ca4d7

File tree

17 files changed

+148
-124
lines changed

17 files changed

+148
-124
lines changed

package-lock.json

Lines changed: 106 additions & 104 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "duetwebcontrol",
3-
"version": "3.6.0-rc.2+1",
3+
"version": "3.6.0-rc.2+2",
44
"author": "Christian Hammacher <christian@duet3d.com> (https://www.duet3d.com)",
55
"homepage": "https://forum.duet3d.com/category/27/duet-web-control",
66
"license": "GPL-3.0",
@@ -17,7 +17,7 @@
1717
"@duet3d/connectors": "~3.6.0-rc.1",
1818
"@duet3d/monacotokens": "~3.6.0-rc.1",
1919
"@duet3d/motionanalysis": "~3.4.0",
20-
"@duet3d/objectmodel": "~3.6.0-rc.4",
20+
"@duet3d/objectmodel": "~3.6.0-rc.7",
2121
"@mdi/font": "^7.4.47",
2222
"@sindarius/gcodeviewer": "^3.7.13",
2323
"chart.js": "^2.9.4",

src/components/panels/JobEstimationsPanel.vue

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,15 @@
3434
</span>
3535
</v-col>
3636

37+
<v-col v-if="timesLeft.toPause !== null" class="d-flex flex-column">
38+
<strong>
39+
{{ $t("panel.jobEstimations.toPause") }}
40+
</strong>
41+
<span>
42+
{{ $displayTime(timesLeft.toPause) }}
43+
</span>
44+
</v-col>
45+
3746
<v-col v-if="simulationTime !== null" class="d-flex flex-column">
3847
<strong>
3948
{{ $t("panel.jobEstimations.simulation") }}

src/i18n/de.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -681,7 +681,8 @@
681681
"file": "Dateifortschritt",
682682
"layer": "Schichtdauer",
683683
"slicer": "Slicer",
684-
"simulation": "Simulation"
684+
"simulation": "Simulation",
685+
"toPause": "Nächste Pause"
685686
},
686687
"jobInfo": {
687688
"caption": "Jobinformationen",

src/i18n/en.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -680,7 +680,8 @@
680680
"file": "File Progress",
681681
"layer": "Layer Time",
682682
"slicer": "Slicer",
683-
"simulation": "Simulation"
683+
"simulation": "Simulation",
684+
"toPause": "Next pause"
684685
},
685686
"jobInfo": {
686687
"caption": "Job Information",

src/i18n/es.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -681,7 +681,8 @@
681681
"file": "Progreso de archivo",
682682
"layer": "Tiempo de capa",
683683
"slicer": "Troceado",
684-
"simulation": "Simulación"
684+
"simulation": "Simulación",
685+
"toPause": "Siguiente pausa"
685686
},
686687
"jobInfo": {
687688
"caption": "Información (trabajo)",

src/i18n/fr.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -681,7 +681,8 @@
681681
"file": "Progrès du Fichier",
682682
"layer": "Durée de la Dernière Couche",
683683
"slicer": "Trancheur",
684-
"simulation": "Simulation"
684+
"simulation": "Simulation",
685+
"toPause": "Paute suivante"
685686
},
686687
"jobInfo": {
687688
"caption": "Information du Travail",

src/i18n/hu.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -680,7 +680,8 @@
680680
"file": "Eddigi haladás alapján",
681681
"layer": "Réteg idő",
682682
"slicer": "Slicer által számított",
683-
"simulation": "Szimuláció alapján"
683+
"simulation": "Szimuláció alapján",
684+
"toPause": "Következő szünet"
684685
},
685686
"jobInfo": {
686687
"caption": "Munka információ",

src/i18n/ja.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -681,7 +681,8 @@
681681
"file": "ファイルの進捗",
682682
"layer": "レイヤー時間",
683683
"slicer": "スライサー",
684-
"simulation": "シミュレーション"
684+
"simulation": "シミュレーション",
685+
"toPause": "次の一時停止"
685686
},
686687
"jobInfo": {
687688
"caption": "ジョブ情報",

src/i18n/nl.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -680,7 +680,8 @@
680680
"file": "Bestandsvoortgang",
681681
"layer": "Laag tijd",
682682
"simulation": "Simulatie",
683-
"slicer": "Snijmachine"
683+
"slicer": "Snijmachine",
684+
"toPause": "Volgende pauze"
684685
},
685686
"jobInfo": {
686687
"caption": "Job informatie",

0 commit comments

Comments
 (0)