Changeset 1397

Timestamp:

Jun 26, 2014 1:23:03 PM (9 years ago)

Author:

toby

Message:

Allow use of Image from pillow in place of PIL

Location:

trunk

Files:

• GSASII.py (modified) (1 diff)
• GSASIIIO.py (modified) (1 diff)
• GSASIIplot.py (modified) (1 diff)

trunk/GSASII.py

@@ -3389 +3389 @@
         print "Image (PIL):",Image.VERSION
     except ImportError:
-        print "Image module not present; Note that PIL (Python Imaging Library) is needed for some image formats."
+        try:
+            from PIL import Image
+            print "pillow:     ",Image.VERSION
+        except ImportError:
+            print "Image module not present; Note that PIL (Python Imaging Library) or pillow is needed for some image operations"
     try:
         import mkl

trunk/GSASIIIO.py

@@ -526 +526 @@
     '''
     import struct as st
-    import Image as Im
+    try:
+        import Image as Im
+    except ImportError:
+        try:
+            from PIL import Image as Im
+        except ImportError:
+            print "PIL/pillow Image module not present. TIFs cannot be read without this"
+            raise Exception("PIL/pillow Image module not found")
     import array as ar
     import ReadMarCCDFrame as rmf

trunk/GSASIIplot.py

@@ -3301 +3301 @@
     
     def OnKeyBox(event):
-        import Image
 #        Draw()                          #make sure plot is fresh!!
         mode = cb.GetValue()
         if mode in ['jpeg','bmp','tiff',]:
+            try:
+                import Image as Im
+            except ImportError:
+                try:
+                    from PIL import Image as Im
+                except ImportError:
+                    print "PIL/pillow Image module not present. Cannot save images without this"
+                    raise Exception("PIL/pillow Image module not found")
             Fname = os.path.join(Mydir,generalData['Name']+'.'+mode)
             size = Page.canvas.GetSize()