Changeset d0eac66 in sasview

Timestamp:

Feb 9, 2009 4:35:43 PM (16 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:

fee6059

Parents:

13e120a

Message:

Fixed generating an error when calling 'select data for fitting' twice.

File:

• sansview/perspectives/fitting/fitting.py (modified) (2 diffs)

sansview/perspectives/fitting/fitting.py

@@ -199 +199 @@
                 #find a name for the page created for notebook
                 try:
+                   
                     page, model_name = self.fit_panel.add_fit_page(item)
                     # add data associated to the page created
-                    
-                    if page !=None:    
+                   
+                    if page !=None:   
                         #create a fitproblem storing all link to data,model,page creation
                         self.page_finder[page]= FitProblem()
                         self.page_finder[page].save_model_name(model_name)  
                         self.page_finder[page].add_data(item)
+                        wx.PostEvent(self.parent, StatusEvent(status="Page Created"))
+                    else:
+                        wx.PostEvent(self.parent, StatusEvent(status="Page was already Created"))
                 except:
-                    raise
+                    #raise
                     wx.PostEvent(self.parent, StatusEvent(status="Creating Fit page: %s"\
                     %sys.exc_value))
@@ -669 +673 @@
                 theory.source= data.source
                 
+                theory.qmin= qmin
+                theory.qmax= qmax
+                theory.ymin= ymin
+                theory.ymax= ymax
                 theory.xmin= xmin
                 theory.xmax= xmax
-                theory.ymin= ymin
-                theory.ymax= ymax
         
                 wx.PostEvent(self.parent, NewPlotEvent(plot=theory,