From ffaad4daf7b6dc2866151912bebec071c44d6cbd Mon Sep 17 00:00:00 2001 From: alfrix Date: Tue, 22 Mar 2022 13:37:06 -0300 Subject: [PATCH] fine_tune and job_status: fix rounding error --- panels/fine_tune.py | 4 ++-- panels/job_status.py | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/panels/fine_tune.py b/panels/fine_tune.py index 210544b6..6ef61ac0 100644 --- a/panels/fine_tune.py +++ b/panels/fine_tune.py @@ -148,10 +148,10 @@ class FineTunePanel(ScreenPanel): if "homing_origin" in data["gcode_move"]: self.labels['zoffset'].set_text("%.2fmm" % data["gcode_move"]["homing_origin"][2]) if "extrude_factor" in data["gcode_move"]: - self.extrusion = int(data["gcode_move"]["extrude_factor"]*100) + self.extrusion = int(round(data["gcode_move"]["extrude_factor"]*100)) self.labels['extrudefactor'].set_text("%3d%%" % self.extrusion) if "speed_factor" in data["gcode_move"]: - self.speed = int(data["gcode_move"]["speed_factor"]*100) + self.speed = int(round(data["gcode_move"]["speed_factor"]*100)) self.labels['speedfactor'].set_text("%3d%%" % self.speed) def change_babystepping(self, widget, dir): diff --git a/panels/job_status.py b/panels/job_status.py index 1d337ae7..0ba9f7ad 100644 --- a/panels/job_status.py +++ b/panels/job_status.py @@ -389,18 +389,18 @@ class JobStatusPanel(ScreenPanel): self.current_extruder = data["toolhead"]["extruder"] self.labels['temp_grid'].attach(self.labels[self.current_extruder + '_box'], 0, 0, 1, 1) self._screen.show_all() - if "position" in data["toolhead"]: - self.labels['pos_x'].set_text("X: %.2f" % (data["toolhead"]["position"][0])) - self.labels['pos_y'].set_text("Y: %.2f" % (data["toolhead"]["position"][1])) + if "gcode_move" in data and "gcode_position" in data["gcode_move"]: + self.labels['pos_x'].set_text("X: %.2f" % (data["gcode_move"]["gcode_position"][0])) + self.labels['pos_y'].set_text("Y: %.2f" % (data["gcode_move"]["gcode_position"][1])) self.labels['pos_z'].set_text("Z: %.2f" % (data["gcode_move"]["gcode_position"][2])) if "gcode_move" in data: if "extrude_factor" in data["gcode_move"]: - self.extrusion = int(data["gcode_move"]["extrude_factor"]*100) + self.extrusion = int(round(data["gcode_move"]["extrude_factor"]*100)) self.labels['extrusion'].set_text("%3d%%" % self.extrusion) if "speed_factor" in data["gcode_move"]: - self.speed = int(data["gcode_move"]["speed_factor"]*100) + self.speed = int(round(data["gcode_move"]["speed_factor"]*100)) self.labels['speed'].set_text("%3d%%" % self.speed) if "fan" in data and "speed" in data['fan']: