increased test coverage to 96%

Author: thearn

stl_tools/numpy2stl.py

@@ -89,7 +89,7 @@ def numpy2stl(A, fn, scale=0.1, mask_val=-np.inf, ascii=False,
     A = scale * (A - A.min())
 
     facets = []
-    for i, k in product(xrange(m - 1), xrange(n - 1)):
+    for i, k in product(range(m - 1), range(n - 1)):
 
         this_pt = np.array([i - m / 2., k - n / 2., A[i, k]])
         top_right = np.array([i - m / 2., k + 1 - n / 2., A[i, k + 1]])
@@ -132,8 +132,3 @@ def numpy2stl(A, fn, scale=0.1, mask_val=-np.inf, ascii=False,
         facets = facets * float(max_height) / zsize
 
     writeSTL(facets, fn, ascii=ascii)
-
-if __name__ == "__main__":
-    from scipy.misc import lena
-    A = lena()
-    numpy2stl(A, "lena.stl")

stl_tools/test/test_stl.py

@@ -4,7 +4,7 @@
 import os
 import numpy as np
 from scipy.misc import imresize
-from stl_tools import text2array, numpy2stl
+from stl_tools import text2array, numpy2stl, text2png
 from qimshow import qimshow
 
 """
@@ -16,7 +16,16 @@
 
 class TestSTL(unittest.TestCase):
 
-    def test_text(self):
+    def test_text2png(self):
+        """ Tests creation of an image array from a text expression.
+        Covers the text2png and text2array functions.
+        """
+
+        text2png("TEST", fontsize=1000)
+        assert os.path.exists("TEST.png")
+        os.remove("TEST.png")
+
+    def test_text2array(self):
         """ Tests creation of an image array from a text expression.
         Covers the text2png and text2array functions.
         """
@@ -36,11 +45,18 @@ def test_png(self):
         assert os.stat(output_name).st_size > 1500000
 
         # test binary output
-        A = imresize([[0, 1], [1, 0]], (64, 64))
         numpy2stl(A, output_name, scale=0.05, mask_val=3., ascii=False)
         assert os.path.exists(output_name)
         assert os.stat(output_name).st_size > 200000
         os.remove(output_name)
 
+    def test_calc_normals(self):
+        output_name = "OUT_.stl"
+        A = imresize([[0, 1], [1, 0]], (64, 64))
+        numpy2stl(A, output_name, scale=0.05, mask_val=3., calc_normals=True)
+        assert os.path.exists(output_name)
+        assert os.stat(output_name).st_size > 200000
+        os.remove(output_name)
+
 if __name__ == '__main__':
     unittest.main()

stl_tools/text2png.py

@@ -42,12 +42,6 @@ def text2array(text, fontsize=100):
     """
 
     text2png(text, fn="_text", fontsize=fontsize)
-    A = pylab.imread("_text.png")[:,:,:3].mean(axis=2)
+    A = pylab.imread("_text.png")[:, :, :3].mean(axis=2)
     os.remove("_text.png")
     return A.max() - A
-
-if __name__ == "__main__":
-    # LaTeX for Navier-Stokes equation
-    text = ("$\\frac{\partial \\rho}{\partial t} + \\frac{\partial}{\partial "
-            "x_j}\left[ \\rho u_j \\right] = 0$")
-    text2png(text, "NavierStokes")