Ignore:
Timestamp:
Jul 1, 2017 11:17:10 AM (6 years ago)
Author:
vondreele
Message:

Constraints now displayed
fix TopLevel? references
fix display issues for Sample Parameters
fix Resttraints display issues

File:
1 edited

Legend:

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

    r2888 r2890  
    763763
    764764        wtBox = wx.BoxSizer(wx.HORIZONTAL)
    765         wtBox.Add(wx.StaticText(wind,-1,'Restraint weight factor:'),0,wx.ALIGN_CENTER_VERTICAL)
     765        wtBox.Add(wx.StaticText(wind,-1,'Restraint weight factor: '),0,wx.ALIGN_CENTER_VERTICAL)
    766766        wtfactor = G2G.ValidatedTxtCtrl(wind,restData,'wtFactor',nDig=(10,2),typeHint=float)
    767767        wtBox.Add(wtfactor,0,wx.ALIGN_CENTER_VERTICAL)
     
    771771        wtBox.Add(useData,0,wx.ALIGN_CENTER_VERTICAL)
    772772        if 'Bonds' in restData or 'Angles' in restData:
    773             wtBox.Add(wx.StaticText(wind,-1,'  Search range:'),0,wx.ALIGN_CENTER_VERTICAL)
     773            wtBox.Add(wx.StaticText(wind,-1,'  Search range: '),0,wx.ALIGN_CENTER_VERTICAL)
    774774            sRange = G2G.ValidatedTxtCtrl(wind,restData,'Range',nDig=(10,2),typeHint=float)
    775775            wtBox.Add(sRange,0,wx.ALIGN_CENTER_VERTICAL)
    776             wtBox.Add(wx.StaticText(wind,-1,'(x sum(atom radii)'),0,wx.ALIGN_CENTER_VERTICAL)
     776            wtBox.Add(wx.StaticText(wind,-1,' x sum(atom radii)'),0,wx.ALIGN_CENTER_VERTICAL)
    777777        return wtBox
    778778       
     
    931931
    932932        BondRestr.SetSizer(mainSizer)
    933         Size = mainSizer.Fit(G2frame.dataFrame)
     933        Size = mainSizer.Fit(BondRestr)
    934934        Size[0] = 600
    935935        Size[1] = min(Size[1]+50,500)       #make room for tab, but not too big
     
    10621062
    10631063        AngleRestr.SetSizer(mainSizer)
    1064         Size = mainSizer.Fit(G2frame.dataFrame)
     1064        Size = mainSizer.Fit(AngleRestr)
    10651065        Size[0] = 600
    10661066        Size[1] = min(Size[1]+50,500)       #make room for tab, but not too big
     
    11891189
    11901190        PlaneRestr.SetSizer(mainSizer)
    1191         Size = mainSizer.Fit(G2frame.dataFrame)
     1191        Size = mainSizer.Fit(PlaneRestr)
    11921192        Size[0] = 600
    11931193        Size[1] = min(Size[1]+50,500)       #make room for tab, but not too big
     
    13201320
    13211321        ChiralRestr.SetSizer(mainSizer)
    1322         Size = mainSizer.Fit(G2frame.dataFrame)
     1322        Size = mainSizer.Fit(ChiralRestr)
    13231323        Size[0] = 600
    13241324        Size[1] = min(Size[1]+50,500)       #make room for tab, but not too big
     
    14411441
    14421442        TorsionRestr.SetSizer(mainSizer)
    1443         Size = mainSizer.Fit(G2frame.dataFrame)
     1443        Size = mainSizer.Fit(TorsionRestr)
    14441444        Size[0] = 600
    14451445        Size[1] = min(Size[1]+50,500)       #make room for tab, but not too big
     
    15641564
    15651565        RamaRestr.SetSizer(mainSizer)
    1566         Size = mainSizer.Fit(G2frame.dataFrame)
     1566        Size = mainSizer.Fit(RamaRestr)
    15671567        Size[0] = 600
    15681568        Size[1] = min(Size[1]+50,500)       #make room for tab, but not too big
     
    16971697
    16981698        ChemCompRestr.SetSizer(mainSizer)
    1699         Size = mainSizer.Fit(G2frame.dataFrame)
     1699        Size = mainSizer.Fit(ChemCompRestr)
    17001700        Size[0] = 600
    17011701        Size[1] = min(Size[1]+50,500)       #make room for tab, but not too big
     
    17701770            mainSizer.Add(wx.StaticText(TextureRestr,-1,'No texture restraints for this phase'),0,)
    17711771        TextureRestr.SetSizer(mainSizer)
    1772         Size = mainSizer.Fit(G2frame.dataFrame)
     1772        Size = mainSizer.Fit(TextureRestr)
    17731773        Size[0] = 600
    17741774        Size[1] = min(Size[1]+50,500)       #make room for tab, but not too big
Note: See TracChangeset for help on using the changeset viewer.