Changeset 2938 for branch


Ignore:
Timestamp:
Jul 20, 2017 11:59:48 AM (4 years ago)
Author:
vondreele
Message:

atom reordering problem - draw atoms didn't follow. Now fixed
remove scrollbars from most GSgrids - SetScrollRate?(0,0) removes them

Location:
branch/2frame
Files:
2 edited

Legend:

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

    r2937 r2938  
    25062506                            Atoms.frm = -1
    25072507                            G2frame.GetStatusBar().SetStatusText('',1)
     2508                            data['Drawing']['Atoms'] = []           #clear & rebuild Draw atoms table
     2509                            UpdateDrawAtoms()
    25082510                            wx.CallAfter(Paint)
    25092511                else:
     
    76067608                    Results[r][0] = True
    76077609                    resultsTable.SetValue(r,0,True)
     7610#                    resultsGrid.ForceRefresh()
    76087611                    G2plt.PlotStructure(G2frame,data)
    76097612                    wx.CallAfter(UpdateMCSA,G2frame.MCSA.GetScrollPos(wx.VERTICAL))
    7610                     resultsGrid.ForceRefresh()
    76117613                elif c == 1:
    76127614                    if Results[r][1]:
     
    76417643                    else:
    76427644                        resultsGrid.SetCellStyle(r,c,VERY_LIGHT_GREY,True)
     7645            resultsGrid.SetScrollRate(0,0)
    76437646            resultsSizer.Add(resultsGrid,0,wx.EXPAND)
    76447647            return resultsSizer
     
    77877790                G2plt.PlotXYZ(G2frame,XY,rcov,labelX='ref No.',labelY='ref No.',newPlot=False,Title='Reflection covariance matrix')
    77887791            else:
    7789                 MCSAdata['Results'] = G2mth.MPmcsaSearch(nCyc,data,RBdata,reflType,reflData,covData)
     7792                MCSAdata['Results'] += G2mth.MPmcsaSearch(nCyc,data,RBdata,reflType,reflData,covData)   #+= to  any saved ones
    77907793            print ' MC/SA run time: %.2f'%(time.time()-time1)
    77917794        finally:
     
    88308833    Pages.append('Data')
    88318834    Atoms = G2G.GSGrid(G2frame.phaseDisplay)
     8835    Atoms.SetScrollRate(0,0)
    88328836    G2frame.phaseDisplay.gridList.append(Atoms)
    88338837    G2frame.phaseDisplay.AddPage(Atoms,'Atoms')
     
    88458849    Pages.append('Draw Options')
    88468850    drawAtoms = G2G.GSGrid(G2frame.phaseDisplay)
     8851    drawAtoms.SetScrollRate(0,0)
    88478852    G2frame.phaseDisplay.gridList.append(drawAtoms)
    88488853    G2frame.phaseDisplay.AddPage(drawAtoms,'Draw Atoms')
     
    88538858        Pages.append('RB Models')
    88548859    MapPeaks = G2G.GSGrid(G2frame.phaseDisplay)
     8860    MapPeaks.SetScrollRate(0,0)
    88558861    G2frame.phaseDisplay.gridList.append(MapPeaks)   
    88568862    G2frame.phaseDisplay.AddPage(MapPeaks,'Map peaks')
     
    88648870    Pages.append('Texture')
    88658871    G2frame.PawleyRefl = G2G.GSGrid(G2frame.phaseDisplay)
     8872    G2frame.PawleyRefl.SetScrollRate(0,0)
    88668873    G2frame.phaseDisplay.gridList.append(G2frame.PawleyRefl)
    88678874    G2frame.phaseDisplay.AddPage(G2frame.PawleyRefl,'Pawley reflections')
  • branch/2frame/GSASIIpwdGUI.py

    r2937 r2938  
    880880    reflGrid.Bind(wg.EVT_GRID_LABEL_LEFT_DCLICK, onCellListDClick)
    881881#    G2frame.dataWindow.Bind(wg.EVT_GRID_CELL_LEFT_DCLICK, onCellListDClick)
    882     reflGrid.SetMargins(0,0)
    883882    reflGrid.AutoSizeColumns(False)
     883    reflGrid.SetScrollRate(0,0)
    884884    G2frame.reflGrid = reflGrid
    885     mainSizer.Add(reflGrid,1,wx.ALL|wx.EXPAND,1)
     885    mainSizer.Add(reflGrid)         #,1,wx.ALL|wx.EXPAND,1)
    886886    G2frame.dataWindow.SetDataSize()
    887887
     
    11771177            debyeTable = G2G.Table(data[1]['debyeTerms'],rowLabels=rowLabels,colLabels=colLabels,types=Types)
    11781178            debyeGrid = G2G.GSGrid(parent=G2frame.dataWindow)
     1179            debyeGrid.SetScrollRate(0,0)
    11791180            debyeGrid.SetTable(debyeTable, True)
    11801181            debyeGrid.Bind(wx.EVT_KEY_DOWN, KeyEditPeakGrid)
     
    12381239            peaksTable = G2G.Table(data[1]['peaksList'],rowLabels=rowLabels,colLabels=colLabels,types=Types)
    12391240            peaksGrid = G2G.GSGrid(parent=G2frame.dataWindow)
     1241            peaksGrid.SetScrollRate(0,0)
    12401242            peaksGrid.SetTable(peaksTable, True)
    12411243            peaksGrid.Bind(wx.EVT_KEY_DOWN, KeyEditPeakGrid)
     
    26432645    G2frame.indxPeaks.Bind(wg.EVT_GRID_CELL_LEFT_CLICK, RefreshIndexPeaksGrid)
    26442646    G2frame.indxPeaks.Bind(wx.EVT_KEY_DOWN, KeyEditPickGrid)                 
    2645     G2frame.indxPeaks.SetMargins(0,0)
     2647    G2frame.indxPeaks.SetScrollRate(0,0)
    26462648    G2frame.indxPeaks.AutoSizeColumns(False)
    26472649    if len(XY):
     
    33273329        gridDisplay.Bind(wg.EVT_GRID_CELL_LEFT_CLICK,RefreshUnitCellsGrid)
    33283330        gridDisplay.Bind(wg.EVT_GRID_LABEL_LEFT_DCLICK,OnSortCells)
    3329         gridDisplay.SetMargins(0,0)
     3331        gridDisplay.SetScrollRate(0,0)
    33303332        gridDisplay.SetRowLabelSize(0)
    33313333        gridDisplay.AutoSizeColumns(False)
Note: See TracChangeset for help on using the changeset viewer.