Changeset 64bda1e in sasview for sansview/perspectives/fitting/fitpage.py

Timestamp:

Jan 4, 2011 2:28:37 PM (14 years ago)

Author:

Jae Cho <jhjcho@…>

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:

b9b9930

Parents:

5797edc

Message:

cleaned up a little bit and fixed minor bug of Qsmear on select_model

File:

• sansview/perspectives/fitting/fitpage.py (modified) (3 diffs)

sansview/perspectives/fitting/fitpage.py

@@ -874 +874 @@
       
         if self.model != None:
+            # Reset smearer, model and data
+            self.set_data(self.data)
+            # update smearer sizer
+            self.onSmear(None)
             try:
-                temp_smear= None
-                self.onSmear(None)
-                self.smearer.set_model(self.model)
+                temp_smear = None
                 if self.enable_smearer.GetValue():
+                    # Set the smearer environments
                     temp_smear= self.smearer
                 #self.compute_chisqr(temp_smear)
@@ -890 +893 @@
                 ## set smearing value whether or not 
                 #    the data contain the smearing info
-                evt = ModelEventbox(model=self.model, 
-                                        smearer=temp_smear, 
-                                        qmin= float(self.qmin_x),
-                                     qmax= float(self.qmax_x)) 
+                evt = ModelEventbox(model = self.model, 
+                                        smearer = temp_smear, 
+                                        qmin = float(self.qmin_x),
+                                     qmax = float(self.qmax_x)) 
             else:   
-                 evt = ModelEventbox(model=self.model)
+                 evt = ModelEventbox(model = self.model)
           
-            self.manager._on_model_panel(evt=evt)
+            self.manager._on_model_panel(evt = evt)
             self.state.model = self.model.clone()
             self.state.model.name = self.model.name
@@ -1979 +1982 @@
         if self.check_invalid_panel():
             return
-        if self.model ==None:
+        if self.model == None:
             self.disable_smearer.SetValue(True)
             msg="Please select a Model first..."