Changeset 3926


Ignore:
Timestamp:
Apr 23, 2019 1:11:07 PM (2 years ago)
Author:
toby
Message:

bugfix for plot updates: conflict for single xtal

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIdataGUI.py

    r3913 r3926  
    19981998
    19991999    def AddSimulatedPowder(self,ttArr,intArr,HistName,Lam1,Lam2):
    2000         '''Create a PDWR entry for a computed powder pattern
     2000        '''Create a PWDR entry for a computed powder pattern
    20012001        '''
    20022002        # get a list of existing histograms
     
    45734573        self.SaveTreeSetting() # save the current tree selection
    45744574        self.GPXtree.SaveExposedItems()             # save the exposed/hidden tree items
    4575         refPlotUpdate = G2plt.PlotPatterns(self,refineMode=True) # prepare for plot updating
     4575        if self.GPXtree.GetItemText(self.PatternId).startswith('PWDR '):
     4576            refPlotUpdate = G2plt.PlotPatterns(self,refineMode=True) # prepare for plot updating
     4577        else:
     4578            refPlotUpdate = None
    45764579        try:
    45774580            OK,Msg = G2stMn.Refine(self.GSASprojectfile,dlg,refPlotUpdate=refPlotUpdate)    #Msg is Rvals dict if Ok=True
     
    47134716            histNames.reverse()
    47144717        # select it
    4715         self.PatternId = GetGPXtreeItemId(self,self.root,histNames[0])       
    4716         refPlotUpdate = G2plt.PlotPatterns(self,refineMode=True) # prepare for plot updating
     4718        self.PatternId = GetGPXtreeItemId(self,self.root,histNames[0])
     4719        if self.GPXtree.GetItemText(self.PatternId).startswith('PWDR '):
     4720            refPlotUpdate = G2plt.PlotPatterns(self,refineMode=True) # prepare for plot updating
     4721        else:
     4722            refPlotUpdate = None
    47174723        try:
    47184724            OK,Msg = G2stMn.SeqRefine(self.GSASprojectfile,dlg,refPlotUpdate) #Msg is Rvals dict if Ok=True
  • trunk/GSASIIimgGUI.py

    r3869 r3926  
    28652865        else:
    28662866            namenum = ''
    2867         for Id in G2frame.IntgOutList: # loop over newly created PDWR entry(ies)
     2867        for Id in G2frame.IntgOutList: # loop over newly created PWDR entry(ies)
    28682868            # save the created PWDR tree names so that a reset can delete them
    28692869            G2frame.Image = Id
     
    29982998        G2frame.AutointPWDRnames = [] # list of created PWDR tree item names
    29992999        G2frame.AutointPDFnames = [] # list of created PWDR tree item names
    3000         # check that AutoPDF input is OK, offer chance to use alternate PDWRs if referenced ones
     3000        # check that AutoPDF input is OK, offer chance to use alternate PWDRs if referenced ones
    30013001        # are not present
    30023002        if self.params['ComputePDF']:
     
    30193019                if not name: continue
    30203020                if not G2gd.GetGPXtreeItemId(G2frame,G2frame.root,name):
    3021                     indx = G2G.ItemSelector(fileList, self, header='Select PDWR item',
    3022                                     title='Select a PDWR tree item for '+key+'\n(or cancel to quit)')
     3021                    indx = G2G.ItemSelector(fileList, self, header='Select PWDR item',
     3022                                    title='Select a PWDR tree item for '+key+'\n(or cancel to quit)')
    30233023                    if indx is None:
    30243024                        print('No PWDR entry selected for '+key)
Note: See TracChangeset for help on using the changeset viewer.