Changeset 4759 for trunk/GSASIIpwdGUI.py


Ignore:
Timestamp:
Jan 10, 2021 5:12:01 PM (9 months ago)
Author:
toby
Message:

wx4.1 & mpl3.3 fixes

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIpwdGUI.py

    r4697 r4759  
    17031703    topSizer = wx.BoxSizer(wx.HORIZONTAL)
    17041704    topSizer.Add(wx.StaticText(G2frame.dataWindow,label=' Background used in refinement'),0,WACV)
    1705     # add help button to bring up help web page - at right sede of window
    1706     topSizer.Add((-1,-1),1,WACV|wx.EXPAND)
     1705    # add help button to bring up help web page - at right side of window
     1706    topSizer.Add((-1,-1),1,wx.EXPAND)
    17071707    topSizer.Add(G2G.HelpButton(G2frame.dataWindow,helpIndex=G2frame.dataWindow.helpKey))
    1708     mainSizer.Add(topSizer,0,WACV|wx.EXPAND)
     1708    mainSizer.Add(topSizer,0,wx.EXPAND)
    17091709    mainSizer.Add(BackSizer())
    17101710    mainSizer.Add((0,5),0)
     
    17911791        topSizer = wx.BoxSizer(wx.HORIZONTAL)
    17921792        topSizer.Add(wx.StaticText(G2frame.dataWindow,label=' Data used in refinement'),0,WACV)
    1793         # add help button to bring up help web page - at right sede of window
    1794         topSizer.Add((-1,-1),1,WACV|wx.EXPAND)
     1793        # add help button to bring up help web page - at right side of window
     1794        topSizer.Add((-1,-1),1,wx.EXPAND)
    17951795        topSizer.Add(G2G.HelpButton(G2frame.dataWindow,helpIndex=G2frame.dataWindow.helpKey))
    1796         mainSizer.Add(topSizer,0,WACV|wx.EXPAND)
     1796        mainSizer.Add(topSizer,0,wx.EXPAND)
    17971797        mainSizer.Add((5,5))
    17981798        mainSizer.Add(LimitSizer())
     
    22032203        text = ' Histogram Type: %s  Bank: %d'%(insVal['Type'],insVal['Bank'])
    22042204        subSizer.Add(wx.StaticText(G2frame.dataWindow,-1,text),0,WACV)
    2205         # add help button to bring up help web page - at right sede of window
    2206         subSizer.Add((-1,-1),1,WACV|wx.EXPAND)
     2205        # add help button to bring up help web page - at right side of window
     2206        subSizer.Add((-1,-1),1,wx.EXPAND)
    22072207        subSizer.Add(G2G.HelpButton(G2frame.dataWindow,helpIndex=G2frame.dataWindow.helpKey))
    2208         mainSizer.Add(subSizer,0,WACV|wx.EXPAND)
     2208        mainSizer.Add(subSizer,0,wx.EXPAND)
    22092209#        mainSizer.Add(subSizer)
    22102210        labelLst[:],elemKeysLst[:],dspLst[:],refFlgElem[:] = [],[],[],[]
     
    29422942    topSizer = wx.BoxSizer(wx.HORIZONTAL)
    29432943    topSizer.Add(wx.StaticText(G2frame.dataWindow,label=' Sample and Experimental Parameters'))
    2944     # add help button to bring up help web page - at right sede of window
    2945     topSizer.Add((-1,-1),1,WACV|wx.EXPAND)
     2944    # add help button to bring up help web page - at right side of window
     2945    topSizer.Add((-1,-1),1,wx.EXPAND)
    29462946    topSizer.Add(G2G.HelpButton(G2frame.dataWindow,helpIndex=G2frame.dataWindow.helpKey))
    2947     mainSizer.Add(topSizer,0,WACV|wx.EXPAND)
     2947    mainSizer.Add(topSizer,0,wx.EXPAND)
    29482948    nameSizer = wx.BoxSizer(wx.HORIZONTAL)
    29492949    nameSizer.Add(wx.StaticText(G2frame.dataWindow,wx.ID_ANY,' Instrument Name '),0,WACV)
     
    29532953    nameSizer.Add(instNameVal)
    29542954    instNameVal.Bind(wx.EVT_CHAR,OnNameVal)
    2955     mainSizer.Add(nameSizer,0,WACV)
     2955    mainSizer.Add(nameSizer,0)
    29562956    mainSizer.Add((5,5),0)
    29572957    labelLst.append('Instrument Name')
     
    29722972                    onChoice=OnHistoChange)
    29732973        nameSizer.Add(histoType)
    2974         mainSizer.Add(nameSizer,0,WACV)
     2974        mainSizer.Add(nameSizer,0)
    29752975        mainSizer.Add((5,5),0)
    29762976
     
    29812981        if 'list' in str(type(data[key])):
    29822982            parmRef = G2G.G2CheckBox(G2frame.dataWindow,' '+lbl,data[key],1)
    2983             parmSizer.Add(parmRef,0,WACV|wx.EXPAND)
     2983            parmSizer.Add(parmRef,0,wx.EXPAND)
    29842984            parmVal = G2G.ValidatedTxtCtrl(G2frame.dataWindow,data[key],0,
    29852985                nDig=nDig,typeHint=float,OnLeave=AfterChange)
     
    29882988        else:
    29892989            parmSizer.Add(wx.StaticText(G2frame.dataWindow,label=' '+lbl),
    2990                 0,WACV|wx.EXPAND)
     2990                0,wx.EXPAND)
    29912991            parmVal = G2G.ValidatedTxtCtrl(G2frame.dataWindow,data,key,
    29922992                typeHint=float,OnLeave=AfterChange)
     
    44144414    topSizer = wx.BoxSizer(wx.HORIZONTAL)
    44154415    topSizer.Add(wx.StaticText(parent=G2frame.dataWindow,label=' Indexing controls: '),0,WACV)
    4416     # add help button to bring up help web page - at right sede of window
    4417     topSizer.Add((-1,-1),1,WACV|wx.EXPAND)
     4416    # add help button to bring up help web page - at right side of window
     4417    topSizer.Add((-1,-1),1,wx.EXPAND)
    44184418    topSizer.Add(G2G.HelpButton(G2frame.dataWindow,helpIndex=G2frame.dataWindow.helpKey))
    4419     mainSizer.Add(topSizer,0,WACV|wx.EXPAND)
     4419    mainSizer.Add(topSizer,0,wx.EXPAND)
    44204420    mainSizer.Add((5,5),0)
    44214421    littleSizer = wx.FlexGridSizer(0,5,5,5)
     
    44364436    mainSizer.Add((5,5),0)
    44374437    mainSizer.Add(wx.StaticText(G2frame.dataWindow,label=' Select Bravais Lattices for indexing: '),
    4438         0,WACV)
     4438        0)
    44394439    mainSizer.Add((5,5),0)
    44404440    littleSizer = wx.FlexGridSizer(0,5,5,5)
     
    44564456    hklShow.Bind(wx.EVT_BUTTON,OnHklShow)
    44574457    littleSizer.Add(hklShow,0,WACV)   
    4458     littleSizer.Add(wx.StaticText(G2frame.dataWindow,label=' cell step ',style=wx.ALIGN_RIGHT),0,WACV|wx.ALIGN_RIGHT)
     4458    littleSizer.Add(wx.StaticText(G2frame.dataWindow,label=' cell step ',style=wx.ALIGN_RIGHT),0,WACV)
    44594459    shiftChoices = [ '0.01%','0.05%','0.1%','0.5%', '1.0%','2.5%','5.0%']
    44604460    shiftSel = wx.Choice(G2frame.dataWindow,choices=shiftChoices)
     
    62686268    elif 'Particle' in data['Current']:
    62696269        G2frame.dataWindow.SasSeqFit.Enable(True)
    6270         mainSizer.Add(PartSizer(),1,wx.ALIGN_LEFT|wx.EXPAND)
     6270        mainSizer.Add(PartSizer(),1,wx.EXPAND)
    62716271    elif 'Pair' in data['Current']:
    62726272        G2frame.dataWindow.SasSeqFit.Enable(False)
    6273         mainSizer.Add(PairSizer(),1,wx.ALIGN_LEFT|wx.EXPAND)
     6273        mainSizer.Add(PairSizer(),1,wx.EXPAND)
    62746274    elif 'Shape' in data['Current']:
    62756275        G2frame.dataWindow.SasSeqFit.Enable(False)
    6276         mainSizer.Add(ShapesSizer(),1,wx.ALIGN_LEFT|wx.EXPAND)
     6276        mainSizer.Add(ShapesSizer(),1,wx.EXPAND)
    62776277    G2G.HorizontalLine(mainSizer,G2frame.dataWindow)   
    62786278    backSizer = wx.BoxSizer(wx.HORIZONTAL)
     
    72217221            typeHint=float,OnLeave=AfterChangeNoRefresh)
    72227222        bkBox.Add(backVal,0,WACV)   
    7223         sfgSizer.Add(bkBox,0,wx.ALIGN_LEFT|wx.EXPAND)
     7223        sfgSizer.Add(bkBox,0,wx.EXPAND)
    72247224
    72257225        if 'XC' in inst['Type'][0]:
     
    72337233                typeHint=float,OnLeave=AfterChangeNoRefresh)
    72347234            sqBox.Add(rulandWdt,0,WACV)   
    7235             sfgSizer.Add(sqBox,0,wx.ALIGN_LEFT|wx.EXPAND)
     7235            sfgSizer.Add(sqBox,0,wx.EXPAND)
    72367236       
    72377237        sqBox = wx.BoxSizer(wx.HORIZONTAL)
Note: See TracChangeset for help on using the changeset viewer.