zkk d822333489 优化翻译,耗材检测提示和一些细节问题
Squashed commit of the following:

commit 02c7556cdadf8de1ef3c54d2831920927cadbe30
Merge: 6bfa42e0 991003e6
Author: zkk <1007518571@qq.com>
Date:   Tue Dec 31 15:07:54 2024 +0800

    Merge commit '991003e6cbea335eca73d3783aa1837059614724' into release

commit 991003e6cbea335eca73d3783aa1837059614724
Author: zkk <1007518571@qq.com>
Date:   Tue Dec 31 15:03:34 2024 +0800

    优化完整 简体中文和繁体中文的翻译

commit 1a177e90d09b9b9949bff2a1e3c6b12173420620
Author: zkk <1007518571@qq.com>
Date:   Tue Dec 31 14:10:03 2024 +0800

    优化排除对象的英文语法错误

commit e8d509cb6c2883b1fadb5ab9f9ca658e61849055
Author: zkk <1007518571@qq.com>
Date:   Fri Dec 27 16:40:52 2024 +0800

    优化耗材检测显示内容

commit 1b7670485a918cb334119175777525f768e670be
Author: zkk <1007518571@qq.com>
Date:   Fri Dec 27 14:56:25 2024 +0800

    完善断料自动切头功能描述

commit ecc0c3dd16442497e56f5f8ab3a0c6be00bd180e
Author: zkk <1007518571@qq.com>
Date:   Fri Dec 27 13:40:01 2024 +0800

    实现弹窗翻译功能

commit bc6d60fa183af50b7b16fea685139ca9d5df90ea
Author: zkk <1007518571@qq.com>
Date:   Fri Dec 27 09:53:16 2024 +0800

    优化不合理名称和不合理大小写

commit 2e650926bdba1c65baa506be1b1dd09621e8d8ea
Author: zkk <1007518571@qq.com>
Date:   Thu Dec 26 15:06:11 2024 +0800

    修复10寸屏幕偏移值微调页面出界问题

commit c481b551f777a3a6cadf7be3bfcab38448b51694
Author: zkk <1007518571@qq.com>
Date:   Wed Dec 25 15:28:26 2024 +0800

    优化移轴设置页面没有返回按钮的问题

commit 2b3c9936bd693c8fc265d6352799f382680f4920
Author: zkk <1007518571@qq.com>
Date:   Wed Dec 25 10:05:04 2024 +0800

    删除移动设置页面中轴反转的选项

commit 5e37d59497c54086d3f1e215cbabc03254857a58
Author: zkk <1007518571@qq.com>
Date:   Wed Dec 25 09:05:03 2024 +0800

    优化选择语言标题

commit 5214c3697baac78bd0a465e33d6f4f3c1e30862e
Author: zkk <1007518571@qq.com>
Date:   Tue Dec 24 10:57:41 2024 +0800

    增加设置hostname功能

commit 3709a7465cc2e0d677ecc9979fb18144f7e0ec33
Author: zkk <1007518571@qq.com>
Date:   Tue Dec 24 10:43:46 2024 +0800

    增加工厂设置中打包模式

commit 0c2a2618beb68d50601e433beef06122fb0ffd40
Author: zkk <1007518571@qq.com>
Date:   Mon Dec 23 16:25:37 2024 +0800

    实现恢复出厂设置功能

commit e3a38f85613d53a4a063e835c34c701196010c6e
Author: zkk <1007518571@qq.com>
Date:   Mon Dec 23 15:48:17 2024 +0800

    一点格式化

commit 4e9e452e8bed4b53eaaae8f0a69142de8aa50611
Author: zkk <1007518571@qq.com>
Date:   Sat Dec 21 14:20:22 2024 +0800

    优化探针偏移值校准时如果当前激活为第一个喷头时不会重复激活喷头

