Changeset 2895 for branch/2frame/GSASIIplot.py

Timestamp:

Jul 2, 2017 7:27:09 PM (6 years ago)

Author:

toby

Message:

merge trunk changes to 2984

File:

• branch/2frame/GSASIIplot.py (modified) (6 diffs)

branch/2frame/GSASIIplot.py

@@ -1181 +1181 @@
 ##### PlotPatterns
 ################################################################################
+def SequentialPlotPattern(G2frame,refdata,histogram):
+    '''This is passed into :func:`GSASIIstrMain.SeqRefine` where it is used to
+    provide a plot of the current powder histogram just after a refinement. It
+    takes the old refinement information (Rfactors, curve locations, etc.) and
+    combines it with the refinement results in refdata and passes that to
+    :func:`PlotPatterns`
+    '''
+    if not histogram.startswith('PWDR'): return
+    pickId = G2frame.PickId
+    G2frame.PickId = G2frame.PatternId = G2gd.GetPatternTreeItemId(G2frame, G2frame.root, histogram)
+    treedata = G2frame.PatternTree.GetItemPyData(G2frame.PatternId)
+    PlotPatterns(G2frame,newPlot=True,plotType='PWDR',data=[treedata[0],refdata])
+    wx.Yield() # force a plot update (needed on Windows?)
+    G2frame.PickId = pickId
+    
 def ReplotPattern(G2frame,newPlot,plotType,PatternName=None,PickName=None):
     '''This does the same as PlotPatterns except that it expects the information
@@ -1196 +1211 @@
     PlotPatterns(G2frame,newPlot,plotType)
 
-def PlotPatterns(G2frame,newPlot=False,plotType='PWDR'):
+def PlotPatterns(G2frame,newPlot=False,plotType='PWDR',data=None):
     '''Powder pattern plotting package - displays single or multiple powder patterns as intensity vs
     2-theta, q or TOF. Can display multiple patterns as "waterfall plots" or contour plots. Log I 
@@ -1220 +1235 @@
         return
 #patch
-    data = G2frame.PatternTree.GetItemPyData(G2frame.PatternId)
+    if data is None:
+        data = G2frame.PatternTree.GetItemPyData(G2frame.PatternId)
     if 'Offset' not in data[0] and plotType in ['PWDR','SASD','REFD']:     #plot offset data
         Ymax = max(data[1][1])
@@ -1824 +1840 @@
         Page.canvas.mpl_connect('button_press_event',OnPress)
     if 'PWDR' in G2frame.PatternTree.GetItemText(G2frame.PickId):
+        Histograms,Phases = G2frame.GetUsedHistogramsAndPhasesfromTree()
+        refColors=['b','r','c','g','m','k']
+        Page.phaseColors = {p:refColors[i%len(refColors)] for i,p in enumerate(Phases)}
         Phases = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,G2frame.PatternId,'Reflection Lists'))
         Page.phaseList = sorted(Phases.keys()) # define an order for phases (once!)
@@ -2215 +2234 @@
         elif G2frame.PatternTree.GetItemText(PickId) in ['Reflection Lists'] or \
             'PWDR' in G2frame.PatternTree.GetItemText(PickId):
-            refColors=['b','r','c','g','m','k']
             Phases = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,PatternId,'Reflection Lists'))
             l = GSASIIpath.GetConfigValue('Tick_length',8.0)
@@ -2230 +2248 @@
                     peak = np.array([[peak[4],peak[5]] for peak in peaks])
                 pos = Pattern[0]['refOffset']-pId*Pattern[0]['refDelt']*np.ones_like(peak)
+                plsym = Page.phaseColors.get(phase,'y')+'|' # yellow should never happen!
                 if G2frame.plotStyle['qPlot']:
-                    Page.tickDict[phase],j = Plot.plot(2*np.pi/peak.T[0],pos,refColors[pId%6]+'|',mew=w,ms=l,picker=3.,label=phase)
+                    Page.tickDict[phase],j = Plot.plot(2*np.pi/peak.T[0],pos,plsym,mew=w,ms=l,picker=3.,label=phase)
                 elif G2frame.plotStyle['dPlot']:
-                    Page.tickDict[phase],j = Plot.plot(peak.T[0],pos,refColors[pId%6]+'|',mew=w,ms=l,picker=3.,label=phase)
+                    Page.tickDict[phase],j = Plot.plot(peak.T[0],pos,plsym,mew=w,ms=l,picker=3.,label=phase)
                 else:
-                    Page.tickDict[phase],j = Plot.plot(peak.T[1],pos,refColors[pId%6]+'|',mew=w,ms=l,picker=3.,label=phase)
+                    Page.tickDict[phase],j = Plot.plot(peak.T[1],pos,plsym,mew=w,ms=l,picker=3.,label=phase)
             if len(Phases):
                 handles,legends = Plot.get_legend_handles_labels()  #got double entries in the legends for some reason