Ignore:
Timestamp:
Jul 30, 2017 3:01:17 PM (4 years ago)
Author:
vondreele
Message:

oops - forgot the SetSizer? in SetPhaseWindow?
make SetScrollRate?(0,0) the default for GSGrid - grids have no scroll bars
remove all those individual SetScrollRates? everywhere a GSGrid is made - all did same thing.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branch/2frame/GSASIIphsGUI.py

    r2949 r2950  
    985985   
    986986def SetPhaseWindow(phasePage,mainSizer=None,size=None,Scroll=0):
     987    if not mainSizer is None:
     988        phasePage.SetSizer(mainSizer)
    987989    phasePage.SetAutoLayout(True)
    988990    phasePage.SetScrollRate(1,1)
    989991    phasePage.SendSizeEvent()
    990992
    991 #    if not mainSizer is None:
    992 #        phasePage.SetSizer(mainSizer)
    993993#        Size = mainSizer.GetMinSize()
    994994#    else:
     
    38753875            atomGrid = G2G.GSGrid(layerData)
    38763876            atomGrid.SetTable(atomTable,True)
    3877             atomGrid.SetScrollRate(0,0)    #get rid of automatic scroll bars
     3877#            atomGrid.SetScrollRate(0,0)    #get rid of automatic scroll bars
    38783878            for c in range(2,5):
    38793879                attr = wx.grid.GridCellAttr()
     
    39613961                transGrid = G2G.GSGrid(layerData)
    39623962                transGrid.SetTable(transTable,True)
    3963                 transGrid.SetScrollRate(0,0)    #get rid of automatic scroll bars
     3963#                transGrid.SetScrollRate(0,0)    #get rid of automatic scroll bars
    39643964                Indx[transGrid.GetId()] = Yi
    39653965                for c in range(0,4):
     
    76467646                    else:
    76477647                        resultsGrid.SetCellStyle(r,c,VERY_LIGHT_GREY,True)
    7648             resultsGrid.SetScrollRate(0,0)
     7648#            resultsGrid.SetScrollRate(0,0)
    76497649            resultsSizer.Add(resultsGrid,0,wx.EXPAND)
    76507650            return resultsSizer
     
    88398839    Pages.append('Data')
    88408840    Atoms = G2G.GSGrid(G2frame.phaseDisplay)
    8841     Atoms.SetScrollRate(0,0)
     8841#    Atoms.SetScrollRate(0,0)
    88428842    G2frame.phaseDisplay.gridList.append(Atoms)
    88438843    G2frame.phaseDisplay.AddPage(Atoms,'Atoms')
     
    88558855    Pages.append('Draw Options')
    88568856    drawAtoms = G2G.GSGrid(G2frame.phaseDisplay)
    8857     drawAtoms.SetScrollRate(0,0)
     8857#    drawAtoms.SetScrollRate(0,0)
    88588858    G2frame.phaseDisplay.gridList.append(drawAtoms)
    88598859    G2frame.phaseDisplay.AddPage(drawAtoms,'Draw Atoms')
     
    88648864        Pages.append('RB Models')
    88658865    MapPeaks = G2G.GSGrid(G2frame.phaseDisplay)
    8866     MapPeaks.SetScrollRate(0,0)
     8866#    MapPeaks.SetScrollRate(0,0)
    88678867    G2frame.phaseDisplay.gridList.append(MapPeaks)   
    88688868    G2frame.phaseDisplay.AddPage(MapPeaks,'Map peaks')
     
    88768876    Pages.append('Texture')
    88778877    G2frame.PawleyRefl = G2G.GSGrid(G2frame.phaseDisplay)
    8878     G2frame.PawleyRefl.SetScrollRate(0,0)
     8878#    G2frame.PawleyRefl.SetScrollRate(0,0)
    88798879    G2frame.phaseDisplay.gridList.append(G2frame.PawleyRefl)
    88808880    G2frame.phaseDisplay.AddPage(G2frame.PawleyRefl,'Pawley reflections')
Note: See TracChangeset for help on using the changeset viewer.