Changeset 6747217 in sasview for sansview/perspectives/fitting/fitpage.py

Timestamp:

Apr 9, 2010 12:39:34 PM (14 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:

9abec44

Parents:

4ed210f4

Message:

remove double call of draw panel in fitpanel select model

File:

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

sansview/perspectives/fitting/fitpage.py

@@ -765 +765 @@
         """
              call back for model selection
-        """    
+        """  
         self._on_select_model_helper() 
         self.set_model_param_sizer(self.model)                   
@@ -775 +775 @@
         except:
             pass
+        self.btFit.SetFocus() 
+        self.state.enable_disp = self.enable_disp.GetValue()
+        self.state.disable_disp = self.disable_disp.GetValue()
+        self.state.pinhole_smearer = self.pinhole_smearer.GetValue()
+        self.state.slit_smearer = self.slit_smearer.GetValue()
+    
+        self.state.structurecombobox = self.structurebox.GetCurrentSelection()
+        self.state.formfactorcombobox = self.formfactorbox.GetCurrentSelection()
+      
         if self.model != None:
             try:
@@ -786 +795 @@
             if self.data is not None and self.data.__class__.__name__ !="Data2D":
                 ## set smearing value whether or not the data contain the smearing info
-                self.manager.set_smearer(smearer=temp_smear, qmin= float(self.qmin_x),
+                evt = ModelEventbox(model=self.model, 
+                                        smearer=temp_smear, 
+                                        qmin= float(self.qmin_x),
                                      qmax= float(self.qmax_x)) 
-           
-            evt = ModelEventbox(model=self.model)
+            else:   
+                 evt = ModelEventbox(model=self.model)
             wx.PostEvent(self.event_owner, evt)  
             
-        self.btFit.SetFocus() 
-        self.state.enable_disp = self.enable_disp.GetValue()
-        self.state.disable_disp = self.disable_disp.GetValue()
-        self.state.pinhole_smearer = self.pinhole_smearer.GetValue()
-        self.state.slit_smearer = self.slit_smearer.GetValue()
-    
-        self.state.structurecombobox = self.structurebox.GetCurrentSelection()
-        self.state.formfactorcombobox = self.formfactorbox.GetCurrentSelection()
-      
-       
         if event !=None:
             #self._undo.Enable(True)