Changeset 657e52c in sasview for inversionview/src

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:

• inversion_panel.py (modified) (2 diffs)
• inversion_state.py (modified) (1 diff)

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

@@ -968 +968 @@
         """
         from sans.pr.invertor import help
-        wx.Dialog.__init__(self, parent, id, size=(400, 420))
+        wx.Dialog.__init__(self, parent, id, size=(400, 450))
         self.SetTitle("P(r) help") 
-        
+        self.SetWindowVariant(variant=FONT_VARIANT)
 
         vbox = wx.BoxSizer(wx.VERTICAL)
@@ -976 +976 @@
         explanation = help()
            
-        label_explain = wx.StaticText(self, -1, explanation, size=(350, 320))
+        label_explain = wx.StaticText(self, -1, explanation, size=(360, 350))
             
         vbox.Add(label_explain, 0, wx.ALL|wx.EXPAND, 15)

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

@@ -33 +33 @@
            ["slit_height",  "height"],
            ["qmin",         "qmin"],
-           ["qmax",         "qmax"]]                      
+           ["qmax",         "qmax"],
+           ["estimate_bck", "estimate_bck"]]                      
 
 ## List of P(r) inversion outputs