Changeset 30d103a in sasview for sansview/perspectives/fitting/modelpage.py

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

File:

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

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))