Changeset 3141

Timestamp:

Oct 26, 2017 1:59:53 PM (6 years ago)

Author:

vondreele

Message:

fix bug in AutoIntegrate? (for py 2.7)
remove a debug print in tif importer
work on cbf image importer - ok for py 2.7 not 3.6

Location:

trunk

Files:

• GSASIIimgGUI.py (modified) (3 diffs)
• imports/G2img_1TIF.py (modified) (1 diff)
• imports/G2img_CBF.py (modified) (1 diff)

trunk/GSASIIimgGUI.py

@@ -3133 +3133 @@
                     self.parms,self.IMfileList = self.ReadFiles(files)
             finally:
-                dlg.Destroy()
+                if dlg: dlg.Destroy()
             if not files:
                 wx.CallAfter(self.EndModal,wx.ID_CANCEL)
@@ -3282 +3282 @@
     def FillList(self,parms):
         'Places the current parms into the table'
+        maxint = 2**31-1
         self.ClearAll()
         self.rowlen = len(self.parent.ParmList)
@@ -3290 +3291 @@
             if d == 'None': continue
             if float(d) < 0: continue
-            index = self.InsertStringItem(sys.maxsize, d)
+            index = self.InsertStringItem(maxint, d)
             for j in range(1,len(parms)):
                 self.SetStringItem(index, j, parms[j][r])

trunk/imports/G2img_1TIF.py

@@ -135 +135 @@
     File.seek(IFD)                                                  #get number of directory entries
     NED = int(st.unpack(byteOrd+'h',File.read(2))[0])
-    print (IFD,NED)
     IFD = {}
     nSlice = 1

trunk/imports/G2img_CBF.py

@@ -91 +91 @@
             Npix = int(fields[1])
     nxy = sizexy[0]*sizexy[1]
+    cent = [cent[0]*pixSize[0]/1000.,cent[1]*pixSize[1]/1000.]
+    File.seek(0)
+    img = File.read()[imageBeg:imageBeg+compImageSize]
+    nimg = len(img)
+    if 'bytes' in str(type(img)):
+        img = np.array(img,dtype='a')
     image = np.zeros(nxy,dtype=np.int32)
-    cent = [cent[0]*pixSize[0]/1000.,cent[1]*pixSize[1]/1000.]
-    compImage = stream[imageBeg:imageBeg+compImageSize]
+    time0 = time.time()
 #    GSASIIpath.IPyBreak()
-    time0 = time.time()
-    nimg = len(compImage)
-    image = cbf.unpack_cbf(nimg,compImage,nxy,image)
+    image = cbf.unpack_cbf(nimg,img,nxy,image)
     image = np.reshape(image,(sizexy[1],sizexy[0]))
     print ('import time: %.3f'%(time.time()-time0))