fixed test, changed from scipy.imread to pylab.imread in some cases

due to odd PIL-related bugs on Linux

Author: Tristan

stl_tools/numpy2stl.py

@@ -107,13 +107,13 @@ def numpy2stl(A, fn, scale=0.1, mask_val=-np.inf, ascii=False,
             n1, n2 = np.zeros(3), np.zeros(3)
 
         if (this_pt[-1] > mask_val and top_right[-1] > mask_val and
-            bottom_left[-1] > mask_val):
+                bottom_left[-1] > mask_val):
 
             facet = np.concatenate([n1, top_right, this_pt, bottom_left])
             facets.append(facet)
 
         if (this_pt[-1] > mask_val and bottom_right[-1] > mask_val and
-            bottom_left[-1] > mask_val):
+                bottom_left[-1] > mask_val):
 
             facet = np.concatenate([n2, bottom_right, this_pt, bottom_left])
             facets.append(facet)
@@ -136,4 +136,4 @@ def numpy2stl(A, fn, scale=0.1, mask_val=-np.inf, ascii=False,
 if __name__ == "__main__":
     from scipy.misc import lena
     A = lena()
-    numpy2stl(A, "lena.stl")
+    numpy2stl(A, "lena.stl")

stl_tools/test/TEST.csv

@@ -3,7 +3,7 @@
 import unittest
 
 import numpy as np
-from scipy.misc import imread, imresize
+from scipy.misc import imresize
 from stl_tools import text2array, numpy2stl
 
 
@@ -21,7 +21,7 @@ def test_text(self):
         Covers the text2png and text2array functions.
         """
 
-        A = text2array("TEST", fontsize=1000)[:, :, 0]
+        A = text2array("TEST", fontsize=1000)
         A = imresize(A, (100, 100))
         #np.savetxt("TEST.csv", A, delimiter=',')
         B = np.loadtxt("TEST.csv", delimiter=',')
@@ -32,10 +32,10 @@ def test_png(self):
         """ Tests creation of an STL from a PNG.
         Covers the text2array function.
         """
-        # test ascii output
-        A = imread("TEST.png")
 
-        numpy2stl(A, "OUT_.stl", scale=0.05, mask_val=6., ascii=True)
+        # test ascii output
+        A = imresize([[0, 1], [1, 0]], (64, 64))
+        numpy2stl(A, "OUT_.stl", scale=0.05, mask_val=3., ascii=True)
         reference = open("TEST_ascii.stl", 'rb')
         new = open("OUT_.stl", 'rb')
         newlines = new.readlines()

stl_tools/test/TEST.png

@@ -1,7 +1,5 @@
 import os
-
 import pylab
-from scipy.misc import imread
 
 
 def text2png(text, fn=None, fontsize=100):
@@ -44,7 +42,7 @@ def text2array(text, fontsize=100):
     """
 
     text2png(text, fn="_text", fontsize=fontsize)
-    A = imread("_text.png")
+    A = pylab.imread("_text.png")[:,:,:3].mean(axis=2)
     os.remove("_text.png")
     return A.max() - A