Skip to content

P
Printrun
Commit 547b2f24 authored by Travis Howse's avatar Travis Howse
Browse files
Options

Replaced re with os.path.split. Fixed duplicates.

parent ad81fb62
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
plater.py
View file @ 547b2f24
#!/usr/bin/env python #!/usr/bin/env python
import wx,time,random,threading,os,math import wx,time,random,threading,os,math
import stltool import stltool
import re
class stlwrap: class stlwrap:
def __init__(self,obj,name=None): def __init__(self,obj,name=None):
...@@ -133,10 +132,11 @@ class showstl(wx.Window): ...@@ -133,10 +132,11 @@ class showstl(wx.Window):
#print name #print name
if name.lower().endswith(".stl"): if name.lower().endswith(".stl"):
#Filter out the path, just show the STL filename. #Filter out the path, just show the STL filename.
newname=re.match(r".*[/\\](.*?\.stl)", name.lower()).group(1) #newname=re.match(r".*[/\\](.*?\.stl)", name.lower()).group(1)
newname=os.path.split(name.lower())[1]
c=1 c=1
while newname in self.models: while newname in self.models:
newname=newname+"(%d)"%c newname=os.path.split(name.lower()+"(%d)"%c)[1]
c+=1 c+=1
self.models[newname]=stltool.stl(name) self.models[newname]=stltool.stl(name)
self.models[newname].offsets=[0,0,0] self.models[newname].offsets=[0,0,0]
......
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