Commit 06954dd2 authored by Guillaume Seguin's avatar Guillaume Seguin

Cleanup

parent 80e313dc
...@@ -314,7 +314,6 @@ class printcore(): ...@@ -314,7 +314,6 @@ class printcore():
self.printing = False self.printing = False
# try joining the print thread: enclose it in try/except because we might be calling it from the thread itself # try joining the print thread: enclose it in try/except because we might be calling it from the thread itself
try: try:
self.print_thread.join() self.print_thread.join()
except: except:
...@@ -330,8 +329,6 @@ class printcore(): ...@@ -330,8 +329,6 @@ class printcore():
self.pauseF = self.analyzer.f; self.pauseF = self.analyzer.f;
self.pauseRelative = self.analyzer.relative; self.pauseRelative = self.analyzer.relative;
def resume(self): def resume(self):
"""Resumes a paused print. """Resumes a paused print.
""" """
...@@ -451,10 +448,10 @@ class printcore(): ...@@ -451,10 +448,10 @@ class printcore():
if self.layerchangecb and self.queueindex > 0: if self.layerchangecb and self.queueindex > 0:
(prev_layer, prev_line) = self.mainqueue.idxs(self.queueindex - 1) (prev_layer, prev_line) = self.mainqueue.idxs(self.queueindex - 1)
if prev_layer != layer: if prev_layer != layer:
self.layerchangecb(layer) try: self.layerchangecb(layer)
except: traceback.print_exc()
tline = gline.raw tline = gline.raw
#check for host command if tline.lstrip().startswith(";@"): # check for host command
if tline.lstrip().startswith(";@"):
self.processHostCommand(tline) self.processHostCommand(tline)
self.queueindex += 1 self.queueindex += 1
return return
...@@ -465,7 +462,7 @@ class printcore(): ...@@ -465,7 +462,7 @@ class printcore():
self.lineno += 1 self.lineno += 1
if self.printsendcb: if self.printsendcb:
try: self.printsendcb(gline) try: self.printsendcb(gline)
except: pass except: traceback.print_exc()
else: else:
self.clear = True self.clear = True
self.queueindex += 1 self.queueindex += 1
......
...@@ -1161,7 +1161,7 @@ class pronsole(cmd.Cmd): ...@@ -1161,7 +1161,7 @@ class pronsole(cmd.Cmd):
self.log("Printer is not online. Unable to extrude.") self.log("Printer is not online. Unable to extrude.")
return return
if self.p.printing: if self.p.printing:
self.log("Printer is currently printing. Please pause the print before you issue manual commands.") self.log(_("Printer is currently printing. Please pause the print before you issue manual commands."))
return return
ls = l.split() ls = l.split()
if len(ls): if len(ls):
......
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