Changeset da26c1a in sasview for sansview/perspectives/fitting

Timestamp:

Apr 27, 2009 12:06:05 PM (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:

88b5e83

Parents:

ad6dd4c

Message:

error of data1D restore when copying onSelect()…fitting.py

Location:

sansview/perspectives/fitting

Files:

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

sansview/perspectives/fitting/fitpage.py

@@ -45 +45 @@
         ## draw sizer
         self._fill_datainfo_sizer()
-        print "self.qmin, self.qmax====>",self.qmax_x,self.qmin_x
+       
         self._fill_model_sizer( self.sizer1)
         self._fill_range_sizer() 
@@ -554 +554 @@
         if check_float(tcrtl):
             self._onparamEnter_helper()
-            self.compute_chisqr()
+            temp_smearer = None
+            if self.enable_smearer.GetValue():
+                temp_smearer= self.smearer
+            self.compute_chisqr(smearer= temp_smearer)
         else:
             msg= "Cannot Plot :Must enter a number!!!  "

sansview/perspectives/fitting/fitting.py

@@ -24 +24 @@
 import time
 import thread
-
+from sans.fit.AbstractFitEngine import FitAbort
 
 (PageInfoEvent, EVT_PAGE_INFO)   = wx.lib.newevent.NewEvent()
@@ -480 +480 @@
             self.calc_fit.queue()
             self.calc_fit.ready(2.5)
-            
+        
+        except FitAbort:
+            print "in pluging"
         except:
             msg= "%s error: %s" % (engineType,sys.exc_value)
@@ -579 +581 @@
         self.panel = event.GetEventObject()
         for plottable in self.panel.graph.plottables:
-            
             if plottable.name == self.panel.graph.selected_plottable:
                 #if not hasattr(plottable, "is_data"):
@@ -606 +607 @@
                         data.is_data= item.is_data
                     else:
-                        data= self.copy_data(item)
+                        data= self.copy_data(item, item.dy)
                         data.is_data= item.is_data
                         
@@ -616 +617 @@
                         data.is_data=item.is_data
                     else:
-                        data= self.copy_data(item)
+                        data= self.copy_data(item,item.dy)
                         data.is_data=item.is_data