Changeset 281 for trunk/GSASII.py


Ignore:
Timestamp:
May 4, 2011 4:18:44 PM (11 years ago)
Author:
vondreele
Message:

implement reusable GSAS-II image files that can be read into a new project.
fix order of color schemes in contour plots
fix azimuth values from image integration
fix use of correct data structure for calculat all pdfs

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASII.py

    r273 r281  
    422422        self.CheckNotebook()
    423423        dlg = wx.FileDialog(self, 'Choose image files', '.', '',\
    424         'Any image file (*.tif;*.tiff;*.mar*;*.avg;*.sum;*.img)\
    425         |*.tif;*.tiff;*.mar*;*.avg;*.sum;*.img|\
     424        'Any image file (*.tif;*.tiff;*.mar*;*.avg;*.sum;*.img;*.G2img)\
     425        |*.tif;*.tiff;*.mar*;*.avg;*.sum;*.img;*.G2img|\
    426426        Any detector tif (*.tif;*.tiff)|*.tif;*.tiff|\
    427427        MAR file (*.mar*)|*.mar*|\
    428428        GE Image (*.avg;*.sum)|*.avg;*.sum|\
    429429        ADSC Image (*.img)|*.img|\
     430        GSAS-II Image (*.G2img)|*.G2img|\
    430431        All files (*.*)|*.*',
    431432        wx.OPEN | wx.MULTIPLE)
     
    602603                name.SetEditable(False)
    603604                scale = wx.TextCtrl(panel,id,str(item[0]),style=wx.TE_PROCESS_ENTER)
    604                 scale.Bind(wx.EVT_TEXT,self.OnScaleChange)                   
     605                scale.Bind(wx.EVT_TEXT_ENTER,self.OnScaleChange)
     606                scale.Bind(wx.EVT_KILL_FOCUS,self.OnScaleChange)
    605607                dataGridSizer.Add(scale,0,wx.LEFT,10)
    606608                dataGridSizer.Add(name,0,wx.RIGHT,10)
     
    608610                wx.LEFT|wx.TOP|wx.ALIGN_CENTER_VERTICAL,10)
    609611            self.name = wx.TextCtrl(panel,-1,self.data[-1],size=wx.Size(200,20),style=wx.TE_PROCESS_ENTER)
    610             self.name.Bind(wx.EVT_TEXT,self.OnNameChange)
     612            self.name.Bind(wx.EVT_TEXT_ENTER,self.OnNameChange)
     613            self.name.Bind(wx.EVT_KILL_FOCUS,self.OnNameChange)
    611614            dataGridSizer.Add(self.name,0,wx.RIGHT|wx.TOP,10)
    612615            mainSizer.Add(dataGridSizer,0,wx.EXPAND)
     
    825828                            self.dirname = dlg.GetDirectory()
    826829                            newimagefile = dlg.GetPath()
    827                             G2IO.PutG2Image(newimagefile,newImage)
     830                            G2IO.PutG2Image(newimagefile,Comments,Data,Npix,newImage)
    828831                            Imax = np.amax(newImage)
    829832                            Imin = np.amin(newImage)
Note: See TracChangeset for help on using the changeset viewer.