Changeset 2647
- Timestamp:
- Jan 19, 2017 1:33:35 PM (6 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/GSASIIctrls.py
r2645 r2647 1381 1381 if toggle: 1382 1382 tSizer = wx.FlexGridSizer(cols=2,hgap=5,vgap=5) 1383 tSizer.Add(wx.StaticText(self,label=' Set Stride:'),0,WACV) 1384 numbs = [str(i+1) for i in range(9)]+[str(2*i+10) for i in range(6)] 1385 self.stride = wx.ComboBox(self,value='1',choices=numbs,style=wx.CB_READONLY|wx.CB_DROPDOWN) 1386 self.stride.Bind(wx.EVT_COMBOBOX,self.OnStride) 1387 tSizer.Add(self.stride,0,WACV) 1383 1388 setBut = wx.Button(self,wx.ID_ANY,'Set All') 1384 1389 setBut.Bind(wx.EVT_BUTTON,self._SetAll) … … 1387 1392 togBut.Bind(wx.EVT_BUTTON,self._ToggleAll) 1388 1393 tSizer.Add(togBut) 1389 tSizer.Add(wx.StaticText(self,label=' Set Stride:'),0,WACV)1390 numbs = [str(i+1) for i in range(9)]+[str(2*i+10) for i in range(6)]1391 self.stride = wx.ComboBox(self,value='1',choices=numbs,style=wx.CB_READONLY|wx.CB_DROPDOWN)1392 self.stride.Bind(wx.EVT_COMBOBOX,self.OnStride)1393 tSizer.Add(self.stride,0,WACV)1394 1394 self.rangeBut = wx.ToggleButton(self,wx.ID_ANY,'Set Range') 1395 1395 self.rangeBut.Bind(wx.EVT_TOGGLEBUTTON,self.SetRange) -
trunk/GSASIIplot.py
r2646 r2647 2396 2396 G2frame.PDFselections = None 2397 2397 dlg.Destroy() 2398 newPlot = True2399 2398 elif event.key == 's': 2400 2399 choice = [m for m in mpl.cm.datad.keys() if not m.endswith("_r")] … … 2544 2543 Plot.set_ylim(Ymin-dy,Ymax+dy) 2545 2544 acolor = mpl.cm.get_cmap(G2frame.ContourColor) 2545 wx.BeginBusyCursor() 2546 2546 if XYlist.shape[0]>1: 2547 2547 if G2frame.Waterfall: … … 2556 2556 Plot.add_collection(line) 2557 2557 axcb = Page.figure.colorbar(line) 2558 axcb.set_label( 'Intensity')2558 axcb.set_label(plotType) 2559 2559 else: #ok 2560 2560 lines = mplC.LineCollection(XYlist,cmap=acolor) … … 2575 2575 line = mplC.LineCollection(XYlist,color=colors[0]) 2576 2576 Plot.add_collection(line) 2577 wx.EndBusyCursor() 2577 2578 if plotType == 'G(R)': 2578 2579 Xb = [0.,2.5]
Note: See TracChangeset
for help on using the changeset viewer.