Changeset 2647


Ignore:
Timestamp:
Jan 19, 2017 1:33:35 PM (5 years ago)
Author:
vondreele
Message:

put stride above select all & toggle buttons in G2fileselection dialog - more logical OrderBox?
changes in ISFG plots

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIctrls.py

    r2645 r2647  
    13811381        if toggle:
    13821382            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)
    13831388            setBut = wx.Button(self,wx.ID_ANY,'Set All')
    13841389            setBut.Bind(wx.EVT_BUTTON,self._SetAll)
     
    13871392            togBut.Bind(wx.EVT_BUTTON,self._ToggleAll)
    13881393            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)
    13941394            self.rangeBut = wx.ToggleButton(self,wx.ID_ANY,'Set Range')
    13951395            self.rangeBut.Bind(wx.EVT_TOGGLEBUTTON,self.SetRange)
  • trunk/GSASIIplot.py

    r2646 r2647  
    23962396                    G2frame.PDFselections = None
    23972397            dlg.Destroy()
    2398             newPlot = True
    23992398        elif event.key == 's':
    24002399            choice = [m for m in mpl.cm.datad.keys() if not m.endswith("_r")]
     
    25442543        Plot.set_ylim(Ymin-dy,Ymax+dy)
    25452544        acolor = mpl.cm.get_cmap(G2frame.ContourColor)
     2545        wx.BeginBusyCursor()
    25462546        if XYlist.shape[0]>1:
    25472547            if G2frame.Waterfall:
     
    25562556                    Plot.add_collection(line)
    25572557                axcb = Page.figure.colorbar(line)
    2558                 axcb.set_label('Intensity')
     2558                axcb.set_label(plotType)
    25592559            else:   #ok
    25602560                lines = mplC.LineCollection(XYlist,cmap=acolor)
     
    25752575                line = mplC.LineCollection(XYlist,color=colors[0])
    25762576                Plot.add_collection(line)
     2577        wx.EndBusyCursor()
    25772578        if plotType == 'G(R)':
    25782579            Xb = [0.,2.5]
Note: See TracChangeset for help on using the changeset viewer.