Changeset 6747217 in sasview

Timestamp:

Apr 9, 2010 2: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

Location:

sansview/perspectives/fitting

Files:

• fitpage.py (modified) (3 diffs)
• fitting.py (modified) (6 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)

sansview/perspectives/fitting/fitting.py

@@ -932 +932 @@
         """
         model = evt.model
-        
         if model == None:
             return
-        model.origin_name = model.name
+        smearer = None
+        qmin = None
+        qmax = None
+        if hasattr(evt, "qmin"):
+            qmin = evt.qmin
+        if hasattr(evt, "qmax"):
+            qmax = evt.qmax
+        if hasattr(evt, "smearer"):
+            smearer = evt.smearer
+        #model.origin_name = model.name
         self.current_pg = self.fit_panel.get_current_page() 
         ## make sure nothing is done on self.sim_page
         ## example trying to call set_panel on self.sim_page
         if self.current_pg != self.sim_page :
-           
             if self.page_finder[self.current_pg].get_model()== None :
                 
@@ -947 +954 @@
             else:
                 model.name= self.page_finder[self.current_pg].get_model().name
-                
+            
             data = self.page_finder[self.current_pg].get_fit_data()
             
@@ -956 +963 @@
             smearer=  self.page_finder[self.current_pg].get_smearer()
             # save model name
-            self.draw_model( model=model, smearer=smearer, 
-                             data=data, qmin=qmin, qmax=qmax)
+            self.set_smearer(smearer=smearer, qmin=qmin, qmax=qmax)
             
             if self.sim_page!=None:
@@ -1124 +1130 @@
                              title=str(title), reset=True))
             else:
-                wx.PostEvent(self.parent, NewPlotEvent(plot=new_plot,
-                             title= str(title)))
+                wx.PostEvent(self.parent, NewPlotEvent(plot=new_plot,title= str(title)))
             msg = "Plot 1D  complete !"
             wx.PostEvent( self.parent, StatusEvent( status= msg , type="stop" ))
@@ -1189 +1194 @@
         """
         self.err_dy = event.err_dy
-        print "receiving error dy",self.err_dy
+        #print "receiving error dy",self.err_dy
          
     def _draw_model2D(self,model,data=None,description=None, enable2D=False,
@@ -1299 +1304 @@
     cProfile.runctx('call()', dict(call=call), {}, 'profile.out')
     stats = pstats.Stats('profile.out')
-    stats.sort_stats('time')
-    #stats.sort_stats('calls')
+    #stats.sort_stats('time')
+    stats.sort_stats('calls')
     stats.print_stats()
     os.unlink('profile.out')