Changeset 9170547 in sasview for sansview/perspectives/fitting

Timestamp:

Oct 13, 2009 10:21:59 AM (15 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:

860afc1

Parents:

0686c4d6

Message:

changed panel box width larger so that it fits well on linux/MAC too.

Location:

sansview/perspectives/fitting

Files:

• basepage.py (modified) (4 diffs)
• fitpage.py (modified) (2 diffs)

sansview/perspectives/fitting/basepage.py

@@ -17 +17 @@
 _QMAX_DEFAULT = 0.13
 _NPTS_DEFAULT = 50
+#Control panel width 
+if sys.platform.count("win32")>0:
+    PANEL_WIDTH = 420
+else:
+    PANEL_WIDTH = 490
+    
 class BasicPage(wx.ScrolledWindow):
     """
@@ -236 +242 @@
         self.sizer6 = wx.BoxSizer(wx.VERTICAL)
         
-        self.sizer0.SetMinSize((375,-1))
-        self.sizer1.SetMinSize((375,-1))
-        self.sizer2.SetMinSize((375,-1))
-        self.sizer3.SetMinSize((375,-1))
-        self.sizer4.SetMinSize((375,-1))
-        self.sizer5.SetMinSize((375,-1))
+        self.sizer0.SetMinSize((PANEL_WIDTH,-1))
+        self.sizer1.SetMinSize((PANEL_WIDTH,-1))
+        self.sizer2.SetMinSize((PANEL_WIDTH,-1))
+        self.sizer3.SetMinSize((PANEL_WIDTH,-1))
+        self.sizer4.SetMinSize((PANEL_WIDTH,-1))
+        self.sizer5.SetMinSize((PANEL_WIDTH,-1))
         #self.sizer6.SetMinSize((375,-1))
         
@@ -1286 +1292 @@
         if object !=None:
             boxsizer1.Add( (-72,-72))
-            boxsizer1.Add( object,  0, wx.ALIGN_RIGHT| wx.RIGHT, 10)
+            boxsizer1.Add( object,  0, wx.ALIGN_RIGHT| wx.RIGHT, 40)
             boxsizer1.Add( (60,60))
         #--------------------------------------------------------
@@ -1367 +1373 @@
         self.disp_cb_dict ={}
         f_id = self.formfactorbox.GetCurrentSelection()
+
         form_factor = self.formfactorbox.GetClientData( f_id )
         if not form_factor in  self.model_list_box["multiplication"]:

sansview/perspectives/fitting/fitpage.py

@@ -154 +154 @@
         
         sizer_fit.Add((5,5),1, wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 5)        
-        sizer_fit.Add(self.btFit,0, wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 5) 
+        sizer_fit.Add(self.btFit,0, wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 35) 
         
         sizer_smearer = wx.BoxSizer(wx.HORIZONTAL)
@@ -170 +170 @@
         
         #Display Chi^2/dof
-        sizer_smearer.Add((68,10))
+        sizer_smearer.Add((90,10))
         box_description= wx.StaticBox(self, -1,'Chi2/dof')
         boxsizer1 = wx.StaticBoxSizer(box_description, wx.VERTICAL)
-        boxsizer1.SetMinSize((60,-1))
+        boxsizer1.SetMinSize((80,-1))
         temp_smearer = None
         if self.enable_smearer.GetValue():