Changeset 916 for trunk/GSASIIphsGUI.py


Ignore:
Timestamp:
May 16, 2013 11:29:00 PM (10 years ago)
Author:
toby
Message:

switch General & Draw Options tabs to wx.ScrolledWindow?

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/GSASIIphsGUI.py

    r912 r916  
    232232                    Text += line+'\n'
    233233                wx.MessageBox(Text,caption=msg,style=Style)
    234 #                dataDisplay.DestroyChildren()           #needed to clear away bad cellSizer, etc.
     234#                General.DestroyChildren()           #needed to clear away bad cellSizer, etc.
    235235                wx.CallAfter(UpdateGeneral)
    236236               
    237237            nameSizer = wx.BoxSizer(wx.HORIZONTAL)
    238             nameSizer.Add(wx.StaticText(dataDisplay,-1,' Phase name: '),0,wx.ALIGN_CENTER_VERTICAL)
    239             NameTxt = wx.TextCtrl(dataDisplay,-1,value=generalData['Name'],style=wx.TE_PROCESS_ENTER)
     238            nameSizer.Add(wx.StaticText(General,-1,' Phase name: '),0,wx.ALIGN_CENTER_VERTICAL)
     239            NameTxt = wx.TextCtrl(General,-1,value=generalData['Name'],style=wx.TE_PROCESS_ENTER)
    240240            NameTxt.Bind(wx.EVT_TEXT_ENTER,OnPhaseName)
    241241            NameTxt.Bind(wx.EVT_KILL_FOCUS,OnPhaseName)
    242242            nameSizer.Add(NameTxt,0,wx.ALIGN_CENTER_VERTICAL)
    243             nameSizer.Add(wx.StaticText(dataDisplay,-1,'  Phase type: '),0,wx.ALIGN_CENTER_VERTICAL)
    244             TypeTxt = wx.ComboBox(dataDisplay,-1,value=generalData['Type'],choices=phaseTypes,
     243            nameSizer.Add(wx.StaticText(General,-1,'  Phase type: '),0,wx.ALIGN_CENTER_VERTICAL)
     244            TypeTxt = wx.ComboBox(General,-1,value=generalData['Type'],choices=phaseTypes,
    245245                style=wx.CB_READONLY|wx.CB_DROPDOWN)
    246246            TypeTxt.Bind(wx.EVT_COMBOBOX, OnPhaseType)
    247247            nameSizer.Add(TypeTxt,0,wx.ALIGN_CENTER_VERTICAL)
    248             nameSizer.Add(wx.StaticText(dataDisplay,-1,'  Space group: '),0,wx.ALIGN_CENTER_VERTICAL)
    249             SGTxt = wx.TextCtrl(dataDisplay,-1,value=generalData['SGData']['SpGrp'],style=wx.TE_PROCESS_ENTER)
     248            nameSizer.Add(wx.StaticText(General,-1,'  Space group: '),0,wx.ALIGN_CENTER_VERTICAL)
     249            SGTxt = wx.TextCtrl(General,-1,value=generalData['SGData']['SpGrp'],style=wx.TE_PROCESS_ENTER)
    250250            SGTxt.Bind(wx.EVT_TEXT_ENTER,OnSpaceGroup)
    251251            nameSizer.Add(SGTxt,0,wx.ALIGN_CENTER_VERTICAL)
    … …  
    361361            cellSizer = wx.FlexGridSizer(2,useGUI[1]+1,5,5)
    362362            if PWDR:
    363                 cellRef = wx.CheckBox(dataDisplay,-1,label='Refine unit cell:')
     363                cellRef = wx.CheckBox(General,-1,label='Refine unit cell:')
    364364                cellSizer.Add(cellRef,0,wx.ALIGN_CENTER_VERTICAL)
    365365                cellRef.Bind(wx.EVT_CHECKBOX, OnCellRef)
    … …  
    367367            cellList = []
    368368            for txt,fmt,ifEdit,Id in useGUI[2]:
    369                 cellSizer.Add(wx.StaticText(dataDisplay,label=txt),0,wx.ALIGN_CENTER_VERTICAL)
     369                cellSizer.Add(wx.StaticText(General,label=txt),0,wx.ALIGN_CENTER_VERTICAL)
    370370                if ifEdit:          #a,b,c,etc.
    371                     cellVal = wx.TextCtrl(dataDisplay,value=(fmt%(cell[Id+1])),
     371                    cellVal = wx.TextCtrl(General,value=(fmt%(cell[Id+1])),
    372372                        style=wx.TE_PROCESS_ENTER)
    373373                    cellVal.Bind(wx.EVT_TEXT_ENTER,OnCellChange)       
    … …  
    376376                    cellList.append(cellVal.GetId())
    377377                else:               #volume
    378                     volVal = wx.TextCtrl(dataDisplay,value=(fmt%(cell[7])),style=wx.TE_READONLY)
     378                    volVal = wx.TextCtrl(General,value=(fmt%(cell[7])),style=wx.TE_READONLY)
    379379                    volVal.SetBackgroundColour(VERY_LIGHT_GREY)
    380380                    cellSizer.Add(volVal,0,wx.ALIGN_CENTER_VERTICAL)
    … …  
    396396               
    397397            elemSizer = wx.FlexGridSizer(8,len(generalData['AtomTypes'])+1,1,1)
    398             elemSizer.Add(wx.StaticText(dataDisplay,label=' Elements'),0,wx.ALIGN_CENTER_VERTICAL)
     398            elemSizer.Add(wx.StaticText(General,label=' Elements'),0,wx.ALIGN_CENTER_VERTICAL)
    399399            for elem in generalData['AtomTypes']:
    400                 typTxt = wx.TextCtrl(dataDisplay,value=elem,style=wx.TE_READONLY)
     400                typTxt = wx.TextCtrl(General,value=elem,style=wx.TE_READONLY)
    401401                typTxt.SetBackgroundColour(VERY_LIGHT_GREY)
    402402                elemSizer.Add(typTxt,0,wx.ALIGN_CENTER_VERTICAL)
    403             elemSizer.Add(wx.StaticText(dataDisplay,label=' Isotope'),0,wx.ALIGN_CENTER_VERTICAL)
     403            elemSizer.Add(wx.StaticText(General,label=' Isotope'),0,wx.ALIGN_CENTER_VERTICAL)
    404404            for elem in generalData['AtomTypes']:
    405405                choices = generalData['Isotopes'][elem].keys()
    406                 isoSel = wx.ComboBox(dataDisplay,-1,value=generalData['Isotope'][elem],choices=choices,
     406                isoSel = wx.ComboBox(General,-1,value=generalData['Isotope'][elem],choices=choices,
    407407                    style=wx.CB_READONLY|wx.CB_DROPDOWN)
    408408                isoSel.Bind(wx.EVT_COMBOBOX,OnIsotope)
    409409                Indx[isoSel.GetId()] = elem
    410410                elemSizer.Add(isoSel,1,wx.ALIGN_CENTER_VERTICAL|wx.EXPAND)
    411             elemSizer.Add(wx.StaticText(dataDisplay,label=' No. per cell'),0,wx.ALIGN_CENTER_VERTICAL)
     411            elemSizer.Add(wx.StaticText(General,label=' No. per cell'),0,wx.ALIGN_CENTER_VERTICAL)
    412412            for elem in generalData['AtomTypes']:
    413                 numbTxt = wx.TextCtrl(dataDisplay,value='%.1f'%(generalData['NoAtoms'][elem]),
     413                numbTxt = wx.TextCtrl(General,value='%.1f'%(generalData['NoAtoms'][elem]),
    414414                    style=wx.TE_READONLY)
    415415                numbTxt.SetBackgroundColour(VERY_LIGHT_GREY)
    416416                elemSizer.Add(numbTxt,0,wx.ALIGN_CENTER_VERTICAL)
    417             elemSizer.Add(wx.StaticText(dataDisplay,label=' Atom weight'),0,wx.ALIGN_CENTER_VERTICAL)
     417            elemSizer.Add(wx.StaticText(General,label=' Atom weight'),0,wx.ALIGN_CENTER_VERTICAL)
    418418            for wt in generalData['AtomMass']:
    419                 wtTxt = wx.TextCtrl(dataDisplay,value='%.3f'%(wt),style=wx.TE_READONLY)
     419                wtTxt = wx.TextCtrl(General,value='%.3f'%(wt),style=wx.TE_READONLY)
    420420                wtTxt.SetBackgroundColour(VERY_LIGHT_GREY)
    421421                elemSizer.Add(wtTxt,0,wx.ALIGN_CENTER_VERTICAL)
    422             elemSizer.Add(wx.StaticText(dataDisplay,label=' Bond radii'),0,wx.ALIGN_CENTER_VERTICAL)
     422            elemSizer.Add(wx.StaticText(General,label=' Bond radii'),0,wx.ALIGN_CENTER_VERTICAL)
    423423            for rad in generalData['BondRadii']:
    424                 bondRadii = wx.TextCtrl(dataDisplay,value='%.2f'%(rad),style=wx.TE_READONLY)
     424                bondRadii = wx.TextCtrl(General,value='%.2f'%(rad),style=wx.TE_READONLY)
    425425                bondRadii.SetBackgroundColour(VERY_LIGHT_GREY)
    426426                elemSizer.Add(bondRadii,0,wx.ALIGN_CENTER_VERTICAL)
    427             elemSizer.Add(wx.StaticText(dataDisplay,label=' Angle radii'),0,wx.ALIGN_CENTER_VERTICAL)
     427            elemSizer.Add(wx.StaticText(General,label=' Angle radii'),0,wx.ALIGN_CENTER_VERTICAL)
    428428            for rad in generalData['AngleRadii']:
    429                 elemTxt = wx.TextCtrl(dataDisplay,value='%.2f'%(rad),style=wx.TE_READONLY)
     429                elemTxt = wx.TextCtrl(General,value='%.2f'%(rad),style=wx.TE_READONLY)
    430430                elemTxt.SetBackgroundColour(VERY_LIGHT_GREY)
    431431                elemSizer.Add(elemTxt,0,wx.ALIGN_CENTER_VERTICAL)
    432             elemSizer.Add(wx.StaticText(dataDisplay,label=' van der Waals radii'),0,wx.ALIGN_CENTER_VERTICAL)
     432            elemSizer.Add(wx.StaticText(General,label=' van der Waals radii'),0,wx.ALIGN_CENTER_VERTICAL)
    433433            for rad in generalData['vdWRadii']:
    434                 elemTxt = wx.TextCtrl(dataDisplay,value='%.2f'%(rad),style=wx.TE_READONLY)
     434                elemTxt = wx.TextCtrl(General,value='%.2f'%(rad),style=wx.TE_READONLY)
    435435                elemTxt.SetBackgroundColour(VERY_LIGHT_GREY)
    436436                elemSizer.Add(elemTxt,0,wx.ALIGN_CENTER_VERTICAL)
    437             elemSizer.Add(wx.StaticText(dataDisplay,label=' Default color'),0,wx.ALIGN_CENTER_VERTICAL)
     437            elemSizer.Add(wx.StaticText(General,label=' Default color'),0,wx.ALIGN_CENTER_VERTICAL)
    438438            for R,G,B in generalData['Color']:
    439                 colorTxt = wx.TextCtrl(dataDisplay,value='',style=wx.TE_READONLY)
     439                colorTxt = wx.TextCtrl(General,value='',style=wx.TE_READONLY)
    440440                colorTxt.SetBackgroundColour(wx.Colour(R,G,B))
    441441                elemSizer.Add(colorTxt,0,wx.ALIGN_CENTER_VERTICAL)
    … …  
    447447            density,mattCoeff = G2mth.getDensity(generalData)
    448448            denSizer = wx.BoxSizer(wx.HORIZONTAL)
    449             denSizer.Add(wx.StaticText(dataDisplay,-1,' Density: '),0,wx.ALIGN_CENTER_VERTICAL)
    450             denTxt = wx.TextCtrl(dataDisplay,-1,'%.3f'%(density),style=wx.TE_READONLY)
     449            denSizer.Add(wx.StaticText(General,-1,' Density: '),0,wx.ALIGN_CENTER_VERTICAL)
     450            denTxt = wx.TextCtrl(General,-1,'%.3f'%(density),style=wx.TE_READONLY)
    451451            denTxt.SetBackgroundColour(VERY_LIGHT_GREY)
    452452            denSizer.Add(denTxt,0,wx.ALIGN_CENTER_VERTICAL)
    453453            mattTxt = None       
    454454            if generalData['Type'] == 'macromolecular' and mass > 0.0:
    455                 denSizer.Add(wx.StaticText(dataDisplay,-1,' Matthews coeff.: '),
     455                denSizer.Add(wx.StaticText(General,-1,' Matthews coeff.: '),
    456456                    0,wx.ALIGN_CENTER_VERTICAL)
    457                 mattTxt = wx.TextCtrl(dataDisplay,-1,'%.3f'%(mattCoeff),style=wx.TE_READONLY)
     457                mattTxt = wx.TextCtrl(General,-1,'%.3f'%(mattCoeff),style=wx.TE_READONLY)
    458458                mattTxt.SetBackgroundColour(VERY_LIGHT_GREY)
    459459                denSizer.Add(mattTxt,0,wx.ALIGN_CENTER_VERTICAL)
    … …  
    484484
    485485            pawleySizer = wx.BoxSizer(wx.HORIZONTAL)
    486             pawleySizer.Add(wx.StaticText(dataDisplay,label=' Pawley controls: '),0,wx.ALIGN_CENTER_VERTICAL)
    487             pawlRef = wx.CheckBox(dataDisplay,-1,label=' Do Pawley refinement?')
     486            pawleySizer.Add(wx.StaticText(General,label=' Pawley controls: '),0,wx.ALIGN_CENTER_VERTICAL)
     487            pawlRef = wx.CheckBox(General,-1,label=' Do Pawley refinement?')
    488488            pawlRef.SetValue(generalData['doPawley'])
    489489            pawlRef.Bind(wx.EVT_CHECKBOX,OnPawleyRef)
    490490            pawleySizer.Add(pawlRef,0,wx.ALIGN_CENTER_VERTICAL)
    491             pawleySizer.Add(wx.StaticText(dataDisplay,label=' Pawley dmin: '),0,wx.ALIGN_CENTER_VERTICAL)
    492             pawlVal = wx.TextCtrl(dataDisplay,value='%.3f'%(generalData['Pawley dmin']),style=wx.TE_PROCESS_ENTER)
     491            pawleySizer.Add(wx.StaticText(General,label=' Pawley dmin: '),0,wx.ALIGN_CENTER_VERTICAL)
     492            pawlVal = wx.TextCtrl(General,value='%.3f'%(generalData['Pawley dmin']),style=wx.TE_PROCESS_ENTER)
    493493            pawlVal.Bind(wx.EVT_TEXT_ENTER,OnPawleyVal)       
    494494            pawlVal.Bind(wx.EVT_KILL_FOCUS,OnPawleyVal)
    495495            pawleySizer.Add(pawlVal,0,wx.ALIGN_CENTER_VERTICAL)
    496             pawleySizer.Add(wx.StaticText(dataDisplay,label=' Pawley neg. wt.: '),0,wx.ALIGN_CENTER_VERTICAL)
    497             pawlNegWt = wx.TextCtrl(dataDisplay,value='%.2f'%(generalData['Pawley neg wt']),style=wx.TE_PROCESS_ENTER)
     496            pawleySizer.Add(wx.StaticText(General,label=' Pawley neg. wt.: '),0,wx.ALIGN_CENTER_VERTICAL)
     497            pawlNegWt = wx.TextCtrl(General,value='%.2f'%(generalData['Pawley neg wt']),style=wx.TE_PROCESS_ENTER)
    498498            pawlNegWt.Bind(wx.EVT_TEXT_ENTER,OnPawleyNegWt)       
    499499            pawlNegWt.Bind(wx.EVT_KILL_FOCUS,OnPawleyNegWt)
    … …  
    537537            mapSizer = wx.BoxSizer(wx.VERTICAL)
    538538            lineSizer = wx.BoxSizer(wx.HORIZONTAL)
    539             lineSizer.Add(wx.StaticText(dataDisplay,label=' Fourier map controls: Map type: '),0,wx.ALIGN_CENTER_VERTICAL)
    540             mapType = wx.ComboBox(dataDisplay,-1,value=Map['MapType'],choices=mapTypes,
     539            lineSizer.Add(wx.StaticText(General,label=' Fourier map controls: Map type: '),0,wx.ALIGN_CENTER_VERTICAL)
     540            mapType = wx.ComboBox(General,-1,value=Map['MapType'],choices=mapTypes,
    541541                style=wx.CB_READONLY|wx.CB_DROPDOWN)
    542542            mapType.Bind(wx.EVT_COMBOBOX,OnMapType)
    543543            lineSizer.Add(mapType,0,wx.ALIGN_CENTER_VERTICAL)
    544             lineSizer.Add(wx.StaticText(dataDisplay,label=' Reflection set from: '),0,wx.ALIGN_CENTER_VERTICAL)
    545             refList = wx.ComboBox(dataDisplay,-1,value=Map['RefList'],choices=refList,
     544            lineSizer.Add(wx.StaticText(General,label=' Reflection set from: '),0,wx.ALIGN_CENTER_VERTICAL)
     545            refList = wx.ComboBox(General,-1,value=Map['RefList'],choices=refList,
    546546                style=wx.CB_READONLY|wx.CB_DROPDOWN)
    547547            refList.Bind(wx.EVT_COMBOBOX,OnRefList)
    … …  
    549549            mapSizer.Add(lineSizer,0,wx.ALIGN_CENTER_VERTICAL)
    550550            line2Sizer = wx.BoxSizer(wx.HORIZONTAL)
    551             line2Sizer.Add(wx.StaticText(dataDisplay,label=' Resolution: '),0,wx.ALIGN_CENTER_VERTICAL)
    552             mapRes =  wx.TextCtrl(dataDisplay,value='%.2f'%(Map['Resolution']),style=wx.TE_PROCESS_ENTER)
     551            line2Sizer.Add(wx.StaticText(General,label=' Resolution: '),0,wx.ALIGN_CENTER_VERTICAL)
     552            mapRes =  wx.TextCtrl(General,value='%.2f'%(Map['Resolution']),style=wx.TE_PROCESS_ENTER)
    553553            mapRes.Bind(wx.EVT_TEXT_ENTER,OnResVal)       
    554554            mapRes.Bind(wx.EVT_KILL_FOCUS,OnResVal)
    555555            line2Sizer.Add(mapRes,0,wx.ALIGN_CENTER_VERTICAL)
    556             line2Sizer.Add(wx.StaticText(dataDisplay,label=' Peak cutoff %: '),0,wx.ALIGN_CENTER_VERTICAL)
    557             cutOff =  wx.TextCtrl(dataDisplay,value='%.1f'%(Map['cutOff']),style=wx.TE_PROCESS_ENTER)
     556            line2Sizer.Add(wx.StaticText(General,label=' Peak cutoff %: '),0,wx.ALIGN_CENTER_VERTICAL)
     557            cutOff =  wx.TextCtrl(General,value='%.1f'%(Map['cutOff']),style=wx.TE_PROCESS_ENTER)
    558558            cutOff.Bind(wx.EVT_TEXT_ENTER,OnCutOff)       
    559559            cutOff.Bind(wx.EVT_KILL_FOCUS,OnCutOff)
    … …  
    605605            flipSizer = wx.BoxSizer(wx.VERTICAL)
    606606            lineSizer = wx.BoxSizer(wx.HORIZONTAL)
    607             lineSizer.Add(wx.StaticText(dataDisplay,label=' Charge flip controls: Reflection set from: '),0,wx.ALIGN_CENTER_VERTICAL)
    608             refList = wx.ComboBox(dataDisplay,-1,value=Flip['RefList'],choices=refList,
     607            lineSizer.Add(wx.StaticText(General,label=' Charge flip controls: Reflection set from: '),0,wx.ALIGN_CENTER_VERTICAL)
     608            refList = wx.ComboBox(General,-1,value=Flip['RefList'],choices=refList,
    609609                style=wx.CB_READONLY|wx.CB_DROPDOWN)
    610610            refList.Bind(wx.EVT_COMBOBOX,OnRefList)
    611611            lineSizer.Add(refList,0,wx.ALIGN_CENTER_VERTICAL)
    612             lineSizer.Add(wx.StaticText(dataDisplay,label=' Normalizing element: '),0,wx.ALIGN_CENTER_VERTICAL)
    613             normElem = wx.Button(dataDisplay,label=Flip['Norm element'],style=wx.TE_READONLY)
     612            lineSizer.Add(wx.StaticText(General,label=' Normalizing element: '),0,wx.ALIGN_CENTER_VERTICAL)
     613            normElem = wx.Button(General,label=Flip['Norm element'],style=wx.TE_READONLY)
    614614            normElem.Bind(wx.EVT_BUTTON,OnNormElem)
    615615            lineSizer.Add(normElem,0,wx.ALIGN_CENTER_VERTICAL)
    616616            flipSizer.Add(lineSizer,0,wx.ALIGN_CENTER_VERTICAL)
    617617            line2Sizer = wx.BoxSizer(wx.HORIZONTAL)
    618             line2Sizer.Add(wx.StaticText(dataDisplay,label=' Resolution: '),0,wx.ALIGN_CENTER_VERTICAL)
    619             flipRes =  wx.TextCtrl(dataDisplay,value='%.2f'%(Flip['Resolution']),style=wx.TE_PROCESS_ENTER)
     618            line2Sizer.Add(wx.StaticText(General,label=' Resolution: '),0,wx.ALIGN_CENTER_VERTICAL)
     619            flipRes =  wx.TextCtrl(General,value='%.2f'%(Flip['Resolution']),style=wx.TE_PROCESS_ENTER)
    620620            flipRes.Bind(wx.EVT_TEXT_ENTER,OnResVal)       
    621621            flipRes.Bind(wx.EVT_KILL_FOCUS,OnResVal)
    622622            line2Sizer.Add(flipRes,0,wx.ALIGN_CENTER_VERTICAL)
    623             line2Sizer.Add(wx.StaticText(dataDisplay,label=' k-Factor (0.1-1.2): '),0,wx.ALIGN_CENTER_VERTICAL)
    624             kFactor =  wx.TextCtrl(dataDisplay,value='%.3f'%(Flip['k-factor']),style=wx.TE_PROCESS_ENTER)
     623            line2Sizer.Add(wx.StaticText(General,label=' k-Factor (0.1-1.2): '),0,wx.ALIGN_CENTER_VERTICAL)
     624            kFactor =  wx.TextCtrl(General,value='%.3f'%(Flip['k-factor']),style=wx.TE_PROCESS_ENTER)
    625625            kFactor.Bind(wx.EVT_TEXT_ENTER,OnkFactor)       
    626626            kFactor.Bind(wx.EVT_KILL_FOCUS,OnkFactor)
    627627            line2Sizer.Add(kFactor,0,wx.ALIGN_CENTER_VERTICAL)
    628             line2Sizer.Add(wx.StaticText(dataDisplay,label=' k-Max (>=10.0): '),0,wx.ALIGN_CENTER_VERTICAL)
    629             kMax = wx.TextCtrl(dataDisplay,value='%.1f'%(Flip['k-Max']),style=wx.TE_PROCESS_ENTER)
     628            line2Sizer.Add(wx.StaticText(General,label=' k-Max (>=10.0): '),0,wx.ALIGN_CENTER_VERTICAL)
     629            kMax = wx.TextCtrl(General,value='%.1f'%(Flip['k-Max']),style=wx.TE_PROCESS_ENTER)
    630630            kMax.Bind(wx.EVT_TEXT_ENTER,OnkMax)       
    631631            kMax.Bind(wx.EVT_KILL_FOCUS,OnkMax)
    … …  
    693693            mcsaSizer = wx.BoxSizer(wx.VERTICAL)
    694694            lineSizer = wx.BoxSizer(wx.HORIZONTAL)
    695             lineSizer.Add(wx.StaticText(dataDisplay,label=' Monte Carlo/Simulated Annealing controls: Reflection set from: '),0,wx.ALIGN_CENTER_VERTICAL)
    696             refList = wx.ComboBox(dataDisplay,-1,value=MCSA['Data source'],choices=refList,
     695            lineSizer.Add(wx.StaticText(General,label=' Monte Carlo/Simulated Annealing controls: Reflection set from: '),0,wx.ALIGN_CENTER_VERTICAL)
     696            refList = wx.ComboBox(General,-1,value=MCSA['Data source'],choices=refList,
    697697                style=wx.CB_READONLY|wx.CB_DROPDOWN)
    698698            refList.Bind(wx.EVT_COMBOBOX,OnRefList)
    699699            lineSizer.Add(refList,0,wx.ALIGN_CENTER_VERTICAL)
    700             lineSizer.Add(wx.StaticText(dataDisplay,label=' d-min: '),0,wx.ALIGN_CENTER_VERTICAL)
    701             dmin = wx.TextCtrl(dataDisplay,-1,value='%.3f'%(MCSA['dmin']),style=wx.TE_PROCESS_ENTER)
     700            lineSizer.Add(wx.StaticText(General,label=' d-min: '),0,wx.ALIGN_CENTER_VERTICAL)
     701            dmin = wx.TextCtrl(General,-1,value='%.3f'%(MCSA['dmin']),style=wx.TE_PROCESS_ENTER)
    702702            dmin.Bind(wx.EVT_TEXT_ENTER,OnDmin)       
    703703            dmin.Bind(wx.EVT_KILL_FOCUS,OnDmin)
    … …  
    707707            line2Sizer = wx.BoxSizer(wx.HORIZONTAL)
    708708            Achoice = ['Normal','Random jump','Tremayne jump']
    709             line2Sizer.Add(wx.StaticText(dataDisplay,label=' MC/SA algorithm: '),0,wx.ALIGN_CENTER_VERTICAL)
    710             Alist = wx.ComboBox(dataDisplay,-1,value=MCSA['Algolrithm'],choices=Achoice,
     709            line2Sizer.Add(wx.StaticText(General,label=' MC/SA algorithm: '),0,wx.ALIGN_CENTER_VERTICAL)
     710            Alist = wx.ComboBox(General,-1,value=MCSA['Algolrithm'],choices=Achoice,
    711711                style=wx.CB_READONLY|wx.CB_DROPDOWN)
    712712            Alist.Bind(wx.EVT_COMBOBOX,OnAlist)
    … …  
    714714            if 'Tremayne' in MCSA['Algolrithm']:
    715715                for i,name in enumerate([' A-jump: ',' B-jump: ']):
    716                     line2Sizer.Add(wx.StaticText(dataDisplay,label=name),0,wx.ALIGN_CENTER_VERTICAL)
    717                     Ajump =  wx.TextCtrl(dataDisplay,-1,value='%.3f'%(MCSA['Jump coeff'][i]),style=wx.TE_PROCESS_ENTER)
     716                    line2Sizer.Add(wx.StaticText(General,label=name),0,wx.ALIGN_CENTER_VERTICAL)
     717                    Ajump =  wx.TextCtrl(General,-1,value='%.3f'%(MCSA['Jump coeff'][i]),style=wx.TE_PROCESS_ENTER)
    718718                    Ajump.Bind(wx.EVT_TEXT_ENTER,OnAjump)       
    719719                    Ajump.Bind(wx.EVT_KILL_FOCUS,OnAjump)
    … …  
    723723            mcsaSizer.Add((5,5),)
    724724            line3Sizer = wx.BoxSizer(wx.HORIZONTAL)
    725             line3Sizer.Add(wx.StaticText(dataDisplay,label=' Annealing schedule: '),0,wx.ALIGN_CENTER_VERTICAL)
     725            line3Sizer.Add(wx.StaticText(General,label=' Annealing schedule: '),0,wx.ALIGN_CENTER_VERTICAL)
    726726            names = [' Start temp: ',' Final temp: ',' Slope: ',' No. trials: ']
    727727            fmts = ['%.1f','%.5f','%.2f','%d']
    728728            for i,[name,fmt] in enumerate(zip(names,fmts)):
    729                 line3Sizer.Add(wx.StaticText(dataDisplay,label=name),0,wx.ALIGN_CENTER_VERTICAL)
    730                 anneal =  wx.TextCtrl(dataDisplay,-1,value=fmt%(MCSA['Annealing'][i]),style=wx.TE_PROCESS_ENTER)
     729                line3Sizer.Add(wx.StaticText(General,label=name),0,wx.ALIGN_CENTER_VERTICAL)
     730                anneal =  wx.TextCtrl(General,-1,value=fmt%(MCSA['Annealing'][i]),style=wx.TE_PROCESS_ENTER)
    731731                anneal.Bind(wx.EVT_TEXT_ENTER,OnAnneal)       
    732732                anneal.Bind(wx.EVT_KILL_FOCUS,OnAnneal)
    … …  
    737737
    738738        # UpdateGeneral execution continues here
    739         General.DestroyChildren()
    740         dataDisplay = wx.Panel(General)
     739        if General.GetSizer():
     740            General.GetSizer().Clear(True)
    741741        mainSizer = wx.BoxSizer(wx.VERTICAL)
    742742        mainSizer.Add((5,5),0)
    … …  
    753753            mainSizer.Add((5,5),0)           
    754754            mainSizer.Add(ElemSizer())
    755         G2gd.HorizontalLine(mainSizer,dataDisplay)
     755        G2gd.HorizontalLine(mainSizer,General)
    756756
    757757        mainSizer.Add(PawleySizer())
    758         G2gd.HorizontalLine(mainSizer,dataDisplay)
     758        G2gd.HorizontalLine(mainSizer,General)
    759759       
    760760        mainSizer.Add(MapSizer())
    761         G2gd.HorizontalLine(mainSizer,dataDisplay)
     761        G2gd.HorizontalLine(mainSizer,General)
    762762
    763763        mainSizer.Add(FlipSizer())
    764         G2gd.HorizontalLine(mainSizer,dataDisplay)
     764        G2gd.HorizontalLine(mainSizer,General)
    765765
    766766        mainSizer.Add(MCSASizer())
    767767
    768         dataDisplay.SetSizer(mainSizer)
     768        General.SetSizer(mainSizer)
     769        General.SetScrollbars(1,1,1,1)
     770
    769771        if G2frame.dataFrame.PhaseUserSize is None:
    770             Size = mainSizer.ComputeFittingWindowSize(G2frame.dataFrame)  # get size needed by window
    771             Size[1] += 35                           #compensate for status bar
     772            Size = mainSizer.GetMinSize()
     773            Size[0] += 40
     774            Size[1] = max(Size[1],290) + 35
     775            General.SetSize(Size)
     776            General.SetScrollbars(10,10,Size[0]/10-4,Size[1]/10-1)
     777            Size[1] = min(Size[1],500) # don't let initial size get larger than 500 points
    772778            G2frame.dataFrame.setSizePosLeft(Size)
    773779        else:
     780            Size = G2frame.dataFrame.PhaseUserSize
     781            General.SetSize(G2frame.dataFrame.GetClientSize())
     782            Size = mainSizer.ComputeFittingWindowSize(G2frame.dataFrame)
     783            General.SetVirtualSize(Size)
     784            General.SetScrollbars(10,10,Size[0]/10-4,Size[1]/10-1)
    774785            G2frame.dataFrame.Update()
    775         dataDisplay.SetSize(G2frame.dataFrame.GetClientSize())
    776786        G2frame.dataFrame.SetStatusText('')
    777787
    … …  
    24812491                VP = np.inner(Bmat,VP)
    24822492                drawingData['viewPoint'][0] = VP
    2483                 panel = dataDisplay.GetChildren()
     2493                panel = drawOptions.GetChildren()
    24842494                names = [child.GetName() for child in panel]
    24852495                panel[names.index('viewPoint')].SetValue('%.3f %.3f %.3f'%(VP[0],VP[1],VP[2]))               
    … …  
    25212531            slideSizer.AddGrowableCol(1,1)
    25222532   
    2523             cameraPosTxt = wx.StaticText(dataDisplay,-1,
     2533            cameraPosTxt = wx.StaticText(drawOptions,-1,
    25242534                ' Camera Distance: '+'%.2f'%(drawingData['cameraPos']),name='cameraPos')
    25252535            slideSizer.Add(cameraPosTxt,0,wx.ALIGN_CENTER_VERTICAL)
    2526             cameraPos = wx.Slider(dataDisplay,style=wx.SL_HORIZONTAL,value=drawingData['cameraPos'],name='cameraSlider')
     2536            cameraPos = wx.Slider(drawOptions,style=wx.SL_HORIZONTAL,value=drawingData['cameraPos'],name='cameraSlider')
    25272537            cameraPos.SetRange(10,500)
    25282538            cameraPos.Bind(wx.EVT_SLIDER, OnCameraPos)
    25292539            slideSizer.Add(cameraPos,1,wx.EXPAND|wx.RIGHT)
    25302540           
    2531             ZclipTxt = wx.StaticText(dataDisplay,-1,' Z clipping: '+'%.2fA'%(drawingData['Zclip']*drawingData['cameraPos']/100.))
     2541            ZclipTxt = wx.StaticText(drawOptions,-1,' Z clipping: '+'%.2fA'%(drawingData['Zclip']*drawingData['cameraPos']/100.))
    25322542            slideSizer.Add(ZclipTxt,0,wx.ALIGN_CENTER_VERTICAL)
    2533             Zclip = wx.Slider(dataDisplay,style=wx.SL_HORIZONTAL,value=drawingData['Zclip'])
     2543            Zclip = wx.Slider(drawOptions,style=wx.SL_HORIZONTAL,value=drawingData['Zclip'])
    25342544            Zclip.SetRange(1,99)
    25352545            Zclip.Bind(wx.EVT_SLIDER, OnZclip)
    … …  
    25372547           
    25382548            ZstepSizer = wx.BoxSizer(wx.HORIZONTAL)
    2539             ZstepSizer.Add(wx.StaticText(dataDisplay,-1,' Z step:'),0,wx.ALIGN_CENTER_VERTICAL)
    2540             Zstep = wx.TextCtrl(dataDisplay,value='%.2f'%(drawingData['Zstep']),
     2549            ZstepSizer.Add(wx.StaticText(drawOptions,-1,' Z step:'),0,wx.ALIGN_CENTER_VERTICAL)
     2550            Zstep = wx.TextCtrl(drawOptions,value='%.2f'%(drawingData['Zstep']),
    25412551                style=wx.TE_PROCESS_ENTER)
    25422552            Zstep.Bind(wx.EVT_TEXT_ENTER,OnZstep)
    … …  
    25452555            slideSizer.Add(ZstepSizer)
    25462556            MoveSizer = wx.BoxSizer(wx.HORIZONTAL)
    2547             MoveSizer.Add(wx.StaticText(dataDisplay,-1,'   Press to step:'),0,wx.ALIGN_CENTER_VERTICAL)
    2548             MoveZ = wx.SpinButton(dataDisplay,style=wx.SP_HORIZONTAL,size=wx.Size(100,20))
     2557            MoveSizer.Add(wx.StaticText(drawOptions,-1,'   Press to step:'),0,wx.ALIGN_CENTER_VERTICAL)
     2558            MoveZ = wx.SpinButton(drawOptions,style=wx.SP_HORIZONTAL,size=wx.Size(100,20))
    25492559            MoveZ.SetValue(0)
    25502560            MoveZ.SetRange(-1,1)
    … …  
    25532563            slideSizer.Add(MoveSizer,1,wx.EXPAND|wx.RIGHT)
    25542564           
    2555             vdwScaleTxt = wx.StaticText(dataDisplay,-1,' van der Waals scale: '+'%.2f'%(drawingData['vdwScale']))
     2565            vdwScaleTxt = wx.StaticText(drawOptions,-1,' van der Waals scale: '+'%.2f'%(drawingData['vdwScale']))
    25562566            slideSizer.Add(vdwScaleTxt,0,wx.ALIGN_CENTER_VERTICAL)
    2557             vdwScale = wx.Slider(dataDisplay,style=wx.SL_HORIZONTAL,value=int(100*drawingData['vdwScale']))
     2567            vdwScale = wx.Slider(drawOptions,style=wx.SL_HORIZONTAL,value=int(100*drawingData['vdwScale']))
    25582568            vdwScale.Bind(wx.EVT_SLIDER, OnVdWScale)
    25592569            slideSizer.Add(vdwScale,1,wx.EXPAND|wx.RIGHT)
    25602570   
    2561             ellipseProbTxt = wx.StaticText(dataDisplay,-1,' Ellipsoid probability: '+'%d%%'%(drawingData['ellipseProb']))
     2571            ellipseProbTxt = wx.StaticText(drawOptions,-1,' Ellipsoid probability: '+'%d%%'%(drawingData['ellipseProb']))
    25622572            slideSizer.Add(ellipseProbTxt,0,wx.ALIGN_CENTER_VERTICAL)
    2563             ellipseProb = wx.Slider(dataDisplay,style=wx.SL_HORIZONTAL,value=drawingData['ellipseProb'])
     2573            ellipseProb = wx.Slider(drawOptions,style=wx.SL_HORIZONTAL,value=drawingData['ellipseProb'])
    25642574            ellipseProb.SetRange(1,99)
    25652575            ellipseProb.Bind(wx.EVT_SLIDER, OnEllipseProb)
    25662576            slideSizer.Add(ellipseProb,1,wx.EXPAND|wx.RIGHT)
    25672577   
    2568             ballScaleTxt = wx.StaticText(dataDisplay,-1,' Ball scale: '+'%.2f'%(drawingData['ballScale']))
     2578            ballScaleTxt = wx.StaticText(drawOptions,-1,' Ball scale: '+'%.2f'%(drawingData['ballScale']))
    25692579            slideSizer.Add(ballScaleTxt,0,wx.ALIGN_CENTER_VERTICAL)
    2570             ballScale = wx.Slider(dataDisplay,style=wx.SL_HORIZONTAL,value=int(100*drawingData['ballScale']))
     2580            ballScale = wx.Slider(drawOptions,style=wx.SL_HORIZONTAL,value=int(100*drawingData['ballScale']))
    25712581            ballScale.Bind(wx.EVT_SLIDER, OnBallScale)
    25722582            slideSizer.Add(ballScale,1,wx.EXPAND|wx.RIGHT)
    25732583   
    2574             bondRadiusTxt = wx.StaticText(dataDisplay,-1,' Bond radius, A: '+'%.2f'%(drawingData['bondRadius']))
     2584            bondRadiusTxt = wx.StaticText(drawOptions,-1,' Bond radius, A: '+'%.2f'%(drawingData['bondRadius']))
    25752585            slideSizer.Add(bondRadiusTxt,0,wx.ALIGN_CENTER_VERTICAL)
    2576             bondRadius = wx.Slider(dataDisplay,style=wx.SL_HORIZONTAL,value=int(100*drawingData['bondRadius']))
     2586            bondRadius = wx.Slider(drawOptions,style=wx.SL_HORIZONTAL,value=int(100*drawingData['bondRadius']))
    25772587            bondRadius.SetRange(1,25)
    25782588            bondRadius.Bind(wx.EVT_SLIDER, OnBondRadius)
    … …  
    25802590           
    25812591            if generalData['Map']['rhoMax']:
    2582                 contourLevelTxt = wx.StaticText(dataDisplay,-1,' Contour level: '+'%.2f'%(drawingData['contourLevel']*generalData['Map']['rhoMax']))
     2592                contourLevelTxt = wx.StaticText(drawOptions,-1,' Contour level: '+'%.2f'%(drawingData['contourLevel']*generalData['Map']['rhoMax']))
    25832593                slideSizer.Add(contourLevelTxt,0,wx.ALIGN_CENTER_VERTICAL)
    2584                 contourLevel = wx.Slider(dataDisplay,style=wx.SL_HORIZONTAL,value=int(100*drawingData['contourLevel']))
     2594                contourLevel = wx.Slider(drawOptions,style=wx.SL_HORIZONTAL,value=int(100*drawingData['contourLevel']))
    25852595                contourLevel.SetRange(1,100)
    25862596                contourLevel.Bind(wx.EVT_SLIDER, OnContourLevel)
    25872597                slideSizer.Add(contourLevel,1,wx.EXPAND|wx.RIGHT)
    2588                 mapSizeTxt = wx.StaticText(dataDisplay,-1,' Map radius, A: '+'%.1f'%(drawingData['mapSize']))
     2598                mapSizeTxt = wx.StaticText(drawOptions,-1,' Map radius, A: '+'%.1f'%(drawingData['mapSize']))
    25892599                slideSizer.Add(mapSizeTxt,0,wx.ALIGN_CENTER_VERTICAL)
    2590                 mapSize = wx.Slider(dataDisplay,style=wx.SL_HORIZONTAL,value=int(10*drawingData['mapSize']))
     2600                mapSize = wx.Slider(drawOptions,style=wx.SL_HORIZONTAL,value=int(10*drawingData['mapSize']))
    25912601                mapSize.SetRange(1,100)
    25922602                mapSize.Bind(wx.EVT_SLIDER, OnMapSize)
    … …  
    26572667            showSizer = wx.BoxSizer(wx.VERTICAL)           
    26582668            lineSizer = wx.BoxSizer(wx.HORIZONTAL)
    2659             lineSizer.Add(wx.StaticText(dataDisplay,-1,' Background color:'),0,wx.ALIGN_CENTER_VERTICAL)
    2660             backColor = wcs.ColourSelect(dataDisplay, -1,colour=drawingData['backColor'],size=wx.Size(25,25))
     2669            lineSizer.Add(wx.StaticText(drawOptions,-1,' Background color:'),0,wx.ALIGN_CENTER_VERTICAL)
     2670            backColor = wcs.ColourSelect(drawOptions, -1,colour=drawingData['backColor'],size=wx.Size(25,25))
    26612671            backColor.Bind(wcs.EVT_COLOURSELECT, OnBackColor)
    26622672            lineSizer.Add(backColor,0,wx.ALIGN_CENTER_VERTICAL)
    2663             lineSizer.Add(wx.StaticText(dataDisplay,-1,' View Dir.:'),0,wx.ALIGN_CENTER_VERTICAL)
     2673            lineSizer.Add(wx.StaticText(drawOptions,-1,' View Dir.:'),0,wx.ALIGN_CENTER_VERTICAL)
    26642674            VD = drawingData['viewDir']
    2665             viewDir = wx.TextCtrl(dataDisplay,value='%.3f %.3f %.3f'%(VD[0],VD[1],VD[2]),
     2675            viewDir = wx.TextCtrl(drawOptions,value='%.3f %.3f %.3f'%(VD[0],VD[1],VD[2]),
    26662676                style=wx.TE_PROCESS_ENTER,size=wx.Size(140,20),name='viewDir')
    26672677            viewDir.Bind(wx.EVT_TEXT_ENTER,OnViewDir)
    … …  
    26722682           
    26732683            lineSizer = wx.BoxSizer(wx.HORIZONTAL)
    2674             showABC = wx.CheckBox(dataDisplay,-1,label=' Show view point?')
     2684            showABC = wx.CheckBox(drawOptions,-1,label=' Show view point?')
    26752685            showABC.Bind(wx.EVT_CHECKBOX, OnShowABC)
    26762686            showABC.SetValue(drawingData['showABC'])
    26772687            lineSizer.Add(showABC,0,wx.ALIGN_CENTER_VERTICAL)
    2678             lineSizer.Add(wx.StaticText(dataDisplay,-1,' View Point:'),0,wx.ALIGN_CENTER_VERTICAL)
     2688            lineSizer.Add(wx.StaticText(drawOptions,-1,' View Point:'),0,wx.ALIGN_CENTER_VERTICAL)
    26792689            VP = drawingData['viewPoint'][0]
    2680             viewPoint = wx.TextCtrl(dataDisplay,value='%.3f %.3f %.3f'%(VP[0],VP[1],VP[2]),
     2690            viewPoint = wx.TextCtrl(drawOptions,value='%.3f %.3f %.3f'%(VP[0],VP[1],VP[2]),
    26812691                style=wx.TE_PROCESS_ENTER,size=wx.Size(140,20),name='viewPoint')
    26822692            viewPoint.Bind(wx.EVT_TEXT_ENTER,OnViewPoint)
    … …  
    26882698            line2Sizer = wx.BoxSizer(wx.HORIZONTAL)
    26892699   
    2690             unitCellBox = wx.CheckBox(dataDisplay,-1,label=' Show unit cell?')
     2700            unitCellBox = wx.CheckBox(drawOptions,-1,label=' Show unit cell?')
    26912701            unitCellBox.Bind(wx.EVT_CHECKBOX, OnShowUnitCell)
    26922702            unitCellBox.SetValue(drawingData['unitCellBox'])
    26932703            line2Sizer.Add(unitCellBox,0,wx.ALIGN_CENTER_VERTICAL)
    26942704   
    2695             showHydrogen = wx.CheckBox(dataDisplay,-1,label=' Show hydrogens?')
     2705            showHydrogen = wx.CheckBox(drawOptions,-1,label=' Show hydrogens?')
    26962706            showHydrogen.Bind(wx.EVT_CHECKBOX, OnShowHyd)
    26972707            showHydrogen.SetValue(drawingData['showHydrogen'])
    26982708            line2Sizer.Add(showHydrogen,0,wx.ALIGN_CENTER_VERTICAL)
    26992709           
    2700             showRB = wx.CheckBox(dataDisplay,-1,label=' Show rigid Bodies?')
     2710            showRB = wx.CheckBox(drawOptions,-1,label=' Show rigid Bodies?')
    27012711            showRB.Bind(wx.EVT_CHECKBOX, OnShowRB)
    27022712            showRB.SetValue(drawingData['showRigidBodies'])
    … …  
    27282738           
    27292739            radSizer = wx.BoxSizer(wx.HORIZONTAL)
    2730             radSizer.Add(wx.StaticText(dataDisplay,-1,' Hydrogen radius, A:  '),0,wx.ALIGN_CENTER_VERTICAL)
    2731             sizeH = wx.TextCtrl(dataDisplay,-1,value='%.2f'%(drawingData['sizeH']),size=wx.Size(60,20),style=wx.TE_PROCESS_ENTER)
     2740            radSizer.Add(wx.StaticText(drawOptions,-1,' Hydrogen radius, A:  '),0,wx.ALIGN_CENTER_VERTICAL)
     2741            sizeH = wx.TextCtrl(drawOptions,-1,value='%.2f'%(drawingData['sizeH']),size=wx.Size(60,20),style=wx.TE_PROCESS_ENTER)
    27322742            sizeH.Bind(wx.EVT_TEXT_ENTER,OnSizeHatoms)
    27332743            sizeH.Bind(wx.EVT_KILL_FOCUS,OnSizeHatoms)
    27342744            radSizer.Add(sizeH,0,wx.ALIGN_CENTER_VERTICAL)
    27352745   
    2736             radSizer.Add(wx.StaticText(dataDisplay,-1,' Bond search factor:  '),0,wx.ALIGN_CENTER_VERTICAL)
    2737             radFactor = wx.TextCtrl(dataDisplay,value='%.2f'%(drawingData['radiusFactor']),size=wx.Size(60,20),style=wx.TE_PROCESS_ENTER)
     2746            radSizer.Add(wx.StaticText(drawOptions,-1,' Bond search factor:  '),0,wx.ALIGN_CENTER_VERTICAL)
     2747            radFactor = wx.TextCtrl(drawOptions,value='%.2f'%(drawingData['radiusFactor']),size=wx.Size(60,20),style=wx.TE_PROCESS_ENTER)
    27382748            radFactor.Bind(wx.EVT_TEXT_ENTER,OnRadFactor)
    27392749            radFactor.Bind(wx.EVT_KILL_FOCUS,OnRadFactor)
    … …  
    27522762
    27532763        G2frame.dataFrame.SetStatusText('')
    2754         drawOptions.DestroyChildren()
    2755         dataDisplay = wx.Panel(drawOptions)
     2764        if drawOptions.GetSizer():
     2765            drawOptions.GetSizer().Clear(True)
    27562766        mainSizer = wx.BoxSizer(wx.VERTICAL)
    27572767        mainSizer.Add((5,5),0)
    2758         mainSizer.Add(wx.StaticText(dataDisplay,-1,' Drawing controls:'),0,wx.ALIGN_CENTER_VERTICAL)
     2768        mainSizer.Add(wx.StaticText(drawOptions,-1,' Drawing controls:'),0,wx.ALIGN_CENTER_VERTICAL)
    27592769        mainSizer.Add((5,5),0)       
    27602770        mainSizer.Add(SlopSizer(),0)
    … …  
    27642774        mainSizer.Add(RadSizer(),0,)
    27652775
    2766         dataDisplay.SetSizer(mainSizer)
     2776        drawOptions.SetSizer(mainSizer)
    27672777        if G2frame.dataFrame.PhaseUserSize is None:
    27682778            Size = mainSizer.Fit(G2frame.dataFrame)
    2769             Size[1] += 35                           #compensate for status bar
     2779            Size[0] = max(Size[0]+35,500)           # leave some extra room and don't get too small
     2780            Size[1] = max(Size[1]+35,350)                           #compensate for status bar
     2781            drawOptions.SetScrollbars(10,10,Size[0]/10-4,Size[1]/10-1)
    27702782            G2frame.dataFrame.setSizePosLeft(Size)
    27712783        else:
     2784            Size = G2frame.dataFrame.PhaseUserSize
     2785            drawOptions.SetSize(G2frame.dataFrame.GetClientSize())
     2786            Size = mainSizer.ComputeFittingWindowSize(G2frame.dataFrame)
     2787            drawOptions.SetVirtualSize(Size)
     2788            drawOptions.SetScrollbars(10,10,Size[0]/10-4,Size[1]/10-1)
    27722789            G2frame.dataFrame.Update()
    2773         dataDisplay.SetSize(G2frame.dataFrame.GetClientSize())
     2790        drawOptions.SetSize(G2frame.dataFrame.GetClientSize())
    27742791
    27752792################################################################################
    … …  
    44804497       
    44814498    wx.Frame.Unbind(G2frame.dataFrame,wx.EVT_SIZE) # ignore size events during this routine
    4482     General = wx.Window(G2frame.dataDisplay)
    4483     # General = wx.ScrolledWindow(G2frame.dataDisplay) # would like to change to this
     4499    General = wx.ScrolledWindow(G2frame.dataDisplay)
    44844500    G2frame.dataDisplay.AddPage(General,'General')
    44854501    DData = wx.ScrolledWindow(G2frame.dataDisplay)
    … …  
    44874503    Atoms = G2gd.GSGrid(G2frame.dataDisplay)
    44884504    G2frame.dataDisplay.AddPage(Atoms,'Atoms')
    4489     drawOptions = wx.Window(G2frame.dataDisplay)
     4505    drawOptions = wx.ScrolledWindow(G2frame.dataDisplay)
    44904506    G2frame.dataDisplay.AddPage(drawOptions,'Draw Options')
    44914507    drawAtoms = G2gd.GSGrid(G2frame.dataDisplay)
Note: See TracChangeset for help on using the changeset viewer.