Changeset 3926

Timestamp:

Apr 23, 2019 1:11:07 PM (5 years ago)

Author:

toby

Message:

bugfix for plot updates: conflict for single xtal

Location:

trunk

Files:

• GSASIIdataGUI.py (modified) (3 diffs)
• GSASIIimgGUI.py (modified) (3 diffs)

trunk/GSASIIdataGUI.py

@@ -1998 +1998 @@
 
     def AddSimulatedPowder(self,ttArr,intArr,HistName,Lam1,Lam2):
-        '''Create a PDWR entry for a computed powder pattern
+        '''Create a PWDR entry for a computed powder pattern
         '''
         # get a list of existing histograms
@@ -4573 +4573 @@
         self.SaveTreeSetting() # save the current tree selection
         self.GPXtree.SaveExposedItems()             # save the exposed/hidden tree items
-        refPlotUpdate = G2plt.PlotPatterns(self,refineMode=True) # prepare for plot updating
+        if self.GPXtree.GetItemText(self.PatternId).startswith('PWDR '):
+            refPlotUpdate = G2plt.PlotPatterns(self,refineMode=True) # prepare for plot updating
+        else:
+            refPlotUpdate = None
         try:
             OK,Msg = G2stMn.Refine(self.GSASprojectfile,dlg,refPlotUpdate=refPlotUpdate)    #Msg is Rvals dict if Ok=True
@@ -4713 +4716 @@
             histNames.reverse()
         # select it
-        self.PatternId = GetGPXtreeItemId(self,self.root,histNames[0])        
-        refPlotUpdate = G2plt.PlotPatterns(self,refineMode=True) # prepare for plot updating
+        self.PatternId = GetGPXtreeItemId(self,self.root,histNames[0])
+        if self.GPXtree.GetItemText(self.PatternId).startswith('PWDR '):
+            refPlotUpdate = G2plt.PlotPatterns(self,refineMode=True) # prepare for plot updating
+        else:
+            refPlotUpdate = None
         try:
             OK,Msg = G2stMn.SeqRefine(self.GSASprojectfile,dlg,refPlotUpdate) #Msg is Rvals dict if Ok=True

trunk/GSASIIimgGUI.py

@@ -2865 +2865 @@
         else:
             namenum = ''
-        for Id in G2frame.IntgOutList: # loop over newly created PDWR entry(ies)
+        for Id in G2frame.IntgOutList: # loop over newly created PWDR entry(ies)
             # save the created PWDR tree names so that a reset can delete them
             G2frame.Image = Id
@@ -2998 +2998 @@
         G2frame.AutointPWDRnames = [] # list of created PWDR tree item names
         G2frame.AutointPDFnames = [] # list of created PWDR tree item names
-        # check that AutoPDF input is OK, offer chance to use alternate PDWRs if referenced ones
+        # check that AutoPDF input is OK, offer chance to use alternate PWDRs if referenced ones
         # are not present
         if self.params['ComputePDF']:
@@ -3019 +3019 @@
                 if not name: continue
                 if not G2gd.GetGPXtreeItemId(G2frame,G2frame.root,name):
-                    indx = G2G.ItemSelector(fileList, self, header='Select PDWR item',
-                                    title='Select a PDWR tree item for '+key+'\n(or cancel to quit)')
+                    indx = G2G.ItemSelector(fileList, self, header='Select PWDR item',
+                                    title='Select a PWDR tree item for '+key+'\n(or cancel to quit)')
                     if indx is None:
                         print('No PWDR entry selected for '+key)