Changeset 7d9e7a9 in sasview

Timestamp:

Jun 22, 2011 6:38:09 PM (14 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:

f199764

Parents:

db47703

Message:

try to fix inv w/ wx2.9

Files:

• prview/perspectives/pr/inversion_panel.py (modified) (3 diffs)
• sansview/perspectives/fitting/fitting.py (modified) (1 diff)

prview/perspectives/pr/inversion_panel.py

@@ -17 +17 @@
 from pr_widgets import OutputTextCtrl
 
-
+if sys.platform.count("darwin")==0:
+    FONT_VARIANT = 0
+else:
+    FONT_VARIANT = 1
 
 class InversionControl(ScrolledPanel, PanelBase):
@@ -38 +41 @@
         PanelBase.__init__(self, parent)
         self.SetupScrolling()
+        #Set window's font size 
+        self.SetWindowVariant(variant=FONT_VARIANT)
         
         self.plots = plots
@@ -920 +925 @@
                 wx.PostEvent(self._manager.parent, StatusEvent(status=message))
             else:
-                self._manager.setup_plot_inversion(alpha=alpha, nfunc=nfunc, 
-                                                  d_max=dmax,
-                                                  q_min=qmin, q_max=qmax,
-                                                  bck=has_bck,
-                                                  height=height,
-                                                  width=width)
+                wx.CallAfter(self._manager.setup_plot_inversion, alpha=alpha, 
+                                                    nfunc=nfunc, 
+                                                    d_max=dmax,
+                                                    q_min=qmin, q_max=qmax,
+                                                    bck=has_bck,
+                                                    height=height,
+                                                    width=width)
         else:
             message = "The P(r) form contains invalid values: "

sansview/perspectives/fitting/fitting.py

@@ -956 +956 @@
    
                 cpage = self.fit_panel.get_page_by_id(uid)
-
+                # Make sure we got all results (CallAfter is important to MAC)
                 wx.CallAfter(cpage.onsetValues, result.fitness, 
                                   param_name, result.pvec, result.stderr)