Changeset 2762


Ignore:
Timestamp:
Mar 27, 2017 2:00:48 PM (5 years ago)
Author:
vondreele
Message:

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

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIgrid.py

    r2759 r2762  
    38473847    newCellDict = {}
    38483848    for name in histNames:
    3849         newCellDict.update(data[name].get('newCellDict',{}))
     3849        if name in data and 'newCellDict' in data[name]:
     3850            newCellDict.update(data[name]['newCellDict'])
    38503851#    newCellDict = data[histNames[0]].get('newCellDict',{})
    38513852    cellAlist = []
     
    39923993        sampleDict[name] = dict(zip(sampleParms.keys(),[sampleParms[key][i] for key in sampleParms.keys()]))
    39933994    # add unique cell parameters TODO: review this where the cell symmetry changes (when possible)
    3994     if Controls.get('ShowCell',False):
     3995    if Controls.get('ShowCell',False) and len(newCellDict):
    39953996        for pId in sorted(RecpCellTerms):
    39963997            pfx = str(pId)+'::' # prefix for A values from phase
  • trunk/GSASIIpwdGUI.py

    r2758 r2762  
    47084708        SaveState()
    47094709        G2pwd.REFDRefine(Profile,ProfDict,Inst,Limits,Substances,data)
    4710         wx.CallAfter(G2plt.PlotPatterns,G2frame,plotType='REFD')
    4711         wx.CallAfter(UpdateREFDModelsGrid,G2frame,data)
     4710        G2plt.PlotPatterns(G2frame,plotType='REFD')
     4711        wx.CallLater(100,UpdateREFDModelsGrid,G2frame,data)
    47124712       
    47134713    def OnFitModelAll(event):
     
    47204720            G2frame.PatternId,'Models'))
    47214721        G2frame.dataFrame.REFDUndo.Enable(False)
    4722         UpdateREFDModelsGrid(G2frame,data)
    47234722        G2pwd.REFDModelFxn(Profile,Inst,Limits,Substances,data)
     4723        G2plt.PlotPatterns(G2frame,plotType='REFD')
     4724        wx.CallLater(100,UpdateREFDModelsGrid,G2frame,data)
    47244725
    47254726    def DoUnDo():
     
    47834784            if invalid:
    47844785                return
     4786           
    47854787            G2pwd.REFDModelFxn(Profile,Inst,Limits,Substances,data)
    47864788            G2plt.PlotPatterns(G2frame,plotType='REFD')
     
    48414843            if invalid:
    48424844                return
    4843             wx.CallAfter(G2pwd.REFDModelFxn,Profile,Inst,Limits,Substances,data)
    4844             wx.CallAfter(G2plt.PlotPatterns,G2frame,plotType='REFD')
    4845             wx.CallAfter(UpdateREFDModelsGrid,G2frame,data)
     4845            G2pwd.REFDModelFxn(Profile,Inst,Limits,Substances,data)
     4846            G2plt.PlotPatterns(G2frame,plotType='REFD')
     4847            wx.CallLater(100,UpdateREFDModelsGrid,G2frame,data)
    48464848                       
    48474849        layerSizer = wx.BoxSizer(wx.VERTICAL)
Note: See TracChangeset for help on using the changeset viewer.