Changeset 2770

Timestamp:

Apr 2, 2017 8:15:22 AM (7 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:

• GSASII.py (modified) (3 diffs)
• GSASIIphsGUI.py (modified) (1 diff)
• GSASIIpwdGUI.py (modified) (1 diff)
• GSASIIstrIO.py (modified) (1 diff)

trunk/GSASII.py

@@ -665 +665 @@
             self.PatternTree.Expand(sub) 
             self.PatternTree.Expand(psub)
-            self.PatternTree.SelectItem(psub) # show the page to complete the initialization (yuk!)
-            wx.Yield() # make sure call of GSASII.OnDataTreeSelChanged happens before we go on
+            wx.CallAfter(G2gd.SelectDataTreeItem,self,psub) #bring up new phase General tab
 
             if rd.Constraints:
@@ -693 +692 @@
                 item, cookie = self.PatternTree.GetNextChild(self.root, cookie)
         TextList = PWDRlist + HKLFlist
-        if not len(TextList): return # no data loaded yet
+        if not TextList:
+            return          #no histograms
         header = 'Select histogram(s) to add to new phase(s):'
         for phaseName in newPhaseList:
@@ -771 +771 @@
         wx.EndBusyCursor()
         self.EnableRefineCommand()
+        
         return # success
         

trunk/GSASIIphsGUI.py

@@ -5556 +5556 @@
             refDict,reflData = G2frame.PatternTree.GetItemPyData(Id)
             UseList[histoName] = {'Histogram':histoName,'Show':False,'Scale':[1.0,True],
-                'Babinet':{'BabA':[0.0,False],'BabU':[0.0,False]},'LeBail':False,'newLeBail':True,
+                'Babinet':{'BabA':[0.0,False],'BabU':[0.0,False]},
                 'Extinction':['Lorentzian','None',
                 {'Tbar':0.1,'Cos2TM':0.955,'Eg':[1.e-7,False],'Es':[1.e-7,False],'Ep':[1.e-7,False]},],

trunk/GSASIIpwdGUI.py

@@ -2873 +2873 @@
                 value = 90.
         SetCellValue(Obj,ObjId/2,value)
+        OnHklShow(event)
         wx.CallAfter(UpdateUnitCellsGrid,G2frame,data)
         

trunk/GSASIIstrIO.py

@@ -2305 +2305 @@
                         if hapData['Babinet']['BabA'][0]:
                             PrintBabinet(hapData['Babinet'])                        
-                if resetRefList and hapDict[pfx+'newLeBail']:
+                if resetRefList and (not hapDict[pfx+'LeBail'] or (hapData['LeBail'] and hapData['newLeBail'])):
                     if hapData.get('LeBail',True):         #stop regeneating reflections for LeBail
                         hapData['newLeBail'] = False