Changeset 30d103a in sasview for sansview/perspectives/fitting

Timestamp:

Aug 6, 2009 12:22:55 PM (15 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:

c9aa125

Parents:

1b001a7

Message:

rename gaussian method to allow more than one dispersion

Location:

sansview/perspectives/fitting

Files:

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

sansview/perspectives/fitting/basepage.py

@@ -170 +170 @@
             Cancel the previous action
         """
-        print "enable undo"
+        #print "enable undo"
         event = PreviousStateEvent(page = self)
         wx.PostEvent(self.parent, event)
@@ -291 +291 @@
         self.disp_box = wx.ComboBox(self, -1)
 
-        for key in self.polydisp.iterkeys():
-            name = str(key.__name__)
-            if name=="ArrayDispersion":
-                # Remove the option until the rest of the code is ready for it
-                self.disp_box.Append("Select customized Model",key)
-            else:
-                self.disp_box.Append(name,key)
-        self.disp_box.SetSelection(0) 
-        
+        for key, value in self.polydisp.iteritems():
+            name = str(key)
+            self.disp_box.Append(name,value)
+        
+        self.disp_box.SetStringSelection("gaussian") 
         wx.EVT_COMBOBOX(self.disp_box,-1, self._on_select_Disp) 
              
@@ -306 +302 @@
         sizer_select_dispers.Add(self.disp_box,0,
                 wx.TOP|wx.BOTTOM|wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE,border=5)
-        #sizer_select_dispers.Add((10,10)) 
+      
         self.model_disp.Hide()
         self.disp_box.Hide()
@@ -1528 +1524 @@
 
         n = self.disp_box.GetCurrentSelection()
+        name = self.disp_box.GetValue()
         dispersity= self.disp_box.GetClientData(n)
-        name= dispersity.__name__
+        
         self.disp_name = name
-        if name == "GaussianDispersion":
-            self._set_sizer_gaussian()
-        if name == "ArrayDispersion":
+        
+        if name.lower() == "array":
             self._set_sizer_arraydispersion()
+        else:
+            self._set_sizer_dispersion(dispersity= dispersity)
             
             
@@ -1590 +1588 @@
                 self.disp_cb_dict[p] = wx.CheckBox(self, -1, p, (10, 10))
                 self.state.disp_cb_dict[p]=  self.disp_cb_dict[p].GetValue()
-                print "self.enable2D",self.enable2D
+                #print "self.enable2D",self.enable2D
                 if not (self.enable2D or self.data.__class__.__name__ =="Data2D"):
                     self.disp_cb_dict[p].Hide()

sansview/perspectives/fitting/fitpage.py

@@ -241 +241 @@
         
     
-    def _set_sizer_gaussian(self):
+    #def _set_sizer_gaussian(self):
+    def _set_sizer_dispersion(self, dispersity):
         """
             draw sizer with gaussian dispersity parameters
@@ -261 +262 @@
         # Create the dispersion objects
         for item in self.model.dispersion.keys():
-            disp_model =  GaussianDispersion()
+            #disp_model =  GaussianDispersion()
+            disp_model = dispersity()
             self._disp_obj_dict[item] = disp_model
             self.model.set_dispersion(item, disp_model)

sansview/perspectives/fitting/modelpage.py

@@ -116 +116 @@
     
   
-    def _set_sizer_gaussian(self):
-        """
-            draw sizer with gaussian dispersity parameters
+    #def _set_sizer_gaussian(self):
+    def _set_sizer_dispersion(self, dispersity):
+        """
+            draw sizer with gaussian, log or schulz dispersity parameters
         """
         self.fittable_param=[]
@@ -134 +135 @@
         # Create the dispersion objects
         for item in self.model.dispersion.keys():
-            disp_model =  GaussianDispersion()
+            #disp_model =  GaussianDispersion()
+            disp_model = dispersity()
             self._disp_obj_dict[item] = disp_model
             self.model.set_dispersion(item, disp_model)
@@ -297 +299 @@
             self._draw_model()
             self.model_view.Disable()
+           
             
             self.set_model_param_sizer(self.model)
@@ -304 +307 @@
                 for item in self.orientation_params:
                     if item[2]!=None:      
+    
                         item[2].Enable()
-            if  self.disp_name == "ArrayDispersion":                
+            if  self.disp_name.lower() == "array":                
                 self._set_sizer_arraydispersion()  
             else:
@@ -437 +441 @@
         # Set the controls
         #For qmin and qmax, do not use format_number.(If do, qmin and max could be different from what is in the data.)
-        """
-        self.qmin.SetValue(format_number(self.qmin_x))
-        self.qmax.SetValue(format_number(self.qmax_x))
-        self.npts.SetValue(format_number(self.num_points))
-        """
+       
         self.qmin.SetValue(str(self.qmin_x))
         self.qmax.SetValue(str(self.qmax_x))