Changeset 244


Ignore:
Timestamp:
Feb 12, 2011 10:26:33 AM (11 years ago)
Author:
vondreele
Message:

fix to reading GEsum data - made "memory error"s
improve read of missing image dialog
GSASIIplot.py now has a commented image size print line

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIIO.py

    r243 r244  
    415415    if not ospath.exists(imagefile):
    416416        dlg = wx.FileDialog(self, 'Bad image file name; choose name', '.', '',\
    417         'MAR345 (*.mar3450;*.mar2300)|*.mar3450;*.mar2300|ADSC Image (*.img)\
    418         |*.img|Detector tif (*.tif;*.tiff)|*.tif;*.tiff|GE Image sum (*.sum)\
    419         |*.sum|GE Image avg (*.avg)|*.avg|GE Image raw (*)|*|All files (*.*)|*.*',wx.OPEN)
     417        'Any image file (*.tif;*.tiff;*.mar*;*.avg;*.sum;*.img)\
     418        |*.tif;*.tiff;*.mar*;*.avg;*.sum;*.img|\
     419        Any detector tif (*.tif;*.tiff)|*.tif;*.tiff|\
     420        MAR file (*.mar*)|*.mar*|\
     421        GE Image (*.avg;*.sum)|*.avg;*.sum|\
     422        ADSC Image (*.img)|*.img|\
     423        All files (*.*)|*.*',wx.OPEN)
    420424        if self.dirname:
    421425            dlg.SetDirectory(self.dirname)
     
    469473    if '.sum' in filename:
    470474        head = ['GE detector sum data from APS 1-ID',]
    471         sizexy = [2048,2047]
     475        sizexy = [2048,2048]
    472476    elif '.avg' in filename:
    473477        head = ['GE detector avg data from APS 1-ID',]
  • trunk/GSASIIplot.py

    r243 r244  
    10641064        self.PatternTree.SetItemPyData(self.Image,[size,imagefile])
    10651065        self.ImageZ = G2IO.GetImageData(self,imagefile,imageOnly=True)
     1066#        print self.ImageZ.shape,self.ImageZ.size,Data['size'] #might be useful debugging line
    10661067        self.oldImagefile = imagefile
    10671068
Note: See TracChangeset for help on using the changeset viewer.