Changeset 3101


Ignore:
Timestamp:
Sep 28, 2017 9:16:15 AM (4 years ago)
Author:
vondreele
Message:

change SetScrollRate?(1,1) to SetScrollRate?(10,10) - improves scrolling speed on all windows

Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIdataGUI.py

    r3095 r3101  
    46114611        #if Sizer.GetItemCount() == 1: # not wx 2.8
    46124612        if len(Sizer.GetChildren()) == 1: # handle cases with a single grid in DataWindow differently
    4613             # note that Grid's scroll bars must be turned on with .SetScrollRate(1,1)
     4613            # note that Grid's scroll bars must be turned on with .SetScrollRate(10,10)
    46144614            # just after the call to .GSGrid()
    46154615            if isinstance(Sizer.GetItem(0).GetWindow(), G2G.GSGrid):
     
    46214621                return
    46224622        self.SetAutoLayout(True)
    4623         self.SetScrollRate(1,1)
     4623        self.SetScrollRate(10,10)
    46244624        self.SendSizeEvent()
    46254625
     
    71867186    G2frame.dataWindow.currentGrids = []
    71877187    G2frame.dataDisplay = G2G.GSGrid(parent=G2frame.dataWindow)
    7188     G2frame.dataDisplay.SetScrollRate(1,1)
     7188    G2frame.dataDisplay.SetScrollRate(10,10)
    71897189    G2frame.dataWindow.GetSizer().Add(G2frame.dataDisplay,1,wx.ALL|wx.EXPAND)
    71907190    G2frame.SeqTable = G2G.Table([list(cl) for cl in zip(*G2frame.colList)],     # convert from columns to rows
  • trunk/GSASIIphsGUI.py

    r3100 r3101  
    991991        phasePage.SetSizer(mainSizer)
    992992    phasePage.SetAutoLayout(True)
    993     phasePage.SetScrollRate(1,1)
     993    phasePage.SetScrollRate(10,10)
    994994    phasePage.SendSizeEvent()
    995995    phasePage.Scroll(0,Scroll)
  • trunk/GSASIIplot.py

    r3082 r3101  
    57115711    uColors = [Rd,Gr,Bl,Wt-Bc, Wt-Bc,Wt-Bc,Wt-Bc,Wt-Bc, Wt-Bc,Wt-Bc,Wt-Bc,Wt-Bc]
    57125712    G2frame.tau = 0.
     5713    G2frame.seq = 0
    57135714   
    57145715    def OnKeyBox(event):
     
    58565857                elif key == '-':
    58575858                    G2frame.tau -= 0.1
    5858                 G2frame.tau %= 1.   #force 0-1 range
     5859                G2frame.tau %= 1.   #force 0-1 range; makes loop
    58595860                G2frame.G2plotNB.status.SetStatusText('Modulation tau = %.2f'%(G2frame.tau),1)
    58605861                data['Drawing']['Atoms'],Fade = G2mth.ApplyModulation(data,G2frame.tau)     #modifies drawing atom array!         
     
    58645865                    Fade += 1
    58655866                Draw('key down',Fade)
    5866             else:
    5867                 pass        #TODO sequential result movie here
     5867            else:        #TODO sequential result movie here
     5868                SeqId = G2gd.GetGPXtreeItemId(G2frame, G2frame.root, 'Sequential results')
     5869                if SeqId:
     5870                    Seqdata = G2frame.GPXtree.GetItemPyData(SeqId)
     5871                    histNames = [seqKey for seqKey in Seqdata.keys() if 'PWDR' in seqKey]
     5872                    histNames.sort()
     5873                    if key == '0':
     5874                        G2frame.seq = 0
     5875                    elif key in ['=','+']:
     5876                        G2frame.seq += 1
     5877                    elif key in ['-','_']:
     5878                        G2frame.seq -= 1
     5879                    G2frame.seq %= len(histNames)   #makes loop
     5880                    G2frame.G2plotNB.status.SetStatusText('Seq. data file: %s'%(histNames[G2frame.seq]),1)
     5881                   
     5882                   
     5883                   
     5884                    SetDrawAtomsText(data['Drawing']['Atoms'])
     5885                    G2phG.FindBondsDraw(data)           #rebuild bonds & polygons
     5886                    Draw('key down')                   
     5887                else:
     5888                    pass
    58685889           
    58695890    def GetTruePosition(xy,Add=False):
  • trunk/GSASIIpwdGUI.py

    r3096 r3101  
    878878#    G2frame.dataWindow.Bind(wg.EVT_GRID_CELL_LEFT_DCLICK, onCellListDClick)
    879879    reflGrid.AutoSizeColumns(False)
    880     reflGrid.SetScrollRate(1,1)
     880    reflGrid.SetScrollRate(10,10)
    881881    G2frame.reflGrid = reflGrid
    882882    mainSizer.Add(reflGrid,1,wx.ALL|wx.EXPAND,1)
     
    26082608    G2frame.indxPeaks = G2G.GSGrid(parent=G2frame.dataWindow)               
    26092609    G2frame.indxPeaks.SetTable(G2frame.IndexPeaksTable, True)
    2610     G2frame.indxPeaks.SetScrollRate(1,1)
     2610    G2frame.indxPeaks.SetScrollRate(10,10)
    26112611    XY = []
    26122612    Sigs = []
     
    35703570            G2frame.refTable[phase] = G2G.GSGrid(parent=G2frame.refBook)
    35713571            G2frame.refBook.AddPage(G2frame.refTable[phase],phase)
    3572             G2frame.refTable[phase].SetScrollRate(1,1) # reflection grids (inside tab) need scroll bars
     3572            G2frame.refTable[phase].SetScrollRate(10,10) # reflection grids (inside tab) need scroll bars
    35733573        elif len(data[phase]):              #else dict for PWDR
    35743574            G2frame.refTable[phase] = G2G.GSGrid(parent=G2frame.refBook)
    35753575            G2frame.refBook.AddPage(G2frame.refTable[phase],phase)
    3576             G2frame.refTable[phase].SetScrollRate(1,1) # as above
     3576            G2frame.refTable[phase].SetScrollRate(10,10) # as above
    35773577        else:       #cleanup deleted phase reflection lists
    35783578            del data[phase]
  • trunk/exports/G2export_CIF.py

    r3027 r3101  
    361361          histOnly: used to export only one histogram
    362362          IncludeOnlyHist: used for a full CIF that includes only one of the
    363             histograms (from a sequential fit) TODO: needs lots of work!
     363            histograms (from a sequential fit) #TODO: needs lots of work!
    364364        '''
    365365
Note: See TracChangeset for help on using the changeset viewer.