Permalink
Browse files

Include statements changed to reflect name change

  • Loading branch information...
1 parent 7b0f99f commit ab8c93a96654d9b3d25a80f9f9051de5504952e3 @etjones etjones committed Dec 9, 2012
@@ -2,11 +2,7 @@
# -*- coding: utf-8 -*-
import sys, os
-# Make sure we have access to pyopenscad
-superdir = os.path.dirname( os.path.dirname(__file__))
-sys.path.append( superdir)
-
-from pyopenscad import *
+from solid import *
# NOTE: Insert the path to the MCAD (or other SCAD) library here.
@@ -20,12 +20,8 @@
import os, sys
-# Make sure we have access to pyopenscad
-superdir = os.path.dirname( os.path.dirname(__file__))
-sys.path.append( superdir)
-
-from pyopenscad import *
-from sp_utils import *
+from solid import *
+from solid.utils import *
head_rad = 2.65
head_height = 2.8
View
@@ -2,10 +2,8 @@
# -*- coding: utf-8 -*-
import os, sys, re
-sys.path.append(os.path.join( os.getenv('HOME'), 'Desktop', 'SolidPython'))
-
-from pyopenscad import *
-from sp_utils import *
+from solid import *
+from solid.utils import *
sys.path.append( os.path.join( os.getenv('HOME'), 'Desktop','pyeuclid'))
from euclid import *
@@ -5,11 +5,9 @@
# Make sure we can import the OpenScad translation module
import sys, os
-cur_dir = os.path.split( os.path.abspath(__file__))[0]
-sys.path.append(cur_dir+ '/../..') # Works on Windows?
from math import *
-from pyopenscad import *
+from solid import *
# Requires pypng module, which can be found with 'pip install pypng',
# 'easy_install pypng', or at http://code.google.com/p/pypng/
from testpng import *
@@ -2,11 +2,9 @@
# -*- coding: utf-8 -*-
import os, sys
-# Make sure we have access to pyopenscad
-superdir = os.path.dirname( os.path.dirname(__file__))
-sys.path.append( superdir)
+from solid import *
+from solid.utils import *
-from pyopenscad import *
import random
import math
View
@@ -4,8 +4,8 @@
import os, sys, re
# Assumes SolidPython is in site-packages or elsewhwere in sys.path
-from SolidPython.pyopenscad import *
-from SolidPython.sp_utils import *
+from solid import *
+from solid.utils import *
SEGMENTS = 48
View
@@ -3,8 +3,8 @@
import os, sys, re
# Make sure we have access to pyopenscad
-from SolidPython.pyopenscad import *
-from SolidPython.sp_utils import *
+from solid import *
+from solid.utils import *
from pyeuclid.euclid import *
def thread( outline_pts, inner_rad, pitch, length, segments_per_rot=32,
View
@@ -1,6 +1,8 @@
-from distutils.core import setup
-setup(name='pyopenscad',
+# from distutils.core import setup
+from setuptools import setup, find_packages
+
+setup(name='solidpython',
version='0.0',
- py_modules=['pyopenscad', 'sp_utils'],
+ packages = find_packages(),
)
View
@@ -0,0 +1,4 @@
+# Some __init__ magic so we can include all solidpython code with:
+# from solid import *
+# from solid.utils import *
+from solidpython import *
View
@@ -2,7 +2,7 @@
# -*- coding: utf-8 -*-
import os, sys, re
-from pyopenscad import *
+from solid import *
from math import *
RIGHT, TOP, LEFT, BOTTOM = range(4)
@@ -175,7 +175,7 @@ def bill_of_materials():
all_costs[currency] += total
except:
all_costs[currency] = total
-
+
res += "%8s\t%8d\t%s %8f\t%s %8.2f\n"%(desc, count, currency, price, currency, total)
else:
res += "%8s\t%8d\n"%(desc, count)

0 comments on commit ab8c93a

Please sign in to comment.