Changeset 847091f in sasview for sansview/perspectives/fitting

Timestamp:

Apr 16, 2009 10:01:36 AM (16 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:

3370922

Parents:

997131a

Message:

disabling smearing for data with no smearing info

Location:

sansview/perspectives/fitting

Files:

• fitpage.py (modified) (3 diffs)
• fitting.py (modified) (5 diffs)

sansview/perspectives/fitting/fitpage.py

@@ -50 +50 @@
         if self.data !=None:
             self.smearer = smear_selection( self.data )
-            
+            if self.smearer ==None:
+                self.enable_smearer.Disable()
+                self.disable_smearer.Disable()
+                
         ## to update the panel according to the fit engine type selected
         self.Bind(EVT_FITTER_TYPE,self._on_engine_change)
@@ -602 +605 @@
         
         
-      
     def onSmear(self, event):
         """
@@ -631 +633 @@
         ## save the state enable smearing
         self.save_current_state()
+         
+   
         
   

sansview/perspectives/fitting/fitting.py

@@ -825 +825 @@
             Update the output of plotting model 1D
         """
-        self.calc_thread.ready(1)
+        wx.PostEvent(self.parent, StatusEvent(status="Plot \
+        #updating ... ",type="update"))
+        self.calc_thread.ready(0.01)
     
     def _fill_default_model2D(self, theory, qmax,qstep, qmin=None):
@@ -907 +909 @@
             Complete plotting 1D data
         """ 
+       
         try:
             
@@ -931 +934 @@
                 wx.PostEvent(self.parent, NewPlotEvent(plot=new_plot,
                              title= str(title)))
-            
+            msg = "Plot 1D  complete !"
+            wx.PostEvent( self.parent, StatusEvent( status= msg , type="stop" ))
         except:
             msg= " Error occurred when drawing %s Model 1D: "%new_plot.name
             msg+= " %s"%sys.exc_value
-            wx.PostEvent( self.parent, StatusEvent(status= msg ))
+            wx.PostEvent( self.parent, StatusEvent(status= msg, type="stop"  ))
             return  
         
@@ -955 +959 @@
             that can be plot.
         """
-        msg = "Calc complete !"
-        wx.PostEvent( self.parent, StatusEvent( status= msg , type="stop" ))
+      
     
         err_image = numpy.zeros(numpy.shape(image))
@@ -983 +986 @@
         wx.PostEvent(self.parent, NewPlotEvent(plot=theory,
                          title="Analytical model 2D ", reset=True ))
+        msg = "Plot 2D complete !"
+        wx.PostEvent( self.parent, StatusEvent( status= msg , type="stop" ))
          
     def _on_data_error(self, event):