Changeset fa58441 in sasview

Timestamp:

Apr 12, 2009 7:39:33 PM (16 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:

45bf0ede

Parents:

8e09f63

Message:

minor changes (some names of titles)

Location:

sansview/perspectives/fitting

Files:

• basepage.py (modified) (5 diffs)
• fitpage.py (modified) (4 diffs)
• modelpage.py (modified) (5 diffs)

sansview/perspectives/fitting/basepage.py

@@ -181 +181 @@
         boxsizer1 = wx.StaticBoxSizer(box_description, wx.VERTICAL)
         #----------------------------------------------------
-        self.disable_disp = wx.RadioButton(self, -1, 'No', (10, 10), style=wx.RB_GROUP)
-        self.enable_disp = wx.RadioButton(self, -1, 'Yes', (10, 30))
+        self.disable_disp = wx.RadioButton(self, -1, 'Off', (10, 10), style=wx.RB_GROUP)
+        self.enable_disp = wx.RadioButton(self, -1, 'On', (10, 30))
         ## saving the state of enable dispersity button
         self.state.enable_disp= self.enable_disp.GetValue()
@@ -191 +191 @@
         sizer_dispersion = wx.BoxSizer(wx.HORIZONTAL)
         sizer_dispersion.Add((20,20))
-        name="Polydispersity and \nOrientational Distribution "
+        name=""#Polydispersity and \nOrientational Distribution "
         sizer_dispersion.Add(wx.StaticText(self,-1,name))
         sizer_dispersion.Add(self.enable_disp )
@@ -200 +200 @@
         ## fill a sizer with the combobox to select dispersion type
         sizer_select_dispers = wx.BoxSizer(wx.HORIZONTAL)  
-        self.model_disp = wx.StaticText(self, -1, 'Model Disp')
+        self.model_disp = wx.StaticText(self, -1, 'Distribution Function ')
             
         import sans.models.dispersion_models 
@@ -821 +821 @@
         sizer_selection = wx.BoxSizer(wx.HORIZONTAL)
         
-        self.text1 = wx.StaticText( self,-1,"P(Q)" )
-        self.text2 = wx.StaticText( self,-1,"* S(Q)" )
+        self.text1 = wx.StaticText( self,-1,"" )
+        self.text2 = wx.StaticText( self,-1,"P(Q)*S(Q)" )
         
         
@@ -1248 +1248 @@
         self.btSave = wx.Button(self,wx.NewId(),'Save')
         self.btSave.Bind(wx.EVT_BUTTON, self.onSave,id= self.btSave.GetId())
-        self.btSave.SetToolTipString("Save current state")
+        self.btSave.SetToolTipString("Save current panel state")
          
         sizer_save.Add((20,20),0, wx.LEFT|wx.RIGHT|wx.EXPAND,120)        

sansview/perspectives/fitting/fitpage.py

@@ -120 +120 @@
             return
         
-        box_description= wx.StaticBox(self, -1, 'Loaded Data')
+        box_description= wx.StaticBox(self, -1, 'Data')
         boxsizer1 = wx.StaticBoxSizer(box_description, wx.VERTICAL)
         #----------------------------------------------------------
@@ -127 +127 @@
         DataSource  =wx.StaticText(self, -1,str(self.data.name))
 
-        sizer_data.Add(wx.StaticText(self, -1, 'Data Source Name : '))
+        sizer_data.Add(wx.StaticText(self, -1, 'Source Name : '))
         sizer_data.Add(DataSource )
         sizer_data.Add( (5,5) )
@@ -138 +138 @@
             # Maximum value of data  
             data_max = str(format_number(numpy.max(self.data.x)))
-            text4_3 = wx.StaticText(self, -1, 'Maximum Q Range(Linear)',
+            text4_3 = wx.StaticText(self, -1, 'Total Q Range(1/A)',
                                      style=wx.ALIGN_LEFT)
             sizer_data.Add( text4_3 )
@@ -153 +153 @@
             # Maximum value of data  
             data_max = str(format_number(radius_max))
-            text4_3 = wx.StaticText(self, -1, 'Maximum Q Range',
+            text4_3 = wx.StaticText(self, -1, 'Total Q Range',
                                      style=wx.ALIGN_LEFT)
             sizer_data.Add( text4_3 )

sansview/perspectives/fitting/modelpage.py

@@ -24 +24 @@
   
     """
+
     def __init__(self,parent, page_info):
         BasicPage.__init__(self, parent, page_info)
@@ -31 +32 @@
         self._fill_model_sizer( self.sizer1)  
         self._fill_range_sizer() 
-       
+         
         description=""
         if self.model!=None:
@@ -108 +109 @@
         self.model_view.SetToolTipString("View model in 2D")
         
-        ## class base method  to add view 2d button    
+        ## class base method  to add view 2d button   
         self._set_model_sizer(sizer=sizer, title="Model",object= self.model_view )    
     
@@ -287 +288 @@
                    id=self.description_show.GetId() )
         
-        self.model_description = wx.Button(self,-1, label="More Details")
+        self.model_description = wx.Button(self,-1, label="Details")
         self.model_description.Bind(wx.EVT_BUTTON,self.on_button_clicked)
         self.model_description.SetToolTipString("Click Model Functions in HelpWindow...")
@@ -294 +295 @@
         sizer_selection.Add( (20,20)) 
         sizer_selection.Add( self.description_hide )
-        sizer_selection.Add( (20,20)) 
+        #sizer_selection.Add( (20,20)) 
+        sizer_selection.Add((20,20),0, wx.LEFT|wx.RIGHT|wx.EXPAND,67)
         sizer_selection.Add( self.model_description )
-        
+                     
          
         self.sizer_description=wx.BoxSizer(wx.HORIZONTAL)
         self.sizer_description.Add( self.description, 1, wx.EXPAND | wx.ALL, 10 )
-       
         boxsizer1.Add( sizer_selection) 
         boxsizer1.Add( (20,20))