fix(gui,cli,gcode): 元数据默认累加模式,格式化Unknown→未知
- BuildOptions.metadata_mode 默认 sum(累加预测和耗材用量) - CLI --metadata-mode 默认 sum - GUI 设置回退值默认 sum - format_duration/format_filament 空值返回 未知 而非 Unknown
This commit is contained in:
@@ -117,10 +117,10 @@ def format_duration(seconds: float | None) -> str:
|
||||
seconds: 秒数,可为 None。
|
||||
|
||||
返回:
|
||||
格式化后的时间字符串,如 "2h 30m"、"5m 20s"、"45s",未知则返回 "Unknown"。
|
||||
格式化后的时间字符串,如 "2h 30m"、"5m 20s"、"45s",未知则返回 "未知"。
|
||||
"""
|
||||
if seconds is None:
|
||||
return "Unknown"
|
||||
return "未知"
|
||||
total = max(0, int(round(seconds)))
|
||||
hours, rem = divmod(total, 3600)
|
||||
minutes, secs = divmod(rem, 60)
|
||||
@@ -139,10 +139,10 @@ def format_filament(weight_grams: float | None, used_m: float | None = None) ->
|
||||
used_m: 耗材使用长度(米),可为 None。
|
||||
|
||||
返回:
|
||||
格式化后的耗材信息字符串,未知则返回 "Unknown"。
|
||||
格式化后的耗材信息字符串,未知则返回 "未知"。
|
||||
"""
|
||||
if weight_grams is None and used_m is None:
|
||||
return "Unknown"
|
||||
return "未知"
|
||||
parts: list[str] = []
|
||||
if weight_grams is not None:
|
||||
parts.append(f"{weight_grams:.2f} g")
|
||||
|
||||
Reference in New Issue
Block a user