Changeset bdb27e6 in sasview

Timestamp:

Mar 7, 2009 6:56:50 AM (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:

aae8d23

Parents:

fbc3e04

Message:

sansview: fixed problem with switching back to a Gaussian dispersity model after have used an ArrayDispersion? model (the dispersion model were not properly set to Gaussian before filling the form, which left the form blank).

File:

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

sansview/perspectives/fitting/modelpage.py

@@ -231 +231 @@
         self.Layout()
         self.parent.GetSizer().Layout()
+        
+    def _set_dispersion(self, par, disp_model):
+        """
+            Utility method to set a dispersion model while making
+            sure that the dispersion model object doesn't go out
+            of scope. The models should be cleaned up so we don't
+            have to do this.
+        """
+        # Store the object to make it persist outside the scope of this method
+        #TODO: refactor model to clean this up?
+        self._disp_obj_dict[par] = disp_model
+                    
+        # Set the new model as the dispersion object for the selected parameter
+        self.model.set_dispersion(par, disp_model)
+        
     def set_model_description(self, model):
         
@@ -314 +329 @@
             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)
+                self._set_dispersion(p, disp_model)
                     
             # Redraw the model
@@ -693 +702 @@
                     disp_model = ArrayDispersion()
                     disp_model.set_weights(values, weights)
-                    # 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)
-                    
+                    self._set_dispersion(p, disp_model)
                     
                     # Redraw the model
@@ -707 +710 @@
                     # The parameter was un-selected. Go back to Gaussian model (with 0 pts)
                     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)
+                    self._set_dispersion(p, disp_model)
                     
                     # Redraw the model
@@ -731 +729 @@
         iy=1
                 ### this will become a separate method
+        #TODO: don't hard code text values to be shown on the interface
         if type== "Select customized Model":
             ix=0
@@ -784 +783 @@
                 name3=item+".nsigmas"
                 iy += 1
+                
+                # Make sure the dispersion model is Gaussian
+                if not self.model.dispersion[item]['type'] == 'gaussian': 
+                    disp_model = GaussianDispersion()
+                    self._set_dispersion(item, disp_model)
+                
+                # Create the interface
                 for p in self.model.dispersion[item].keys():
                     #print "name 1 2 3", name1, name2, name3