Changeset 2762

Timestamp:

Mar 27, 2017 2:00:48 PM (6 years ago)

Author:

vondreele

Message:

fix sequential peak fit display
fix window crash issue in reflectometry model display

Location:

trunk

Files:

• GSASIIgrid.py (modified) (2 diffs)
• GSASIIpwdGUI.py (modified) (4 diffs)

trunk/GSASIIgrid.py

@@ -3847 +3847 @@
     newCellDict = {}
     for name in histNames:
-        newCellDict.update(data[name].get('newCellDict',{}))
+        if name in data and 'newCellDict' in data[name]:
+            newCellDict.update(data[name]['newCellDict'])
 #    newCellDict = data[histNames[0]].get('newCellDict',{})
     cellAlist = []
@@ -3992 +3993 @@
         sampleDict[name] = dict(zip(sampleParms.keys(),[sampleParms[key][i] for key in sampleParms.keys()])) 
     # add unique cell parameters TODO: review this where the cell symmetry changes (when possible)
-    if Controls.get('ShowCell',False):
+    if Controls.get('ShowCell',False) and len(newCellDict):
         for pId in sorted(RecpCellTerms):
             pfx = str(pId)+'::' # prefix for A values from phase

trunk/GSASIIpwdGUI.py

@@ -4708 +4708 @@
         SaveState()
         G2pwd.REFDRefine(Profile,ProfDict,Inst,Limits,Substances,data)
-        wx.CallAfter(G2plt.PlotPatterns,G2frame,plotType='REFD')
-        wx.CallAfter(UpdateREFDModelsGrid,G2frame,data)
+        G2plt.PlotPatterns(G2frame,plotType='REFD')
+        wx.CallLater(100,UpdateREFDModelsGrid,G2frame,data)
         
     def OnFitModelAll(event):
@@ -4720 +4720 @@
             G2frame.PatternId,'Models'))
         G2frame.dataFrame.REFDUndo.Enable(False)
-        UpdateREFDModelsGrid(G2frame,data)
         G2pwd.REFDModelFxn(Profile,Inst,Limits,Substances,data)
+        G2plt.PlotPatterns(G2frame,plotType='REFD')
+        wx.CallLater(100,UpdateREFDModelsGrid,G2frame,data)
 
     def DoUnDo():
@@ -4783 +4784 @@
             if invalid:
                 return
+            
             G2pwd.REFDModelFxn(Profile,Inst,Limits,Substances,data)
             G2plt.PlotPatterns(G2frame,plotType='REFD')
@@ -4841 +4843 @@
             if invalid:
                 return
-            wx.CallAfter(G2pwd.REFDModelFxn,Profile,Inst,Limits,Substances,data)
-            wx.CallAfter(G2plt.PlotPatterns,G2frame,plotType='REFD')
-            wx.CallAfter(UpdateREFDModelsGrid,G2frame,data) 
+            G2pwd.REFDModelFxn(Profile,Inst,Limits,Substances,data)
+            G2plt.PlotPatterns(G2frame,plotType='REFD')
+            wx.CallLater(100,UpdateREFDModelsGrid,G2frame,data) 
                        
         layerSizer = wx.BoxSizer(wx.VERTICAL)