Changeset 1416


Ignore:
Timestamp:
Jul 7, 2014 12:18:15 PM (7 years ago)
Author:
vondreele
Message:

fix wx c++ error in Constraints after a Refine

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIconstrGUI.py

    r1411 r1416  
    930930        Siz.Add(MakeConstraintsSizer(typ,panel))
    931931        panel.SetSizer(Siz,True)
    932         G2frame.dataFrame.SetSize((500,250)) # set frame size here
    933         panel.SetAutoLayout(1)
    934         panel.SetupScrolling()
     932        Size = Siz.GetMinSize()
     933        Size[0] += 40
     934        Size[1] += 20
     935        panel.SetSize(Size)
     936        panel.SetScrollbars(10,10,Size[0]/10-4,Size[1]/10-1)
     937#        Size[1] = min(500,Size[1])
     938        G2frame.dataFrame.setSizePosLeft(Size)
     939#        G2frame.dataFrame.SetSize((500,250)) # set frame size here
    935940
    936941    def OnPageChanged(event):
     
    994999    G2frame.dataDisplay = G2gd.GSNoteBook(parent=G2frame.dataFrame)
    9951000    # note that order of pages is hard-coded in RaisePage
    996     wxstyle = wx.TAB_TRAVERSAL|wx.SUNKEN_BORDER
    997     PhaseConstr = wxscroll.ScrolledPanel(G2frame.dataDisplay, wx.ID_ANY,style=wxstyle)
     1001    PhaseConstr = wx.ScrolledWindow(G2frame.dataDisplay)
    9981002    G2frame.dataDisplay.AddPage(PhaseConstr,'Phase constraints')
    999     HAPConstr = wxscroll.ScrolledPanel(G2frame.dataDisplay, wx.ID_ANY,style=wxstyle)
     1003    HAPConstr = wx.ScrolledWindow(G2frame.dataDisplay)
    10001004    G2frame.dataDisplay.AddPage(HAPConstr,'Histogram/Phase constraints')
    1001     HistConstr = wxscroll.ScrolledPanel(G2frame.dataDisplay, wx.ID_ANY,style=wxstyle)
     1005    HistConstr = wx.ScrolledWindow(G2frame.dataDisplay)
    10021006    G2frame.dataDisplay.AddPage(HistConstr,'Histogram constraints')
    1003     GlobalConstr = wxscroll.ScrolledPanel(G2frame.dataDisplay, wx.ID_ANY,style=wxstyle)
     1007    GlobalConstr = wx.ScrolledWindow(G2frame.dataDisplay)
    10041008    G2frame.dataDisplay.AddPage(GlobalConstr,'Global constraints')
    10051009    OnPageChanged(None) # show initial page
Note: See TracChangeset for help on using the changeset viewer.