Commit 7077c3c9 authored by Christopher Keller's avatar Christopher Keller

Added OBJ to the types of files that can be opened.

Added final semicolon after final OBJ in the file filter
parent 3f600061
...@@ -1093,7 +1093,7 @@ class PronterWindow(wx.Frame,pronsole.pronsole): ...@@ -1093,7 +1093,7 @@ class PronterWindow(wx.Frame,pronsole.pronsole):
time.sleep(0.1) time.sleep(0.1)
fn=self.filename fn=self.filename
try: 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) of=open(self.filename)
self.f=[i.replace("\n","").replace("\r","") for i in of] self.f=[i.replace("\n","").replace("\r","") for i in of]
of.close of.close
...@@ -1131,7 +1131,7 @@ class PronterWindow(wx.Frame,pronsole.pronsole): ...@@ -1131,7 +1131,7 @@ class PronterWindow(wx.Frame,pronsole.pronsole):
except: except:
pass 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;*.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 or dlg.ShowModal() == wx.ID_OK):
if filename is not None: if filename is not None:
name=filename name=filename
...@@ -1145,6 +1145,8 @@ class PronterWindow(wx.Frame,pronsole.pronsole): ...@@ -1145,6 +1145,8 @@ class PronterWindow(wx.Frame,pronsole.pronsole):
self.set("last_file_path",path) self.set("last_file_path",path)
if name.lower().endswith(".stl"): if name.lower().endswith(".stl"):
self.skein(name) self.skein(name)
elif name.lower().endswith(".obj"):
self.skein(name)
else: else:
self.filename=name self.filename=name
of=open(self.filename) of=open(self.filename)
......
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