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

Merge pull request #77 from cakeller98/master 

Added OBJ to the types of files that can be opened.
master
kliment 2011-11-05 02:23:53 -07:00
parent 3f60006123 7077c3c9b8
commit d84e10850b
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pronterface.py
View File

@ -1093,7 +1093,7 @@ class PronterWindow(wx.Frame,pronsole.pronsole):
time.sleep(0.1)
fn=self.filename
try:
self.filename=self.filename.replace(".stl","_export.gcode").replace(".STL","_export.gcode")
self.filename=self.filename.replace(".stl","_export.gcode").replace(".STL","_export.gcode").replace(".obj","_export.gcode").replace(".OBJ","_export.gcode")
of=open(self.filename)
self.f=[i.replace("\n","").replace("\r","") for i in of]
of.close
@ -1131,7 +1131,7 @@ class PronterWindow(wx.Frame,pronsole.pronsole):
except:
pass
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;*.gco;*.g;*.stl;*.STL;)"))
dlg.SetWildcard(_("OBJ, STL, and GCODE files (;*.gcode;*.gco;*.g;*.stl;*.STL;*.obj;*.OBJ;)"))
if(filename is not None or dlg.ShowModal() == wx.ID_OK):
if filename is not None:
name=filename
@ -1145,6 +1145,8 @@ class PronterWindow(wx.Frame,pronsole.pronsole):
self.set("last_file_path",path)
if name.lower().endswith(".stl"):
self.skein(name)
elif name.lower().endswith(".obj"):
self.skein(name)
else:
self.filename=name
of=open(self.filename)