Changeset 2863 for trunk/GSASIIplot.py
- Timestamp:
- Jun 14, 2017 4:11:42 PM (6 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/GSASIIplot.py
r2849 r2863 1255 1255 elif event.key == 's' and 'PWDR' in plottype: 1256 1256 if G2frame.Contour: 1257 choice = [m for m in mpl.cm.datad.keys() if not m.endswith("_r")]1257 choice = [m for m in mpl.cm.datad.keys()] # if not m.endswith("_r") 1258 1258 choice.sort() 1259 1259 dlg = wx.SingleChoiceDialog(G2frame,'Select','Color scheme',choice) … … 1262 1262 G2frame.ContourColor = choice[sel] 1263 1263 else: 1264 G2frame.ContourColor = 'Paired'1264 G2frame.ContourColor = GSASIIpath.GetConfigValue('Contour_color','gist_ncar') 1265 1265 dlg.Destroy() 1266 1266 elif G2frame.SinglePlot: … … 1374 1374 xpos = G2lat.Dsp2pos(Parms,xpos) 1375 1375 elif G2frame.Contour and 'T' in Parms['Type'][0]: 1376 xpos = X[ xpos]1376 xpos = X[int(xpos)] 1377 1377 dsp = G2lat.Pos2dsp(Parms,xpos) 1378 1378 q = 2.*np.pi/dsp … … 2439 2439 dlg.Destroy() 2440 2440 elif event.key == 's': 2441 choice = [m for m in mpl.cm.datad.keys() if not m.endswith("_r")]2441 choice = [m for m in mpl.cm.datad.keys()] # if not m.endswith("_r") 2442 2442 choice.sort() 2443 2443 dlg = wx.SingleChoiceDialog(G2frame,'Select','Color scheme',choice) … … 2446 2446 G2frame.ContourColor = choice[sel] 2447 2447 else: 2448 G2frame.ContourColor = 'Paired'2448 G2frame.ContourColor = GSASIIpath.GetConfigValue('Contour_color','gist_ncar') 2449 2449 dlg.Destroy() 2450 2450 elif event.key == 'i': #for smoothing contour plot … … 2987 2987 2988 2988 elif event.key == 's': 2989 choice = [m for m in mpl.cm.datad.keys() if not m.endswith("_r")]2989 choice = [m for m in mpl.cm.datad.keys()] # if not m.endswith("_r") 2990 2990 choice.sort() 2991 2991 dlg = wx.SingleChoiceDialog(G2frame,'Select','Color scheme',choice) … … 2994 2994 G2frame.ContourColor = choice[sel] 2995 2995 else: 2996 G2frame.ContourColor = 'Paired'2996 G2frame.ContourColor = GSASIIpath.GetConfigValue('Contour_color','gist_ncar') 2997 2997 dlg.Destroy() 2998 2998 wx.CallAfter(PlotXYZ,G2frame,XY,Z,labelX,labelY,False,Title) … … 3625 3625 except ValueError: 3626 3626 pass 3627 Img = Plot.imshow(Z.T,aspect='equal',cmap=G2frame.ContourColor,extent=[-1,1,-1,1]) 3627 acolor = mpl.cm.get_cmap(G2frame.ContourColor) 3628 Img = Plot.imshow(Z.T,aspect='equal',cmap=acolor,extent=[-1,1,-1,1]) 3628 3629 Plot.plot(-x,y,'+',picker=3) 3629 3630 Page.figure.colorbar(Img) … … 3746 3747 except ValueError: 3747 3748 pass 3748 Img = Plot.imshow(Z.T,aspect='equal',cmap=G2frame.ContourColor,extent=[-1,1,-1,1]) 3749 acolor = mpl.cm.get_cmap(G2frame.ContourColor) 3750 Img = Plot.imshow(Z.T,aspect='equal',cmap=acolor,extent=[-1,1,-1,1]) 3749 3751 Page.figure.colorbar(Img) 3750 3752 x,y,z = SHData['PFxyz'] … … 3794 3796 except ValueError: 3795 3797 pass 3796 Img = Plot.imshow(Z.T,aspect='equal',cmap=G2frame.ContourColor,extent=[-1,1,-1,1]) 3798 acolor = mpl.cm.get_cmap(G2frame.ContourColor) 3799 Img = Plot.imshow(Z.T,aspect='equal',cmap=acolor,extent=[-1,1,-1,1]) 3797 3800 Page.figure.colorbar(Img) 3798 3801 h,k,l = SHData['PFhkl'] … … 3937 3940 def OnPlotKeyPress(event): 3938 3941 if event.key == 's': 3939 choice = [m for m in mpl.cm.datad.keys() if not m.endswith("_r")]3942 choice = [m for m in mpl.cm.datad.keys()] # if not m.endswith("_r") 3940 3943 choice.sort() 3941 3944 dlg = wx.SingleChoiceDialog(G2frame,'Select','Color scheme',choice) … … 4096 4099 def OnPlotKeyPress(event): 4097 4100 if event.key == 's': 4098 choice = [m for m in mpl.cm.datad.keys() if not m.endswith("_r")]4101 choice = [m for m in mpl.cm.datad.keys()] # if not m.endswith("_r") 4099 4102 choice.sort() 4100 4103 dlg = wx.SingleChoiceDialog(G2frame,'Select','Color scheme',choice)
Note: See TracChangeset
for help on using the changeset viewer.