commit 3b85e8e8d59b0d4eae75f80d9e637fe9dc272cbe
Merge: 882850db 10ec2029
Author: zkk <1007518571@qq.com>
Date:   Wed Dec 18 17:26:08 2024 +0800

    Merge branch 'develop' of https://server.creatbot.com/Gitea/CreatBot/CreatBotKlipperScreen into develop

commit 882850dbde648598e5f91281101d0ea01fd56d56
Author: zkk <1007518571@qq.com>
Date:   Wed Dec 18 17:21:16 2024 +0800

    补充双喷头偏移校准页面二维码图片

commit 10ec2029eb73e66874d5a0ec492c016480641110
Author: ruipeng <1041589370@qq.com>
Date:   Wed Dec 18 17:17:18 2024 +0800

    增加自动切换喷头开关选项

commit 3d6eed9d9526b77472ba7df29014b5768c594026
Author: zkk <1007518571@qq.com>
Date:   Mon Dec 16 16:33:34 2024 +0800

    喷头偏移值校准功能的实现

commit 40ecbb3ea4827c9bac1aa271cccc958c94c1114a
Author: zkk <1007518571@qq.com>
Date:   Fri Dec 13 09:20:00 2024 +0800

    z探针校准时指定默认激活工具头为第一个头

commit bce3caa409618ef5bc2067865940d14a1441c0f8
Author: zkk <1007518571@qq.com>
Date:   Fri Dec 13 09:19:19 2024 +0800

    优化z探针校准时候移动过慢问题

commit 6bfa42e036a521c8ff7db1bf8ccb65500eabb6ea
Merge: 1a87ced3 4f3aa9aa
Author: zkk <1007518571@qq.com>
Date:   Thu Dec 12 10:33:58 2024 +0800

    Merge commit '4f3aa9aa4c581ae9e7a740bd37f9e80ba064c27f' into release

commit 4f3aa9aa4c581ae9e7a740bd37f9e80ba064c27f
Merge: e3fd413d 1a69b518
Author: zkk <1007518571@qq.com>
Date:   Thu Dec 12 10:30:00 2024 +0800

    Merge branch 'develop' of https://server.creatbot.com/Gitea/CreatBot/CreatBotKlipperScreen into develop

commit 1a69b5180de733f15550a1294a7221d6070306a0
Author: ruipeng <1041589370@qq.com>
Date:   Wed Dec 11 11:44:36 2024 +0800

    新增D600pro2、D1000的V0版机型

commit e3fd413d6256414441e9fe653c1132b1799a5cb2
Author: zkk <1007518571@qq.com>
Date:   Tue Dec 10 14:34:13 2024 +0800

    修复打印时没有修改z偏移值 仍提示保存z偏移的按钮的bug

commit 594fb668fe94fe907c028bf65ecced43ea8660cb
Author: zkk <1007518571@qq.com>
Date:   Tue Dec 10 14:25:04 2024 +0800

    设置自适应调平选项默认为关闭状态

commit 1a87ced3f5725569a6b9a7ee5f5250044d01d852
Merge: 629416d1 6064a6e1
Author: zkk <1007518571@qq.com>
Date:   Fri Nov 29 10:18:32 2024 +0800

    Merge branch 'develop' into release

# Conflicts:
#	panels/advanced.py
#	panels/nozzle_offset.py
#	panels/offset_fine_tune.py
#	panels/zcalibrate.py
2024-12-31 15:14:35 +08:00

188 lines
8.1 KiB
Python

