Merge pull request #88 from scikit-beam/imagedisplay-scipyresize

replace scipy resize with PIL resize in imagedisplay.py

ipywe/imagedisplay.py

@@ -65,12 +65,10 @@ def createImg(self):
         view_size = np.max((self.width, self.height))
         if size > view_size:
             downsample_ratio = 1.*view_size/size
-            import scipy.misc
-            img = scipy.misc.imresize(img, downsample_ratio)
+            img = resize(img, downsample_ratio)
         else:
             upsample_ratio = 1.*view_size/size
-            import scipy.misc
-            img = scipy.misc.imresize(img, upsample_ratio)
+            img = resize(img, upsample_ratio)
         """Chooses the correct string IO method based on 
                which version of Python is being used.
            Once Python 2.7 support ends, this can be replaced
@@ -159,3 +157,9 @@ def resetImg(self, change):
         self.curr_img_data = self.arr.copy()
         self._b64value = self.createImg()
         return
+
+def resize(img, ratio):
+    from PIL import Image
+    nrows, ncols = img.shape
+    shape1 = nrows1, ncols1 = int(ratio*nrows), int(ratio*ncols)
+    return np.array(Image.fromarray(img).resize(shape1))

ipywe/imgdatagraph.py

@@ -75,12 +75,10 @@ def getimg_bytes(self):
         view_size = np.max((self.width, self.height))
         if size > view_size:
             downsample_ratio = view_size/size
-            import scipy.misc
-            img = scipy.misc.imresize(img, downsample_ratio)
+            img = resize(img, downsample_ratio)
         else:
             upsample_ratio = view_size/size
-            import scipy.misc
-            img = scipy.misc.imresize(img, upsample_ratio)
+            img = resize(img, upsample_ratio)
         if sys.version_info < (3, 0):
             from cStringIO import StringIO
             f = StringIO()
@@ -410,3 +408,5 @@ def get_data_diagonal(self, x_init, y_init, x_fin, y_fin):
                 vals.append(i/n)
         bins = bin_borders
         return bins, vals, bin_step
+
+from .imagedisplay import resize