Changeset ff8f99b in sasview for sansview/perspectives/fitting/modelpage.py

Timestamp:

Oct 14, 2009 10:00:19 PM (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:

448e69c

Parents:

860afc1

Message:

fixed textbox and buttons in fit-panel and model-panel for MAC.

File:

• sansview/perspectives/fitting/modelpage.py (modified) (6 diffs)

sansview/perspectives/fitting/modelpage.py

@@ -83 +83 @@
             add  access to npts
         """
-        sizer_npts= wx.GridSizer(1, 1,5, 5)
-    
+        ##The following 3 lines are for Mac. Let JHC know before modifying..
+        title = "Plotted Q Range"
+        box_description= wx.StaticBox(self, -1,str(title))
+        boxsizer1 = wx.StaticBoxSizer(box_description, wx.VERTICAL)
+
+        sizer_npts= wx.GridSizer(1, 1,5, 5)    
         self.npts    = BasicPage.ModelTextCtrl(self, -1,size=(_BOX_WIDTH,20))
         self.npts.SetValue(format_number(self.num_points))
@@ -91 +95 @@
         sizer_npts.Add(wx.StaticText(self, -1, 'Npts'),1, wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 5)        
         sizer_npts.Add(self.npts,1, wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 5) 
-        self._set_range_sizer( title="Plotted Q Range", object= sizer_npts)
+        self._set_range_sizer( title=title, box_sizer=boxsizer1, object= sizer_npts)
        
        
@@ -108 +112 @@
             fill sizer containing model info
         """
+        ##The following 3 lines are for Mac. Let JHC know before modifying..
+        title = "Model"
+        box_description= wx.StaticBox(self, -1,str(title))
+        boxsizer1 = wx.StaticBoxSizer(box_description, wx.VERTICAL)
+        
         id = wx.NewId()
         self.model_view =wx.Button(self,id,'View 2D')
@@ -114 +123 @@
         
         ## class base method  to add view 2d button   
-        self._set_model_sizer(sizer=sizer, title="Model",object= self.model_view )    
+        self._set_model_sizer(sizer=sizer,box_sizer=boxsizer1, title=title,object= self.model_view )    
     
   
@@ -397 +406 @@
         self.Bind( wx.EVT_RADIOBUTTON, self._on_display_description,
                    id=self.description_show.GetId() )
+        #MAC needs SetValue
+        self.description_hide.SetValue(True)
         
         self.model_description = wx.Button(self,-1, label="Details")
@@ -405 +416 @@
         sizer_selection.Add( (20,20)) 
         sizer_selection.Add( self.description_hide )
-        sizer_selection.Add((20,20),0, wx.LEFT|wx.RIGHT|wx.EXPAND,67)
+        sizer_selection.Add((20,20),0, wx.LEFT|wx.RIGHT|wx.EXPAND,75)
         sizer_selection.Add( self.model_description )