Changeset 2770


Ignore:
Timestamp:
Apr 2, 2017 8:15:22 AM (5 years ago)
Author:
vondreele
Message:

fix import new phase behavior - wasn't finishing properly
fix HKL display when cell parms changed in Unit Cells GUI
fix problem with newLeBail flag

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASII.py

    r2755 r2770  
    665665            self.PatternTree.Expand(sub)
    666666            self.PatternTree.Expand(psub)
    667             self.PatternTree.SelectItem(psub) # show the page to complete the initialization (yuk!)
    668             wx.Yield() # make sure call of GSASII.OnDataTreeSelChanged happens before we go on
     667            wx.CallAfter(G2gd.SelectDataTreeItem,self,psub) #bring up new phase General tab
    669668
    670669            if rd.Constraints:
     
    693692                item, cookie = self.PatternTree.GetNextChild(self.root, cookie)
    694693        TextList = PWDRlist + HKLFlist
    695         if not len(TextList): return # no data loaded yet
     694        if not TextList:
     695            return          #no histograms
    696696        header = 'Select histogram(s) to add to new phase(s):'
    697697        for phaseName in newPhaseList:
     
    771771        wx.EndBusyCursor()
    772772        self.EnableRefineCommand()
     773       
    773774        return # success
    774775       
  • trunk/GSASIIphsGUI.py

    r2750 r2770  
    55565556            refDict,reflData = G2frame.PatternTree.GetItemPyData(Id)
    55575557            UseList[histoName] = {'Histogram':histoName,'Show':False,'Scale':[1.0,True],
    5558                 'Babinet':{'BabA':[0.0,False],'BabU':[0.0,False]},'LeBail':False,'newLeBail':True,
     5558                'Babinet':{'BabA':[0.0,False],'BabU':[0.0,False]},
    55595559                'Extinction':['Lorentzian','None',
    55605560                {'Tbar':0.1,'Cos2TM':0.955,'Eg':[1.e-7,False],'Es':[1.e-7,False],'Ep':[1.e-7,False]},],
  • trunk/GSASIIpwdGUI.py

    r2768 r2770  
    28732873                value = 90.
    28742874        SetCellValue(Obj,ObjId/2,value)
     2875        OnHklShow(event)
    28752876        wx.CallAfter(UpdateUnitCellsGrid,G2frame,data)
    28762877       
  • trunk/GSASIIstrIO.py

    r2766 r2770  
    23052305                        if hapData['Babinet']['BabA'][0]:
    23062306                            PrintBabinet(hapData['Babinet'])                       
    2307                 if resetRefList and hapDict[pfx+'newLeBail']:
     2307                if resetRefList and (not hapDict[pfx+'LeBail'] or (hapData['LeBail'] and hapData['newLeBail'])):
    23082308                    if hapData.get('LeBail',True):         #stop regeneating reflections for LeBail
    23092309                        hapData['newLeBail'] = False
Note: See TracChangeset for help on using the changeset viewer.