Changeset f1aa385 in sasview

Timestamp:

Nov 10, 2009 4:32:28 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:

c69b6d5

Parents:

ffb838f

Message:

mac font sized changed for these panels: note:)textctrl still to go.

Location:

sansview

Files:

• perspectives/fitting/basepage.py (modified) (7 diffs)
• perspectives/fitting/simfitpage.py (modified) (2 diffs)
• perspectives/fitting/sldPanel.py (modified) (2 diffs)
• welcome_panel.py (modified) (3 diffs)

sansview/perspectives/fitting/basepage.py

@@ -20 +20 @@
 if sys.platform.count("win32")>0:
     PANEL_WIDTH = 450
+    FONT_VARIANT = 0
 else:
     PANEL_WIDTH = 500
+    FONT_VARIANT = 1
     
 class BasicPage(wx.ScrolledWindow):
@@ -35 +37 @@
         wx.ScrolledWindow.__init__(self, parent,
                  style= wx.FULL_REPAINT_ON_RESIZE )
+        #Set window's font size 
+        self.SetWindowVariant(variant=FONT_VARIANT)
         ##window_name
         self.window_name = page_info.window_name
@@ -745 +749 @@
         self.enable2D= state.enable2D
         self.engine_type = state.engine_type
-
+        
         #???
         self.disp_cb_dict = state.disp_cb_dict
@@ -819 +823 @@
                     
             else:
-                
+                keys = self.model.getParamList()
+                for item in keys:
+                    if item in self.disp_list and not self.model.details.has_key(item):
+                        self.model.details[item]=["",None,None]
                 for k,v in self.state.disp_cb_dict.iteritems():
                     self.disp_cb_dict = copy.deepcopy(state.disp_cb_dict) 
@@ -832 +839 @@
             self.disable_smearer.SetValue(state.disable_smearer)
             self.onSmear(event=None)
-            self.tcChi.SetLabel(str( state.tcChi))
-            self.sizer5.Layout()
-            self.Layout()
-            self.Refresh()
-            
+            self.tcChi.SetLabel(str( state.tcChi))            
        
         ## reset state of checkbox,textcrtl  and dispersity parameters value
@@ -879 +882 @@
                     item[4].Clear()
                     item[4].Hide()
-        ##Is this layout necessary? Had a problem w/MAC.
+        ##Is this layout necessary? Had a problem w/MAC:Not anymore.
         #self.Layout()
         
@@ -1579 +1582 @@
         #draw the model with the current dispersity
         self._draw_model()
-        #self.sizer4_4.Layout()
-        #self.sizer5.Layout()
+        self.sizer4_4.Layout()
+        self.sizer5.Layout()
         self.Layout()
-        #self.Refresh()
-        #self.SetScrollbars(20,20,25,65)       
+        #self.Refresh()      
           
         

sansview/perspectives/fitting/simfitpage.py

@@ -7 +7 @@
 if sys.platform.count("win32")>0:
     PANEL_WID = 420
+    FONT_VARIANT = 0
 else:
     PANEL_WID = 490
-
+    FONT_VARIANT = 1
             
 def get_fittableParam( model):
@@ -44 +45 @@
              Simultaneous page display
         """
+        ##Font size
+        self.SetWindowVariant(variant = FONT_VARIANT)
+        
         self.parent = parent
         ## store page_finder

sansview/perspectives/fitting/sldPanel.py

@@ -19 +19 @@
     _STATICBOX_WIDTH = 350
     PANEL_SIZE = 400
+    FONT_VARIANT = 0
 else:
     _STATICBOX_WIDTH = 380
     PANEL_SIZE = 430
-
+    FONT_VARIANT = 1
+    
 class SldPanel(wx.Panel):
     """
@@ -29 +31 @@
     def __init__(self, parent,base=None, id = -1):
         wx.Panel.__init__(self, parent, id = id)
+        #Font size 
+        self.SetWindowVariant(variant=FONT_VARIANT)
+        
         # Object that receive status event
         self.base= base

sansview/welcome_panel.py

@@ -15 +15 @@
 import wx.lib.hyperlink
 import os.path
-import os
-
+import os, sys
 import local_config as config
 
+#Font size width 
+if sys.platform.count("win32")>0:
+    FONT_VARIANT = 0
+else:
+    FONT_VARIANT = 1 
+    
 class WelcomePanel(wx.Panel):
     """
@@ -30 +35 @@
     ## Flag to tell the AUI manager to put this panel in the center pane
     CENTER_PANE = True
+   
     
     def __init__(self, *args, **kwds):
@@ -39 +45 @@
         image = os.path.join("images","SVwelcome.png")
         
+        self.SetWindowVariant(variant = FONT_VARIANT)
         self.bitmap_logo = wx.StaticBitmap(self, -1, wx.Bitmap(image))