Changeset 87fbc60 in sasview

Timestamp:

Apr 9, 2009 6:47:11 PM (16 years ago)

Author:

Gervaise Alina <gervyh@…>

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:

81d87347

Parents:

24415e9

Message:

rename polydispersity fields

Location:

sansview/perspectives/fitting

Files:

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

sansview/perspectives/fitting/basepage.py

@@ -177 +177 @@
         """
         self.sizer4.Clear(True)
-        box_description= wx.StaticBox(self, -1,"PolyDispersity")
+        name="Polydispersity and Orientational Distribution"
+        box_description= wx.StaticBox(self, -1,name)
         boxsizer1 = wx.StaticBoxSizer(box_description, wx.VERTICAL)
         #----------------------------------------------------
@@ -190 +191 @@
         sizer_dispersion = wx.BoxSizer(wx.HORIZONTAL)
         sizer_dispersion.Add((20,20))
-        name="Polydispersity and \nOrientation average "
+        name="Polydispersity and \nOrientational Distribution "
         sizer_dispersion.Add(wx.StaticText(self,-1,name))
         sizer_dispersion.Add(self.enable_disp )
@@ -422 +423 @@
             Store current state
         """
-        self.state.model = self.model.clone()
+        if self.model!= None:
+            self.state.model = self.model.clone()
         self.state.save_data(self.data)
     
@@ -956 +958 @@
             self.structurebox.Disable()
             self.structurebox.SetSelection(0)
-            
+        else:
+            self.structurebox.Enable()
            
         s_id = self.structurebox.GetCurrentSelection()

sansview/perspectives/fitting/fitpage.py

@@ -44 +44 @@
         self._fill_datainfo_sizer()
         self._fill_model_sizer( self.sizer1)
+        self._fill_range_sizer() 
         self._on_select_model(event=None)
-        self._fill_range_sizer() 
     
         ## to update the panel according to the fit engine type selected
@@ -172 +172 @@
             fill sizer containing model info
         """
-        sizer_tcChi = wx.GridSizer(2, 2,5, 5)
+       
+        box_description= wx.StaticBox(self, -1,'Chi2/dof')
+        boxsizer1 = wx.StaticBoxSizer(box_description, wx.VERTICAL)
+        boxsizer1.SetMinSize((50,-1))
         self.tcChi    =  wx.StaticText(self, -1, "-", style=wx.ALIGN_LEFT)
-        
-        
-        self.text1_1 = wx.StaticText(self, -1, 'Chi2/dof', style=wx.ALIGN_LEFT)
-        
-        
-        self.btChi = wx.Button(self,wx.NewId(),'View Chi')
-        self.btChi.Bind(wx.EVT_BUTTON, self._onFit,id= self.btChi.GetId())
-        self.btChi.SetToolTipString("View data - model.")
-        
-        sizer_tcChi.Add(self.text1_1,1, wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 5)
-        sizer_tcChi.Add(self.btChi,1, wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 5)        
-        sizer_tcChi.Add(self.tcChi,1, wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 5)        
-        sizer_tcChi.Add((5,5),1, wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 5)
+        boxsizer1.Add( self.tcChi )
+        
             
         ## class base method  to add view 2d button    
-        self._set_model_sizer(sizer=sizer, title="Model",object=  sizer_tcChi )    
+        self._set_model_sizer(sizer=sizer, title="Model",object= boxsizer1 )