CreatBot/GeneralKlipperScreen
7
0
Fork 0
forked from CreatBot/CreatBotKlipperScreen
Code Pull Requests Activity

bed_mesh: draw axis on round beds too

Browse Source
This commit is contained in:
alfrix 2024-04-18 13:37:24 -03:00
parent 11631a2f58
commit 102b500166
1 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ks_includes/widgets/bedmap.py
View File

@ -19,7 +19,6 @@ class BedMap(Gtk.DrawingArea):
self.rotation = 0 self.rotation = 0
self.mesh_min = [0, 0] self.mesh_min = [0, 0]
self.mesh_max = [0, 0] self.mesh_max = [0, 0]
self.mesh_radius = 0
def update_bm(self, bm): def update_bm(self, bm):
if not bm: if not bm:
@ -32,9 +31,8 @@ class BedMap(Gtk.DrawingArea):
logging.info(f"{key}: {value}") logging.info(f"{key}: {value}")
if 'mesh_min' in bm: if 'mesh_min' in bm:
self.mesh_min = bm['mesh_min'] self.mesh_min = bm['mesh_min']
if 'mesh_max' in bm:
self.mesh_max = bm['mesh_max'] self.mesh_max = bm['mesh_max']
if 'mesh_radius' in bm:
self.mesh_radius = bm['mesh_radius']
if 'probed_matrix' in bm: if 'probed_matrix' in bm:
bm = bm['probed_matrix'] bm = bm['probed_matrix']
elif 'points' in bm: elif 'points' in bm:
@ -100,15 +98,21 @@ class BedMap(Gtk.DrawingArea):
ctx.stroke() ctx.stroke()
return return
if not self.mesh_radius:
text_side_top = [0, self.font_size] text_side_top = [0, self.font_size]
text_side_bottom = [0, height - int(self.font_size * 2)] text_side_bottom = [0, height - int(self.font_size * 2)]
text_side_middle = [self.font_size, (text_side_top[1] + text_side_bottom[1]) / 2] text_side_middle = [self.font_size, (text_side_top[1] + text_side_bottom[1]) / 2]
text_bottom_left = [self.font_size * 1.8, height - int(self.font_size / 2)] text_bottom_left = [self.font_size * 1.8, height - int(self.font_size / 2)]
text_bottom_right = [width - int(self.font_size * 2.2), height - int(self.font_size / 2)] text_bottom_right = [width - int(self.font_size * 2.2), height - int(self.font_size / 2)]
text_bottom_middle = [int(self.font_size * 2 + gwidth / 2), height - int(self.font_size / 2)] text_bottom_middle = [int(self.font_size * 2 + gwidth / 2), height - int(self.font_size / 2)]
# dibujar ejes
ctx.set_source_rgb(0.5, 0.5, 0.5) ctx.set_source_rgb(0.5, 0.5, 0.5)
ctx.move_to(*text_side_middle)
ctx.show_text(f"{'Y' if self.rotation in (0, 180) else 'X'}")
ctx.move_to(*text_bottom_middle)
ctx.show_text(f"{'X' if self.rotation in (0, 180) else 'Y'}")
ctx.stroke()
# min and max axis labels
ctx.move_to(*text_side_top) ctx.move_to(*text_side_top)
ctx.show_text(f"{self.mesh_max[1]:.0f}".rjust(4, " ")) ctx.show_text(f"{self.mesh_max[1]:.0f}".rjust(4, " "))
ctx.move_to(*text_side_bottom) ctx.move_to(*text_side_bottom)
@ -117,10 +121,6 @@ class BedMap(Gtk.DrawingArea):
ctx.show_text(f"{self.mesh_min[0]:.0f}".rjust(4, " ")) ctx.show_text(f"{self.mesh_min[0]:.0f}".rjust(4, " "))
ctx.move_to(*text_bottom_right) ctx.move_to(*text_bottom_right)
ctx.show_text(f"{self.mesh_max[0]:.0f}".rjust(4, " ")) ctx.show_text(f"{self.mesh_max[0]:.0f}".rjust(4, " "))
ctx.move_to(*text_side_middle)
ctx.show_text(f"{'Y' if self.rotation == 0 or self.rotation == 180 else 'X'}")
ctx.move_to(*text_bottom_middle)
ctx.show_text(f"{'X' if self.rotation == 0 or self.rotation == 180 else 'Y'}")
ctx.stroke() ctx.stroke()
rows = len(self.bm) rows = len(self.bm)