yw1573/A1SwapModPacker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

fix(gui,gcode): 无数据时格式化显示0s和0.00g替代未知

Browse Source 
format_duration/format_filament 接收 None 时返回零值字符串而非未知，
GUI 初始合计标签同步更新。
This commit is contained in:
yw1573
2026-07-28 10:26:48 +08:00
parent 002b8117d8
commit b749bdd807
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
a1_swap_mod_packer/gcode.py
+2 -2
View File
@@ -120,7 +120,7 @@ def format_duration(seconds: float | None) -> str:
格式化后的时间字符串，如 "2h 30m"、"5m 20s"、"45s"，未知则返回 "未知"。 格式化后的时间字符串，如 "2h 30m"、"5m 20s"、"45s"，未知则返回 "未知"。
""" """
if seconds is None: if seconds is None:
return "未知" return "0s"
total = max(0, int(round(seconds))) total = max(0, int(round(seconds)))
hours, rem = divmod(total, 3600) hours, rem = divmod(total, 3600)
minutes, secs = divmod(rem, 60) minutes, secs = divmod(rem, 60)
@@ -142,7 +142,7 @@ def format_filament(weight_grams: float | None, used_m: float | None = None) ->
格式化后的耗材信息字符串，未知则返回 "未知"。 格式化后的耗材信息字符串，未知则返回 "未知"。
""" """
if weight_grams is None and used_m is None: if weight_grams is None and used_m is None:
return "未知" return "0.00 g"
parts: list[str] = [] parts: list[str] = []
if weight_grams is not None: if weight_grams is not None:
parts.append(f"{weight_grams:.2f} g") parts.append(f"{weight_grams:.2f} g")
a1_swap_mod_packer/gui.py
+1 -1
View File
@@ -423,7 +423,7 @@ class MainWindow(QMainWindow):
table_layout.addWidget(self.table) table_layout.addWidget(self.table)
# --- 合计统计标签 --- # --- 合计统计标签 ---
self.total_summary_label = QLabel("合计：0 板 | 时间：未知 | 耗材：未知") self.total_summary_label = QLabel("合计：0 板 | 时间：0s | 耗材：0.00 g")
table_layout.addWidget(self.total_summary_label) table_layout.addWidget(self.total_summary_label)
file_body.addLayout(table_layout, 1) file_body.addLayout(table_layout, 1)