import re
import logging
import gi
gi.require_version("Gtk", "3.0")
from gi.repository import Gtk
from ks_includes.KlippyGcodes import KlippyGcodes
from ks_includes.screen_panel import ScreenPanel
class Panel(ScreenPanel):
distances = [".1", ".5", "1", "5", "10", "25", "50"]
distance = distances[-2]
def __init__(self, screen, title):
title = title or _("Move")
super().__init__(screen, title)
if self.ks_printer_cfg is not None:
dis = self.ks_printer_cfg.get("move_distances", "")
if re.match(r"^[0-9,\.\s]+$", dis):
dis = [str(i.strip()) for i in dis.split(",")]
if 1 < len(dis) <= 7:
self.distances = dis
self.distance = self.distances[-2]
self.settings = {}
self.menu.append("move_menu")
self.buttons = {
"x+": self._gtk.Button("arrow-right", "X+", "color1"),
"x-": self._gtk.Button("arrow-left", "X-", "color1"),
"y+": self._gtk.Button("arrow-up", "Y+", "color2"),
"y-": self._gtk.Button("arrow-down", "Y-", "color2"),
"z+": self._gtk.Button("z-farther", "Z+", "color3"),
"z-": self._gtk.Button("z-closer", "Z-", "color3"),
"home": self._gtk.Button("home", _("Home"), "color4"),
"motors_off": self._gtk.Button("motor-off", _("Disable Motors"), "color4"),
}
self.buttons["x+"].connect("clicked", self.move, "X", "+")
self.buttons["x-"].connect("clicked", self.move, "X", "-")
self.buttons["y+"].connect("clicked", self.move, "Y", "+")
self.buttons["y-"].connect("clicked", self.move, "Y", "-")
self.buttons["z+"].connect("clicked", self.move, "Z", "+")
self.buttons["z-"].connect("clicked", self.move, "Z", "-")
self.buttons["home"].connect("clicked", self.home)
script = {"script": "M18"}
self.buttons["motors_off"].connect(
"clicked",
self._screen._confirm_send_action,
_("Are you sure you wish to disable motors?"),
"printer.gcode.script",
script,
)
adjust = self._gtk.Button(
"settings", None, "color2", 1, Gtk.PositionType.LEFT, 1
)
adjust.connect("clicked", self.menu_item_clicked, {"panel": "move_setting"})
adjust.set_hexpand(False)
grid = Gtk.Grid(row_homogeneous=True, column_homogeneous=True)
if self._screen.vertical_mode:
if self._screen.lang_ltr:
grid.attach(self.buttons["x+"], 2, 1, 1, 1)
grid.attach(self.buttons["x-"], 0, 1, 1, 1)
grid.attach(self.buttons["z+"], 2, 2, 1, 1)
grid.attach(self.buttons["z-"], 0, 2, 1, 1)
else:
grid.attach(self.buttons["x+"], 0, 1, 1, 1)
grid.attach(self.buttons["x-"], 2, 1, 1, 1)
grid.attach(self.buttons["z+"], 0, 2, 1, 1)
grid.attach(self.buttons["z-"], 2, 2, 1, 1)
grid.attach(adjust, 1, 2, 1, 1)
grid.attach(self.buttons["y+"], 1, 0, 1, 1)
grid.attach(self.buttons["y-"], 1, 1, 1, 1)
else:
if self._screen.lang_ltr:
grid.attach(self.buttons["x+"], 2, 1, 1, 1)
grid.attach(self.buttons["x-"], 0, 1, 1, 1)
else:
grid.attach(self.buttons["x+"], 0, 1, 1, 1)
grid.attach(self.buttons["x-"], 2, 1, 1, 1)
grid.attach(self.buttons["y+"], 1, 0, 1, 1)
grid.attach(self.buttons["y-"], 1, 1, 1, 1)
grid.attach(self.buttons["z+"], 3, 1, 1, 1)
grid.attach(self.buttons["z-"], 3, 0, 1, 1)
grid.attach(self.buttons["home"], 0, 0, 1, 1)
grid.attach(self.buttons["motors_off"], 2, 0, 1, 1)
distgrid = Gtk.Grid()
for j, i in enumerate(self.distances):
self.labels[i] = self._gtk.Button(label=i)
self.labels[i].set_direction(Gtk.TextDirection.LTR)
self.labels[i].connect("clicked", self.change_distance, i)
ctx = self.labels[i].get_style_context()
ctx.add_class("horizontal_togglebuttons")
if i == self.distance:
ctx.add_class("horizontal_togglebuttons_active")
distgrid.attach(self.labels[i], j, 0, 1, 1)
for p in ("pos_x", "pos_y", "pos_z"):
self.labels[p] = Gtk.Label()
self.labels["move_dist"] = Gtk.Label(label=_("Move Distance (mm)"))
bottomgrid = Gtk.Grid(row_homogeneous=True, column_homogeneous=True)
bottomgrid.set_direction(Gtk.TextDirection.LTR)
bottomgrid.attach(self.labels["pos_x"], 0, 0, 1, 1)
bottomgrid.attach(self.labels["pos_y"], 1, 0, 1, 1)
bottomgrid.attach(self.labels["pos_z"], 2, 0, 1, 1)
bottomgrid.attach(self.labels["move_dist"], 0, 1, 3, 1)
if not self._screen.vertical_mode:
bottomgrid.attach(adjust, 3, 0, 1, 2)
self.labels["move_menu"] = Gtk.Grid(row_homogeneous=True, column_homogeneous=True)
self.labels["move_menu"].attach(grid, 0, 0, 1, 3)
self.labels["move_menu"].attach(bottomgrid, 0, 3, 1, 1)
self.labels["move_menu"].attach(distgrid, 0, 4, 1, 1)
self.content.add(self.labels["move_menu"])
def process_update(self, action, data):
if action != "notify_status_update":
return
if (
"gcode_move" in data
or "toolhead" in data
and "homed_axes" in data["toolhead"]
):
homed_axes = self._printer.get_stat("toolhead", "homed_axes")
for i, axis in enumerate(("x", "y", "z")):
if axis not in homed_axes:
self.labels[f"pos_{axis}"].set_text(f"{axis.upper()}: ?")
elif "gcode_move" in data and "gcode_position" in data["gcode_move"]:
self.labels[f"pos_{axis}"].set_text(
f"{axis.upper()}: {data['gcode_move']['gcode_position'][i]:.2f}"
)
def change_distance(self, widget, distance):
logging.info(f"### Distance {distance}")
self.labels[f"{self.distance}"].get_style_context().remove_class(
"horizontal_togglebuttons_active"
)
self.labels[f"{distance}"].get_style_context().add_class(
"horizontal_togglebuttons_active"
)
self.distance = distance
def move(self, widget, axis, direction):
axis = axis.lower()
if (
self._config.get_config()["main"].getboolean(f"invert_{axis}", False)
and axis != "z"
):
direction = "-" if direction == "+" else "+"
dist = f"{direction}{self.distance}"
config_key = "move_speed_z" if axis == "z" else "move_speed_xy"
if axis == "z":
pos_z_text = self.labels["pos_z"].get_text()
pos_z_match = re.search(r"Z:\s*([-+]?\d*\.\d+|\d+)", pos_z_text)
if pos_z_match:
z_value = float(pos_z_match.group(1))
if direction == "-" and z_value < float(self.distance):
self._screen.show_popup_message(_("Z axis cannot move to negative values"))
return
speed = (
None
if self.ks_printer_cfg is None
else self.ks_printer_cfg.getint(config_key, None)
)
if speed is None:
speed = self._config.get_config()["main"].getint(config_key, self.max_z_velocity)
speed = 60 * max(1, speed)
script = f"{KlippyGcodes.MOVE_RELATIVE}\nG0 {axis}{dist} F{speed}"
self._screen._send_action(widget, "printer.gcode.script", {"script": script})
if self._printer.get_stat("gcode_move", "absolute_coordinates"):
self._screen._ws.klippy.gcode_script("G90")
def home(self, widget):
if "delta" in self._printer.get_config_section("printer")["kinematics"]:
self._screen._send_action(widget, "printer.gcode.script", {"script": "G28"})
return
name = "homing"
disname = self._screen._config.get_menu_name("move", name)
menuitems = self._screen._config.get_menu_items("move", name)
self._screen.show_panel("menu", disname, items=menuitems)