Changeset 2634

Timestamp:

Jan 16, 2017 4:41:14 PM (6 years ago)

Author:

vondreele

Message:

add ExpandAll? to main File menu
change PDF plotting to use color schemes for multiplots
's' option on multiplot changed to color scheme selection
removed G9r0-4pi*r plot

Location:

trunk

Files:

• GSASII.py (modified) (2 diffs)
• GSASIIctrls.py (modified) (1 diff)
• GSASIIplot.py (modified) (7 diffs)
• GSASIIpwdGUI.py (modified) (1 diff)

trunk/GSASII.py

@@ -160 +160 @@
             kind=wx.ITEM_NORMAL,text='&New project')
         self.Bind(wx.EVT_MENU, self.OnFileClose, id=item.GetId())
+        item = parent.Append(              #not a good idea - reads all images as each is expanded!
+            help='Expand all items in GSAS-II data tree',id=wx.ID_ANY,
+            kind=wx.ITEM_NORMAL,text='Expand all')
+        self.Bind(wx.EVT_MENU,self.ExpandAll,id=item.GetId())
         item = parent.Append(wx.ID_PREFERENCES, text = "&Preferences")
         self.Bind(wx.EVT_MENU, self.OnPreferences, item)
@@ -3317 +3321 @@
         finally:
             dlg.Destroy()
+            
+    def ExpandAll(self,event):
+        self.PatternTree.ExpandAll()        
 
     def ExitMain(self, event):

trunk/GSASIIctrls.py

@@ -234 +234 @@
         idata = self.GetItemPyData(TreeId)
         if type(idata[1]) is tuple or type(idata[1]) is list:
+            idata[1] = list(idata[1])
             idata[1][0] = [imagefile,idata[1][1]]
         else:

trunk/GSASIIplot.py

