Changeset 2637
- Timestamp:
- Jan 17, 2017 12:13:28 PM (6 years ago)
- Location:
- trunk
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/GSASII.py
r2636 r2637 3135 3135 name = self.PatternTree.GetItemText(item) 3136 3136 if name not in ['Notebook','Controls','Covariance','Constraints', 3137 'Restraints','Phases','Rigid bodies'] or'Sequential' not in name:3137 'Restraints','Phases','Rigid bodies'] and 'Sequential' not in name: 3138 3138 if 'PWDR' in name: nItems['PWDR'] += 1 3139 3139 if 'SASD' in name: nItems['SASD'] += 1 -
trunk/GSASIIctrls.py
r2634 r2637 1385 1385 tSizer.Add(togBut) 1386 1386 tSizer.Add(wx.StaticText(self,label=' Set Stride:'),0,WACV) 1387 numbs = [str(i+1) for i in range( 10)]1387 numbs = [str(i+1) for i in range(9)]+[str(2*i+10) for i in range(6)] 1388 1388 self.stride = wx.ComboBox(self,value='1',choices=numbs,style=wx.CB_READONLY|wx.CB_DROPDOWN) 1389 1389 self.stride.Bind(wx.EVT_COMBOBOX,self.OnStride) -
trunk/GSASIIplot.py
r2634 r2637 22 22 import wx.glcanvas 23 23 import matplotlib as mpl 24 import matplotlib.collections as mplC 24 25 import mpl_toolkits.mplot3d.axes3d as mp3d 25 26 import GSASIIpath … … 2348 2349 or multiple plots with waterfall and contour plots as options 2349 2350 ''' 2350 import matplotlib.collections as mplC2351 2351 if not plotType: 2352 2352 plotType = G2frame.G2plotNB.plotList[G2frame.G2plotNB.nb.GetSelection()] 2353 2353 if plotType not in ['I(Q)','S(Q)','F(Q)','G(R)']: 2354 2354 return 2355 superMinusOne = unichr(0xaf)+unichr(0xb9)2356 2355 2357 2356 def OnPlotKeyPress(event): … … 2483 2482 Plot.set_xlabel(r'r,$\AA$',fontsize=14) 2484 2483 Plot.set_ylabel(r'G(r), $\AA^{-2}$',fontsize=14) 2485 Plot.set_title(name)2486 2484 else: 2487 2485 Plot.set_xlabel(r'$Q,\AA^{-1}$',fontsize=14) 2488 2486 Plot.set_ylabel(r''+plotType,fontsize=14) 2489 2487 Plot.set_title(name) 2490 2488 colors=['b','g','r','c','m','k'] 2491 2489 PDFdata = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,PatternId, 'PDF Controls')) … … 2543 2541 acolor = mpl.cm.get_cmap(G2frame.ContourColor) 2544 2542 if XYlist.shape[0]>1: 2543 colorRange = np.arange(XYlist.shape[0]) 2545 2544 lines = mplC.LineCollection(XYlist,cmap=acolor) 2545 lines.set_array(colorRange) 2546 2546 else: 2547 2547 lines = mplC.LineCollection(XYlist,color=colors[0]) 2548 lines.set_array(np.arange(XYlist.shape[0]))2549 2548 Plot.add_collection(lines) 2550 2549 if plotType == 'G(R)': … … 2558 2557 if XYlist.shape[0] > 1: 2559 2558 axcb = Page.figure.colorbar(lines) 2560 axcb.set_label(' Runnumber')2559 axcb.set_label('PDF number') 2561 2560 2562 2561 # elif G2frame.Legend:
Note: See TracChangeset
for help on using the changeset viewer.