Changeset 4803 for trunk


Ignore:
Timestamp:
Feb 7, 2021 7:35:35 PM (9 months ago)
Author:
toby
Message:

don't reuse dataWindow sizer for background or PWDR; plotting: reset f by select all (or none).

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIdataGUI.py

    r4801 r4803  
    51955195            if 'msg' in Rvals: text += '\n' + Rvals['msg'] + '\n'
    51965196            if 'Aborted' in Rvals:
    5197                 text += '\ERROR: Minimizer failed to reduce chi**2!\n'
     5197                text += '\nWARNING: Minimizer halted because chi**2 increased\n'
    51985198            if lamMax >= 10.:
    51995199                text += '\nWARNING: Steepest descents dominates;'+   \
     
    85238523   
    85248524    if G2frame.dataWindow:
    8525         G2frame.dataWindow.ClearData()
    8526     mainSizer = G2frame.dataWindow.GetSizer()
     8525        G2frame.dataWindow.ClearData()
     8526    #G2frame.dataWindow.GetSizer() # don't use this since may be wx.HORIZONTAL or wx.VERTICAL
     8527    bigSizer = wx.BoxSizer(wx.HORIZONTAL)
     8528    mainSizer = wx.BoxSizer(wx.VERTICAL)
    85278529    mainSizer.Add((5,5),)
    85288530    wtSizer = wx.BoxSizer(wx.HORIZONTAL)
     
    86368638        mainSizer.Add(mSizer)
    86378639       
     8640    bigSizer.Add(mainSizer)   
     8641    bigSizer.Add(G2G.HelpButton(G2frame.dataWindow,helpIndex=kind))
     8642    G2frame.dataWindow.SetSizer(bigSizer)
     8643   
    86388644    G2frame.GPXtree.SetItemPyData(item,data)
    86398645    G2frame.PatternId = item
  • trunk/GSASIIphsGUI.py

    r4801 r4803  
    1096110961            choices = sorted(list(rbNames.keys()))
    1096210962            dlg = G2G.G2SingleChoiceDialog(
    10963                 G2frame,'Select rigid body to add to structure',
     10963                G2frame,'Select rigid body to\nadd to structure',
    1096410964                'Select rigid body',choices)
    1096510965            dlg.CenterOnParent()
  • trunk/GSASIIplot.py

    r4794 r4803  
    19461946                G2frame.selections = []
    19471947                select = dlg.GetSelections()
    1948                 if select:
     1948                if select and len(select) != len(choices):
    19491949                    for Id in select:
    19501950                        G2frame.selections.append(choices[Id])
  • trunk/GSASIIpwdGUI.py

    r4759 r4803  
    17001700    Choices = ['chebyschev','chebyschev-1','cosine','Q^2 power series','Q^-2 power series','lin interpolate','inv interpolate','log interpolate']
    17011701    G2frame.dataWindow.ClearData()
    1702     mainSizer = G2frame.dataWindow.GetSizer()
     1702    mainSizer = wx.BoxSizer(wx.VERTICAL)
    17031703    topSizer = wx.BoxSizer(wx.HORIZONTAL)
    17041704    topSizer.Add(wx.StaticText(G2frame.dataWindow,label=' Background used in refinement'),0,WACV)
     
    17141714    mainSizer.Add((0,5),0)
    17151715    mainSizer.Add(BackFileSizer())
     1716    G2frame.dataWindow.SetSizer(mainSizer)
    17161717    G2frame.dataWindow.SetDataSize()
    17171718       
Note: See TracChangeset for help on using the changeset viewer.