@@ -2348 +2348 @@
     or multiple plots with waterfall and contour plots as options
     '''
+    import matplotlib.collections as mplC
     if not plotType:
         plotType = G2frame.G2plotNB.plotList[G2frame.G2plotNB.nb.GetSelection()]
@@ -2395 +2396 @@
             newPlot = True
         elif event.key == 's':
-            if G2frame.Contour:
-                choice = [m for m in mpl.cm.datad.keys() if not m.endswith("_r")]
-                choice.sort()
-                dlg = wx.SingleChoiceDialog(G2frame,'Select','Color scheme',choice)
-                if dlg.ShowModal() == wx.ID_OK:
-                    sel = dlg.GetSelection()
-                    G2frame.ContourColor = choice[sel]
-                else:
-                    G2frame.ContourColor = 'Paired'
-                dlg.Destroy()
+            choice = [m for m in mpl.cm.datad.keys() if not m.endswith("_r")]
+            choice.sort()
+            dlg = wx.SingleChoiceDialog(G2frame,'Select','Color scheme',choice)
+            if dlg.ShowModal() == wx.ID_OK:
+                sel = dlg.GetSelection()
+                G2frame.ContourColor = choice[sel]
             else:
-                G2frame.SinglePlot = not G2frame.SinglePlot                
+                G2frame.ContourColor = 'Paired'
+            dlg.Destroy()
         elif event.key == 'i':                  #for smoothing contour plot
             choice = ['nearest','bilinear','bicubic','spline16','spline36','hanning',
@@ -2454 +2452 @@
         Page.Choice = (' key press','l: offset left','r: offset right','d: offset down','u: offset up',
             'o: reset offset','t: toggle legend','c: contour on',
-            'm: toggle multiplot','s: toggle single plot','f: select data' )
+            'm: toggle multiplot','s: color scheme','f: select data' )
     Page.keyPress = OnPlotKeyPress
     PatternId = G2frame.PatternId
-    if plotType == 'G(R)':
-        Plot.set_xlabel(r'r,$\AA$',fontsize=14)
-        Plot.set_ylabel(r'G(r), $\AA^{-2}$',fontsize=14)
-        Plot.set_title('G(r)')
-    else:
-        Plot.set_xlabel(r'$Q,\AA^{-1}$'+superMinusOne,fontsize=14)
-        Plot.set_ylabel(r''+plotType,fontsize=14)
-        Plot.set_title(plotType)
-    colors=['b','g','r','c','m','k']
     name = G2frame.PatternTree.GetItemText(PatternId)[4:]
     Pattern = []    
@@ -2490 +2479 @@
                 Pattern.append(item)
                 PlotList.append(Pattern)
+        name = plotType
+    if plotType == 'G(R)':
+        Plot.set_xlabel(r'r,$\AA$',fontsize=14)
+        Plot.set_ylabel(r'G(r), $\AA^{-2}$',fontsize=14)
+        Plot.set_title(name)
+    else:
+        Plot.set_xlabel(r'$Q,\AA^{-1}$',fontsize=14)
+        Plot.set_ylabel(r''+plotType,fontsize=14)
+        Plot.set_title(name)
+    colors=['b','g','r','c','m','k']
     PDFdata = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,PatternId, 'PDF Controls'))
     numbDen = G2pwd.GetNumDensity(PDFdata['ElList'],PDFdata['Form Vol'])
@@ -2504 +2503 @@
         ContourY = []
         Nseq = 0
+    else:
+        XYlist = []
     for N,Pattern in enumerate(PlotList):
         xye = Pattern[1]
@@ -2520 +2521 @@
             X = xye[0]+Page.Offset[0]*.005*N
             Y = xye[1]+Page.Offset[1]*.01*N
-            if G2frame.Legend:
-                Plot.plot(X,Y,colors[N%6],picker=False,label='Azm:'+Pattern[2].split('=')[1])
-            else:
-                Plot.plot(X,Y,colors[N%6],picker=False)
-            if plotType == 'G(R)':
-                Xb = [0.,2.5]
-                Yb = [0.,-10.*np.pi*numbDen]
-                Plot.plot(Xb,Yb,color='k',dashes=(5,5))
-            elif plotType == 'F(Q)':
-                Plot.axhline(0.,color=wx.BLACK)
-            elif plotType == 'S(Q)':
-                Plot.axhline(1.,color=wx.BLACK)
+            XYlist.append(list(zip(X,Y)))
+#            if G2frame.Legend:
+#                Plot.plot(X,Y,colors[N%6],picker=False,label='Azm:'+Pattern[2].split('=')[1])
+#            else:
+#                Plot.plot(X,Y,colors[N%6],picker=False)
     if G2frame.Contour and len(Pattern)>1:
         acolor = mpl.cm.get_cmap(G2frame.ContourColor)
@@ -2537 +2531 @@
             extent=[ContourX[0],ContourX[-1],ContourY[0],ContourY[-1]],aspect='auto',origin='lower')
         Page.figure.colorbar(Img)
-    elif G2frame.Legend:
-        Plot.legend(loc='best')
+    else:
+        XYlist = np.array(XYlist)
+        Xmin = np.amin(XYlist.T[0])
+        Xmax = np.amax(XYlist.T[0])
+        dx = 0.02*(Xmax-Xmin)
+        Ymin = np.amin(XYlist.T[1])
+        Ymax = np.amax(XYlist.T[1])
+        dy = 0.02*(Ymax-Ymin)
+        Plot.set_xlim(Xmin-dx,Xmax+dx)
+        Plot.set_ylim(Ymin-dy,Ymax+dy)
+        acolor = mpl.cm.get_cmap(G2frame.ContourColor)
+        if XYlist.shape[0]>1:            
+            lines = mplC.LineCollection(XYlist,cmap=acolor)
+        else:
+            lines = mplC.LineCollection(XYlist,color=colors[0])
+        lines.set_array(np.arange(XYlist.shape[0]))
+        Plot.add_collection(lines)
+        if plotType == 'G(R)':
+            Xb = [0.,2.5]
+            Yb = [0.,-10.*np.pi*numbDen]
+            Plot.plot(Xb,Yb,color='k',dashes=(5,5))
+        elif plotType == 'F(Q)':
+            Plot.axhline(0.,color=wx.BLACK)
+        elif plotType == 'S(Q)':
+            Plot.axhline(1.,color=wx.BLACK)
+        if XYlist.shape[0] > 1:
+            axcb = Page.figure.colorbar(lines)
+            axcb.set_label('Run number')
+        
+#    elif G2frame.Legend:
+#        Plot.legend(loc='best')
     if not newPlot:
         Page.toolbar.push_current()

trunk/GSASIIpwdGUI.py

@@ -4875 +4875 @@
             data['Ruland'] = R/10.
             G2pwd.CalcPDF(data,inst,limits,xydata)
-            g = xydata['GofR'][1][1]
-            r = xydata['GofR'][1][0]
-            g0 = g[r < Data['Rmin']] + 4*np.pi*r[r < Data['Rmin']]*numbDen
-            G2plt.PlotXY(G2frame,[[r[r < Data['Rmin']], g0]],Title='G(r)+4pi*r',
-                         labelX=r'r, $\AA$',labelY=r'G(r)$+4\pi r$')            
+#            g = xydata['GofR'][1][1]
+#            r = xydata['GofR'][1][0]
+#            g0 = g[r < Data['Rmin']] + 4*np.pi*r[r < Data['Rmin']]*numbDen
+#            G2plt.PlotXY(G2frame,[[r[r < Data['Rmin']], g0]],Title='G(r)+4pi*r',
+#                         labelX=r'r, $\AA$',labelY=r'G(r)$+4\pi r$')            
         EvalLowPDF(GetCurrentVals())
         BkgMax = max(xydata['IofQ'][1][1])/50.