Changeset 59a7f2d in sasview for sansview

Timestamp:

Mar 31, 2009 3:49:02 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:

db1dcef

Parents:

9853ad0

Message:

select default value in combobox box

Location:

sansview/perspectives/fitting

Files:

• basepage.py (modified) (7 diffs)
• fitpage.py (modified) (4 diffs)
• modelpage.py (modified) (3 diffs)
• pageInfo.py (modified) (1 diff)

sansview/perspectives/fitting/basepage.py

@@ -17 +17 @@
     ## Title to appear on top of the window
     window_caption = "Fit Page"
+    
     name=""
+    
     def __init__(self,parent, pageinfo, name):
         wx.ScrolledWindow.__init__(self, parent)
@@ -68 +70 @@
             self.data = self.page_info.data
             self.event_owner = self.page_info.event_owner
+            
             if self.model !=None:
                 self.disp_list= self.model.getDispParamList()
@@ -573 +576 @@
         if self.model!=None:
             self.formfactorbox.SetValue(self.model.name)
-        
+           
+            
         self.structurebox = wx.ComboBox(self, -1,style=wx.CB_READONLY)
         wx.EVT_COMBOBOX(self.formfactorbox,-1, self._on_select_model)
@@ -587 +591 @@
                                 self.model_list_box["Structure Factors"])
         
-         ## check model type to show sizer
+        ## check model type to show sizer
         if self.model !=None:
             self._set_model_sizer_selection( self.model )
@@ -698 +702 @@
         try:
             combobox.SetSelection(0)
+            
         except:
             pass
@@ -704 +709 @@
    
    
-    def _on_select_model_helper(self,event): 
+    def _on_select_model_helper(self): 
         """
              call back for model selection
@@ -817 +822 @@
             TO IMPLEMENT
         """
-    
         return
-        from sans.models.dispersion_models import GaussianDispersion
         if self.model==None:
             return
-        list= self.model.dispersion.keys()
+        from sans.models.dispersion_models import GaussianDispersion
+        list = self.model.dispersion.keys()
+        
         for key in list:
-           
             ## The parameter was un-selected. Go back to Gaussian model (with 0 pts)
             disp_model = GaussianDispersion()

sansview/perspectives/fitting/fitpage.py

@@ -31 +31 @@
         self.name= self.data.name
         page_info.page_name= self.data.name
+       
         ## fit page does not content npts txtcrtl
         self.npts=None
@@ -39 +40 @@
         self._fill_model_sizer( self.sizer1)
         self._fill_range_sizer() 
-        if hasattr(self.page_info,"model"):
-            self.set_model_param_sizer(self.model)
+        self.model = self.formfactorbox.GetClientData(0)()
+        self.page_info.model= self.model
+        self._on_select_model(event=None)
             
         
@@ -345 +347 @@
              call back for model selection
         """    
-        self._on_select_model_helper(event) 
+        self._on_select_model_helper() 
         self.set_model_param_sizer(self.model)
         self._set_sizer_gaussian()
@@ -358 +360 @@
             ## error occured on chisqr computation
             pass
-        
+    
     def _onparamEnter(self,event):
         """ 

sansview/perspectives/fitting/modelpage.py

@@ -97 +97 @@
              call back for model selection
         """    
-        self._on_select_model_helper(event) 
+        self._on_select_model_helper() 
         self.set_model_param_sizer(self.model)
         self._set_sizer_gaussian()
@@ -150 +150 @@
         nsigmas = wx.StaticText(self, -1, 'Nsigmas')
         self.sizer4_4.Add(nsigmas,( iy, ix),(1,1), wx.EXPAND|wx.ADJUST_MINSIZE, 0)
-       
+        
+        
         for item in self.model.dispersion.keys():
             name1=item+".width"
@@ -191 +192 @@
                 
                 elif p=="nsigmas":
+                        
                         ix =3 
                         value= self.model.getParam(name3)

sansview/perspectives/fitting/pageInfo.py

@@ -70 +70 @@
         self.list_of_radiobox[label]=[label, id, state]    
     
+    
     def clone(self):
         model=None