Ignore:
Timestamp:
Dec 14, 2012 2:50:24 PM (12 years ago)
Author:
Jae Cho <jhjcho@…>
Branches:
master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
Children:
0203ade
Parents:
aa01d07b
Message:

merging from the release 2.2.0

Location:
inversionview/src/sans/perspectives/pr
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • inversionview/src/sans/perspectives/pr/inversion_panel.py

    rc4ae1c2 r657e52c  
    968968        """ 
    969969        from sans.pr.invertor import help 
    970         wx.Dialog.__init__(self, parent, id, size=(400, 420)) 
     970        wx.Dialog.__init__(self, parent, id, size=(400, 450)) 
    971971        self.SetTitle("P(r) help")  
    972          
     972        self.SetWindowVariant(variant=FONT_VARIANT) 
    973973 
    974974        vbox = wx.BoxSizer(wx.VERTICAL) 
    … …  
    976976        explanation = help() 
    977977            
    978         label_explain = wx.StaticText(self, -1, explanation, size=(350, 320)) 
     978        label_explain = wx.StaticText(self, -1, explanation, size=(360, 350)) 
    979979             
    980980        vbox.Add(label_explain, 0, wx.ALL|wx.EXPAND, 15) 

  • inversionview/src/sans/perspectives/pr/inversion_state.py

    r1e62361 r657e52c  
    3333           ["slit_height",  "height"], 
    3434           ["qmin",         "qmin"], 
    35            ["qmax",         "qmax"]]                       
     35           ["qmax",         "qmax"], 
     36           ["estimate_bck", "estimate_bck"]]                       
    3637 
    3738## List of P(r) inversion outputs 
Note: See TracChangeset for help on using the changeset viewer.