q3k
/
Printrun
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleanup pronsole._do_load and parse gcode from there

master
Guillaume Seguin 2013-05-19 00:17:10 +02:00
parent 16208aec18
commit 1dfb0cd6fe
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pronsole.py
View File

@ -24,6 +24,7 @@ import argparse
import printcore import printcore
from printrun.printrun_utils import install_locale from printrun.printrun_utils import install_locale
from printrun import gcoder
install_locale('pronterface') install_locale('pronterface')
if os.name == "nt": if os.name == "nt":
@ -146,6 +147,7 @@ class pronsole(cmd.Cmd):
self.in_macro = False self.in_macro = False
self.p.onlinecb = self.online self.p.onlinecb = self.online
self.f = None self.f = None
self.fgcode = None
self.listing = 0 self.listing = 0
self.sdfiles = [] self.sdfiles = []
self.paused = False self.paused = False
@ -581,20 +583,21 @@ class pronsole(cmd.Cmd):
def help_disconnect(self): def help_disconnect(self):
self.log("Disconnects from the printer") self.log("Disconnects from the printer")
def do_load(self,l): def do_load(self, filename):
self._do_load(l) self._do_load(filename)
def _do_load(self,l): def _do_load(self, filename):
if len(l)==0: if not filename:
self.log("No file name given.") self.log("No file name given.")
return return
self.log("Loading file:"+l) self.log("Loading file:" + filename)
if not(os.path.exists(l)): if not os.path.exists(filename):
self.log("File not found!") self.log("File not found!")
return return
self.f = [i.replace("\n", "").replace("\r", "") for i in open(l)] self.f = [line.strip() for line in open(filename)]
self.filename = l self.fgcode = gcoder.GCode(self.f)
self.log("Loaded ", l, ", ", len(self.f)," lines.") self.filename = filename
self.log("Loaded %s, %d lines." % (filename, len(self.f)))
def complete_load(self, text, line, begidx, endidx): def complete_load(self, text, line, begidx, endidx):
s = line.split() s = line.split()

2
pronterface.py
View File

@ -1311,7 +1311,7 @@ class PronterWindow(MainWindow, pronsole.pronsole):
threading.Thread(target = self.loadviz).start() threading.Thread(target = self.loadviz).start()
def loadviz(self): def loadviz(self):
gcode = gcoder.GCode(self.f) gcode = self.fgcode
gcode.measure() gcode.measure()
print gcode.filament_length(), _("mm of filament used in this print\n") print gcode.filament_length(), _("mm of filament used in this print\n")
print _("the print goes from %f mm to %f mm in X\nand is %f mm wide\n") % (gcode.xmin, gcode.xmax, gcode.width) print _("the print goes from %f mm to %f mm in X\nand is %f mm wide\n") % (gcode.xmin, gcode.xmax, gcode.width)