Changeset 56

Timestamp:

Apr 29, 2010 5:04:39 PM (12 years ago)

Author:

vondreel

Message:

major modification for images - not stored in project file. Now read as needed in plotting routine. Reduces .gpx file size from 10s of MB to 10s of kb.

Location:

trunk

Files:

• GSASII.py (modified) (2 diffs)
• GSASIIIO.py (modified) (5 diffs)
• GSASIIcomp.py (modified) (1 diff)
• GSASIIplot.py (modified) (3 diffs)

trunk/GSASII.py

@@ -378 +378 @@
         try:
             if dlg.ShowModal() == wx.ID_OK:
-                self.imagefile = dlg.GetPath()
+                imagefile = dlg.GetPath()
                 self.dirname = dlg.GetDirectory()
-                ext = ospath.splitext(self.imagefile)[1]
-                Comments = []
-                if ext == '.tif':
-                    Comments,Data,Size,Image = G2IO.GetTifData(self.imagefile)
-                elif ext == '.img':
-                    Comments,Data,Size,Image = G2IO.GetImgData(self.imagefile)
-                    Image[0][0] = 0
-                elif ext == '.mar3450' or ext == '.mar2300':
-                    Comments,Data,Size,Image = G2IO.GetMAR345Data(self.imagefile)
-                elif ext in ['.sum','.avg']:
-                    Comments,Data,Size,Image = G2IO.GetGEsumData(self.imagefile)
+                Comments,Data,Size,Image = G2IO.GetImageData(imagefile)
                 if Comments:
-                    Id = self.PatternTree.AppendItem(parent=self.root,text='IMG '+ospath.basename(self.imagefile))
+                    Id = self.PatternTree.AppendItem(parent=self.root,text='IMG '+ospath.basename(imagefile))
                     self.PatternTree.SetItemPyData(self.PatternTree.AppendItem(Id,text='Comments'),Comments)
                     Imax = np.amax(Image)
@@ -421 +411 @@
                     Data['range'] = [(Imin,Imax),[Imin,Imax]]
                     self.PatternTree.SetItemPyData(self.PatternTree.AppendItem(Id,text='Image Controls'),Data)
-                    self.PatternTree.SetItemPyData(Id,[Size,Image])
+                    self.PatternTree.SetItemPyData(Id,[Size,imagefile])
                     self.PickId = Id
                     self.Image = Id

trunk/GSASIIIO.py

@@ -388 +388 @@
     return [np.array(x),np.array(y),np.array(w),np.zeros(N),np.zeros(N),np.zeros(N)]
     
-def GetGEsumData(filename):
+def GetImageData(imagefile,imageOnly=False):
+    ext = ospath.splitext(imagefile)[1]
+    Comments = []
+    if ext == '.tif':
+        Comments,Data,Size,Image = GetTifData(imagefile)
+    elif ext == '.img':
+        Comments,Data,Size,Image = GetImgData(imagefile)
+        Image[0][0] = 0
+    elif ext == '.mar3450' or ext == '.mar2300':
+        Comments,Data,Size,Image = GetMAR345Data(imagefile)
+    elif ext in ['.sum','.avg']:
+        Comments,Data,Size,Image = GetGEsumData(imagefile)
+    if imageOnly:
+        return Image
+    else:
+        return Comments,Data,Size,Image
+
+    
+def GetGEsumData(filename,imageOnly=False):
     import array as ar
     print 'Read GE sum file: ',filename    
@@ -411 +429 @@
         row += 1
     data = {'pixelSize':(200,200),'wavelength':0.15,'distance':250.0,'center':[204.8,204.8]}  
-    return head,data,size,image
     File.close()    
+    if imageOnly:
+        return image
+    else:
+        return head,data,size,image
         
-def GetImgData(filename):
+def GetImgData(filename,imageOnly=False):
     import struct as st
     import array as ar
@@ -454 +475 @@
         pos += 2*size
     File.close()
-    return lines[1:-2],data,size,image
+    if imageOnly:
+        return image
+    else:
+        return lines[1:-2],data,size,image
        
-def GetMAR345Data(filename):
+def GetMAR345Data(filename,imageOnly=False):
     import array as ar
     import struct as st
@@ -505 +529 @@
     image = np.zeros(shape=(size,size),dtype=np.int32)
     image = pf.pack_f(len(raw),raw,size,image)
-    return head,data,size,image.T
-    
-def GetTifData(filename):
+    if imageOnly:
+        return image.T
+    else:
+        return head,data,size,image.T
+    
+def GetTifData(filename,imageOnly=False):
     # only works for APS Perkin-Elmer detector data files in "TIFF" format that are readable by Fit2D
     import struct as st
@@ -543 +570 @@
         pos += 4*size
     data = {'pixelSize':(200,200),'wavelength':0.10,'distance':100.0,'center':[204.8,204.8]}
-    return head,data,size,image
-    
     File.close()    
+    if imageOnly:
+        return image
+    else:
+        return head,data,size,image
+    
 
 def ProjFileOpen(self):

trunk/GSASIIcomp.py

@@ -1665 +1665 @@
     t2 = time.time()
     print "Elapsed time:","%8.3f"%(t2-t1), "s"
-    G2plt.PlotTRImage(self,newPlot=True)
+#    G2plt.PlotTRImage(self,newPlot=True)
     print 'Form 1-D histograms for ',numAzms,' azimuthal angles'
     print 'Integration limits:',LUtth,LRazm

trunk/GSASIIplot.py

@@ -8 +8 @@
 import GSASIIgrid as G2gd
 import GSASIIcomp as G2cmp
+import GSASIIIO as G2IO
 from matplotlib.backends.backend_wxagg import FigureCanvasWxAgg as Canvas
 from matplotlib.backends.backend_wxagg import NavigationToolbar2Wx as Toolbar
@@ -654 +655 @@
         
     Plot.set_title(self.PatternTree.GetItemText(self.Image)[4:])
-    size,self.ImageZ = self.PatternTree.GetItemPyData(self.Image)
+    size,imagefile = self.PatternTree.GetItemPyData(self.Image)
+    self.ImageZ = G2IO.GetImageData(imagefile,True)
     Data = self.PatternTree.GetItemPyData( \
         G2gd.GetPatternTreeItemId(self,self.Image, 'Image Controls'))
@@ -801 +803 @@
     Data = self.PatternTree.GetItemPyData( \
         G2gd.GetPatternTreeItemId(self,self.Image, 'Image Controls'))
+    size,imagefile = self.PatternTree.GetItemPyData(self.Image)
+    self.ImageZ = G2IO.GetImageData(imagefile,True)
     image = self.ImageZ
     Iz = len(image)