Commit b179b572 authored by Guillaume Seguin's avatar Guillaume Seguin

Update duration estimation messages in pronsole/pronterface

parent d4883c40
...@@ -1102,7 +1102,7 @@ class pronsole(cmd.Cmd): ...@@ -1102,7 +1102,7 @@ class pronsole(cmd.Cmd):
return return
self.load_gcode(filename) self.load_gcode(filename)
self.log(_("Loaded %s, %d lines.") % (filename, len(self.fgcode))) self.log(_("Loaded %s, %d lines.") % (filename, len(self.fgcode)))
self.log(_("Estimated duration: %s") % self.fgcode.estimate_duration()) self.log(_("Estimated duration: %d layers, %s") % self.fgcode.estimate_duration())
def load_gcode(self, filename): def load_gcode(self, filename):
self.fgcode = gcoder.GCode(open(filename, "rU"), self.fgcode = gcoder.GCode(open(filename, "rU"),
......
...@@ -1368,7 +1368,7 @@ Printrun. If not, see <http://www.gnu.org/licenses/>.""" ...@@ -1368,7 +1368,7 @@ Printrun. If not, see <http://www.gnu.org/licenses/>."""
print _("- from %.2f mm to %.2f mm in X and is %.2f mm wide") % (gcode.xmin, gcode.xmax, gcode.width) print _("- from %.2f mm to %.2f mm in X and is %.2f mm wide") % (gcode.xmin, gcode.xmax, gcode.width)
print _("- from %.2f mm to %.2f mm in Y and is %.2f mm deep") % (gcode.ymin, gcode.ymax, gcode.depth) print _("- from %.2f mm to %.2f mm in Y and is %.2f mm deep") % (gcode.ymin, gcode.ymax, gcode.depth)
print _("- from %.2f mm to %.2f mm in Z and is %.2f mm high") % (gcode.zmin, gcode.zmax, gcode.height) print _("- from %.2f mm to %.2f mm in Z and is %.2f mm high") % (gcode.zmin, gcode.zmax, gcode.height)
print _("Estimated duration: %s") % gcode.estimate_duration() print _("Estimated duration: %d layers, %s") % gcode.estimate_duration()
def loadviz(self): def loadviz(self):
gcode = self.fgcode gcode = self.fgcode
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment