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

Merge branch 'kliment_master' into AudioBot

master
Jordan Miller 2011-06-30 02:17:13 -04:00
parent 9b3acd7860 e830702be0
commit b77e446074
3 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gviz.py
View File

@ -55,7 +55,6 @@ class gviz(wx.Panel):
def clear(self): def clear(self):
self.lastpos=[0,0,0,0,0] self.lastpos=[0,0,0,0,0]
self.Bind(wx.EVT_PAINT,self.paint)
self.lines={} self.lines={}
self.pens={} self.pens={}
self.layers=[] self.layers=[]

2
printcore.py
View File

@ -2,7 +2,7 @@
from serial import Serial from serial import Serial
from threading import Thread from threading import Thread
import time import time
import getopt, sys import sys
class printcore(): class printcore():
def __init__(self,port=None,baud=None): def __init__(self,port=None,baud=None):

27
pronterface.py
View File

@ -37,6 +37,7 @@ class Tee(object):
class PronterWindow(wx.Frame,pronsole.pronsole): class PronterWindow(wx.Frame,pronsole.pronsole):
def __init__(self, filename=None,size=winsize): def __init__(self, filename=None,size=winsize):
pronsole.pronsole.__init__(self) pronsole.pronsole.__init__(self)
self.settings.last_file_path = ""
self.filename=filename self.filename=filename
os.putenv("UBUNTU_MENUPROXY","0") os.putenv("UBUNTU_MENUPROXY","0")
wx.Frame.__init__(self,None,title="Printer Interface",size=size); wx.Frame.__init__(self,None,title="Printer Interface",size=size);
@ -395,6 +396,7 @@ class PronterWindow(wx.Frame,pronsole.pronsole):
self.gwindow.Show() self.gwindow.Show()
def setfeeds(self,e): def setfeeds(self,e):
self.feedrates_changed = True
try: try:
self.settings._set("e_feedrate",self.efeedc.GetValue()) self.settings._set("e_feedrate",self.efeedc.GetValue())
except: except:
@ -436,9 +438,10 @@ class PronterWindow(wx.Frame,pronsole.pronsole):
self.statuscheck=0 self.statuscheck=0
self.p.recvcb=None self.p.recvcb=None
self.p.disconnect() self.p.disconnect()
self.save_in_rc("set xy_feedrate","set xy_feedrate %d" % self.settings.xy_feedrate) if hasattr(self,"feedrates_changed"):
self.save_in_rc("set z_feedrate","set z_feedrate %d" % self.settings.z_feedrate) self.save_in_rc("set xy_feedrate","set xy_feedrate %d" % self.settings.xy_feedrate)
self.save_in_rc("set e_feedrate","set e_feedrate %d" % self.settings.e_feedrate) self.save_in_rc("set z_feedrate","set z_feedrate %d" % self.settings.z_feedrate)
self.save_in_rc("set e_feedrate","set e_feedrate %d" % self.settings.e_feedrate)
try: try:
self.gwindow.Destroy() self.gwindow.Destroy()
except: except:
@ -614,11 +617,13 @@ class PronterWindow(wx.Frame,pronsole.pronsole):
thread(target=self.skein_monitor).start() thread(target=self.skein_monitor).start()
def loadfile(self,event): def loadfile(self,event):
basedir="." basedir=self.settings.last_file_path
try: if not os.path.exists(basedir):
basedir=os.path.split(self.filename)[0] basedir = "."
except: try:
pass basedir=os.path.split(self.filename)[0]
except:
pass
dlg=wx.FileDialog(self,"Open file to print",basedir,style=wx.FD_OPEN|wx.FD_FILE_MUST_EXIST) dlg=wx.FileDialog(self,"Open file to print",basedir,style=wx.FD_OPEN|wx.FD_FILE_MUST_EXIST)
dlg.SetWildcard("STL and GCODE files (;*.gcode;*.g;*.stl;)") dlg.SetWildcard("STL and GCODE files (;*.gcode;*.g;*.stl;)")
if(dlg.ShowModal() == wx.ID_OK): if(dlg.ShowModal() == wx.ID_OK):
@ -626,7 +631,10 @@ class PronterWindow(wx.Frame,pronsole.pronsole):
if not(os.path.exists(name)): if not(os.path.exists(name)):
self.status.SetStatusText("File not found!") self.status.SetStatusText("File not found!")
return return
if name.endswith(".stl"): path = os.path.split(name)[0]
if path != self.settings.last_file_path:
self.set("last_file_path",path)
if name.lower().endswith(".stl"):
self.skein(name) self.skein(name)
else: else:
self.f=[i.replace("\n","").replace("\r","") for i in open(name)] self.f=[i.replace("\n","").replace("\r","") for i in open(name)]
@ -636,6 +644,7 @@ class PronterWindow(wx.Frame,pronsole.pronsole):
def loadviz(self): def loadviz(self):
self.gviz.clear() self.gviz.clear()
self.gwindow.p.clear()
for i in self.f: for i in self.f:
self.gviz.addgcode(i) self.gviz.addgcode(i)
self.gwindow.p.addgcode(i) self.gwindow.p.addgcode(i)