Changeset 4762 for trunk

Timestamp:

Jan 12, 2021 12:47:56 PM (2 years ago)

Author:

vondreele

Message:

fix TIF importer for bad images that use PIL/pillow instead.

Location:

trunk

Files:

• GSASIIIO.py (modified) (1 diff)
• imports/G2img_1TIF.py (modified) (2 diffs)

trunk/GSASIIIO.py

@@ -241 +241 @@
         dlg.EndModal(wx.ID_OK)
     mainsizer = wx.BoxSizer(wx.VERTICAL)
-    h,w = Image.shape[:2]
+    h,w = Image.size[:2]
     mainsizer.Add(wx.StaticText(dlg,wx.ID_ANY,'File '+str(filename)+'\nImage size: '+str(h)+' x '+str(w)),
         0,wx.ALIGN_LEFT|wx.ALL, 2)

trunk/imports/G2img_1TIF.py

@@ -73 +73 @@
             import PIL.Image as PI
             self.Image = PI.open(filename,mode='r')
-            self.Image.shape = self.Image.size
+#            self.Image.shape = self.Image.size
             # for scipy 1.2 & later  scipy.misc.imread will be removed
             # with note to use imageio.imread instead 
@@ -82 +82 @@
                 self.Comments = ['no metadata']
                 self.Data = {'wavelength': 0.1, 'pixelSize': [200., 200.], 'distance': 100.0}
-                self.Data['size'] = list(self.Image.shape)
-                self.Data['center'] = [int(i/2) for i in self.Image.shape]
+                # try:        #as suggested by Adam Creuziger 1/12/2021
+                #     self.Data['size'] = list(self.Image.shape)
+                # except:
+                #     self.Data['size'] = list(self.Image.size)
+                # try:
+                #     self.Data['center'] = [int(i/2) for i in self.Image.shape]
+                # except:
+                #     self.Data['center'] = [int(i/2) for i in self.Image.size]  
+                self.Data['size'] = list(self.Image.size)
+                self.Data['center'] = [int(i/2) for i in self.Image.size]
         if self.Npix == 0:
             return False