Changeset 07a93a1 in sasview

Timestamp:

Mar 5, 2009 8:10:36 PM (16 years ago)

Author:

Mathieu Doucet <doucetm@…>

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:

1fbb343

Parents:

12aa9b5

Message:

sansview: fixed problem with switching back and forth between dispersity and no dispersity

Location:

sansview/perspectives/fitting

Files:

• fitpage1D.py (modified) (2 diffs)
• modelpage.py (modified) (3 diffs)

sansview/perspectives/fitting/fitpage1D.py

@@ -13 +13 @@
 
 
-
+#TODO: FitPage1D inherits from ModelPage but doesn't call its __init__ method!
+#TODO: refactor this class to have an __init__ that deals with data only, then calls a UI builder method.
 class FitPage1D(ModelPage):
     """
@@ -40 +41 @@
         #fit page manager 
         self.manager = None
+        
+        
+        # Should not have to write the following line if the inheritance
+        # was coded properly...
+        #TODO: get rid of this line once the class is refactored
+        self._disp_obj_dict = {}
+        
+        
         #Store the parent of this panel parent
         # For this application fitpanel is the parent

sansview/perspectives/fitting/modelpage.py

@@ -37 +37 @@
         # Data member to store the dispersion object created
         self._disp_obj_dict = {}
-        self.back_up_model= model.clone()
         #list of dispersion paramaters
         self.disp_list=[]
@@ -279 +278 @@
 
     def Set_DipersParam(self, event):
+        """
+            This method is called when the user changes the state 
+            of the "dispersity" radio buttons.
+            
+            #TODO: correct the spelling mistake in the name of this method, start name with lowercase.
+        """
         if self.enable_disp.GetValue():
+            # The user selected to use dispersion/averaging
             if len(self.disp_list)==0:
+                # This model contains no parameter to which we can apply dispersion/averaging
                 ix=0
                 iy=1
@@ -294 +301 @@
                 return 
             else:
-                if self.data !=None and self.model !=None: # allow to recognize data panel from model panel
-                    
-                
-                    self.cb1.SetValue(False)
-                    self.select_all_param_helper()
-                
+                # Show the default dispersion/averaging sub-panel
                 self.populate_disp_box()
                 self.set_panel_dispers(self.disp_list)
                 
         else:
-            if self.data !=None and self.model!=None:
-                if self.cb1.GetValue():
-                    self.select_all_param_helper()
-            
-            if self.back_up_model!=None:
-                keys = self.back_up_model.getDispParamList()
-                keys.sort()
-                #disperse param into the initial state
-                for item in keys:
-                    value= self.back_up_model.getParam(item)
-                    self.model.setParam(item, value)
-                self._draw_model() 
-            
+            # The user selected not to use dispersion/averaging            
+            # Make sure all parameters have the default Gaussian
+            # dispersion object with only a single point (no dispersion).
+            for p in self.model.dispersion.keys():
+                disp_model = GaussianDispersion()
+                
+                # Store the object to make it persist outside the scope of this method
+                #TODO: refactor model to clean this up?
+                self._disp_obj_dict[p] = disp_model
+                    
+                # Set the new model as the dispersion object for the selected parameter
+                self.model.set_dispersion(p, disp_model)
+                    
+            # Redraw the model
+            self._draw_model()
                 
             self.fittable_param=[]