Changeset 406 for trunk/GSASII.py


Ignore:
Timestamp:
Nov 2, 2011 1:11:04 PM (10 years ago)
Author:
vondreele
Message:

implement background subtraction during image integration
implement copy for instrument parms & background
continue constraint GUI development
make sure proper updates in refinement/seq refinement

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASII.py

    r404 r406  
    502502                            Data['fullIntegrate'] = False
    503503                            Data['setRings'] = False
     504                            Data['background image'] = ['',1.0]                           
    504505                        Data['setDefault'] = False
    505506                        Data['range'] = [(Imin,Imax),[Imin,Imax]]
     
    564565        if not G2gd.GetPatternTreeItemId(self,self.root,'Constraints'):
    565566            sub = self.PatternTree.AppendItem(parent=self.root,text='Constraints')
    566             self.PatternTree.SetItemPyData(sub,{})
     567            self.PatternTree.SetItemPyData(sub,{'Hist':[],'HAP':[],'Phase':[]})
    567568        if not G2gd.GetPatternTreeItemId(self,self.root,'Restraints'):
    568569            sub = self.PatternTree.AppendItem(parent=self.root,text='Restraints')
     
    643644                dataGridSizer.Add(scale,0,wx.LEFT,10)
    644645                dataGridSizer.Add(name,0,wx.RIGHT,10)
    645             dataGridSizer.Add(wx.StaticText(panel,-1,'Sum result name: '+dataType),0, \
    646                 wx.LEFT|wx.TOP|wx.ALIGN_CENTER_VERTICAL,10)
    647             self.name = wx.TextCtrl(panel,-1,self.data[-1],size=wx.Size(200,20),style=wx.TE_PROCESS_ENTER)
    648             self.name.Bind(wx.EVT_TEXT_ENTER,self.OnNameChange)
    649             self.name.Bind(wx.EVT_KILL_FOCUS,self.OnNameChange)
    650             dataGridSizer.Add(self.name,0,wx.RIGHT|wx.TOP,10)
     646            if dataType:
     647                dataGridSizer.Add(wx.StaticText(panel,-1,'Sum result name: '+dataType),0, \
     648                    wx.LEFT|wx.TOP|wx.ALIGN_CENTER_VERTICAL,10)
     649                self.name = wx.TextCtrl(panel,-1,self.data[-1],size=wx.Size(200,20),style=wx.TE_PROCESS_ENTER)
     650                self.name.Bind(wx.EVT_TEXT_ENTER,self.OnNameChange)
     651                self.name.Bind(wx.EVT_KILL_FOCUS,self.OnNameChange)
     652                dataGridSizer.Add(self.name,0,wx.RIGHT|wx.TOP,10)
    651653            mainSizer.Add(dataGridSizer,0,wx.EXPAND)
    652654            OkBtn = wx.Button(panel,-1,"Ok")
     
    15331535
    15341536    def OnSeqRefine(self,event):
    1535         self.OnFileSave(event)
    15361537        Id = G2gd.GetPatternTreeItemId(self,self.root,'Sequental results')
    1537         print Id
    15381538        if not Id:
    15391539            Id = self.PatternTree.AppendItem(self.root,text='Sequental results')
    1540             print Id
    15411540            self.PatternTree.SetItemPyData(Id,{})           
     1541        self.OnFileSave(event)
    15421542        dlg = wx.ProgressDialog('Residual for histogram 0','Powder profile Rwp =',101.0,
    15431543            style = wx.PD_ELAPSED_TIME|wx.PD_AUTO_HIDE|wx.PD_CAN_ABORT)
Note: See TracChangeset for help on using the changeset viewer.