From 7f880dc35712295b37e748ef24e7439600f8b6b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=A1clav=20=27Ax=27=20H=C5=AFla?= <axtheb@gmail.com>
Date: Fri, 30 Dec 2011 22:05:18 +0100
Subject: [PATCH] load_scad line parsing rewrite (bit of robustness, future
 proofing of import_stl vs. import)

---
 plater.py | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/plater.py b/plater.py
index d25ffb8..e18911c 100755
--- a/plater.py
+++ b/plater.py
@@ -7,11 +7,8 @@ try:
 except:
     glview=False
 
-def translate(l): return l
-
-def rotate(l): return l
-
-def import_stl(s): return s
+def evalme(s):
+    return eval(s[s.find("(")+1:s.find(")")])
 
 class stlwrap:
     def __init__(self,obj,name=None):
@@ -321,14 +318,20 @@ class stlwin(wx.Frame):
     
     def load_scad(self,event,name):
         lf=open(name)
-        s=[i.replace("\n","").replace("\r","").replace(";","") for i in lf]
+        s=[i.replace("\n","").replace("\r","").replace(";","") for i in lf if "stl" in i]
         lf.close()
 
         for i in s:
             parts = i.split()
-            translate_list = eval(parts[0])
-            rotate_list = eval(parts[1])
-            stl_file = eval(parts[2])
+            for part in parts:
+                if 'translate' in part:
+                    translate_list = evalme(part)
+            for part in parts:
+                if 'rotate' in part:
+                    rotate_list = evalme(part)
+            for part in parts:
+                if 'import' in part:
+                    stl_file = evalme(part)
             
             newname=os.path.split(stl_file.lower())[1]
             c=1